Patch "PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge" has been added to the 5.17-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge

to the 5.17-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     pci-aardvark-fix-reading-pci_exp_rtsta_pme-bit-on-em.patch
and it can be found in the queue-5.17 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9874730bfac19842c7fe756ff63346c64c28f58e
Author: Pali Rohár <pali@xxxxxxxxxx>
Date:   Mon Jan 10 02:50:09 2022 +0100

    PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
    
    [ Upstream commit 735f5ae49e1b44742cc63ca9b5c1ffde3e94ba91 ]
    
    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@xxxxxxxxxx
    Fixes: 8a3ebd8de328 ("PCI: aardvark: Implement emulated root PCI bridge config space")
    Signed-off-by: Pali Rohár <pali@xxxxxxxxxx>
    Signed-off-by: Marek Behún <kabel@xxxxxxxxxx>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 10e936363461..82e2c618d532 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -846,7 +846,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;
 	}