From: Greg Kroah-Hartman Date: Thu, 30 Apr 2020 15:25:45 +0000 (+0200) Subject: 5.6-stable patches X-Git-Tag: v5.4.37~25 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=7d6beee14135de99c1f71d4991fba4d11d2e6fe3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.6-stable patches added patches: pci-add-zhaoxin-vendor-id.patch --- diff --git a/queue-5.6/pci-add-zhaoxin-vendor-id.patch b/queue-5.6/pci-add-zhaoxin-vendor-id.patch new file mode 100644 index 00000000000..04cf61ed91b --- /dev/null +++ b/queue-5.6/pci-add-zhaoxin-vendor-id.patch @@ -0,0 +1,31 @@ +From 3375590623e4a132b19a8740512f4deb95728933 Mon Sep 17 00:00:00 2001 +From: Raymond Pang +Date: Fri, 27 Mar 2020 17:11:46 +0800 +Subject: PCI: Add Zhaoxin Vendor ID + +From: Raymond Pang + +commit 3375590623e4a132b19a8740512f4deb95728933 upstream. + +Add Zhaoxin Vendor ID to pci_ids.h + +Link: https://lore.kernel.org/r/20200327091148.5190-2-RaymondPang-oc@zhaoxin.com +Signed-off-by: Raymond Pang +Signed-off-by: Bjorn Helgaas +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/pci_ids.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -2583,6 +2583,8 @@ + + #define PCI_VENDOR_ID_AMAZON 0x1d0f + ++#define PCI_VENDOR_ID_ZHAOXIN 0x1d17 ++ + #define PCI_VENDOR_ID_HYGON 0x1d94 + + #define PCI_VENDOR_ID_HXT 0x1dbf diff --git a/queue-5.6/series b/queue-5.6/series index 15b0344521f..4fdfc22f29b 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -41,6 +41,7 @@ svcrdma-fix-leak-of-svc_rdma_recv_ctxt-objects.patch net-mlx5e-don-t-trigger-irq-multiple-times-on-xsk-wakeup-to-avoid-wq-overruns.patch net-mlx5e-get-the-latest-values-from-counters-in-switchdev-mode.patch pci-avoid-asmedia-xhci-usb-pme-from-d0-defect.patch +pci-add-zhaoxin-vendor-id.patch pci-add-acs-quirk-for-zhaoxin-multi-function-devices.patch pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch