mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-13 18:53:52 +02:00
be381a7ac7
Deleted (upstreamed): generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1] generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2] generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3] generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4] Manually rebased: generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch ramips/patches-5.15/710-at803x.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Refresh patches again] [Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
62 lines
1.9 KiB
Diff
62 lines
1.9 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(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -876,8 +876,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru
|
|
|
|
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;
|
|
}
|
|
@@ -891,10 +896,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
|
|
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)
|
|
@@ -916,6 +917,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
|
|
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;
|
|
}
|