Commit ec6daf25 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/aardvark' 

- Emulate the PCI Bridge Subsystem Vendor ID (Pali Rohár)

* remotes/lorenzo/pci/aardvark:
  PCI: aardvark: Add support for PCI Bridge Subsystem Vendor ID on emulated bridge
parents 99e2c73d a080f9ad

drivers/pci/controller/pci-aardvark.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define PCIE_CORE_DEV_ID_REG					0x0

#define PCIE_CORE_DEV_ID_REG					0x0

#define PCIE_CORE_CMD_STATUS_REG				0x4

#define PCIE_CORE_CMD_STATUS_REG				0x4

#define PCIE_CORE_DEV_REV_REG					0x8

#define PCIE_CORE_DEV_REV_REG					0x8

#define PCIE_CORE_SSDEV_ID_REG					0x2c

#define PCIE_CORE_PCIEXP_CAP					0xc0

#define PCIE_CORE_PCIEXP_CAP					0xc0

#define PCIE_CORE_PCIERR_CAP					0x100

#define PCIE_CORE_PCIERR_CAP					0x100

#define PCIE_CORE_ERR_CAPCTL_REG				0x118

#define PCIE_CORE_ERR_CAPCTL_REG				0x118
@@ -1077,6 +1078,8 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) 
	/* Indicates supports for Completion Retry Status */

	/* Indicates supports for Completion Retry Status */

	bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS);

	bridge->pcie_conf.rootcap = cpu_to_le16(PCI_EXP_RTCAP_CRSVIS);





	bridge->subsystem_vendor_id = advk_readl(pcie, PCIE_CORE_SSDEV_ID_REG) & 0xffff;

	bridge->subsystem_id = advk_readl(pcie, PCIE_CORE_SSDEV_ID_REG) >> 16;

	bridge->has_pcie = true;

	bridge->has_pcie = true;

	bridge->data = pcie;

	bridge->data = pcie;

	bridge->ops = &advk_pci_bridge_emul_ops;

	bridge->ops = &advk_pci_bridge_emul_ops;