From 70a9b59fd7b64bacc9000b2d73434727341d4ac7 Mon Sep 17 00:00:00 2001 From: LeoLiu-oc Date: Fri, 30 May 2025 18:40:45 +0800 Subject: [PATCH 1/2] PCI: Add ACS quirk for more Zhaoxin Root Ports ANBZ: #21585 commit e367e3c765f5477b2e79da0f1399aed49e2d1e37 upstream. Add more Root Port Device IDs to pci_quirk_zhaoxin_pcie_ports_acs() for some new Zhaoxin platforms. Fixes: 299bd04 ("PCI: Add ACS quirk for Zhaoxin Root/Downstream Ports") Link: https://lore.kernel.org/r/20231211091543.735903-1-LeoLiu-oc@zhaoxin.com Signed-off-by: LeoLiuoc [bhelgaas: update subject, drop changelog, add Fixes, add stable tag, fix whitespace, wrap code comment] Signed-off-by: Bjorn Helgaas Cc: # 5.7 Signed-off-by: LeoLiu-oc --- drivers/pci/quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index bd2d277b704b..903e2645c7bd 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4270,7 +4270,7 @@ static int pci_quirk_xgene_acs(struct pci_dev *dev, u16 acs_flags) * But the implementation could block peer-to-peer transactions between them * and provide ACS-like functionality. */ -static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags) +static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags) { u16 flags = (PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_SV); int ret = acs_flags & ~flags ? 0 : 1; @@ -4283,7 +4283,7 @@ static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags) switch (dev->device) { case 0x0710 ... 0x071e: case 0x0721: - case 0x0723 ... 0x0732: + case 0x0723 ... 0x0752: return ret; } -- Gitee From b7515550cf93b441cced384a4097459b3ad2bb7a Mon Sep 17 00:00:00 2001 From: LeoLiu-oc Date: Fri, 30 May 2025 18:56:34 +0800 Subject: [PATCH 2/2] anolis: PCI: Supplement ACS quirk for more Zhaoxin Root Ports ANBZ: #21585 To adapt to more new Zhaoxin platforms, further supplement more Root Port Device IDs to the pci_quirk_zhaoxin_pcie_ports_acs() function. Signed-off-by: LeoLiu-oc --- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 903e2645c7bd..afdd06b82817 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4283,7 +4283,7 @@ static int pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags) switch (dev->device) { case 0x0710 ... 0x071e: case 0x0721: - case 0x0723 ... 0x0752: + case 0x0723 ... 0x075e: return ret; } -- Gitee