lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0805/1039] PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge
    Date
    From: Pali Rohár <pali@kernel.org>

    [ Upstream commit ecae073e393e65ee7be7ebf3fdd5258ab99f1636 ]

    Comment in Armada 370 functional specification is misleading.
    PCI_EXP_DEVCTL_*RE bits are supported and configures receiving of error
    interrupts.

    Link: https://lore.kernel.org/r/20211125124605.25915-14-pali@kernel.org
    Fixes: 1f08673eef12 ("PCI: mvebu: Convert to PCI emulated bridge config space")
    Signed-off-by: Pali Rohár <pali@kernel.org>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/pci-mvebu.c | 11 +----------
    1 file changed, 1 insertion(+), 10 deletions(-)

    diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
    index aaf6a226f6dba..0052e83c95de9 100644
    --- a/drivers/pci/controller/pci-mvebu.c
    +++ b/drivers/pci/controller/pci-mvebu.c
    @@ -498,9 +498,7 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
    break;

    case PCI_EXP_DEVCTL:
    - *value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL) &
    - ~(PCI_EXP_DEVCTL_URRE | PCI_EXP_DEVCTL_FERE |
    - PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_CERE);
    + *value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL);
    break;

    case PCI_EXP_LNKCAP:
    @@ -590,13 +588,6 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,

    switch (reg) {
    case PCI_EXP_DEVCTL:
    - /*
    - * Armada370 data says these bits must always
    - * be zero when in root complex mode.
    - */
    - new &= ~(PCI_EXP_DEVCTL_URRE | PCI_EXP_DEVCTL_FERE |
    - PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_CERE);
    -
    mvebu_writel(port, new, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL);
    break;

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:14    [W:4.015 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site