aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeontx
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-21 08:39:18 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-27 19:19:11 +0100
commitbe077f48124b8bcedd7cdb552c050ce73a42e509 (patch)
treee837e50dd01176b0f694b5701ee8575f30352698 /target/linux/octeontx
parent553a3ac221e92c6fad9ffa9229b18a4e77e42c23 (diff)
downloadupstream-be077f48124b8bcedd7cdb552c050ce73a42e509.tar.gz
upstream-be077f48124b8bcedd7cdb552c050ce73a42e509.tar.bz2
upstream-be077f48124b8bcedd7cdb552c050ce73a42e509.zip
kernel: bump 5.10 to 5.10.81
Manually rebased: octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ipq806x/R7800 Run-tested: bcm2711/RPi4B, ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/octeontx')
-rw-r--r--target/linux/octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
index 9bedaa1a87..c7e39e07b7 100644
--- a/target/linux/octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
+++ b/target/linux/octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
@@ -22,10 +22,10 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
#include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h>
#include <linux/suspend.h>
-@@ -5763,3 +5764,34 @@ static void apex_pci_fixup_class(struct
+@@ -5769,3 +5770,34 @@ static void nvidia_ion_ahci_fixup(struct
+ pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
}
- DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
- PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
+
+#ifdef CONFIG_PCI_HOST_THUNDER_PEM
+/*