diff mbox series

[1/6] arm-bsp/linux-yocto: Update N1SDP PCI quirk patch

Message ID 20230330163815.3677638-1-ross.burton@arm.com
State New
Headers show
Series [1/6] arm-bsp/linux-yocto: Update N1SDP PCI quirk patch | expand

Commit Message

Ross Burton March 30, 2023, 4:38 p.m. UTC
From: Adam Johnston <adam.johnston@arm.com>

Poky commit 9ef8cbcdfc85c3ce2ca52d8bee2ab6929f589383 updates
the kernel to 6.1.20 which breaks the PCI quirk patch for the N1SDP.

This change fixes it.

Signed-off-by: Adam Johnston <adam.johnston@arm.com>
---
 ...002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jon Mason March 30, 2023, 11:17 p.m. UTC | #1
On Thu, 30 Mar 2023 17:38:10 +0100, Ross Burton wrote:
> Poky commit 9ef8cbcdfc85c3ce2ca52d8bee2ab6929f589383 updates
> the kernel to 6.1.20 which breaks the PCI quirk patch for the N1SDP.
> 
> This change fixes it.

Applied, thanks!

[1/6] arm-bsp/linux-yocto: Update N1SDP PCI quirk patch
      commit: 1caacf78c7405a1ad3d97659c39eba247e082bc5
[2/6] arm/scp-firmware: fix up whitespace
      (no commit info)
[3/6] arm/scp-firmware: enable verbose builds
      (no commit info)
[4/6] arm/scp-firmware: remove textrel from INSANE_SKIP
      (no commit info)
[5/6] arm/scp-firmware: improve debug packaging
      (no commit info)
[6/6] CI: mask poky's llvm if we're using clang
      (no commit info)

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch
index 7a5ab7a2..cb72ed0a 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch
@@ -150,9 +150,9 @@  index 285acc4aaccc..d6ebef1f30db 100644
   * Some NVIDIA GPU devices do not work with bus reset, SBR needs to be
   * prevented for those affected devices.
 @@ -4980,6 +5081,7 @@ static const struct pci_dev_acs_enabled {
- 	{ PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },
- 	/* Zhaoxin Root/Downstream Ports */
  	{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
+ 	/* Wangxun nics */
+ 	{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
 +	{ PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
  	{ 0 }
  };