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

Commit 16416a15 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Greg Kroah-Hartman
Browse files

PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register 

[ Upstream commit e3bca37d15dca118f2ef1f0a068bb6e07846ea20 ]

Commit 1b79c528 ("PCI: cadence: Add host driver for Cadence PCIe
controller") in order to update Vendor ID, directly wrote to
PCI_VENDOR_ID register. However PCI_VENDOR_ID in root port configuration
space is read-only register and writing to it will have no effect.
Use local management register to configure Vendor ID and Subsystem Vendor
ID.

Link: https://lore.kernel.org/r/20200722110317.4744-10-kishon@ti.com


Fixes: 1b79c528 ("PCI: cadence: Add host driver for Cadence PCIe controller")
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 84560175

drivers/pci/controller/pcie-cadence-host.c

+7 −2
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) 
{

	struct cdns_pcie *pcie = &rc->pcie;

	u32 value, ctrl;

	u32 id;



	/*

	 * Set the root complex BAR configuration register:
@@ -121,8 +122,12 @@ static int cdns_pcie_host_init_root_port(struct cdns_pcie_rc *rc) 
	cdns_pcie_writel(pcie, CDNS_PCIE_LM_RC_BAR_CFG, value);



	/* Set root port configuration space */

	if (rc->vendor_id != 0xffff)

		cdns_pcie_rp_writew(pcie, PCI_VENDOR_ID, rc->vendor_id);

	if (rc->vendor_id != 0xffff) {

		id = CDNS_PCIE_LM_ID_VENDOR(rc->vendor_id) |

			CDNS_PCIE_LM_ID_SUBSYS(rc->vendor_id);

		cdns_pcie_writel(pcie, CDNS_PCIE_LM_ID, id);

	}



	if (rc->device_id != 0xffff)

		cdns_pcie_rp_writew(pcie, PCI_DEVICE_ID, rc->device_id);