mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 5f354992eeef9a51c67796dc9f7f578d3584baa2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Wed, 8 Dec 2021 05:57:54 +0100
|
|
Subject: [PATCH] PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated
|
|
bridge
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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.
|
|
|
|
Fixes: 8a3ebd8de328 ("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>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -874,7 +874,9 @@ advk_pci_bridge_emul_pcie_conf_read(stru
|
|
case PCI_EXP_RTSTA: {
|
|
u32 isr0 = advk_readl(pcie, PCIE_ISR0_REG);
|
|
u32 msglog = advk_readl(pcie, PCIE_MSG_LOG_REG);
|
|
- *value = (isr0 & PCIE_MSG_PM_PME_MASK) << 16 | (msglog >> 16);
|
|
+ *value = msglog >> 16;
|
|
+ if (isr0 & PCIE_MSG_PM_PME_MASK)
|
|
+ *value |= PCI_EXP_RTSTA_PME;
|
|
return PCI_BRIDGE_EMUL_HANDLED;
|
|
}
|
|
|