Skip to content

Commit 735f5ae

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
The emulated bridge returns incorrect value for PCI_EXP_RTSTA register during readout in advk_pci_bridge_emul_pcie_conf_read() function: the correct bit is BIT(16), but we are setting BIT(23), because the code does *value = (isr0 & PCIE_MSG_PM_PME_MASK) << 16 where PCIE_MSG_PM_PME_MASK is BIT(7). The code should probably have been something like *value = (!!(isr0 & PCIE_MSG_PM_PME_MASK)) << 16, but we are better of using an if() and using the proper macro for this bit. Link: https://lore.kernel.org/r/20220110015018.26359-15-kabel@kernel.org Fixes: 8a3ebd8 ("PCI: aardvark: Implement emulated root PCI bridge config space") 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 3ebfefa commit 735f5ae

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/pci/controller/pci-aardvark.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,9 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
867867
case PCI_EXP_RTSTA: {
868868
u32 isr0 = advk_readl(pcie, PCIE_ISR0_REG);
869869
u32 msglog = advk_readl(pcie, PCIE_MSG_LOG_REG);
870-
*value = (isr0 & PCIE_MSG_PM_PME_MASK) << 16 | (msglog >> 16);
870+
*value = msglog >> 16;
871+
if (isr0 & PCIE_MSG_PM_PME_MASK)
872+
*value |= PCI_EXP_RTSTA_PME;
871873
return PCI_BRIDGE_EMUL_HANDLED;
872874
}
873875

0 commit comments

Comments
 (0)