PCI: mvebu: Fix support for PCI_EXP_DEVCTL on emulated bridge

[platform/kernel/linux-rpi.git] / drivers / pci / controller / pci-mvebu.c

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 3563301..6100608 100644 (file)
--- 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;