From: Greg Kroah-Hartman Date: Mon, 6 Nov 2023 12:18:20 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.14.329~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79d08df5838c001cc93f809f0c58c4498a7f55e8;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: pci-prevent-xhci-driver-from-claiming-amd-vangogh-usb3-drd-device.patch tty-8250-add-support-for-additional-brainboxes-uc-cards.patch tty-8250-add-support-for-brainboxes-up-cards.patch tty-8250-add-support-for-intashield-is-100.patch tty-8250-remove-uc-257-and-uc-431.patch usb-storage-set-1.50-as-the-lower-bcddevice-for-older-super-top-compatibility.patch --- diff --git a/queue-5.4/pci-prevent-xhci-driver-from-claiming-amd-vangogh-usb3-drd-device.patch b/queue-5.4/pci-prevent-xhci-driver-from-claiming-amd-vangogh-usb3-drd-device.patch new file mode 100644 index 00000000000..81019e2f3a2 --- /dev/null +++ b/queue-5.4/pci-prevent-xhci-driver-from-claiming-amd-vangogh-usb3-drd-device.patch @@ -0,0 +1,71 @@ +From 7e6f3b6d2c352b5fde37ce3fed83bdf6172eebd4 Mon Sep 17 00:00:00 2001 +From: Vicki Pfau +Date: Wed, 27 Sep 2023 13:22:12 -0700 +Subject: PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device + +From: Vicki Pfau + +commit 7e6f3b6d2c352b5fde37ce3fed83bdf6172eebd4 upstream. + +The AMD VanGogh SoC contains a DesignWare USB3 Dual-Role Device that can be +operated as either a USB Host or a USB Device, similar to on the AMD Nolan +platform. + +be6646bfbaec ("PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD +device") added a quirk to let the dwc3 driver claim the Nolan device since +it provides more specific support. + +Extend that quirk to include the VanGogh SoC USB3 device. + +Link: https://lore.kernel.org/r/20230927202212.2388216-1-vi@endrift.com +Signed-off-by: Vicki Pfau +[bhelgaas: include be6646bfbaec reference, add stable tag] +Signed-off-by: Bjorn Helgaas +Cc: stable@vger.kernel.org # v3.19+ +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/quirks.c | 8 +++++--- + include/linux/pci_ids.h | 1 + + 2 files changed, 6 insertions(+), 3 deletions(-) + +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -597,7 +597,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + /* + * In the AMD NL platform, this device ([1022:7912]) has a class code of + * PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will +- * claim it. ++ * claim it. The same applies on the VanGogh platform device ([1022:163a]). + * + * But the dwc3 driver is a more specific driver for this device, and we'd + * prefer to use it instead of xhci. To prevent xhci from claiming the +@@ -605,7 +605,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + * defines as "USB device (not host controller)". The dwc3 driver can then + * claim it based on its Vendor and Device ID. + */ +-static void quirk_amd_nl_class(struct pci_dev *pdev) ++static void quirk_amd_dwc_class(struct pci_dev *pdev) + { + u32 class = pdev->class; + +@@ -615,7 +615,9 @@ static void quirk_amd_nl_class(struct pc + class, pdev->class); + } + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB, +- quirk_amd_nl_class); ++ quirk_amd_dwc_class); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VANGOGH_USB, ++ quirk_amd_dwc_class); + + /* + * Synopsys USB 3.x host HAPS platform has a class code of +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -554,6 +554,7 @@ + #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 + #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b + #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 ++#define PCI_DEVICE_ID_AMD_VANGOGH_USB 0x163a + #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653 + #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 + #define PCI_DEVICE_ID_AMD_LANCE 0x2000 diff --git a/queue-5.4/series b/queue-5.4/series index 082fb8c5667..285e3aa10bd 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -66,3 +66,9 @@ remove-the-sx8-block-driver.patch nvmet-tcp-move-send-recv-error-handling-in-the-send-recv-methods-instead-of-call-sites.patch nvmet-tcp-fix-a-possible-uaf-in-queue-intialization-setup.patch revert-arm-dts-move-am33xx-and-am43xx-mmc-nodes-to-sdhci-omap-driver.patch +pci-prevent-xhci-driver-from-claiming-amd-vangogh-usb3-drd-device.patch +usb-storage-set-1.50-as-the-lower-bcddevice-for-older-super-top-compatibility.patch +tty-8250-remove-uc-257-and-uc-431.patch +tty-8250-add-support-for-additional-brainboxes-uc-cards.patch +tty-8250-add-support-for-brainboxes-up-cards.patch +tty-8250-add-support-for-intashield-is-100.patch diff --git a/queue-5.4/tty-8250-add-support-for-additional-brainboxes-uc-cards.patch b/queue-5.4/tty-8250-add-support-for-additional-brainboxes-uc-cards.patch new file mode 100644 index 00000000000..4203313230c --- /dev/null +++ b/queue-5.4/tty-8250-add-support-for-additional-brainboxes-uc-cards.patch @@ -0,0 +1,122 @@ +From c563db486db7d245c0e2f319443417ae8e692f7f Mon Sep 17 00:00:00 2001 +From: Cameron Williams +Date: Fri, 20 Oct 2023 17:03:09 +0100 +Subject: tty: 8250: Add support for additional Brainboxes UC cards + +From: Cameron Williams + +commit c563db486db7d245c0e2f319443417ae8e692f7f upstream. + +Add device IDs for some more Brainboxes UC cards, namely +UC-235/UC-246, UC-253/UC-734, UC-302, UC-313, UC-346, UC-357, +UC-607 and UC-836. + +Cc: stable@vger.kernel.org +Signed-off-by: Cameron Williams +Link: https://lore.kernel.org/r/DU0PR02MB789969998A6C3FAFCD95C85DC4DBA@DU0PR02MB7899.eurprd02.prod.outlook.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 57 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 57 insertions(+) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -5131,6 +5131,17 @@ static const struct pci_device_id serial + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, + pbn_b2_1_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0AA2, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_1_115200 }, ++ /* ++ * Brainboxes UC-253/UC-734 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0CA1, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, + /* + * Brainboxes UC-260/271/701/756 + */ +@@ -5163,6 +5174,14 @@ static const struct pci_device_id serial + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, + pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x08E2, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x08E3, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, + /* + * Brainboxes UC-310 + */ +@@ -5173,6 +5192,14 @@ static const struct pci_device_id serial + /* + * Brainboxes UC-313 + */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x08A1, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x08A2, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x08A3, + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, +@@ -5187,6 +5214,10 @@ static const struct pci_device_id serial + /* + * Brainboxes UC-346 + */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0B01, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_4_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0B02, + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, +@@ -5198,6 +5229,10 @@ static const struct pci_device_id serial + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, + pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0A82, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0A83, + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, +@@ -5216,6 +5251,28 @@ static const struct pci_device_id serial + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, + pbn_b2_4_115200 }, ++ /* ++ * Brainboxes UC-607 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x09A1, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x09A2, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x09A3, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ /* ++ * Brainboxes UC-836 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0D41, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_4_115200 }, + /* + * Perle PCI-RAS cards + */ diff --git a/queue-5.4/tty-8250-add-support-for-brainboxes-up-cards.patch b/queue-5.4/tty-8250-add-support-for-brainboxes-up-cards.patch new file mode 100644 index 00000000000..bed93800916 --- /dev/null +++ b/queue-5.4/tty-8250-add-support-for-brainboxes-up-cards.patch @@ -0,0 +1,89 @@ +From 2c6fec1e1532f15350be7e14ba6b88a39d289fe4 Mon Sep 17 00:00:00 2001 +From: Cameron Williams +Date: Fri, 20 Oct 2023 17:03:10 +0100 +Subject: tty: 8250: Add support for Brainboxes UP cards + +From: Cameron Williams + +commit 2c6fec1e1532f15350be7e14ba6b88a39d289fe4 upstream. + +Add support for the Brainboxes UP (powered PCI) range of +cards, namely UP-189, UP-200, UP-869 and UP-880. + +Cc: stable@vger.kernel.org +Signed-off-by: Cameron Williams +Link: https://lore.kernel.org/r/DU0PR02MB7899B5B59FF3D8587E88C117C4DBA@DU0PR02MB7899.eurprd02.prod.outlook.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 60 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 60 insertions(+) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -5154,6 +5154,66 @@ static const struct pci_device_id serial + PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00, + pbn_b2_4_115200 }, + /* ++ * Brainboxes UP-189 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0AC1, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0AC2, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0AC3, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ /* ++ * Brainboxes UP-200 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0B21, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0B22, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0B23, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ /* ++ * Brainboxes UP-869 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C01, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C02, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C03, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ /* ++ * Brainboxes UP-880 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C21, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C22, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ { PCI_VENDOR_ID_INTASHIELD, 0x0C23, ++ PCI_ANY_ID, PCI_ANY_ID, ++ 0, 0, ++ pbn_b2_2_115200 }, ++ /* + * Brainboxes UC-268 + */ + { PCI_VENDOR_ID_INTASHIELD, 0x0841, diff --git a/queue-5.4/tty-8250-add-support-for-intashield-is-100.patch b/queue-5.4/tty-8250-add-support-for-intashield-is-100.patch new file mode 100644 index 00000000000..0319cd06ddb --- /dev/null +++ b/queue-5.4/tty-8250-add-support-for-intashield-is-100.patch @@ -0,0 +1,34 @@ +From 4d994e3cf1b541ff32dfb03fbbc60eea68f9645b Mon Sep 17 00:00:00 2001 +From: Cameron Williams +Date: Fri, 20 Oct 2023 17:03:11 +0100 +Subject: tty: 8250: Add support for Intashield IS-100 + +From: Cameron Williams + +commit 4d994e3cf1b541ff32dfb03fbbc60eea68f9645b upstream. + +Add support for the Intashield IS-100 1 port serial card. + +Cc: stable@vger.kernel.org +Signed-off-by: Cameron Williams +Link: https://lore.kernel.org/r/DU0PR02MB7899A0E0CDAA505AF5A874CDC4DBA@DU0PR02MB7899.eurprd02.prod.outlook.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -5105,6 +5105,12 @@ static const struct pci_device_id serial + pbn_b1_bt_1_115200 }, + + /* ++ * IntaShield IS-100 ++ */ ++ { PCI_VENDOR_ID_INTASHIELD, 0x0D60, ++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, ++ pbn_b2_1_115200 }, ++ /* + * IntaShield IS-200 + */ + { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200, diff --git a/queue-5.4/tty-8250-remove-uc-257-and-uc-431.patch b/queue-5.4/tty-8250-remove-uc-257-and-uc-431.patch new file mode 100644 index 00000000000..50b1b9a97df --- /dev/null +++ b/queue-5.4/tty-8250-remove-uc-257-and-uc-431.patch @@ -0,0 +1,50 @@ +From 33092fb3af51deb80849e90a17bada44bbcde6b3 Mon Sep 17 00:00:00 2001 +From: Cameron Williams +Date: Fri, 20 Oct 2023 17:03:08 +0100 +Subject: tty: 8250: Remove UC-257 and UC-431 + +From: Cameron Williams + +commit 33092fb3af51deb80849e90a17bada44bbcde6b3 upstream. + +The UC-257 is a serial + LPT card, so remove it from this driver. +A patch has been submitted to add it to parport_serial instead. + +Additionaly, the UC-431 does not use this card ID, only the UC-420 +does. The 431 is a 3-port card and there is no generic 3-port configuration +available, so remove reference to it from this driver. + +Fixes: 152d1afa834c ("tty: Add support for Brainboxes UC cards.") +Cc: stable@vger.kernel.org +Signed-off-by: Cameron Williams +Link: https://lore.kernel.org/r/DU0PR02MB78995ADF7394C74AD4CF3357C4DBA@DU0PR02MB7899.eurprd02.prod.outlook.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_pci.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +--- a/drivers/tty/serial/8250/8250_pci.c ++++ b/drivers/tty/serial/8250/8250_pci.c +@@ -5132,13 +5132,6 @@ static const struct pci_device_id serial + 0, 0, + pbn_b2_1_115200 }, + /* +- * Brainboxes UC-257 +- */ +- { PCI_VENDOR_ID_INTASHIELD, 0x0861, +- PCI_ANY_ID, PCI_ANY_ID, +- 0, 0, +- pbn_b2_2_115200 }, +- /* + * Brainboxes UC-260/271/701/756 + */ + { PCI_VENDOR_ID_INTASHIELD, 0x0D21, +@@ -5217,7 +5210,7 @@ static const struct pci_device_id serial + 0, 0, + pbn_b2_4_115200 }, + /* +- * Brainboxes UC-420/431 ++ * Brainboxes UC-420 + */ + { PCI_VENDOR_ID_INTASHIELD, 0x0921, + PCI_ANY_ID, PCI_ANY_ID, diff --git a/queue-5.4/usb-storage-set-1.50-as-the-lower-bcddevice-for-older-super-top-compatibility.patch b/queue-5.4/usb-storage-set-1.50-as-the-lower-bcddevice-for-older-super-top-compatibility.patch new file mode 100644 index 00000000000..d64aad644da --- /dev/null +++ b/queue-5.4/usb-storage-set-1.50-as-the-lower-bcddevice-for-older-super-top-compatibility.patch @@ -0,0 +1,32 @@ +From 0e3139e6543b241b3e65956a55c712333bef48ac Mon Sep 17 00:00:00 2001 +From: LihaSika +Date: Fri, 27 Oct 2023 20:28:04 +0300 +Subject: usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility + +From: LihaSika + +commit 0e3139e6543b241b3e65956a55c712333bef48ac upstream. + +Change lower bcdDevice value for "Super Top USB 2.0 SATA BRIDGE" to match +1.50. I have such an older device with bcdDevice=1.50 and it will not work +otherwise. + +Cc: stable@vger.kernel.org +Signed-off-by: Liha Sikanen +Link: https://lore.kernel.org/r/ccf7d12a-8362-4916-b3e0-f4150f54affd@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_cypress.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/storage/unusual_cypress.h ++++ b/drivers/usb/storage/unusual_cypress.h +@@ -19,7 +19,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x + "Cypress ISD-300LP", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), + +-UNUSUAL_DEV( 0x14cd, 0x6116, 0x0160, 0x0160, ++UNUSUAL_DEV( 0x14cd, 0x6116, 0x0150, 0x0160, + "Super Top", + "USB 2.0 SATA BRIDGE", + USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),