mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +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>
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 3fe0073d116d9902df08761c1cf0d733dd4c38fc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Wed, 8 Dec 2021 06:03:50 +0100
|
|
Subject: [PATCH] PCI: aardvark: Optimize writing PCI_EXP_RTCTL_PMEIE and
|
|
PCI_EXP_RTSTA_PME on emulated bridge
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
To optimize advk_pci_bridge_emul_pcie_conf_write() code, touch
|
|
PCIE_ISR0_REG and PCIE_ISR0_MASK_REG registers only when it is really
|
|
needed, when processing PCI_EXP_RTCTL_PMEIE and PCI_EXP_RTSTA_PME bits.
|
|
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 20 +++++++++++---------
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -932,19 +932,21 @@ advk_pci_bridge_emul_pcie_conf_write(str
|
|
advk_pcie_wait_for_retrain(pcie);
|
|
break;
|
|
|
|
- case PCI_EXP_RTCTL: {
|
|
+ case PCI_EXP_RTCTL:
|
|
/* Only mask/unmask PME interrupt */
|
|
- u32 val = advk_readl(pcie, PCIE_ISR0_MASK_REG) &
|
|
- ~PCIE_MSG_PM_PME_MASK;
|
|
- if ((new & PCI_EXP_RTCTL_PMEIE) == 0)
|
|
- val |= PCIE_MSG_PM_PME_MASK;
|
|
- advk_writel(pcie, val, PCIE_ISR0_MASK_REG);
|
|
+ if (mask & PCI_EXP_RTCTL_PMEIE) {
|
|
+ u32 val = advk_readl(pcie, PCIE_ISR0_MASK_REG);
|
|
+ if (new & PCI_EXP_RTCTL_PMEIE)
|
|
+ val &= ~PCIE_MSG_PM_PME_MASK;
|
|
+ else
|
|
+ val |= PCIE_MSG_PM_PME_MASK;
|
|
+ advk_writel(pcie, val, PCIE_ISR0_MASK_REG);
|
|
+ }
|
|
break;
|
|
- }
|
|
|
|
case PCI_EXP_RTSTA:
|
|
- new = (new & PCI_EXP_RTSTA_PME) >> 9;
|
|
- advk_writel(pcie, new, PCIE_ISR0_REG);
|
|
+ if (new & PCI_EXP_RTSTA_PME)
|
|
+ advk_writel(pcie, PCIE_MSG_PM_PME_MASK, PCIE_ISR0_REG);
|
|
break;
|
|
|
|
case PCI_EXP_DEVCTL:
|