mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 15:12:13 +02:00
TI SoC driver updates for v6.16
- ti_sci: Bug fix in CPU latency conversion from us to ms for TISCI protocol - k3-socinfo: Add JTAG ID for AM62LX - Code cleanups: wkup_m3_ipc: Use dev_err_probe, k3-ringacc: use device_match_of_probe and knav_qmss_queue: drop unnecessary NULL check -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE+KKGk1TrgjIXoxo03bWEnRc2JJ0FAmgiA5oACgkQ3bWEnRc2 JJ2pfQ//ZwfZ9/QifyvND6E1/xIVe2pk3zCc0Yh5MDCNq0sEC7sw7gHWMW2rwGoQ 6UTLJzqqdjB4FEmr/rWb2ZhYELvlESNrxESrDFULqh//t7J/L9OIqOhxBg2eyADn PHXYizgICKt5FF4K6v5DOGeSYKhk5QOzTVxbdKMnrU6OPrefbV8wnp2gqbvjtRWh CPh2xpx8MZgI2y7Joy/vV9XQkNpLOSSqFg59JiT8zA0gLV6OEikXSSbnxbHgKcSg t30C+7GyUcTQ47cKMPyHzap76vZ707h+CMSJ5UMzjhgJCM1WepquYqE4b+5CWJal 9pajrgLqFABpMXyzGitpv2+MhIfyc8jGY3VY3IsWeezmXucIe8X9AbFb3zvOazVy qmytSADnYcEV2d9ugIwbmBr0ksXNIG0bKmhHzThxSs0nep2Ezzk7O6A6ujL7dQyy 8SogQtfdZSSaDvTVMVIV1QMvF2SJnUUIJgL2obIj8vv2GSsFP4R8uKZaPxevv2tI f6Lb5gUlxLJCFXuyUa7uya4l8QgO+OFW7ln+C31R1jJOOWmsUtfxAhjJXGL8rUL+ lhWOmQs/XCu9AxqH3QNEoTHl0A4JtSk0TbqvnuajguQB1IQHO2TGvgzv9f0nRIM3 6BreADgLQkaFi9YE19SHJxHdXhR4zIQDdcNMCUK6v63yV2SUztc= =2TQF -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmguB6IACgkQmmx57+YA GNk5Xw//WM1CTqM/MgXDImqDR0u41T1rW6vzwo3CKSlh9+qo3JLAApP1cmfN0LLB 0lip3XUvItb72XqgB28GfUF+9dU7jn8FvhsMzE0tF9gfG9D+2zRtpZoPTt8wUX1b MMGiIlQXErfSAeBlzHlQ+dujOD2vYbhFf5YXptv3eQZ1XyTOwF3eOuURbiCBQfAJ Ki8klH/+9p1fVhgyCYXcOrWYJ3IIbGzDj/kwFOYf/kP1FdnfLiG4Fl3uShKzZE4v twwqEPYDNwcw47rYR3Y/jhLsQmfpLvd2tHt7wJS+Rl29QMzFJ0oSIn8Y84YiWdDQ hU5QLqIo4NlEZ+0+VqaBm3ulVypBkMXAKwiGUG+GZyCzNTaq2lGxBPrirXRojjsK 1uMYXPJWG9gdBBDiwDu+lVP/nxZtMgU4Vwo0XtbSNOAQ3eW4/4Dz4jmgw5vGwLe7 a8O3cTr1V4DuvpETp4Meo8pwZHoi/3iw6k3fveGfxYlYNWYx2uP7AoRGbDr5dXPz SYsL5592FCpC6aXLD8+LRJ04PszDAeVx1kyss3/SWwAFeTx6EH0qPLinWrwHi77L Fi5E45Rk9WWslSMFKEwBRJqGuxtbkyPOtuyATmOmnLPz1Ip2puJCBznCipoBULDr lVMbkzkMcoLOLJtm7W51Ng+hJIcg4zykITw4SxZDMCFCB7DxEos= =N/zC -----END PGP SIGNATURE----- Merge tag 'ti-driver-soc-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers TI SoC driver updates for v6.16 - ti_sci: Bug fix in CPU latency conversion from us to ms for TISCI protocol - k3-socinfo: Add JTAG ID for AM62LX - Code cleanups: wkup_m3_ipc: Use dev_err_probe, k3-ringacc: use device_match_of_probe and knav_qmss_queue: drop unnecessary NULL check * tag 'ti-driver-soc-for-v6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: soc: ti: wkup_m3_ipc: Use dev_err_probe firmware: ti_sci: Convert CPU latency constraint from us to ms soc: ti: k3-socinfo: Add JTAG ID for AM62LX soc: ti: knav_qmss_queue: Remove unnecessary NULL check before free_percpu() soc: ti: k3-ringacc: Use device_match_of_node() Link: https://lore.kernel.org/r/20250512144719.mpkyw2jbyzslb5hy@yearly Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
50c77033bc
|
|
@ -2,7 +2,7 @@
|
|||
/*
|
||||
* Texas Instruments System Control Interface Protocol Driver
|
||||
*
|
||||
* Copyright (C) 2015-2024 Texas Instruments Incorporated - https://www.ti.com/
|
||||
* Copyright (C) 2015-2025 Texas Instruments Incorporated - https://www.ti.com/
|
||||
* Nishanth Menon
|
||||
*/
|
||||
|
||||
|
|
@ -3670,6 +3670,7 @@ static int __maybe_unused ti_sci_suspend(struct device *dev)
|
|||
struct ti_sci_info *info = dev_get_drvdata(dev);
|
||||
struct device *cpu_dev, *cpu_dev_max = NULL;
|
||||
s32 val, cpu_lat = 0;
|
||||
u16 cpu_lat_ms;
|
||||
int i, ret;
|
||||
|
||||
if (info->fw_caps & MSG_FLAG_CAPS_LPM_DM_MANAGED) {
|
||||
|
|
@ -3682,9 +3683,16 @@ static int __maybe_unused ti_sci_suspend(struct device *dev)
|
|||
}
|
||||
}
|
||||
if (cpu_dev_max) {
|
||||
dev_dbg(cpu_dev_max, "%s: sending max CPU latency=%u\n", __func__, cpu_lat);
|
||||
/*
|
||||
* PM QoS latency unit is usecs, device manager uses msecs.
|
||||
* Convert to msecs and round down for device manager.
|
||||
*/
|
||||
cpu_lat_ms = cpu_lat / USEC_PER_MSEC;
|
||||
dev_dbg(cpu_dev_max, "%s: sending max CPU latency=%u ms\n", __func__,
|
||||
cpu_lat_ms);
|
||||
ret = ti_sci_cmd_set_latency_constraint(&info->handle,
|
||||
cpu_lat, TISCI_MSG_CONSTRAINT_SET);
|
||||
cpu_lat_ms,
|
||||
TISCI_MSG_CONSTRAINT_SET);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1291,7 +1291,7 @@ struct k3_ringacc *of_k3_ringacc_get_by_phandle(struct device_node *np,
|
|||
|
||||
mutex_lock(&k3_ringacc_list_lock);
|
||||
list_for_each_entry(entry, &k3_ringacc_list, list)
|
||||
if (entry->dev->of_node == ringacc_np) {
|
||||
if (device_match_of_node(entry->dev, ringacc_np)) {
|
||||
ringacc = entry;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
#define JTAG_ID_PARTNO_AM62AX 0xBB8D
|
||||
#define JTAG_ID_PARTNO_AM62PX 0xBB9D
|
||||
#define JTAG_ID_PARTNO_J722S 0xBBA0
|
||||
#define JTAG_ID_PARTNO_AM62LX 0xBBA7
|
||||
|
||||
static const struct k3_soc_id {
|
||||
unsigned int id;
|
||||
|
|
@ -58,6 +59,7 @@ static const struct k3_soc_id {
|
|||
{ JTAG_ID_PARTNO_AM62AX, "AM62AX" },
|
||||
{ JTAG_ID_PARTNO_AM62PX, "AM62PX" },
|
||||
{ JTAG_ID_PARTNO_J722S, "J722S" },
|
||||
{ JTAG_ID_PARTNO_AM62LX, "AM62LX" },
|
||||
};
|
||||
|
||||
static const char * const j721e_rev_string_map[] = {
|
||||
|
|
|
|||
|
|
@ -252,8 +252,7 @@ static struct knav_queue *__knav_queue_open(struct knav_queue_inst *inst,
|
|||
return qh;
|
||||
|
||||
err:
|
||||
if (qh->stats)
|
||||
free_percpu(qh->stats);
|
||||
free_percpu(qh->stats);
|
||||
devm_kfree(inst->kdev->dev, qh);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -644,11 +644,9 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev)
|
|||
|
||||
m3_ipc->mbox = mbox_request_channel(&m3_ipc->mbox_client, 0);
|
||||
|
||||
if (IS_ERR(m3_ipc->mbox)) {
|
||||
dev_err(dev, "IPC Request for A8->M3 Channel failed! %ld\n",
|
||||
PTR_ERR(m3_ipc->mbox));
|
||||
return PTR_ERR(m3_ipc->mbox);
|
||||
}
|
||||
if (IS_ERR(m3_ipc->mbox))
|
||||
return dev_err_probe(dev, PTR_ERR(m3_ipc->mbox),
|
||||
"IPC Request for A8->M3 Channel failed!\n");
|
||||
|
||||
if (of_property_read_u32(dev->of_node, "ti,rproc", &rproc_phandle)) {
|
||||
dev_err(&pdev->dev, "could not get rproc phandle\n");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user