mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
612e1c6801
Backport Aardvark PCIe controller driver changes that will appear in 5.17 kernel. They are currently accessible on LKML [1], in linux-next repository [2], or in Bjorn Helgaas' repository [3]. These changes mainly enhance driver removal method. [1] https://lore.kernel.org/linux-pci/20211130172913.9727-1-kabel@kernel.org/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/pci?h=next-20220107 [3] https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/log/?h=next Signed-off-by: Marek Behún <kabel@kernel.org>
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From 1d3e170344dff2cef8827db6c09909b78cbc11d7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Tue, 30 Nov 2021 18:29:05 +0100
|
|
Subject: [PATCH] PCI: aardvark: Add support for DEVCAP2, DEVCTL2, LNKCAP2 and
|
|
LNKCTL2 registers on emulated bridge
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
PCI aardvark hardware supports access to DEVCAP2, DEVCTL2, LNKCAP2 and
|
|
LNKCTL2 configuration registers of PCIe core via PCIE_CORE_PCIEXP_CAP.
|
|
Export them via emulated software root bridge.
|
|
|
|
Link: https://lore.kernel.org/r/20211130172913.9727-4-kabel@kernel.org
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
|
|
index c5300d49807a..25af189a1052 100644
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -884,8 +884,13 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
|
|
case PCI_CAP_LIST_ID:
|
|
case PCI_EXP_DEVCAP:
|
|
case PCI_EXP_DEVCTL:
|
|
+ case PCI_EXP_DEVCAP2:
|
|
+ case PCI_EXP_DEVCTL2:
|
|
+ case PCI_EXP_LNKCAP2:
|
|
+ case PCI_EXP_LNKCTL2:
|
|
*value = advk_readl(pcie, PCIE_CORE_PCIEXP_CAP + reg);
|
|
return PCI_BRIDGE_EMUL_HANDLED;
|
|
+
|
|
default:
|
|
return PCI_BRIDGE_EMUL_NOT_HANDLED;
|
|
}
|
|
@@ -899,10 +904,6 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
|
|
struct advk_pcie *pcie = bridge->data;
|
|
|
|
switch (reg) {
|
|
- case PCI_EXP_DEVCTL:
|
|
- advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
|
|
- break;
|
|
-
|
|
case PCI_EXP_LNKCTL:
|
|
advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
|
|
if (new & PCI_EXP_LNKCTL_RL)
|
|
@@ -924,6 +925,12 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
|
|
advk_writel(pcie, new, PCIE_ISR0_REG);
|
|
break;
|
|
|
|
+ case PCI_EXP_DEVCTL:
|
|
+ case PCI_EXP_DEVCTL2:
|
|
+ case PCI_EXP_LNKCTL2:
|
|
+ advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
|
|
+ break;
|
|
+
|
|
default:
|
|
break;
|
|
}
|
|
--
|
|
2.34.1
|
|
|