Skip to content

Commit ecae073

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge
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/[email protected] Fixes: 1f08673 ("PCI: mvebu: Convert to PCI emulated bridge config space") Signed-off-by: Pali Rohár <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]>
1 parent d75404c commit ecae073

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

drivers/pci/controller/pci-mvebu.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,7 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
534534
break;
535535

536536
case PCI_EXP_DEVCTL:
537-
*value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL) &
538-
~(PCI_EXP_DEVCTL_URRE | PCI_EXP_DEVCTL_FERE |
539-
PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_CERE);
537+
*value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL);
540538
break;
541539

542540
case PCI_EXP_LNKCAP:
@@ -647,13 +645,6 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
647645

648646
switch (reg) {
649647
case PCI_EXP_DEVCTL:
650-
/*
651-
* Armada370 data says these bits must always
652-
* be zero when in root complex mode.
653-
*/
654-
new &= ~(PCI_EXP_DEVCTL_URRE | PCI_EXP_DEVCTL_FERE |
655-
PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_CERE);
656-
657648
mvebu_writel(port, new, PCIE_CAP_PCIEXP + PCI_EXP_DEVCTL);
658649
break;
659650

0 commit comments

Comments
 (0)