From: Greg Kroah-Hartman Date: Mon, 28 Mar 2022 08:37:11 +0000 (+0200) Subject: 5.17-stable patches X-Git-Tag: v4.14.275~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b6ac1bf156796462778752dbf25260d1270d0d2;p=thirdparty%2Fkernel%2Fstable-queue.git 5.17-stable patches added patches: dt-bindings-usb-hcd-correct-usb-device-path.patch usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-pl2303-fix-gs-type-detection.patch usb-serial-simple-add-nokia-phone-driver.patch --- diff --git a/queue-5.17/dt-bindings-usb-hcd-correct-usb-device-path.patch b/queue-5.17/dt-bindings-usb-hcd-correct-usb-device-path.patch new file mode 100644 index 00000000000..acbdaf57f19 --- /dev/null +++ b/queue-5.17/dt-bindings-usb-hcd-correct-usb-device-path.patch @@ -0,0 +1,34 @@ +From 801109b1a37ad99784e6370cc7e462596f505ea3 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Mon, 14 Mar 2022 19:18:30 +0100 +Subject: dt-bindings: usb: hcd: correct usb-device path + +From: Krzysztof Kozlowski + +commit 801109b1a37ad99784e6370cc7e462596f505ea3 upstream. + +The usb-device.yaml reference is absolute so it should use /schemas part +in path. + +Fixes: 23bf6fc7046c ("dt-bindings: usb: convert usb-device.txt to YAML schema") +Cc: +Reported-by: Rob Herring +Acked-by: Rob Herring +Signed-off-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20220314181830.245853-1-krzysztof.kozlowski@canonical.com +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/devicetree/bindings/usb/usb-hcd.yaml ++++ b/Documentation/devicetree/bindings/usb/usb-hcd.yaml +@@ -33,7 +33,7 @@ patternProperties: + "^.*@[0-9a-f]{1,2}$": + description: The hard wired USB devices + type: object +- $ref: /usb/usb-device.yaml ++ $ref: /schemas/usb/usb-device.yaml + + additionalProperties: true + diff --git a/queue-5.17/series b/queue-5.17/series index 394a87d6b3d..5335b9c43fb 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -1 +1,5 @@ revert-swiotlb-rework-fix-info-leak-with-dma_from_device.patch +usb-serial-pl2303-add-ibm-device-ids.patch +dt-bindings-usb-hcd-correct-usb-device-path.patch +usb-serial-pl2303-fix-gs-type-detection.patch +usb-serial-simple-add-nokia-phone-driver.patch diff --git a/queue-5.17/usb-serial-pl2303-add-ibm-device-ids.patch b/queue-5.17/usb-serial-pl2303-add-ibm-device-ids.patch new file mode 100644 index 00000000000..56ffaa6de78 --- /dev/null +++ b/queue-5.17/usb-serial-pl2303-add-ibm-device-ids.patch @@ -0,0 +1,47 @@ +From e1d15646565b284e9ef2433234d6cfdaf66695f1 Mon Sep 17 00:00:00 2001 +From: Eddie James +Date: Tue, 1 Mar 2022 16:44:46 -0600 +Subject: USB: serial: pl2303: add IBM device IDs + +From: Eddie James + +commit e1d15646565b284e9ef2433234d6cfdaf66695f1 upstream. + +IBM manufactures a PL2303 device for UPS communications. Add the vendor +and product IDs so that the PL2303 driver binds to the device. + +Signed-off-by: Eddie James +Signed-off-by: Joel Stanley +Signed-off-by: Eddie James +Link: https://lore.kernel.org/r/20220301224446.21236-1-eajames@linux.ibm.com +Cc: stable@vger.kernel.org +[ johan: amend the SoB chain ] +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 3 +++ + 2 files changed, 4 insertions(+) + +--- a/drivers/usb/serial/pl2303.c ++++ b/drivers/usb/serial/pl2303.c +@@ -116,6 +116,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) }, + { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, + { USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) }, + { } /* Terminating entry */ + }; + +--- a/drivers/usb/serial/pl2303.h ++++ b/drivers/usb/serial/pl2303.h +@@ -35,6 +35,9 @@ + #define ATEN_PRODUCT_UC232B 0x2022 + #define ATEN_PRODUCT_ID2 0x2118 + ++#define IBM_VENDOR_ID 0x04b3 ++#define IBM_PRODUCT_ID 0x4016 ++ + #define IODATA_VENDOR_ID 0x04bb + #define IODATA_PRODUCT_ID 0x0a03 + #define IODATA_PRODUCT_ID_RSAQ5 0x0a0e diff --git a/queue-5.17/usb-serial-pl2303-fix-gs-type-detection.patch b/queue-5.17/usb-serial-pl2303-fix-gs-type-detection.patch new file mode 100644 index 00000000000..bee73e70f32 --- /dev/null +++ b/queue-5.17/usb-serial-pl2303-fix-gs-type-detection.patch @@ -0,0 +1,36 @@ +From 5b6ab28d06780c87320ceade61698bb6719c85db Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 7 Mar 2022 15:23:19 +0100 +Subject: USB: serial: pl2303: fix GS type detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Johan Hovold + +commit 5b6ab28d06780c87320ceade61698bb6719c85db upstream. + +At least some PL2303GS have a bcdDevice of 0x605 instead of 0x100 as the +datasheet claims. Add it to the list of known release numbers for the +HXN (G) type. + +Fixes: 894758d0571d ("USB: serial: pl2303: tighten type HXN (G) detection") +Reported-by: Matyáš Kroupa +Link: https://lore.kernel.org/r/165de6a0-43e9-092c-2916-66b115c7fbf4@gmail.com +Cc: stable@vger.kernel.org # 5.13 +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/pl2303.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/pl2303.c ++++ b/drivers/usb/serial/pl2303.c +@@ -436,6 +436,7 @@ static int pl2303_detect_type(struct usb + case 0x105: + case 0x305: + case 0x405: ++ case 0x605: + /* + * Assume it's an HXN-type if the device doesn't + * support the old read request value. diff --git a/queue-5.17/usb-serial-simple-add-nokia-phone-driver.patch b/queue-5.17/usb-serial-simple-add-nokia-phone-driver.patch new file mode 100644 index 00000000000..e6c9a1a0a0f --- /dev/null +++ b/queue-5.17/usb-serial-simple-add-nokia-phone-driver.patch @@ -0,0 +1,150 @@ +From c4b9c570965f75d0d55e639747f1e5ccdad2fae0 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Mon, 28 Feb 2022 09:49:19 +0100 +Subject: USB: serial: simple: add Nokia phone driver + +From: Johan Hovold + +commit c4b9c570965f75d0d55e639747f1e5ccdad2fae0 upstream. + +Add a new "simple" driver for certain Nokia phones, including Nokia 130 +(RM-1035) which exposes two serial ports in "charging only" mode: + +Bus 001 Device 009: ID 0421:069a Nokia Mobile Phones 130 [RM-1035] (Charging only) +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x0421 Nokia Mobile Phones + idProduct 0x069a 130 [RM-1035] (Charging only) + bcdDevice 1.00 + iManufacturer 1 Nokia + iProduct 2 Nokia 130 (RM-1035) + iSerial 0 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 0x0037 + bNumInterfaces 2 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0x80 + (Bus Powered) + MaxPower 500mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 255 Vendor Specific Subclass + bInterfaceProtocol 255 Vendor Specific Protocol + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x81 EP 1 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x01 EP 1 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 1 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 255 Vendor Specific Subclass + bInterfaceProtocol 255 Vendor Specific Protocol + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x82 EP 2 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x02 EP 2 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 +Device Status: 0x0000 + (Bus Powered) + +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20220228084919.10656-1-johan@kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/Kconfig | 1 + + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ + 2 files changed, 8 insertions(+) + +--- a/drivers/usb/serial/Kconfig ++++ b/drivers/usb/serial/Kconfig +@@ -66,6 +66,7 @@ config USB_SERIAL_SIMPLE + - Libtransistor USB console + - a number of Motorola phones + - Motorola Tetra devices ++ - Nokia mobile phones + - Novatel Wireless GPS receivers + - Siemens USB/MPI adapter. + - ViVOtech ViVOpay USB device. +--- a/drivers/usb/serial/usb-serial-simple.c ++++ b/drivers/usb/serial/usb-serial-simple.c +@@ -91,6 +91,11 @@ DEVICE(moto_modem, MOTO_IDS); + { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */ + DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS); + ++/* Nokia mobile phone driver */ ++#define NOKIA_IDS() \ ++ { USB_DEVICE(0x0421, 0x069a) } /* Nokia 130 (RM-1035) */ ++DEVICE(nokia, NOKIA_IDS); ++ + /* Novatel Wireless GPS driver */ + #define NOVATEL_IDS() \ + { USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */ +@@ -123,6 +128,7 @@ static struct usb_serial_driver * const + &vivopay_device, + &moto_modem_device, + &motorola_tetra_device, ++ &nokia_device, + &novatel_gps_device, + &hp4x_device, + &suunto_device, +@@ -140,6 +146,7 @@ static const struct usb_device_id id_tab + VIVOPAY_IDS(), + MOTO_IDS(), + MOTOROLA_TETRA_IDS(), ++ NOKIA_IDS(), + NOVATEL_IDS(), + HP4X_IDS(), + SUUNTO_IDS(),