4.19-stable patches

added patches:
	usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch

diff --git a/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch b/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch
deleted file mode 100644 (file)
index 83e8b4c..0000000
--- a/queue-4.19/net-mlx5-update-the-list-of-the-pci-supported-devices.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7eca940322f47fd30dafb70da04d193a0154090 Mon Sep 17 00:00:00 2001
-From: Shani Shapp <shanish@mellanox.com>
-Date: Tue, 12 Nov 2019 15:10:00 +0200
-Subject: net/mlx5: Update the list of the PCI supported devices
-
-From: Shani Shapp <shanish@mellanox.com>
-
-commit b7eca940322f47fd30dafb70da04d193a0154090 upstream.
-
-Add the upcoming ConnectX-6 LX device ID.
-
-Fixes: 85327a9c4150 ("net/mlx5: Update the list of the PCI supported devices")
-Signed-off-by: Shani Shapp <shanish@mellanox.com>
-Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
-Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/mellanox/mlx5/core/main.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
-+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
-@@ -1644,6 +1644,7 @@ static const struct pci_device_id mlx5_c
-       { PCI_VDEVICE(MELLANOX, 0x101c), MLX5_PCI_DEV_IS_VF},   /* ConnectX-6 VF */
-       { PCI_VDEVICE(MELLANOX, 0x101d) },                      /* ConnectX-6 Dx */
-       { PCI_VDEVICE(MELLANOX, 0x101e), MLX5_PCI_DEV_IS_VF},   /* ConnectX Family mlx5Gen Virtual Function */
-+      { PCI_VDEVICE(MELLANOX, 0x101f) },                      /* ConnectX-6 LX */
-       { PCI_VDEVICE(MELLANOX, 0xa2d2) },                      /* BlueField integrated ConnectX-5 network controller */
-       { PCI_VDEVICE(MELLANOX, 0xa2d3), MLX5_PCI_DEV_IS_VF},   /* BlueField integrated ConnectX-5 network controller VF */
-       { PCI_VDEVICE(MELLANOX, 0xa2d6) },                      /* BlueField-2 integrated ConnectX-6 Dx network controller */

diff --git a/queue-4.19/series b/queue-4.19/series
index 66d14b0457f67f187af893eafcc3d39b8286670a..28648b5577e37cedbc69c1290847a7d5441f10f3 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -24,4 +24,4 @@ x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch
 ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch
 ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch
 gpio-prevent-potential-speculation-leaks-in-gpio_device_get_desc.patch
-net-mlx5-update-the-list-of-the-pci-supported-devices.patch
+usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch

diff --git a/queue-4.19/usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch b/queue-4.19/usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch
new file mode 100644 (file)
index 0000000..910739e
--- /dev/null
+++ b/queue-4.19/usb-serial-pl2303-add-device-id-for-macrosilicon-ms3020.patch
@@ -0,0 +1,41 @@
+From 7d47d22444bb7dc1b6d768904a22070ef35e1fc0 Mon Sep 17 00:00:00 2001
+From: Junhao Xie <bigfoot@classfun.cn>
+Date: Tue, 3 Sep 2024 23:06:38 +0800
+Subject: USB: serial: pl2303: add device id for Macrosilicon MS3020
+
+From: Junhao Xie <bigfoot@classfun.cn>
+
+commit 7d47d22444bb7dc1b6d768904a22070ef35e1fc0 upstream.
+
+Add the device id for the Macrosilicon MS3020 which is a
+PL2303HXN based device.
+
+Signed-off-by: Junhao Xie <bigfoot@classfun.cn>
+Cc: stable@vger.kernel.org
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/serial/pl2303.c |    1 +
+ drivers/usb/serial/pl2303.h |    4 ++++
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -112,6 +112,7 @@ static const struct usb_device_id id_tab
+       { 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) },
++      { USB_DEVICE(MACROSILICON_VENDOR_ID, MACROSILICON_MS3020_PRODUCT_ID) },
+       { }                                     /* Terminating entry */
+ };
+ 
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -165,3 +165,7 @@
+ /* Allied Telesis VT-Kit3 */
+ #define AT_VENDOR_ID          0x0caa
+ #define AT_VTKIT3_PRODUCT_ID  0x3001
++
++/* Macrosilicon MS3020 */
++#define MACROSILICON_VENDOR_ID                0x345f
++#define MACROSILICON_MS3020_PRODUCT_ID        0x3020