From: Greg Kroah-Hartman Date: Mon, 10 Mar 2025 10:52:04 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.4.291~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c989cfd202d325bb253e45693f7395eabbd56932;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: eeprom-digsy_mtc-make-gpio-lookup-table-match-the-device.patch intel_th-pci-add-arrow-lake-support.patch intel_th-pci-add-panther-lake-h-support.patch intel_th-pci-add-panther-lake-p-u-support.patch mei-me-add-panther-lake-p-did.patch slimbus-messaging-free-transaction-id-in-delayed-interrupt-scenario.patch --- diff --git a/queue-5.10/eeprom-digsy_mtc-make-gpio-lookup-table-match-the-device.patch b/queue-5.10/eeprom-digsy_mtc-make-gpio-lookup-table-match-the-device.patch new file mode 100644 index 0000000000..356e2357fc --- /dev/null +++ b/queue-5.10/eeprom-digsy_mtc-make-gpio-lookup-table-match-the-device.patch @@ -0,0 +1,35 @@ +From 038ef0754aae76f79b147b8867f9250e6a976872 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Fri, 7 Feb 2025 00:03:11 +0200 +Subject: eeprom: digsy_mtc: Make GPIO lookup table match the device + +From: Andy Shevchenko + +commit 038ef0754aae76f79b147b8867f9250e6a976872 upstream. + +The dev_id value in the GPIO lookup table must match to +the device instance name, which in this case is combined +of name and platform device ID, i.e. "spi_gpio.1". But +the table assumed that there was no platform device ID +defined, which is wrong. Fix the dev_id value accordingly. + +Fixes: 9b00bc7b901f ("spi: spi-gpio: Rewrite to use GPIO descriptors") +Cc: stable +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20250206220311.1554075-1-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/eeprom/digsy_mtc_eeprom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/misc/eeprom/digsy_mtc_eeprom.c ++++ b/drivers/misc/eeprom/digsy_mtc_eeprom.c +@@ -60,7 +60,7 @@ static struct platform_device digsy_mtc_ + }; + + static struct gpiod_lookup_table eeprom_spi_gpiod_table = { +- .dev_id = "spi_gpio", ++ .dev_id = "spi_gpio.1", + .table = { + GPIO_LOOKUP("gpio@b00", GPIO_EEPROM_CLK, + "sck", GPIO_ACTIVE_HIGH), diff --git a/queue-5.10/intel_th-pci-add-arrow-lake-support.patch b/queue-5.10/intel_th-pci-add-arrow-lake-support.patch new file mode 100644 index 0000000000..05c2bb4c7a --- /dev/null +++ b/queue-5.10/intel_th-pci-add-arrow-lake-support.patch @@ -0,0 +1,35 @@ +From b5edccae9f447a92d475267d94c33f4926963eec Mon Sep 17 00:00:00 2001 +From: Pawel Chmielewski +Date: Tue, 11 Feb 2025 20:50:15 +0200 +Subject: intel_th: pci: Add Arrow Lake support + +From: Pawel Chmielewski + +commit b5edccae9f447a92d475267d94c33f4926963eec upstream. + +Add support for the Trace Hub in Arrow Lake. + +Signed-off-by: Pawel Chmielewski +Signed-off-by: Alexander Shishkin +Reviewed-by: Andy Shevchenko +Cc: stable@kernel.org +Link: https://lore.kernel.org/r/20250211185017.1759193-4-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -330,6 +330,11 @@ static const struct pci_device_id intel_ + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + { ++ /* Arrow Lake */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7724), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, ++ { + /* Alder Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), + .driver_data = (kernel_ulong_t)&intel_th_2x, diff --git a/queue-5.10/intel_th-pci-add-panther-lake-h-support.patch b/queue-5.10/intel_th-pci-add-panther-lake-h-support.patch new file mode 100644 index 0000000000..748e3ae9e7 --- /dev/null +++ b/queue-5.10/intel_th-pci-add-panther-lake-h-support.patch @@ -0,0 +1,34 @@ +From a70034d6c0d5f3cdee40bb00a578e17fd2ebe426 Mon Sep 17 00:00:00 2001 +From: Alexander Shishkin +Date: Tue, 11 Feb 2025 20:50:16 +0200 +Subject: intel_th: pci: Add Panther Lake-H support + +From: Alexander Shishkin + +commit a70034d6c0d5f3cdee40bb00a578e17fd2ebe426 upstream. + +Add support for the Trace Hub in Panther Lake-H. + +Signed-off-by: Alexander Shishkin +Reviewed-by: Andy Shevchenko +Cc: stable@kernel.org +Link: https://lore.kernel.org/r/20250211185017.1759193-5-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -335,6 +335,11 @@ static const struct pci_device_id intel_ + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + { ++ /* Panther Lake-H */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe324), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, ++ { + /* Alder Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), + .driver_data = (kernel_ulong_t)&intel_th_2x, diff --git a/queue-5.10/intel_th-pci-add-panther-lake-p-u-support.patch b/queue-5.10/intel_th-pci-add-panther-lake-p-u-support.patch new file mode 100644 index 0000000000..98128db206 --- /dev/null +++ b/queue-5.10/intel_th-pci-add-panther-lake-p-u-support.patch @@ -0,0 +1,34 @@ +From 49114ff05770264ae233f50023fc64a719a9dcf9 Mon Sep 17 00:00:00 2001 +From: Alexander Shishkin +Date: Tue, 11 Feb 2025 20:50:17 +0200 +Subject: intel_th: pci: Add Panther Lake-P/U support + +From: Alexander Shishkin + +commit 49114ff05770264ae233f50023fc64a719a9dcf9 upstream. + +Add support for the Trace Hub in Panther Lake-P/U. + +Signed-off-by: Alexander Shishkin +Reviewed-by: Andy Shevchenko +Cc: stable@kernel.org +Link: https://lore.kernel.org/r/20250211185017.1759193-6-alexander.shishkin@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/hwtracing/intel_th/pci.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -340,6 +340,11 @@ static const struct pci_device_id intel_ + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + { ++ /* Panther Lake-P/U */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe424), ++ .driver_data = (kernel_ulong_t)&intel_th_2x, ++ }, ++ { + /* Alder Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), + .driver_data = (kernel_ulong_t)&intel_th_2x, diff --git a/queue-5.10/mei-me-add-panther-lake-p-did.patch b/queue-5.10/mei-me-add-panther-lake-p-did.patch new file mode 100644 index 0000000000..1b35054260 --- /dev/null +++ b/queue-5.10/mei-me-add-panther-lake-p-did.patch @@ -0,0 +1,44 @@ +From a8e8ffcc3afce2ee5fb70162aeaef3f03573ee1e Mon Sep 17 00:00:00 2001 +From: Alexander Usyskin +Date: Sun, 9 Feb 2025 13:05:50 +0200 +Subject: mei: me: add panther lake P DID + +From: Alexander Usyskin + +commit a8e8ffcc3afce2ee5fb70162aeaef3f03573ee1e upstream. + +Add Panther Lake P device id. + +Cc: stable +Co-developed-by: Tomas Winkler +Signed-off-by: Tomas Winkler +Signed-off-by: Alexander Usyskin +Link: https://lore.kernel.org/r/20250209110550.1582982-1-alexander.usyskin@intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/mei/hw-me-regs.h | 2 ++ + drivers/misc/mei/pci-me.c | 2 ++ + 2 files changed, 4 insertions(+) + +--- a/drivers/misc/mei/hw-me-regs.h ++++ b/drivers/misc/mei/hw-me-regs.h +@@ -117,6 +117,8 @@ + + #define MEI_DEV_ID_LNL_M 0xA870 /* Lunar Lake Point M */ + ++#define MEI_DEV_ID_PTL_P 0xE470 /* Panther Lake P */ ++ + /* + * MEI HW Section + */ +--- a/drivers/misc/mei/pci-me.c ++++ b/drivers/misc/mei/pci-me.c +@@ -123,6 +123,8 @@ static const struct pci_device_id mei_me + + {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)}, + ++ {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)}, ++ + /* required last entry */ + {0, } + }; diff --git a/queue-5.10/series b/queue-5.10/series index ffd53963b1..367912758e 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -455,3 +455,9 @@ usb-gadget-check-bmattributes-only-if-configuration-is-valid.patch kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch xhci-pci-fix-indentation-in-the-pci-device-id-definitions.patch squashfs-check-the-inode-number-is-not-the-invalid-value-of-zero.patch +mei-me-add-panther-lake-p-did.patch +intel_th-pci-add-arrow-lake-support.patch +intel_th-pci-add-panther-lake-h-support.patch +intel_th-pci-add-panther-lake-p-u-support.patch +slimbus-messaging-free-transaction-id-in-delayed-interrupt-scenario.patch +eeprom-digsy_mtc-make-gpio-lookup-table-match-the-device.patch diff --git a/queue-5.10/slimbus-messaging-free-transaction-id-in-delayed-interrupt-scenario.patch b/queue-5.10/slimbus-messaging-free-transaction-id-in-delayed-interrupt-scenario.patch new file mode 100644 index 0000000000..f326806a4b --- /dev/null +++ b/queue-5.10/slimbus-messaging-free-transaction-id-in-delayed-interrupt-scenario.patch @@ -0,0 +1,55 @@ +From dcb0d43ba8eb9517e70b1a0e4b0ae0ab657a0e5a Mon Sep 17 00:00:00 2001 +From: Visweswara Tanuku +Date: Fri, 24 Jan 2025 04:57:40 -0800 +Subject: slimbus: messaging: Free transaction ID in delayed interrupt scenario + +From: Visweswara Tanuku + +commit dcb0d43ba8eb9517e70b1a0e4b0ae0ab657a0e5a upstream. + +In case of interrupt delay for any reason, slim_do_transfer() +returns timeout error but the transaction ID (TID) is not freed. +This results into invalid memory access inside +qcom_slim_ngd_rx_msgq_cb() due to invalid TID. + +Fix the issue by freeing the TID in slim_do_transfer() before +returning timeout error to avoid invalid memory access. + +Call trace: +__memcpy_fromio+0x20/0x190 +qcom_slim_ngd_rx_msgq_cb+0x130/0x290 [slim_qcom_ngd_ctrl] +vchan_complete+0x2a0/0x4a0 +tasklet_action_common+0x274/0x700 +tasklet_action+0x28/0x3c +_stext+0x188/0x620 +run_ksoftirqd+0x34/0x74 +smpboot_thread_fn+0x1d8/0x464 +kthread+0x178/0x238 +ret_from_fork+0x10/0x20 +Code: aa0003e8 91000429 f100044a 3940002b (3800150b) +---[ end trace 0fe00bec2b975c99 ]--- +Kernel panic - not syncing: Oops: Fatal exception in interrupt. + +Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework") +Cc: stable +Signed-off-by: Visweswara Tanuku +Link: https://lore.kernel.org/r/20250124125740.16897-1-quic_vtanuku@quicinc.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/slimbus/messaging.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/slimbus/messaging.c ++++ b/drivers/slimbus/messaging.c +@@ -147,8 +147,9 @@ int slim_do_transfer(struct slim_control + } + + ret = ctrl->xfer_msg(ctrl, txn); +- +- if (!ret && need_tid && !txn->msg->comp) { ++ if (ret == -ETIMEDOUT) { ++ slim_free_txn_tid(ctrl, txn); ++ } else if (!ret && need_tid && !txn->msg->comp) { + unsigned long ms = txn->rl + HZ; + + timeout = wait_for_completion_timeout(txn->comp,