Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b24134f authored by Jonathan Chocron's avatar Jonathan Chocron Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Add validation that PCIe core is set to correct mode 



Some PCIe controllers can be set to either Host or EP according to some
early boot FW. To make sure there is no discrepancy (e.g. FW configured
the port to EP mode while the DT specifies it as a host bridge or vice
versa), a check has been added for each mode.

Signed-off-by: default avatarJonathan Chocron <jonnyc@amazon.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarAndrew Murray <andrew.murray@arm.com>
Acked-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
parent a8daea94

drivers/pci/controller/dwc/pcie-designware-ep.c

+8 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
	int ret;

	u32 reg;

	void *addr;

	u8 hdr_type;

	unsigned int nbars;

	unsigned int offset;

	struct pci_epc *epc;
@@ -595,6 +596,13 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
	if (ep->ops->ep_init)

		ep->ops->ep_init(ep);



	hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE);

	if (hdr_type != PCI_HEADER_TYPE_NORMAL) {

		dev_err(pci->dev, "PCIe controller is not set to EP mode (hdr_type:0x%x)!\n",

			hdr_type);

		return -EIO;

	}



	ret = of_property_read_u8(np, "max-functions", &epc->max_functions);

	if (ret < 0)

		epc->max_functions = 1;

drivers/pci/controller/dwc/pcie-designware-host.c

+16 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	struct pci_bus *child;

	struct pci_host_bridge *bridge;

	struct resource *cfg_res;

	u32 hdr_type;

	int ret;



	raw_spin_lock_init(&pci->pp.lock);
@@ -464,6 +465,21 @@ int dw_pcie_host_init(struct pcie_port *pp) 
			goto err_free_msi;

	}



	ret = dw_pcie_rd_own_conf(pp, PCI_HEADER_TYPE, 1, &hdr_type);

	if (ret != PCIBIOS_SUCCESSFUL) {

		dev_err(pci->dev, "Failed reading PCI_HEADER_TYPE cfg space reg (ret: 0x%x)\n",

			ret);

		ret = pcibios_err_to_errno(ret);

		goto err_free_msi;

	}

	if (hdr_type != PCI_HEADER_TYPE_BRIDGE) {

		dev_err(pci->dev,

			"PCIe controller is not set to bridge type (hdr_type: 0x%x)!\n",

			hdr_type);

		ret = -EIO;

		goto err_free_msi;

	}



	pp->root_bus_nr = pp->busn->start;



	bridge->dev.parent = dev;