Commit 7153884c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Remove PCI_REASSIGN_ALL_RSRC use on arm and arm64 



On arm, PCI_REASSIGN_ALL_RSRC is used only in pcibios_assign_all_busses(),
which helps decide whether to reconfigure bridge bus numbers.  It has
nothing to do with BAR assignments.  On arm64 and powerpc,
pcibios_assign_all_busses() tests PCI_REASSIGN_ALL_BUS, which makes more
sense.

Align arm with arm64 and powerpc, so they all use PCI_REASSIGN_ALL_BUS for
pcibios_assign_all_busses().

Remove PCI_REASSIGN_ALL_RSRC from the generic, Tegra, Versatile, and
R-Car drivers.  These drivers are used only on arm or arm64, where
PCI_REASSIGN_ALL_RSRC is not used after this change, so removing it
should have no effect.

No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManikanta Maddireddy <mmaddireddy@nvidia.com>
Reviewed-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 7a094909

arch/arm/include/asm/pci.h

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ extern unsigned long pcibios_min_io; 
extern unsigned long pcibios_min_mem;

#define PCIBIOS_MIN_MEM pcibios_min_mem



static inline int pcibios_assign_all_busses(void)

{

	return pci_has_flag(PCI_REASSIGN_ALL_RSRC);

}

#define pcibios_assign_all_busses()	pci_has_flag(PCI_REASSIGN_ALL_BUS)



#ifdef CONFIG_PCI_DOMAINS

static inline int pci_proc_domain(struct pci_bus *bus)

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) 
	struct pci_sys_data *sys;

	LIST_HEAD(head);



	pci_add_flags(PCI_REASSIGN_ALL_RSRC);

	pci_add_flags(PCI_REASSIGN_ALL_BUS);

	if (hw->preinit)

		hw->preinit();

	pcibios_init_hw(parent, hw, &head);

drivers/pci/host/pci-host-common.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int pci_host_common_probe(struct platform_device *pdev, 


	/* Do not reassign resources if probe only */

	if (!pci_has_flag(PCI_PROBE_ONLY))

		pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);

		pci_add_flags(PCI_REASSIGN_ALL_BUS);



	list_splice_init(&resources, &bridge->windows);

	bridge->dev.parent = dev;

drivers/pci/host/pci-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) 


	tegra_pcie_enable_ports(pcie);



	pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);

	pci_add_flags(PCI_REASSIGN_ALL_BUS);

	host->busnr = pcie->busn.start;

	host->dev.parent = &pdev->dev;

	host->ops = &tegra_pcie_ops;

drivers/pci/host/pci-versatile.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int versatile_pci_probe(struct platform_device *pdev) 
	writel(0, versatile_cfg_base[0] + PCI_INTERRUPT_LINE);



	pci_add_flags(PCI_ENABLE_PROC_DOMAINS);

	pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC);

	pci_add_flags(PCI_REASSIGN_ALL_BUS);



	list_splice_init(&pci_res, &bridge->windows);

	bridge->dev.parent = dev;