From: "Marek Behún" <kabel@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-pci@vger.kernel.org, pali@kernel.org,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH 10/17] PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
Date: Wed, 8 Dec 2021 07:18:44 +0100 [thread overview]
Message-ID: <20211208061851.31867-11-kabel@kernel.org> (raw)
In-Reply-To: <20211208061851.31867-1-kabel@kernel.org>
From: Pali Rohár <pali@kernel.org>
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(-)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index d5dcb3322d56..f7d553a63f06 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -883,7 +883,9 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
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;
}
--
2.32.0
next prev parent reply other threads:[~2021-12-08 6:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 6:18 [PATCH 00/17] PCI: aardvark controller fixes BATCH 4 Marek Behún
2021-12-08 6:18 ` [PATCH 01/17] PCI: aardvark: Drop __maybe_unused from advk_pcie_disable_phy() Marek Behún
2021-12-08 6:18 ` [PATCH 02/17] PCI: aardvark: Rewrite IRQ code to chained IRQ handler Marek Behún
2021-12-08 6:18 ` [PATCH 03/17] PCI: aardvark: Fix support for MSI interrupts Marek Behún
2021-12-08 6:18 ` [PATCH 04/17] PCI: aardvark: Fix reading MSI interrupt number Marek Behún
2021-12-08 6:18 ` [PATCH 05/17] PCI: aardvark: Refactor unmasking summary MSI interrupt Marek Behún
2021-12-08 6:18 ` [PATCH 06/17] PCI: aardvark: Add support for masking MSI interrupts Marek Behún
2021-12-08 6:18 ` [PATCH 07/17] PCI: aardvark: Fix setting MSI address Marek Behún
2021-12-08 6:18 ` [PATCH 08/17] PCI: aardvark: Enable MSI-X support Marek Behún
2021-12-08 6:18 ` [PATCH 09/17] PCI: aardvark: Add support for ERR interrupt on emulated bridge Marek Behún
2021-12-08 6:18 ` Marek Behún [this message]
2021-12-08 6:18 ` [PATCH 11/17] PCI: aardvark: Optimize writing PCI_EXP_RTCTL_PMEIE and PCI_EXP_RTSTA_PME " Marek Behún
2021-12-08 6:18 ` [PATCH 12/17] PCI: aardvark: Add support for PME interrupts Marek Behún
2021-12-08 6:18 ` [PATCH 13/17] PCI: aardvark: Fix support for PME requester on emulated bridge Marek Behún
2022-01-05 11:07 ` Marek Behún
2021-12-08 6:18 ` [PATCH 14/17] PCI: aardvark: Use separate INTA interrupt for emulated root bridge Marek Behún
2021-12-08 6:18 ` [PATCH 15/17] PCI: aardvark: Check return value of generic_handle_domain_irq() when processing INTx IRQ Marek Behún
2021-12-08 6:18 ` [PATCH 16/17] PCI: aardvark: Remove irq_mask_ack callback for INTx interrupts Marek Behún
2021-12-08 6:18 ` [PATCH 17/17] PCI: aardvark: Don't mask irq when mapping Marek Behún
2021-12-08 6:22 ` [PATCH 00/17] PCI: aardvark controller fixes BATCH 4 Marek Behún
2021-12-08 7:55 ` Marc Zyngier
2022-01-04 18:41 ` Marek Behún
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211208061851.31867-11-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marc.zyngier@arm.com \
--cc=pali@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).