Skip to content

Commit 16038eb

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: mvebu: Properly initialize vendor, device and revision of emulated bridge
With this change also PCI vendor id is read from mvebu registers. Link: https://lore.kernel.org/r/20220104153529.31647-9-pali@kernel.org Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Rob Herring <robh@kernel.org>
1 parent 5c88ed7 commit 16038eb

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/pci/controller/pci-mvebu.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -712,13 +712,14 @@ static int mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port)
712712
{
713713
unsigned int bridge_flags = PCI_BRIDGE_EMUL_NO_PREFMEM_FORWARD;
714714
struct pci_bridge_emul *bridge = &port->bridge;
715+
u32 dev_id = mvebu_readl(port, PCIE_DEV_ID_OFF);
716+
u32 dev_rev = mvebu_readl(port, PCIE_DEV_REV_OFF);
715717
u32 pcie_cap = mvebu_readl(port, PCIE_CAP_PCIEXP);
716718
u8 pcie_cap_ver = ((pcie_cap >> 16) & PCI_EXP_FLAGS_VERS);
717719

718-
bridge->conf.vendor = PCI_VENDOR_ID_MARVELL;
719-
bridge->conf.device = mvebu_readl(port, PCIE_DEV_ID_OFF) >> 16;
720-
bridge->conf.class_revision =
721-
mvebu_readl(port, PCIE_DEV_REV_OFF) & 0xff;
720+
bridge->conf.vendor = cpu_to_le16(dev_id & 0xffff);
721+
bridge->conf.device = cpu_to_le16(dev_id >> 16);
722+
bridge->conf.class_revision = cpu_to_le32(dev_rev & 0xff);
722723

723724
if (mvebu_has_ioport(port)) {
724725
/* We support 32 bits I/O addressing */

0 commit comments

Comments
 (0)