Commit 5b90fc56 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/misc' 

  - Fix mvebu prefetchable BAR regression caused by common bridge emulation
    that assumed all bridges had prefetchable windows (Thomas Petazzoni)

  - Make advk_pci_bridge_emul_ops static (Wei Yongjun)

* remotes/lorenzo/pci/misc:
  PCI: aardvark: Make symbol 'advk_pci_bridge_emul_ops' static
  PCI: pci-bridge-emul: Extend pci_bridge_emul_init() with flags
  PCI: pci-bridge-emul: Create per-bridge copy of register behavior
parents d00aaa88 d3b34d04

drivers/pci/controller/pci-aardvark.c

+2 −2
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, 
	}

}



struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = {

static struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = {

	.read_pcie = advk_pci_bridge_emul_pcie_conf_read,

	.write_pcie = advk_pci_bridge_emul_pcie_conf_write,

};
@@ -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

+59 −27
Original line number Diff line number Diff line
@@ -24,29 +24,6 @@ 
#define PCI_CAP_PCIE_START	PCI_BRIDGE_CONF_END

#define PCI_CAP_PCIE_END	(PCI_CAP_PCIE_START + PCI_EXP_SLTSTA2 + 2)



/*

 * Initialize a pci_bridge_emul structure to represent a fake PCI

 * bridge configuration space. The caller needs to have initialized

 * the PCI configuration space with whatever values make sense

 * (typically at least vendor, device, revision), the ->ops pointer,

 * and optionally ->data and ->has_pcie.

 */

void pci_bridge_emul_init(struct pci_bridge_emul *bridge)

{

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

	bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE;

	bridge->conf.cache_line_size = 0x10;

	bridge->conf.status = PCI_STATUS_CAP_LIST;



	if (bridge->has_pcie) {

		bridge->conf.capabilities_pointer = PCI_CAP_PCIE_START;

		bridge->pcie_conf.cap_id = PCI_CAP_ID_EXP;

		/* Set PCIe v2, root port, slot support */

		bridge->pcie_conf.cap = PCI_EXP_TYPE_ROOT_PORT << 4 | 2 |

			PCI_EXP_FLAGS_SLOT;

	}

}



struct pci_bridge_reg_behavior {

	/* Read-only bits */

	u32 ro;
@@ -283,6 +260,61 @@ const static struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { 
	},

};



/*

 * Initialize a pci_bridge_emul structure to represent a fake PCI

 * bridge configuration space. The caller needs to have initialized

 * the PCI configuration space with whatever values make sense

 * (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,

			 unsigned int flags)

{

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

	bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE;

	bridge->conf.cache_line_size = 0x10;

	bridge->conf.status = PCI_STATUS_CAP_LIST;

	bridge->pci_regs_behavior = kmemdup(pci_regs_behavior,

					    sizeof(pci_regs_behavior),

					    GFP_KERNEL);

	if (!bridge->pci_regs_behavior)

		return -ENOMEM;



	if (bridge->has_pcie) {

		bridge->conf.capabilities_pointer = PCI_CAP_PCIE_START;

		bridge->pcie_conf.cap_id = PCI_CAP_ID_EXP;

		/* Set PCIe v2, root port, slot support */

		bridge->pcie_conf.cap = PCI_EXP_TYPE_ROOT_PORT << 4 | 2 |

			PCI_EXP_FLAGS_SLOT;

		bridge->pcie_cap_regs_behavior =

			kmemdup(pcie_cap_regs_behavior,

				sizeof(pcie_cap_regs_behavior),

				GFP_KERNEL);

		if (!bridge->pcie_cap_regs_behavior) {

			kfree(bridge->pci_regs_behavior);

			return -ENOMEM;

		}

	}



	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;

}



/*

 * Cleanup a pci_bridge_emul structure that was previously initilized

 * using pci_bridge_emul_init().

 */

void pci_bridge_emul_cleanup(struct pci_bridge_emul *bridge)

{

	if (bridge->has_pcie)

		kfree(bridge->pcie_cap_regs_behavior);

	kfree(bridge->pci_regs_behavior);

}



/*

 * Should be called by the PCI controller driver when reading the PCI

 * configuration space of the fake bridge. It will call back the
@@ -312,11 +344,11 @@ int pci_bridge_emul_conf_read(struct pci_bridge_emul *bridge, int where, 
		reg -= PCI_CAP_PCIE_START;

		read_op = bridge->ops->read_pcie;

		cfgspace = (u32 *) &bridge->pcie_conf;

		behavior = pcie_cap_regs_behavior;

		behavior = bridge->pcie_cap_regs_behavior;

	} else {

		read_op = bridge->ops->read_base;

		cfgspace = (u32 *) &bridge->conf;

		behavior = pci_regs_behavior;

		behavior = bridge->pci_regs_behavior;

	}



	if (read_op)
@@ -383,11 +415,11 @@ int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where, 
		reg -= PCI_CAP_PCIE_START;

		write_op = bridge->ops->write_pcie;

		cfgspace = (u32 *) &bridge->pcie_conf;

		behavior = pcie_cap_regs_behavior;

		behavior = bridge->pcie_cap_regs_behavior;

	} else {

		write_op = bridge->ops->write_base;

		cfgspace = (u32 *) &bridge->conf;

		behavior = pci_regs_behavior;

		behavior = bridge->pci_regs_behavior;

	}



	/* Keep all bits, except the RW bits */

drivers/pci/pci-bridge-emul.h

+12 −1
Original line number Diff line number Diff line
@@ -107,15 +107,26 @@ struct pci_bridge_emul_ops { 
			   u32 old, u32 new, u32 mask);

};



struct pci_bridge_reg_behavior;



struct pci_bridge_emul {

	struct pci_bridge_emul_conf conf;

	struct pci_bridge_emul_pcie_conf pcie_conf;

	struct pci_bridge_emul_ops *ops;

	struct pci_bridge_reg_behavior *pci_regs_behavior;

	struct pci_bridge_reg_behavior *pcie_cap_regs_behavior;

	void *data;

	bool has_pcie;

};



void 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,

			      int size, u32 *value);

int pci_bridge_emul_conf_write(struct pci_bridge_emul *bridge, int where,

CRA Git | Maintained and supported by SUSTech CRA and CCSE