mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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
|
|
@@ -881,8 +881,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;
|
|
}
|
|
@@ -896,10 +901,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)
|
|
@@ -921,6 +922,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;
|
|
}
|