Commit 7fb39bf2 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

PCI: cadence: Fix to read 32-bit Vendor ID/Device ID property from DT 

The PCI Bus Binding specification (IEEE Std 1275-1994 Revision 2.1 [1])
defines both Vendor ID and Device ID to be 32-bits. Fix
pcie-cadence-host.c driver to read 32-bit Vendor ID and Device ID
properties from device tree.

[1] -> https://www.devicetree.org/open-firmware/bindings/pci/pci2_1.pdf

Link: https://lore.kernel.org/r/20200508130646.23939-4-kishon@ti.com


Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarTom Joseph <tjoseph@cadence.com>
parent 9e2618c3

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

+2 −2
Original line number Diff line number Diff line
@@ -220,10 +220,10 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) 
	of_property_read_u32(np, "cdns,no-bar-match-nbits", &rc->no_bar_nbits);



	rc->vendor_id = 0xffff;

	of_property_read_u16(np, "vendor-id", &rc->vendor_id);

	of_property_read_u32(np, "vendor-id", &rc->vendor_id);



	rc->device_id = 0xffff;

	of_property_read_u16(np, "device-id", &rc->device_id);

	of_property_read_u32(np, "device-id", &rc->device_id);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "reg");

	pcie->reg_base = devm_ioremap_resource(dev, res);

drivers/pci/controller/cadence/pcie-cadence.h

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ struct cdns_pcie_rc { 
	struct resource		*bus_range;

	void __iomem		*cfg_base;

	u32			no_bar_nbits;

	u16			vendor_id;

	u16			device_id;

	u32			vendor_id;

	u32			device_id;

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE