Commit 239edf68 authored by Pali Rohár's avatar Pali Rohár Committed by Lorenzo Pieralisi
Browse files

PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge 

This register is exported at address offset 0x30.

Link: https://lore.kernel.org/r/20211028185659.20329-8-kabel@kernel.org


Fixes: 8a3ebd8d ("PCI: aardvark: Implement emulated root PCI bridge config space")
Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: stable@vger.kernel.org
parent bc4fac42

drivers/pci/controller/pci-aardvark.c

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

#define PCIE_CORE_CMD_STATUS_REG				0x4

#define PCIE_CORE_DEV_REV_REG					0x8

#define PCIE_CORE_EXP_ROM_BAR_REG				0x30

#define PCIE_CORE_PCIEXP_CAP					0xc0

#define PCIE_CORE_ERR_CAPCTL_REG				0x118

#define     PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX			BIT(5)
@@ -773,6 +774,10 @@ advk_pci_bridge_emul_base_conf_read(struct pci_bridge_emul *bridge, 
		*value = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);

		return PCI_BRIDGE_EMUL_HANDLED;



	case PCI_ROM_ADDRESS1:

		*value = advk_readl(pcie, PCIE_CORE_EXP_ROM_BAR_REG);

		return PCI_BRIDGE_EMUL_HANDLED;



	case PCI_INTERRUPT_LINE: {

		/*

		 * From the whole 32bit register we support reading from HW only
@@ -805,6 +810,10 @@ advk_pci_bridge_emul_base_conf_write(struct pci_bridge_emul *bridge, 
		advk_writel(pcie, new, PCIE_CORE_CMD_STATUS_REG);

		break;



	case PCI_ROM_ADDRESS1:

		advk_writel(pcie, new, PCIE_CORE_EXP_ROM_BAR_REG);

		break;



	case PCI_INTERRUPT_LINE:

		if (mask & (PCI_BRIDGE_CTL_BUS_RESET << 16)) {

			u32 val = advk_readl(pcie, PCIE_CORE_CTRL1_REG);