Commit 454c5327 authored by Pali Rohár's avatar Pali Rohár Committed by Lorenzo Pieralisi
Browse files

PCI: aardvark: Simplify initialization of rootcap on virtual bridge 

PCIe config space can be initialized also before pci_bridge_emul_init()
call, so move rootcap initialization after PCI config space initialization.

This simplifies the function a little since it removes one if (ret < 0)
check.

Link: https://lore.kernel.org/r/20211005180952.6812-11-kabel@kernel.org


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>
Reviewed-by: default avatarMarek Behún <kabel@kernel.org>
parent 223dec14

drivers/pci/controller/pci-aardvark.c

+4 −10
Original line number Diff line number Diff line
@@ -822,7 +822,6 @@ static struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = { 
static int advk_sw_pci_bridge_init(struct advk_pcie *pcie)

{

	struct pci_bridge_emul *bridge = &pcie->bridge;

	int ret;



	bridge->conf.vendor =

		cpu_to_le16(advk_readl(pcie, PCIE_CORE_DEV_ID_REG) & 0xffff);
@@ -842,19 +841,14 @@ static int advk_sw_pci_bridge_init(struct advk_pcie *pcie) 
	/* Support interrupt A for MSI feature */

	bridge->conf.intpin = PCIE_CORE_INT_A_ASSERT_ENABLE;



	/* Indicates supports for Completion Retry Status */

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



	bridge->has_pcie = true;

	bridge->data = pcie;

	bridge->ops = &advk_pci_bridge_emul_ops;



	/* PCIe config space can be initialized after pci_bridge_emul_init() */

	ret = pci_bridge_emul_init(bridge, 0);

	if (ret < 0)

		return ret;



	/* Indicates supports for Completion Retry Status */

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



	return 0;

	return pci_bridge_emul_init(bridge, 0);

}



static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus,