From 0eb8d5abce957dc0797114a07b410a58daba7ed7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Sep 2022 19:28:43 +0200 Subject: [PATCH] 5.10-stable patches added patches: alsa-hda-tegra-set-depop-delay-for-tegra.patch usb-core-fix-rst-error-in-hub.c.patch usb-serial-option-add-quectel-bg95-0x0203-composition.patch usb-serial-option-add-quectel-rm520n.patch --- ...-hda-tegra-set-depop-delay-for-tegra.patch | 31 +++++++++ queue-5.10/series | 4 ++ .../usb-core-fix-rst-error-in-hub.c.patch | 34 ++++++++++ ...-add-quectel-bg95-0x0203-composition.patch | 59 ++++++++++++++++ ...usb-serial-option-add-quectel-rm520n.patch | 68 +++++++++++++++++++ 5 files changed, 196 insertions(+) create mode 100644 queue-5.10/alsa-hda-tegra-set-depop-delay-for-tegra.patch create mode 100644 queue-5.10/usb-core-fix-rst-error-in-hub.c.patch create mode 100644 queue-5.10/usb-serial-option-add-quectel-bg95-0x0203-composition.patch create mode 100644 queue-5.10/usb-serial-option-add-quectel-rm520n.patch diff --git a/queue-5.10/alsa-hda-tegra-set-depop-delay-for-tegra.patch b/queue-5.10/alsa-hda-tegra-set-depop-delay-for-tegra.patch new file mode 100644 index 00000000000..333598080ed --- /dev/null +++ b/queue-5.10/alsa-hda-tegra-set-depop-delay-for-tegra.patch @@ -0,0 +1,31 @@ +From 3c4d8c24fb6c44f426e447b04800b0ed61a7b5ae Mon Sep 17 00:00:00 2001 +From: Mohan Kumar +Date: Tue, 13 Sep 2022 11:06:41 +0530 +Subject: ALSA: hda/tegra: set depop delay for tegra + +From: Mohan Kumar + +commit 3c4d8c24fb6c44f426e447b04800b0ed61a7b5ae upstream. + +Reduce the suspend time by setting depop delay to 10ms for +tegra. + +Signed-off-by: Mohan Kumar +Cc: +Link: https://lore.kernel.org/r/20220913053641.23299-1-mkumard@nvidia.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_hdmi.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -3839,6 +3839,7 @@ static int patch_tegra_hdmi(struct hda_c + if (err) + return err; + ++ codec->depop_delay = 10; + codec->patch_ops.build_pcms = tegra_hdmi_build_pcms; + spec = codec->spec; + spec->chmap.ops.chmap_cea_alloc_validate_get_type = diff --git a/queue-5.10/series b/queue-5.10/series index 4683f840a6b..21b19f1929f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -37,3 +37,7 @@ vfio-type1-unpin-zero-pages.patch revert-usb-gadget-udc-xilinx-replace-memcpy-with-mem.patch arm64-restrict-arm64_bti_kernel-to-clang-12.0.0-and-.patch arm64-bti-disable-in-kernel-bti-when-cross-section-t.patch +usb-core-fix-rst-error-in-hub.c.patch +usb-serial-option-add-quectel-bg95-0x0203-composition.patch +usb-serial-option-add-quectel-rm520n.patch +alsa-hda-tegra-set-depop-delay-for-tegra.patch diff --git a/queue-5.10/usb-core-fix-rst-error-in-hub.c.patch b/queue-5.10/usb-core-fix-rst-error-in-hub.c.patch new file mode 100644 index 00000000000..9a26ebd8d1b --- /dev/null +++ b/queue-5.10/usb-core-fix-rst-error-in-hub.c.patch @@ -0,0 +1,34 @@ +From 766a96dc558385be735a370db867e302c8f22153 Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Thu, 1 Sep 2022 10:36:34 -0400 +Subject: USB: core: Fix RST error in hub.c + +From: Alan Stern + +commit 766a96dc558385be735a370db867e302c8f22153 upstream. + +A recent commit added an invalid RST expression to a kerneldoc comment +in hub.c. The fix is trivial. + +Fixes: 9c6d778800b9 ("USB: core: Prevent nested device-reset calls") +Cc: +Reported-by: Stephen Rothwell +Reviewed-by: Bagas Sanjaya +Signed-off-by: Alan Stern +Link: https://lore.kernel.org/r/YxDDcsLtRZ7c20pq@rowland.harvard.edu +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/core/hub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -5968,7 +5968,7 @@ re_enumerate_no_bos: + * + * Return: The same as for usb_reset_and_verify_device(). + * However, if a reset is already in progress (for instance, if a +- * driver doesn't have pre_ or post_reset() callbacks, and while ++ * driver doesn't have pre_reset() or post_reset() callbacks, and while + * being unbound or re-bound during the ongoing reset its disconnect() + * or probe() routine tries to perform a second, nested reset), the + * routine returns -EINPROGRESS. diff --git a/queue-5.10/usb-serial-option-add-quectel-bg95-0x0203-composition.patch b/queue-5.10/usb-serial-option-add-quectel-bg95-0x0203-composition.patch new file mode 100644 index 00000000000..9cb7998916e --- /dev/null +++ b/queue-5.10/usb-serial-option-add-quectel-bg95-0x0203-composition.patch @@ -0,0 +1,59 @@ +From f8f67eff6847f9b8d753fa029723bcc54296055a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carl=20Yin=28=E6=AE=B7=E5=BC=A0=E6=88=90=29?= + +Date: Fri, 2 Sep 2022 09:49:43 +0000 +Subject: USB: serial: option: add Quectel BG95 0x0203 composition + +From: Carl Yin(殷张成) + +commit f8f67eff6847f9b8d753fa029723bcc54296055a upstream. + +Add support for the following Quectel BG95 composition: + +0x0203: Diag + GNSS + Modem + ECM + +usb-devices output: +T: Bus=01 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=2c7c ProdID=0203 Rev= 0.00 +S: Manufacturer=Quectel, Incorporated +S: Product=Quectel LPWA Module +S: SerialNumber=71d3a21b +C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA +A: FirstIf#= 3 IfCount= 2 Cls=02(comm.) Sub=00 Prot=00 +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=60 Driver=option +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=option +E: Ad=83(I) Atr=03(Int.) MxPS= 64 Ivl=2ms +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether +E: Ad=85(I) Atr=03(Int.) MxPS= 64 Ivl=2ms +I: If#= 4 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +I:* If#= 4 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Carl Yin +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1138,6 +1138,8 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff), + .driver_info = NUMEP2 }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, ++ { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */ ++ .driver_info = ZLP }, + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), + .driver_info = RSVD(4) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), diff --git a/queue-5.10/usb-serial-option-add-quectel-rm520n.patch b/queue-5.10/usb-serial-option-add-quectel-rm520n.patch new file mode 100644 index 00000000000..6bb30fdacc7 --- /dev/null +++ b/queue-5.10/usb-serial-option-add-quectel-rm520n.patch @@ -0,0 +1,68 @@ +From d640c4cb8f2f933c0ca896541f9de7fb1ae245f4 Mon Sep 17 00:00:00 2001 +From: jerry meng +Date: Mon, 5 Sep 2022 14:35:33 +0800 +Subject: USB: serial: option: add Quectel RM520N + +From: jerry meng + +commit d640c4cb8f2f933c0ca896541f9de7fb1ae245f4 upstream. + +add support for Quectel RM520N which is based on Qualcomm SDX62 chip. + +0x0801: DIAG + NMEA + AT + MODEM + RMNET + +T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 10 Spd=480 MxCh= 0 +D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=2c7c ProdID=0801 Rev= 5.04 +S: Manufacturer=Quectel +S: Product=RM520N-GL +S: SerialNumber=384af524 +C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option +E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: jerry meng +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -256,6 +256,7 @@ static void option_instat_callback(struc + #define QUECTEL_PRODUCT_EM060K 0x030b + #define QUECTEL_PRODUCT_EM12 0x0512 + #define QUECTEL_PRODUCT_RM500Q 0x0800 ++#define QUECTEL_PRODUCT_RM520N 0x0801 + #define QUECTEL_PRODUCT_EC200S_CN 0x6002 + #define QUECTEL_PRODUCT_EC200T 0x6026 + #define QUECTEL_PRODUCT_RM500K 0x7001 +@@ -1161,6 +1162,9 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), + .driver_info = ZLP }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, -- 2.47.3