Skip to content

Commit 7122bcb

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: aardvark: Optimize writing PCI_EXP_RTCTL_PMEIE and PCI_EXP_RTSTA_PME on emulated bridge
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. Link: https://lore.kernel.org/r/20220110015018.26359-16-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>
1 parent 735f5ae commit 7122bcb

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

drivers/pci/controller/pci-aardvark.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -925,19 +925,21 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
925925
advk_pcie_wait_for_retrain(pcie);
926926
break;
927927

928-
case PCI_EXP_RTCTL: {
928+
case PCI_EXP_RTCTL:
929929
/* Only mask/unmask PME interrupt */
930-
u32 val = advk_readl(pcie, PCIE_ISR0_MASK_REG) &
931-
~PCIE_MSG_PM_PME_MASK;
932-
if ((new & PCI_EXP_RTCTL_PMEIE) == 0)
933-
val |= PCIE_MSG_PM_PME_MASK;
934-
advk_writel(pcie, val, PCIE_ISR0_MASK_REG);
930+
if (mask & PCI_EXP_RTCTL_PMEIE) {
931+
u32 val = advk_readl(pcie, PCIE_ISR0_MASK_REG);
932+
if (new & PCI_EXP_RTCTL_PMEIE)
933+
val &= ~PCIE_MSG_PM_PME_MASK;
934+
else
935+
val |= PCIE_MSG_PM_PME_MASK;
936+
advk_writel(pcie, val, PCIE_ISR0_MASK_REG);
937+
}
935938
break;
936-
}
937939

938940
case PCI_EXP_RTSTA:
939-
new = (new & PCI_EXP_RTSTA_PME) >> 9;
940-
advk_writel(pcie, new, PCIE_ISR0_REG);
941+
if (new & PCI_EXP_RTSTA_PME)
942+
advk_writel(pcie, PCIE_MSG_PM_PME_MASK, PCIE_ISR0_REG);
941943
break;
942944

943945
case PCI_EXP_DEVCTL:

0 commit comments

Comments
 (0)