From: Greg Kroah-Hartman Date: Thu, 13 Jan 2022 14:52:31 +0000 (+0100) Subject: 5.16-stable patches X-Git-Tag: v5.16.1~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ddf2a3ffd82e64e0121f9469b01f25f65856d53;p=thirdparty%2Fkernel%2Fstable-queue.git 5.16-stable patches added patches: mfd-intel-lpss-pci-fix-clock-speed-for-38a8-uart.patch --- diff --git a/queue-5.16/mfd-intel-lpss-pci-fix-clock-speed-for-38a8-uart.patch b/queue-5.16/mfd-intel-lpss-pci-fix-clock-speed-for-38a8-uart.patch new file mode 100644 index 00000000000..60f214a2f9c --- /dev/null +++ b/queue-5.16/mfd-intel-lpss-pci-fix-clock-speed-for-38a8-uart.patch @@ -0,0 +1,44 @@ +From 9651cf2cb14726c785240e9dc01b274a68e9959e Mon Sep 17 00:00:00 2001 +From: Orlando Chamberlain +Date: Wed, 24 Nov 2021 09:19:44 +0000 +Subject: mfd: intel-lpss-pci: Fix clock speed for 38a8 UART + +From: Orlando Chamberlain + +commit 9651cf2cb14726c785240e9dc01b274a68e9959e upstream. + +This device is found in the MacBookPro16,2, and as the MacBookPro16,1 is +from the same generation of MacBooks and has a UART with bxt_uart_info, +it was incorrectly assumed that the MacBookPro16,2's UART would have the +same info. + +This led to the wrong clock speed being used, and the Bluetooth +controller exposed by the UART receiving and sending random data, which +was incorrectly assumed to be an issue with the Bluetooth stuff, not an +error with the UART side of things. + +Changing the info to spt_uart_info changes the clock speed and makes it +send and receive data correctly. + +Fixes: ddb1ada416fd ("mfd: intel-lpss: Add support for MacBookPro16,2 ICL-N UART") +Signed-off-by: Orlando Chamberlain +Reviewed-by: Andy Shevchenko +Signed-off-by: Lee Jones +Cc: Aditya Garg +Link: https://lore.kernel.org/r/20211124091846.11114-1-redecorating@protonmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mfd/intel-lpss-pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mfd/intel-lpss-pci.c ++++ b/drivers/mfd/intel-lpss-pci.c +@@ -254,7 +254,7 @@ static const struct pci_device_id intel_ + { PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info }, + /* ICL-N */ +- { PCI_VDEVICE(INTEL, 0x38a8), (kernel_ulong_t)&bxt_uart_info }, ++ { PCI_VDEVICE(INTEL, 0x38a8), (kernel_ulong_t)&spt_uart_info }, + /* TGL-H */ + { PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info }, diff --git a/queue-5.16/series b/queue-5.16/series index cca38756f0b..b478fbd4440 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -23,4 +23,5 @@ bluetooth-btbcm-disable-read-tx-power-for-some-macs-with-the-t2-security-chip.pa bluetooth-btbcm-disable-read-tx-power-for-macbook-air-8-1-and-8-2.patch veth-do-not-record-rx-queue-hint-in-veth_xmit.patch mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch +mfd-intel-lpss-pci-fix-clock-speed-for-38a8-uart.patch x86-mce-remove-noinstr-annotation-from-mce_setup.patch