From: Greg Kroah-Hartman Date: Mon, 6 Dec 2021 09:19:29 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.4.294~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6adf5bc63e7cd2529551f3151d86a95f9136944c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: iwlwifi-mvm-retry-init-flow-if-failed.patch parisc-fix-kbuild_image-for-self-extracting-kernel.patch parisc-fix-make-install-on-newer-debian-releases.patch serial-8250_pci-fix-acces-entries-in-pci_serial_quirks-array.patch serial-8250_pci-rewrite-pericom_do_set_divisor.patch serial-core-fix-transmit-buffer-reset-and-memleak.patch serial-pl011-add-acpi-sbsa-uart-match-id.patch tty-serial-msm_serial-deactivate-rx-dma-for-polling-support.patch usb-no_lpm-quirk-lenovo-powered-usb-c-travel-hub.patch usb-typec-tcpm-wait-in-snk_debounced-until-disconnect.patch vgacon-propagate-console-boot-parameters-before-calling-vc_resize.patch x86-64-mm-map-all-kernel-memory-into-trampoline_pgd.patch x86-tsc-add-a-timer-to-make-sure-tsc_adjust-is-always-checked.patch x86-tsc-disable-clocksource-watchdog-for-tsc-on-qualified-platorms.patch xhci-fix-commad-ring-abort-write-all-64-bits-to-crcr-register.patch --- diff --git a/queue-5.4/iwlwifi-mvm-retry-init-flow-if-failed.patch b/queue-5.4/iwlwifi-mvm-retry-init-flow-if-failed.patch new file mode 100644 index 00000000000..b9b3f1f2a9f --- /dev/null +++ b/queue-5.4/iwlwifi-mvm-retry-init-flow-if-failed.patch @@ -0,0 +1,156 @@ +From 5283dd677e52af9db6fe6ad11b2f12220d519d0c Mon Sep 17 00:00:00 2001 +From: Mordechay Goodstein +Date: Wed, 10 Nov 2021 15:01:59 +0200 +Subject: iwlwifi: mvm: retry init flow if failed + +From: Mordechay Goodstein + +commit 5283dd677e52af9db6fe6ad11b2f12220d519d0c upstream. + +In some very rare cases the init flow may fail. In many cases, this is +recoverable, so we can retry. Implement a loop to retry two more times +after the first attempt failed. + +This can happen in two different situations, namely during probe and +during mac80211 start. For the first case, a simple loop is enough. +For the second case, we need to add a flag to prevent mac80211 from +trying to restart it as well, leaving full control with the driver. + +Cc: +Signed-off-by: Mordechay Goodstein +Signed-off-by: Luca Coelho +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/iwlwifi.20211110150132.57514296ecab.I52a0411774b700bdc7dedb124d8b59bf99456eb2@changeid +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 22 +++++++++++++------- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 3 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 +++++++++++++++++++++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 ++ + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 ++ + 5 files changed, 47 insertions(+), 8 deletions(-) + +--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +@@ -1276,23 +1276,31 @@ _iwl_op_mode_start(struct iwl_drv *drv, + const struct iwl_op_mode_ops *ops = op->ops; + struct dentry *dbgfs_dir = NULL; + struct iwl_op_mode *op_mode = NULL; ++ int retry, max_retry = !!iwlwifi_mod_params.fw_restart * IWL_MAX_INIT_RETRY; ++ ++ for (retry = 0; retry <= max_retry; retry++) { + + #ifdef CONFIG_IWLWIFI_DEBUGFS +- drv->dbgfs_op_mode = debugfs_create_dir(op->name, +- drv->dbgfs_drv); +- dbgfs_dir = drv->dbgfs_op_mode; ++ drv->dbgfs_op_mode = debugfs_create_dir(op->name, ++ drv->dbgfs_drv); ++ dbgfs_dir = drv->dbgfs_op_mode; + #endif + +- op_mode = ops->start(drv->trans, drv->trans->cfg, &drv->fw, dbgfs_dir); ++ op_mode = ops->start(drv->trans, drv->trans->cfg, ++ &drv->fw, dbgfs_dir); ++ ++ if (op_mode) ++ return op_mode; ++ ++ IWL_ERR(drv, "retry init count %d\n", retry); + + #ifdef CONFIG_IWLWIFI_DEBUGFS +- if (!op_mode) { + debugfs_remove_recursive(drv->dbgfs_op_mode); + drv->dbgfs_op_mode = NULL; +- } + #endif ++ } + +- return op_mode; ++ return NULL; + } + + static void _iwl_op_mode_stop(struct iwl_drv *drv) +--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.h ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.h +@@ -145,4 +145,7 @@ void iwl_drv_stop(struct iwl_drv *drv); + #define IWL_EXPORT_SYMBOL(sym) + #endif + ++/* max retry for init flow */ ++#define IWL_MAX_INIT_RETRY 2 ++ + #endif /* __iwl_drv_h__ */ +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +@@ -71,6 +71,7 @@ + #include + #include + ++#include "iwl-drv.h" + #include "iwl-op-mode.h" + #include "iwl-io.h" + #include "mvm.h" +@@ -1129,9 +1130,30 @@ static int iwl_mvm_mac_start(struct ieee + { + struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw); + int ret; ++ int retry, max_retry = 0; + + mutex_lock(&mvm->mutex); +- ret = __iwl_mvm_mac_start(mvm); ++ ++ /* we are starting the mac not in error flow, and restart is enabled */ ++ if (!test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status) && ++ iwlwifi_mod_params.fw_restart) { ++ max_retry = IWL_MAX_INIT_RETRY; ++ /* ++ * This will prevent mac80211 recovery flows to trigger during ++ * init failures ++ */ ++ set_bit(IWL_MVM_STATUS_STARTING, &mvm->status); ++ } ++ ++ for (retry = 0; retry <= max_retry; retry++) { ++ ret = __iwl_mvm_mac_start(mvm); ++ if (!ret) ++ break; ++ ++ IWL_ERR(mvm, "mac start retry %d\n", retry); ++ } ++ clear_bit(IWL_MVM_STATUS_STARTING, &mvm->status); ++ + mutex_unlock(&mvm->mutex); + + return ret; +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +@@ -1167,6 +1167,8 @@ struct iwl_mvm { + * @IWL_MVM_STATUS_ROC_AUX_RUNNING: AUX remain-on-channel is running + * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running + * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA ++ * @IWL_MVM_STATUS_STARTING: starting mac, ++ * used to disable restart flow while in STARTING state + */ + enum iwl_mvm_status { + IWL_MVM_STATUS_HW_RFKILL, +@@ -1177,6 +1179,7 @@ enum iwl_mvm_status { + IWL_MVM_STATUS_ROC_AUX_RUNNING, + IWL_MVM_STATUS_FIRMWARE_RUNNING, + IWL_MVM_STATUS_NEED_FLUSH_P2P, ++ IWL_MVM_STATUS_STARTING, + }; + + /* Keep track of completed init configuration */ +--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +@@ -1288,6 +1288,9 @@ void iwl_mvm_nic_restart(struct iwl_mvm + */ + if (!mvm->fw_restart && fw_error) { + iwl_fw_error_collect(&mvm->fwrt); ++ } else if (test_bit(IWL_MVM_STATUS_STARTING, ++ &mvm->status)) { ++ IWL_ERR(mvm, "Starting mac, retry will be triggered anyway\n"); + } else if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) { + struct iwl_mvm_reprobe *reprobe; + diff --git a/queue-5.4/parisc-fix-kbuild_image-for-self-extracting-kernel.patch b/queue-5.4/parisc-fix-kbuild_image-for-self-extracting-kernel.patch new file mode 100644 index 00000000000..0f3abb03c47 --- /dev/null +++ b/queue-5.4/parisc-fix-kbuild_image-for-self-extracting-kernel.patch @@ -0,0 +1,35 @@ +From 1d7c29b77725d05faff6754d2f5e7c147aedcf93 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Fri, 26 Nov 2021 22:35:45 +0100 +Subject: parisc: Fix KBUILD_IMAGE for self-extracting kernel + +From: Helge Deller + +commit 1d7c29b77725d05faff6754d2f5e7c147aedcf93 upstream. + +Default KBUILD_IMAGE to $(boot)/bzImage if a self-extracting +(CONFIG_PARISC_SELF_EXTRACT=y) kernel is to be built. +This fixes the bindeb-pkg make target. + +Signed-off-by: Helge Deller +Cc: # v4.14+ +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/arch/parisc/Makefile ++++ b/arch/parisc/Makefile +@@ -17,7 +17,12 @@ + # Mike Shaver, Helge Deller and Martin K. Petersen + # + ++ifdef CONFIG_PARISC_SELF_EXTRACT ++boot := arch/parisc/boot ++KBUILD_IMAGE := $(boot)/bzImage ++else + KBUILD_IMAGE := vmlinuz ++endif + + NM = sh $(srctree)/arch/parisc/nm + CHECKFLAGS += -D__hppa__=1 diff --git a/queue-5.4/parisc-fix-make-install-on-newer-debian-releases.patch b/queue-5.4/parisc-fix-make-install-on-newer-debian-releases.patch new file mode 100644 index 00000000000..2d5d020482e --- /dev/null +++ b/queue-5.4/parisc-fix-make-install-on-newer-debian-releases.patch @@ -0,0 +1,30 @@ +From 0f9fee4cdebfbe695c297e5b603a275e2557c1cc Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Sat, 4 Dec 2021 21:14:40 +0100 +Subject: parisc: Fix "make install" on newer debian releases + +From: Helge Deller + +commit 0f9fee4cdebfbe695c297e5b603a275e2557c1cc upstream. + +On newer debian releases the debian-provided "installkernel" script is +installed in /usr/sbin. Fix the kernel install.sh script to look for the +script in this directory as well. + +Signed-off-by: Helge Deller +Cc: # v3.13+ +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/install.sh | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/parisc/install.sh ++++ b/arch/parisc/install.sh +@@ -39,6 +39,7 @@ verify "$3" + if [ -n "${INSTALLKERNEL}" ]; then + if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi + if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi ++ if [ -x /usr/sbin/${INSTALLKERNEL} ]; then exec /usr/sbin/${INSTALLKERNEL} "$@"; fi + fi + + # Default install diff --git a/queue-5.4/serial-8250_pci-fix-acces-entries-in-pci_serial_quirks-array.patch b/queue-5.4/serial-8250_pci-fix-acces-entries-in-pci_serial_quirks-array.patch new file mode 100644 index 00000000000..553f23b115b --- /dev/null +++ b/queue-5.4/serial-8250_pci-fix-acces-entries-in-pci_serial_quirks-array.patch @@ -0,0 +1,44 @@ +From c525c5d2437f93520388920baac6d9340c65d239 Mon Sep 17 00:00:00 2001 +From: Jay Dolan +Date: Mon, 22 Nov 2021 14:06:03 +0200 +Subject: serial: 8250_pci: Fix ACCES entries in pci_serial_quirks array + +From: Jay Dolan + +commit c525c5d2437f93520388920baac6d9340c65d239 upstream. + +Fix error in table for PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S that caused it +and PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_4 to be missing their fourth port. + +Fixes: 78d3820b9bd3 ("serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()") +Cc: stable +Signed-off-by: Jay Dolan +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20211122120604.3909-2-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -2285,11 +2285,18 @@ static struct pci_serial_quirk pci_seria + .setup = pci_pericom_setup_four_at_eight, + }, + { +- .vendor = PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S, ++ .vendor = PCI_VENDOR_ID_ACCESIO, + .device = PCI_DEVICE_ID_ACCESIO_PCIE_ICM232_4, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .setup = pci_pericom_setup_four_at_eight, ++ }, ++ { ++ .vendor = PCI_VENDOR_ID_ACCESIO, ++ .device = PCI_DEVICE_ID_ACCESIO_PCIE_ICM_4S, ++ .subvendor = PCI_ANY_ID, ++ .subdevice = PCI_ANY_ID, ++ .setup = pci_pericom_setup_four_at_eight, + }, + { + .vendor = PCI_VENDOR_ID_ACCESIO, diff --git a/queue-5.4/serial-8250_pci-rewrite-pericom_do_set_divisor.patch b/queue-5.4/serial-8250_pci-rewrite-pericom_do_set_divisor.patch new file mode 100644 index 00000000000..49371712e4f --- /dev/null +++ b/queue-5.4/serial-8250_pci-rewrite-pericom_do_set_divisor.patch @@ -0,0 +1,78 @@ +From bb1201d4b38ec67bd9a871cf86b0cc10f28b15b5 Mon Sep 17 00:00:00 2001 +From: Jay Dolan +Date: Mon, 22 Nov 2021 14:06:04 +0200 +Subject: serial: 8250_pci: rewrite pericom_do_set_divisor() + +From: Jay Dolan + +commit bb1201d4b38ec67bd9a871cf86b0cc10f28b15b5 upstream. + +Have pericom_do_set_divisor() use the uartclk instead of a hard coded +value to work with different speed crystals. Tested with 14.7456 and 24 +MHz crystals. + +Have pericom_do_set_divisor() always calculate the divisor rather than +call serial8250_do_set_divisor() for rates below baud_base. + +Do not write registers or call serial8250_do_set_divisor() if valid +divisors could not be found. + +Fixes: 6bf4e42f1d19 ("serial: 8250: Add support for higher baud rates to Pericom chips") +Cc: stable +Signed-off-by: Jay Dolan +Signed-off-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20211122120604.3909-3-andriy.shevchenko@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -1351,29 +1351,33 @@ pericom_do_set_divisor(struct uart_port + { + int scr; + int lcr; +- int actual_baud; +- int tolerance; + +- for (scr = 5 ; scr <= 15 ; scr++) { +- actual_baud = 921600 * 16 / scr; +- tolerance = actual_baud / 50; ++ for (scr = 16; scr > 4; scr--) { ++ unsigned int maxrate = port->uartclk / scr; ++ unsigned int divisor = max(maxrate / baud, 1U); ++ int delta = maxrate / divisor - baud; + +- if ((baud < actual_baud + tolerance) && +- (baud > actual_baud - tolerance)) { ++ if (baud > maxrate + baud / 50) ++ continue; + ++ if (delta > baud / 50) ++ divisor++; ++ ++ if (divisor > 0xffff) ++ continue; ++ ++ /* Update delta due to possible divisor change */ ++ delta = maxrate / divisor - baud; ++ if (abs(delta) < baud / 50) { + lcr = serial_port_in(port, UART_LCR); + serial_port_out(port, UART_LCR, lcr | 0x80); +- +- serial_port_out(port, UART_DLL, 1); +- serial_port_out(port, UART_DLM, 0); ++ serial_port_out(port, UART_DLL, divisor & 0xff); ++ serial_port_out(port, UART_DLM, divisor >> 8 & 0xff); + serial_port_out(port, 2, 16 - scr); + serial_port_out(port, UART_LCR, lcr); + return; +- } else if (baud > actual_baud) { +- break; + } + } +- serial8250_do_set_divisor(port, baud, quot, quot_frac); + } + static int pci_pericom_setup(struct serial_private *priv, + const struct pciserial_board *board, diff --git a/queue-5.4/serial-core-fix-transmit-buffer-reset-and-memleak.patch b/queue-5.4/serial-core-fix-transmit-buffer-reset-and-memleak.patch new file mode 100644 index 00000000000..ac8f874a06c --- /dev/null +++ b/queue-5.4/serial-core-fix-transmit-buffer-reset-and-memleak.patch @@ -0,0 +1,74 @@ +From 00de977f9e0aa9760d9a79d1e41ff780f74e3424 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 8 Nov 2021 09:54:31 +0100 +Subject: serial: core: fix transmit-buffer reset and memleak + +From: Johan Hovold + +commit 00de977f9e0aa9760d9a79d1e41ff780f74e3424 upstream. + +Commit 761ed4a94582 ("tty: serial_core: convert uart_close to use +tty_port_close") converted serial core to use tty_port_close() but +failed to notice that the transmit buffer still needs to be freed on +final close. + +Not freeing the transmit buffer means that the buffer is no longer +cleared on next open so that any ioctl() waiting for the buffer to drain +might wait indefinitely (e.g. on termios changes) or that stale data can +end up being transmitted in case tx is restarted. + +Furthermore, the buffer of any port that has been opened would leak on +driver unbind. + +Note that the port lock is held when clearing the buffer pointer due to +the ldisc race worked around by commit a5ba1d95e46e ("uart: fix race +between uart_put_char() and uart_shutdown()"). + +Also note that the tty-port shutdown() callback is not called for +console ports so it is not strictly necessary to free the buffer page +after releasing the lock (cf. d72402145ace ("tty/serial: do not free +trasnmit buffer page under port lock")). + +Link: https://lore.kernel.org/r/319321886d97c456203d5c6a576a5480d07c3478.1635781688.git.baruch@tkos.co.il +Fixes: 761ed4a94582 ("tty: serial_core: convert uart_close to use tty_port_close") +Cc: stable@vger.kernel.org # 4.9 +Cc: Rob Herring +Reported-by: Baruch Siach +Tested-by: Baruch Siach +Signed-off-by: Johan Hovold +Link: https://lore.kernel.org/r/20211108085431.12637-1-johan@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/serial_core.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -1573,6 +1573,7 @@ static void uart_tty_port_shutdown(struc + { + struct uart_state *state = container_of(port, struct uart_state, port); + struct uart_port *uport = uart_port_check(state); ++ char *buf; + + /* + * At this point, we stop accepting input. To do this, we +@@ -1594,8 +1595,18 @@ static void uart_tty_port_shutdown(struc + */ + tty_port_set_suspended(port, 0); + +- uart_change_pm(state, UART_PM_STATE_OFF); ++ /* ++ * Free the transmit buffer. ++ */ ++ spin_lock_irq(&uport->lock); ++ buf = state->xmit.buf; ++ state->xmit.buf = NULL; ++ spin_unlock_irq(&uport->lock); ++ ++ if (buf) ++ free_page((unsigned long)buf); + ++ uart_change_pm(state, UART_PM_STATE_OFF); + } + + static void uart_wait_until_sent(struct tty_struct *tty, int timeout) diff --git a/queue-5.4/serial-pl011-add-acpi-sbsa-uart-match-id.patch b/queue-5.4/serial-pl011-add-acpi-sbsa-uart-match-id.patch new file mode 100644 index 00000000000..e5f64eea15e --- /dev/null +++ b/queue-5.4/serial-pl011-add-acpi-sbsa-uart-match-id.patch @@ -0,0 +1,40 @@ +From ac442a077acf9a6bf1db4320ec0c3f303be092b3 Mon Sep 17 00:00:00 2001 +From: Pierre Gondois +Date: Tue, 9 Nov 2021 17:22:48 +0000 +Subject: serial: pl011: Add ACPI SBSA UART match id + +From: Pierre Gondois + +commit ac442a077acf9a6bf1db4320ec0c3f303be092b3 upstream. + +The document 'ACPI for Arm Components 1.0' defines the following +_HID mappings: +-'Prime cell UART (PL011)': ARMH0011 +-'SBSA UART': ARMHB000 + +Use the sbsa-uart driver when a device is described with +the 'ARMHB000' _HID. + +Note: +PL011 devices currently use the sbsa-uart driver instead of the +uart-pl011 driver. Indeed, PL011 devices are not bound to a clock +in ACPI. It is not possible to change their baudrate. + +Cc: +Signed-off-by: Pierre Gondois +Link: https://lore.kernel.org/r/20211109172248.19061-1-Pierre.Gondois@arm.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/amba-pl011.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/tty/serial/amba-pl011.c ++++ b/drivers/tty/serial/amba-pl011.c +@@ -2770,6 +2770,7 @@ MODULE_DEVICE_TABLE(of, sbsa_uart_of_mat + + static const struct acpi_device_id sbsa_uart_acpi_match[] = { + { "ARMH0011", 0 }, ++ { "ARMHB000", 0 }, + {}, + }; + MODULE_DEVICE_TABLE(acpi, sbsa_uart_acpi_match); diff --git a/queue-5.4/series b/queue-5.4/series index 8c9e0269215..303ad894464 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -50,3 +50,18 @@ drm-msm-do-hw_init-before-capturing-gpu-state.patch ipv6-fix-memory-leak-in-fib6_rule_suppress.patch kvm-x86-pmu-fix-reserved-bits-for-amd-perfevtseln-re.patch sched-uclamp-fix-rq-uclamp_max-not-set-on-first-enqu.patch +parisc-fix-kbuild_image-for-self-extracting-kernel.patch +parisc-fix-make-install-on-newer-debian-releases.patch +vgacon-propagate-console-boot-parameters-before-calling-vc_resize.patch +xhci-fix-commad-ring-abort-write-all-64-bits-to-crcr-register.patch +usb-no_lpm-quirk-lenovo-powered-usb-c-travel-hub.patch +usb-typec-tcpm-wait-in-snk_debounced-until-disconnect.patch +x86-tsc-add-a-timer-to-make-sure-tsc_adjust-is-always-checked.patch +x86-tsc-disable-clocksource-watchdog-for-tsc-on-qualified-platorms.patch +x86-64-mm-map-all-kernel-memory-into-trampoline_pgd.patch +tty-serial-msm_serial-deactivate-rx-dma-for-polling-support.patch +serial-pl011-add-acpi-sbsa-uart-match-id.patch +serial-core-fix-transmit-buffer-reset-and-memleak.patch +serial-8250_pci-fix-acces-entries-in-pci_serial_quirks-array.patch +serial-8250_pci-rewrite-pericom_do_set_divisor.patch +iwlwifi-mvm-retry-init-flow-if-failed.patch diff --git a/queue-5.4/tty-serial-msm_serial-deactivate-rx-dma-for-polling-support.patch b/queue-5.4/tty-serial-msm_serial-deactivate-rx-dma-for-polling-support.patch new file mode 100644 index 00000000000..a9d335db53d --- /dev/null +++ b/queue-5.4/tty-serial-msm_serial-deactivate-rx-dma-for-polling-support.patch @@ -0,0 +1,55 @@ +From 7492ffc90fa126afb67d4392d56cb4134780194a Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann +Date: Sat, 13 Nov 2021 13:10:50 +0100 +Subject: tty: serial: msm_serial: Deactivate RX DMA for polling support + +From: Sven Eckelmann + +commit 7492ffc90fa126afb67d4392d56cb4134780194a upstream. + +The CONSOLE_POLLING mode is used for tools like k(g)db. In this kind of +setup, it is often sharing a serial device with the normal system console. +This is usually no problem because the polling helpers can consume input +values directly (when in kgdb context) and the normal Linux handlers can +only consume new input values after kgdb switched back. + +This is not true anymore when RX DMA is enabled for UARTDM controllers. +Single input values can no longer be received correctly. Instead following +seems to happen: + +* on 1. input, some old input is read (continuously) +* on 2. input, two old inputs are read (continuously) +* on 3. input, three old input values are read (continuously) +* on 4. input, 4 previous inputs are received + +This repeats then for each group of 4 input values. + +This behavior changes slightly depending on what state the controller was +when the first input was received. But this makes working with kgdb +basically impossible because control messages are always corrupted when +kgdboc tries to parse them. + +RX DMA should therefore be off when CONSOLE_POLLING is enabled to avoid +these kind of problems. No such problem was noticed for TX DMA. + +Fixes: 99693945013a ("tty: serial: msm: Add RX DMA support") +Cc: stable@vger.kernel.org +Signed-off-by: Sven Eckelmann +Link: https://lore.kernel.org/r/20211113121050.7266-1-sven@narfation.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/msm_serial.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/tty/serial/msm_serial.c ++++ b/drivers/tty/serial/msm_serial.c +@@ -603,6 +603,9 @@ static void msm_start_rx_dma(struct msm_ + u32 val; + int ret; + ++ if (IS_ENABLED(CONFIG_CONSOLE_POLL)) ++ return; ++ + if (!dma->chan) + return; + diff --git a/queue-5.4/usb-no_lpm-quirk-lenovo-powered-usb-c-travel-hub.patch b/queue-5.4/usb-no_lpm-quirk-lenovo-powered-usb-c-travel-hub.patch new file mode 100644 index 00000000000..ef6fd358320 --- /dev/null +++ b/queue-5.4/usb-no_lpm-quirk-lenovo-powered-usb-c-travel-hub.patch @@ -0,0 +1,34 @@ +From d2a004037c3c6afd36d40c384d2905f47cd51c57 Mon Sep 17 00:00:00 2001 +From: Ole Ernst +Date: Sat, 27 Nov 2021 10:05:45 +0100 +Subject: USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub + +From: Ole Ernst + +commit d2a004037c3c6afd36d40c384d2905f47cd51c57 upstream. + +This is another branded 8153 device that doesn't work well with LPM: +r8152 2-2.1:1.0 enp0s13f0u2u1: Stop submitting intr, status -71 + +Disable LPM to resolve the issue. + +Signed-off-by: Ole Ernst +Cc: stable +Link: https://lore.kernel.org/r/20211127090546.52072-1-olebowle@gmx.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/core/quirks.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -435,6 +435,9 @@ static const struct usb_device_id usb_qu + { USB_DEVICE(0x1532, 0x0116), .driver_info = + USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + ++ /* Lenovo Powered USB-C Travel Hub (4X90S92381, RTL8153 GigE) */ ++ { USB_DEVICE(0x17ef, 0x721e), .driver_info = USB_QUIRK_NO_LPM }, ++ + /* Lenovo ThinkCenter A630Z TI024Gen3 usb-audio */ + { USB_DEVICE(0x17ef, 0xa012), .driver_info = + USB_QUIRK_DISCONNECT_SUSPEND }, diff --git a/queue-5.4/usb-typec-tcpm-wait-in-snk_debounced-until-disconnect.patch b/queue-5.4/usb-typec-tcpm-wait-in-snk_debounced-until-disconnect.patch new file mode 100644 index 00000000000..70750b702bf --- /dev/null +++ b/queue-5.4/usb-typec-tcpm-wait-in-snk_debounced-until-disconnect.patch @@ -0,0 +1,82 @@ +From fbcd13df1e78eb2ba83a3c160eefe2d6f574beaf Mon Sep 17 00:00:00 2001 +From: Badhri Jagan Sridharan +Date: Mon, 29 Nov 2021 16:18:25 -0800 +Subject: usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect + +From: Badhri Jagan Sridharan + +commit fbcd13df1e78eb2ba83a3c160eefe2d6f574beaf upstream. + +Stub from the spec: +"4.5.2.2.4.2 Exiting from AttachWait.SNK State +A Sink shall transition to Unattached.SNK when the state of both +the CC1 and CC2 pins is SNK.Open for at least tPDDebounce. +A DRP shall transition to Unattached.SRC when the state of both +the CC1 and CC2 pins is SNK.Open for at least tPDDebounce." + +This change makes TCPM to wait in SNK_DEBOUNCED state until +CC1 and CC2 pins is SNK.Open for at least tPDDebounce. Previously, +TCPM resets the port if vbus is not present in PD_T_PS_SOURCE_ON. +This causes TCPM to loop continuously when connected to a +faulty power source that does not present vbus. Waiting in +SNK_DEBOUNCED also ensures that TCPM is adherant to +"4.5.2.2.4.2 Exiting from AttachWait.SNK State" requirements. + +[ 6169.280751] CC1: 0 -> 0, CC2: 0 -> 5 [state TOGGLING, polarity 0, connected] +[ 6169.280759] state change TOGGLING -> SNK_ATTACH_WAIT [rev2 NONE_AMS] +[ 6169.280771] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev2 NONE_AMS] +[ 6169.282427] CC1: 0 -> 0, CC2: 5 -> 5 [state SNK_ATTACH_WAIT, polarity 0, connected] +[ 6169.450825] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] +[ 6169.450834] pending state change SNK_DEBOUNCED -> PORT_RESET @ 480 ms [rev2 NONE_AMS] +[ 6169.930892] state change SNK_DEBOUNCED -> PORT_RESET [delayed 480 ms] +[ 6169.931296] disable vbus discharge ret:0 +[ 6169.931301] Setting usb_comm capable false +[ 6169.932783] Setting voltage/current limit 0 mV 0 mA +[ 6169.932802] polarity 0 +[ 6169.933706] Requesting mux state 0, usb-role 0, orientation 0 +[ 6169.936689] cc:=0 +[ 6169.936812] pending state change PORT_RESET -> PORT_RESET_WAIT_OFF @ 100 ms [rev2 NONE_AMS] +[ 6169.937157] CC1: 0 -> 0, CC2: 5 -> 0 [state PORT_RESET, polarity 0, disconnected] +[ 6170.036880] state change PORT_RESET -> PORT_RESET_WAIT_OFF [delayed 100 ms] +[ 6170.036890] state change PORT_RESET_WAIT_OFF -> SNK_UNATTACHED [rev2 NONE_AMS] +[ 6170.036896] Start toggling +[ 6170.041412] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] +[ 6170.042973] CC1: 0 -> 0, CC2: 0 -> 5 [state TOGGLING, polarity 0, connected] +[ 6170.042976] state change TOGGLING -> SNK_ATTACH_WAIT [rev2 NONE_AMS] +[ 6170.042981] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev2 NONE_AMS] +[ 6170.213014] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] +[ 6170.213019] pending state change SNK_DEBOUNCED -> PORT_RESET @ 480 ms [rev2 NONE_AMS] +[ 6170.693068] state change SNK_DEBOUNCED -> PORT_RESET [delayed 480 ms] +[ 6170.693304] disable vbus discharge ret:0 +[ 6170.693308] Setting usb_comm capable false +[ 6170.695193] Setting voltage/current limit 0 mV 0 mA +[ 6170.695210] polarity 0 +[ 6170.695990] Requesting mux state 0, usb-role 0, orientation 0 +[ 6170.701896] cc:=0 +[ 6170.702181] pending state change PORT_RESET -> PORT_RESET_WAIT_OFF @ 100 ms [rev2 NONE_AMS] +[ 6170.703343] CC1: 0 -> 0, CC2: 5 -> 0 [state PORT_RESET, polarity 0, disconnected] + +Fixes: f0690a25a140b8 ("staging: typec: USB Type-C Port Manager (tcpm)") +Cc: stable@vger.kernel.org +Acked-by: Heikki Krogerus +Signed-off-by: Badhri Jagan Sridharan +Link: https://lore.kernel.org/r/20211130001825.3142830-1-badhri@google.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/typec/tcpm/tcpm.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/drivers/usb/typec/tcpm/tcpm.c ++++ b/drivers/usb/typec/tcpm/tcpm.c +@@ -3118,11 +3118,7 @@ static void run_state_machine(struct tcp + tcpm_try_src(port) ? SRC_TRY + : SNK_ATTACHED, + 0); +- else +- /* Wait for VBUS, but not forever */ +- tcpm_set_state(port, PORT_RESET, PD_T_PS_SOURCE_ON); + break; +- + case SRC_TRY: + port->try_src_count++; + tcpm_set_cc(port, tcpm_rp_cc(port)); diff --git a/queue-5.4/vgacon-propagate-console-boot-parameters-before-calling-vc_resize.patch b/queue-5.4/vgacon-propagate-console-boot-parameters-before-calling-vc_resize.patch new file mode 100644 index 00000000000..83fcf238f48 --- /dev/null +++ b/queue-5.4/vgacon-propagate-console-boot-parameters-before-calling-vc_resize.patch @@ -0,0 +1,94 @@ +From 3dfac26e2ef29ff2abc2a75aa4cd48fce25a2c4b Mon Sep 17 00:00:00 2001 +From: "Maciej W. Rozycki" +Date: Tue, 26 Oct 2021 00:26:22 +0200 +Subject: vgacon: Propagate console boot parameters before calling `vc_resize' + +From: Maciej W. Rozycki + +commit 3dfac26e2ef29ff2abc2a75aa4cd48fce25a2c4b upstream. + +Fix a division by zero in `vgacon_resize' with a backtrace like: + +vgacon_resize +vc_do_resize +vgacon_init +do_bind_con_driver +do_unbind_con_driver +fbcon_fb_unbind +do_unregister_framebuffer +do_register_framebuffer +register_framebuffer +__drm_fb_helper_initial_config_and_unlock +drm_helper_hpd_irq_event +dw_hdmi_irq +irq_thread +kthread + +caused by `c->vc_cell_height' not having been initialized. This has +only started to trigger with commit 860dafa90259 ("vt: Fix character +height handling with VT_RESIZEX"), however the ultimate offender is +commit 50ec42edd978 ("[PATCH] Detaching fbcon: fix vgacon to allow +retaking of the console"). + +Said commit has added a call to `vc_resize' whenever `vgacon_init' is +called with the `init' argument set to 0, which did not happen before. +And the call is made before a key vgacon boot parameter retrieved in +`vgacon_startup' has been propagated in `vgacon_init' for `vc_resize' to +use to the console structure being worked on. Previously the parameter +was `c->vc_font.height' and now it is `c->vc_cell_height'. + +In this particular scenario the registration of fbcon has failed and vt +resorts to vgacon. Now fbcon does have initialized `c->vc_font.height' +somehow, unlike `c->vc_cell_height', which is why this code did not +crash before, but either way the boot parameters should have been copied +to the console structure ahead of the call to `vc_resize' rather than +afterwards, so that first the call has a chance to use them and second +they do not change the console structure to something possibly different +from what was used by `vc_resize'. + +Move the propagation of the vgacon boot parameters ahead of the call to +`vc_resize' then. Adjust the comment accordingly. + +Fixes: 50ec42edd978 ("[PATCH] Detaching fbcon: fix vgacon to allow retaking of the console") +Cc: stable@vger.kernel.org # v2.6.18+ +Reported-by: Wim Osterholt +Reported-by: Pavel V. Panteleev +Signed-off-by: Maciej W. Rozycki +Link: https://lore.kernel.org/r/alpine.DEB.2.21.2110252317110.58149@angie.orcam.me.uk +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/console/vgacon.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +--- a/drivers/video/console/vgacon.c ++++ b/drivers/video/console/vgacon.c +@@ -370,11 +370,17 @@ static void vgacon_init(struct vc_data * + struct uni_pagedir *p; + + /* +- * We cannot be loaded as a module, therefore init is always 1, +- * but vgacon_init can be called more than once, and init will +- * not be 1. ++ * We cannot be loaded as a module, therefore init will be 1 ++ * if we are the default console, however if we are a fallback ++ * console, for example if fbcon has failed registration, then ++ * init will be 0, so we need to make sure our boot parameters ++ * have been copied to the console structure for vgacon_resize ++ * ultimately called by vc_resize. Any subsequent calls to ++ * vgacon_init init will have init set to 0 too. + */ + c->vc_can_do_color = vga_can_do_color; ++ c->vc_scan_lines = vga_scan_lines; ++ c->vc_font.height = c->vc_cell_height = vga_video_font_height; + + /* set dimensions manually if init != 0 since vc_resize() will fail */ + if (init) { +@@ -383,8 +389,6 @@ static void vgacon_init(struct vc_data * + } else + vc_resize(c, vga_video_num_columns, vga_video_num_lines); + +- c->vc_scan_lines = vga_scan_lines; +- c->vc_font.height = c->vc_cell_height = vga_video_font_height; + c->vc_complement_mask = 0x7700; + if (vga_512_chars) + c->vc_hi_font_mask = 0x0800; diff --git a/queue-5.4/x86-64-mm-map-all-kernel-memory-into-trampoline_pgd.patch b/queue-5.4/x86-64-mm-map-all-kernel-memory-into-trampoline_pgd.patch new file mode 100644 index 00000000000..8c1c0cf80b4 --- /dev/null +++ b/queue-5.4/x86-64-mm-map-all-kernel-memory-into-trampoline_pgd.patch @@ -0,0 +1,93 @@ +From 51523ed1c26758de1af7e58730a656875f72f783 Mon Sep 17 00:00:00 2001 +From: Joerg Roedel +Date: Thu, 2 Dec 2021 16:32:26 +0100 +Subject: x86/64/mm: Map all kernel memory into trampoline_pgd + +From: Joerg Roedel + +commit 51523ed1c26758de1af7e58730a656875f72f783 upstream. + +The trampoline_pgd only maps the 0xfffffff000000000-0xffffffffffffffff +range of kernel memory (with 4-level paging). This range contains the +kernel's text+data+bss mappings and the module mapping space but not the +direct mapping and the vmalloc area. + +This is enough to get the application processors out of real-mode, but +for code that switches back to real-mode the trampoline_pgd is missing +important parts of the address space. For example, consider this code +from arch/x86/kernel/reboot.c, function machine_real_restart() for a +64-bit kernel: + + #ifdef CONFIG_X86_32 + load_cr3(initial_page_table); + #else + write_cr3(real_mode_header->trampoline_pgd); + + /* Exiting long mode will fail if CR4.PCIDE is set. */ + if (boot_cpu_has(X86_FEATURE_PCID)) + cr4_clear_bits(X86_CR4_PCIDE); + #endif + + /* Jump to the identity-mapped low memory code */ + #ifdef CONFIG_X86_32 + asm volatile("jmpl *%0" : : + "rm" (real_mode_header->machine_real_restart_asm), + "a" (type)); + #else + asm volatile("ljmpl *%0" : : + "m" (real_mode_header->machine_real_restart_asm), + "D" (type)); + #endif + +The code switches to the trampoline_pgd, which unmaps the direct mapping +and also the kernel stack. The call to cr4_clear_bits() will find no +stack and crash the machine. The real_mode_header pointer below points +into the direct mapping, and dereferencing it also causes a crash. + +The reason this does not crash always is only that kernel mappings are +global and the CR3 switch does not flush those mappings. But if theses +mappings are not in the TLB already, the above code will crash before it +can jump to the real-mode stub. + +Extend the trampoline_pgd to contain all kernel mappings to prevent +these crashes and to make code which runs on this page-table more +robust. + +Signed-off-by: Joerg Roedel +Signed-off-by: Borislav Petkov +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20211202153226.22946-5-joro@8bytes.org +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/realmode/init.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/arch/x86/realmode/init.c ++++ b/arch/x86/realmode/init.c +@@ -50,6 +50,7 @@ static void __init setup_real_mode(void) + #ifdef CONFIG_X86_64 + u64 *trampoline_pgd; + u64 efer; ++ int i; + #endif + + base = (unsigned char *)real_mode_header; +@@ -108,8 +109,17 @@ static void __init setup_real_mode(void) + trampoline_header->flags |= TH_FLAGS_SME_ACTIVE; + + trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd); ++ ++ /* Map the real mode stub as virtual == physical */ + trampoline_pgd[0] = trampoline_pgd_entry.pgd; +- trampoline_pgd[511] = init_top_pgt[511].pgd; ++ ++ /* ++ * Include the entirety of the kernel mapping into the trampoline ++ * PGD. This way, all mappings present in the normal kernel page ++ * tables are usable while running on trampoline_pgd. ++ */ ++ for (i = pgd_index(__PAGE_OFFSET); i < PTRS_PER_PGD; i++) ++ trampoline_pgd[i] = init_top_pgt[i].pgd; + #endif + } + diff --git a/queue-5.4/x86-tsc-add-a-timer-to-make-sure-tsc_adjust-is-always-checked.patch b/queue-5.4/x86-tsc-add-a-timer-to-make-sure-tsc_adjust-is-always-checked.patch new file mode 100644 index 00000000000..2f2ef3aa2db --- /dev/null +++ b/queue-5.4/x86-tsc-add-a-timer-to-make-sure-tsc_adjust-is-always-checked.patch @@ -0,0 +1,88 @@ +From c7719e79347803b8e3b6b50da8c6db410a3012b5 Mon Sep 17 00:00:00 2001 +From: Feng Tang +Date: Wed, 17 Nov 2021 10:37:50 +0800 +Subject: x86/tsc: Add a timer to make sure TSC_adjust is always checked + +From: Feng Tang + +commit c7719e79347803b8e3b6b50da8c6db410a3012b5 upstream. + +The TSC_ADJUST register is checked every time a CPU enters idle state, but +Thomas Gleixner mentioned there is still a caveat that a system won't enter +idle [1], either because it's too busy or configured purposely to not enter +idle. + +Setup a periodic timer (every 10 minutes) to make sure the check is +happening on a regular base. + +[1] https://lore.kernel.org/lkml/875z286xtk.fsf@nanos.tec.linutronix.de/ + +Fixes: 6e3cd95234dc ("x86/hpet: Use another crystalball to evaluate HPET usability") +Requested-by: Thomas Gleixner +Signed-off-by: Feng Tang +Signed-off-by: Thomas Gleixner +Cc: "Paul E. McKenney" +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20211117023751.24190-1-feng.tang@intel.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/tsc_sync.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +--- a/arch/x86/kernel/tsc_sync.c ++++ b/arch/x86/kernel/tsc_sync.c +@@ -30,6 +30,7 @@ struct tsc_adjust { + }; + + static DEFINE_PER_CPU(struct tsc_adjust, tsc_adjust); ++static struct timer_list tsc_sync_check_timer; + + /* + * TSC's on different sockets may be reset asynchronously. +@@ -77,6 +78,46 @@ void tsc_verify_tsc_adjust(bool resume) + } + } + ++/* ++ * Normally the tsc_sync will be checked every time system enters idle ++ * state, but there is still caveat that a system won't enter idle, ++ * either because it's too busy or configured purposely to not enter ++ * idle. ++ * ++ * So setup a periodic timer (every 10 minutes) to make sure the check ++ * is always on. ++ */ ++ ++#define SYNC_CHECK_INTERVAL (HZ * 600) ++ ++static void tsc_sync_check_timer_fn(struct timer_list *unused) ++{ ++ int next_cpu; ++ ++ tsc_verify_tsc_adjust(false); ++ ++ /* Run the check for all onlined CPUs in turn */ ++ next_cpu = cpumask_next(raw_smp_processor_id(), cpu_online_mask); ++ if (next_cpu >= nr_cpu_ids) ++ next_cpu = cpumask_first(cpu_online_mask); ++ ++ tsc_sync_check_timer.expires += SYNC_CHECK_INTERVAL; ++ add_timer_on(&tsc_sync_check_timer, next_cpu); ++} ++ ++static int __init start_sync_check_timer(void) ++{ ++ if (!cpu_feature_enabled(X86_FEATURE_TSC_ADJUST) || tsc_clocksource_reliable) ++ return 0; ++ ++ timer_setup(&tsc_sync_check_timer, tsc_sync_check_timer_fn, 0); ++ tsc_sync_check_timer.expires = jiffies + SYNC_CHECK_INTERVAL; ++ add_timer(&tsc_sync_check_timer); ++ ++ return 0; ++} ++late_initcall(start_sync_check_timer); ++ + static void tsc_sanitize_first_cpu(struct tsc_adjust *cur, s64 bootval, + unsigned int cpu, bool bootcpu) + { diff --git a/queue-5.4/x86-tsc-disable-clocksource-watchdog-for-tsc-on-qualified-platorms.patch b/queue-5.4/x86-tsc-disable-clocksource-watchdog-for-tsc-on-qualified-platorms.patch new file mode 100644 index 00000000000..f51b76184f1 --- /dev/null +++ b/queue-5.4/x86-tsc-disable-clocksource-watchdog-for-tsc-on-qualified-platorms.patch @@ -0,0 +1,124 @@ +From b50db7095fe002fa3e16605546cba66bf1b68a3e Mon Sep 17 00:00:00 2001 +From: Feng Tang +Date: Wed, 17 Nov 2021 10:37:51 +0800 +Subject: x86/tsc: Disable clocksource watchdog for TSC on qualified platorms + +From: Feng Tang + +commit b50db7095fe002fa3e16605546cba66bf1b68a3e upstream. + +There are cases that the TSC clocksource is wrongly judged as unstable by +the clocksource watchdog mechanism which tries to validate the TSC against +HPET, PM_TIMER or jiffies. While there is hardly a general reliable way to +check the validity of a watchdog, Thomas Gleixner proposed [1]: + +"I'm inclined to lift that requirement when the CPU has: + + 1) X86_FEATURE_CONSTANT_TSC + 2) X86_FEATURE_NONSTOP_TSC + 3) X86_FEATURE_NONSTOP_TSC_S3 + 4) X86_FEATURE_TSC_ADJUST + 5) At max. 4 sockets + + After two decades of horrors we're finally at a point where TSC seems + to be halfway reliable and less abused by BIOS tinkerers. TSC_ADJUST + was really key as we can now detect even small modifications reliably + and the important point is that we can cure them as well (not pretty + but better than all other options)." + +As feature #3 X86_FEATURE_NONSTOP_TSC_S3 only exists on several generations +of Atom processorz, and is always coupled with X86_FEATURE_CONSTANT_TSC +and X86_FEATURE_NONSTOP_TSC, skip checking it, and also be more defensive +to use maximal 2 sockets. + +The check is done inside tsc_init() before registering 'tsc-early' and +'tsc' clocksources, as there were cases that both of them had been +wrongly judged as unreliable. + +For more background of tsc/watchdog, there is a good summary in [2] + +[tglx} Update vs. jiffies: + + On systems where the only remaining clocksource aside of TSC is jiffies + there is no way to make this work because that creates a circular + dependency. Jiffies accuracy depends on not missing a periodic timer + interrupt, which is not guaranteed. That could be detected by TSC, but as + TSC is not trusted this cannot be compensated. The consequence is a + circulus vitiosus which results in shutting down TSC and falling back to + the jiffies clocksource which is even more unreliable. + +[1]. https://lore.kernel.org/lkml/87eekfk8bd.fsf@nanos.tec.linutronix.de/ +[2]. https://lore.kernel.org/lkml/87a6pimt1f.ffs@nanos.tec.linutronix.de/ + +[ tglx: Refine comment and amend changelog ] + +Fixes: 6e3cd95234dc ("x86/hpet: Use another crystalball to evaluate HPET usability") +Suggested-by: Thomas Gleixner +Signed-off-by: Feng Tang +Signed-off-by: Thomas Gleixner +Cc: "Paul E. McKenney" +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20211117023751.24190-2-feng.tang@intel.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/tsc.c | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +--- a/arch/x86/kernel/tsc.c ++++ b/arch/x86/kernel/tsc.c +@@ -1162,6 +1162,12 @@ void mark_tsc_unstable(char *reason) + + EXPORT_SYMBOL_GPL(mark_tsc_unstable); + ++static void __init tsc_disable_clocksource_watchdog(void) ++{ ++ clocksource_tsc_early.flags &= ~CLOCK_SOURCE_MUST_VERIFY; ++ clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; ++} ++ + static void __init check_system_tsc_reliable(void) + { + #if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC) +@@ -1178,6 +1184,23 @@ static void __init check_system_tsc_reli + #endif + if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) + tsc_clocksource_reliable = 1; ++ ++ /* ++ * Disable the clocksource watchdog when the system has: ++ * - TSC running at constant frequency ++ * - TSC which does not stop in C-States ++ * - the TSC_ADJUST register which allows to detect even minimal ++ * modifications ++ * - not more than two sockets. As the number of sockets cannot be ++ * evaluated at the early boot stage where this has to be ++ * invoked, check the number of online memory nodes as a ++ * fallback solution which is an reasonable estimate. ++ */ ++ if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC) && ++ boot_cpu_has(X86_FEATURE_NONSTOP_TSC) && ++ boot_cpu_has(X86_FEATURE_TSC_ADJUST) && ++ nr_online_nodes <= 2) ++ tsc_disable_clocksource_watchdog(); + } + + /* +@@ -1369,9 +1392,6 @@ static int __init init_tsc_clocksource(v + if (tsc_unstable) + goto unreg; + +- if (tsc_clocksource_reliable || no_tsc_watchdog) +- clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; +- + if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3)) + clocksource_tsc.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP; + +@@ -1506,7 +1526,7 @@ void __init tsc_init(void) + } + + if (tsc_clocksource_reliable || no_tsc_watchdog) +- clocksource_tsc_early.flags &= ~CLOCK_SOURCE_MUST_VERIFY; ++ tsc_disable_clocksource_watchdog(); + + clocksource_register_khz(&clocksource_tsc_early, tsc_khz); + detect_art(); diff --git a/queue-5.4/xhci-fix-commad-ring-abort-write-all-64-bits-to-crcr-register.patch b/queue-5.4/xhci-fix-commad-ring-abort-write-all-64-bits-to-crcr-register.patch new file mode 100644 index 00000000000..607b7cca845 --- /dev/null +++ b/queue-5.4/xhci-fix-commad-ring-abort-write-all-64-bits-to-crcr-register.patch @@ -0,0 +1,70 @@ +From 09f736aa95476631227d2dc0e6b9aeee1ad7ed58 Mon Sep 17 00:00:00 2001 +From: Mathias Nyman +Date: Fri, 26 Nov 2021 14:23:40 +0200 +Subject: xhci: Fix commad ring abort, write all 64 bits to CRCR register. + +From: Mathias Nyman + +commit 09f736aa95476631227d2dc0e6b9aeee1ad7ed58 upstream. + +Turns out some xHC controllers require all 64 bits in the CRCR register +to be written to execute a command abort. + +The lower 32 bits containing the command abort bit is written first. +In case the command ring stops before we write the upper 32 bits then +hardware may use these upper bits to set the commnd ring dequeue pointer. + +Solve this by making sure the upper 32 bits contain a valid command +ring dequeue pointer. + +The original patch that only wrote the first 32 to stop the ring went +to stable, so this fix should go there as well. + +Fixes: ff0e50d3564f ("xhci: Fix command ring pointer corruption while aborting a command") +Cc: stable@vger.kernel.org +Tested-by: Pavankumar Kondeti +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20211126122340.1193239-2-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci-ring.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -339,7 +339,9 @@ static void xhci_handle_stopped_cmd_ring + /* Must be called with xhci->lock held, releases and aquires lock back */ + static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags) + { +- u32 temp_32; ++ struct xhci_segment *new_seg = xhci->cmd_ring->deq_seg; ++ union xhci_trb *new_deq = xhci->cmd_ring->dequeue; ++ u64 crcr; + int ret; + + xhci_dbg(xhci, "Abort command ring\n"); +@@ -348,13 +350,18 @@ static int xhci_abort_cmd_ring(struct xh + + /* + * The control bits like command stop, abort are located in lower +- * dword of the command ring control register. Limit the write +- * to the lower dword to avoid corrupting the command ring pointer +- * in case if the command ring is stopped by the time upper dword +- * is written. ++ * dword of the command ring control register. ++ * Some controllers require all 64 bits to be written to abort the ring. ++ * Make sure the upper dword is valid, pointing to the next command, ++ * avoiding corrupting the command ring pointer in case the command ring ++ * is stopped by the time the upper dword is written. + */ +- temp_32 = readl(&xhci->op_regs->cmd_ring); +- writel(temp_32 | CMD_RING_ABORT, &xhci->op_regs->cmd_ring); ++ next_trb(xhci, NULL, &new_seg, &new_deq); ++ if (trb_is_link(new_deq)) ++ next_trb(xhci, NULL, &new_seg, &new_deq); ++ ++ crcr = xhci_trb_virt_to_dma(new_seg, new_deq); ++ xhci_write_64(xhci, crcr | CMD_RING_ABORT, &xhci->op_regs->cmd_ring); + + /* Section 4.6.1.2 of xHCI 1.0 spec says software should also time the + * completion of the Command Abort operation. If CRR is not negated in 5