Commit 33776d05 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Lorenzo Pieralisi
Browse files

PCI: pci-bridge-emul: Extend pci_bridge_emul_init() with flags 



Depending on the capabilities of the PCI controller/platform, the
PCI-to-PCI bridge emulation behavior might need to be different. For
example, on platforms that use the pci-mvebu code, we currently don't
support prefetchable memory BARs, so the corresponding fields in the
PCI-to-PCI bridge configuration space should be read-only.

To implement this, extend pci_bridge_emul_init() to take a "flags"
argument, with currently one flag supported:

PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR

that will make the prefetchable memory base and limit registers
read-only.

The pci-mvebu and pci-aardvark drivers are updated accordingly.

Fixes: 1f08673e ("PCI: mvebu: Convert to PCI emulated bridge config space")
Reported-by: default avatarLuís Mendes <luis.p.mendes@gmail.com>
Reported-by: default avatarLeigh Brown <leigh@solinno.co.uk>
Tested-by: default avatarLeigh Brown <leigh@solinno.co.uk>
Tested-by: default avatarLuis Mendes <luis.p.mendes@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: stable@vger.kernel.org
Cc: Luís Mendes <luis.p.mendes@gmail.com>
Cc: Leigh Brown <leigh@solinno.co.uk>
parent 59f81c35

drivers/pci/controller/pci-aardvark.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static void advk_sw_pci_bridge_init(struct advk_pcie *pcie) 
	bridge->data = pcie;

	bridge->ops = &advk_pci_bridge_emul_ops;



	pci_bridge_emul_init(bridge);

	pci_bridge_emul_init(bridge, 0);



}

drivers/pci/controller/pci-mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port) 
	bridge->data = port;

	bridge->ops = &mvebu_pci_bridge_emul_ops;



	pci_bridge_emul_init(bridge);

	pci_bridge_emul_init(bridge, PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR);

}



static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys)

drivers/pci/pci-bridge-emul.c

+7 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ const static struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { 
 * (typically at least vendor, device, revision), the ->ops pointer,

 * and optionally ->data and ->has_pcie.

 */

int pci_bridge_emul_init(struct pci_bridge_emul *bridge)

int pci_bridge_emul_init(struct pci_bridge_emul *bridge,

			 unsigned int flags)

{

	bridge->conf.class_revision |= PCI_CLASS_BRIDGE_PCI << 16;

	bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE;
@@ -295,6 +296,11 @@ int pci_bridge_emul_init(struct pci_bridge_emul *bridge) 
		}

	}



	if (flags & PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR) {

		bridge->pci_regs_behavior[PCI_PREF_MEMORY_BASE / 4].ro = ~0;

		bridge->pci_regs_behavior[PCI_PREF_MEMORY_BASE / 4].rw = 0;

	}



	return 0;

}

drivers/pci/pci-bridge-emul.h

+6 −1
Original line number Diff line number Diff line
@@ -119,7 +119,12 @@ struct pci_bridge_emul { 
	bool has_pcie;

};



int pci_bridge_emul_init(struct pci_bridge_emul *bridge);

enum {

	PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR = BIT(0),

};



int pci_bridge_emul_init(struct pci_bridge_emul *bridge,

			 unsigned int flags);

void pci_bridge_emul_cleanup(struct pci_bridge_emul *bridge);



int pci_bridge_emul_conf_read(struct pci_bridge_emul *bridge, int where,

CRA Git | Maintained and supported by SUSTech CRA and CCSE