| From 1ca9a01f5b8e699ee2569755e3f7ef17ba3c31cb Mon Sep 17 00:00:00 2001 |
| From: Bjorn Helgaas <bhelgaas@google.com> |
| Date: Thu, 30 Nov 2017 11:21:57 -0600 |
| Subject: [PATCH 0431/1795] 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: Bjorn Helgaas <bhelgaas@google.com> |
| Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com> |
| Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| (cherry picked from commit 7153884c088a9500f9379aeec877f3d4d4ec4fba) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/include/asm/pci.h | 5 +---- |
| arch/arm/kernel/bios32.c | 2 +- |
| drivers/pci/host/pci-host-common.c | 2 +- |
| drivers/pci/host/pci-tegra.c | 2 +- |
| drivers/pci/host/pci-versatile.c | 2 +- |
| drivers/pci/host/pcie-rcar.c | 2 +- |
| 6 files changed, 6 insertions(+), 9 deletions(-) |
| |
| diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h |
| index 960d9dc4f380..1f0de808d111 100644 |
| --- a/arch/arm/include/asm/pci.h |
| +++ b/arch/arm/include/asm/pci.h |
| @@ -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) |
| diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c |
| index 0cd0aefb3a8f..ed46ca69813d 100644 |
| --- a/arch/arm/kernel/bios32.c |
| +++ b/arch/arm/kernel/bios32.c |
| @@ -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); |
| diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c |
| index 148896f73c06..eabaaa325bd2 100644 |
| --- a/drivers/pci/host/pci-host-common.c |
| +++ b/drivers/pci/host/pci-host-common.c |
| @@ -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; |
| diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c |
| index 1987fec1f126..5c85bb3e39c4 100644 |
| --- a/drivers/pci/host/pci-tegra.c |
| +++ b/drivers/pci/host/pci-tegra.c |
| @@ -2278,7 +2278,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; |
| diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c |
| index aff4cfb555fb..286a79567207 100644 |
| --- a/drivers/pci/host/pci-versatile.c |
| +++ b/drivers/pci/host/pci-versatile.c |
| @@ -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; |
| diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c |
| index bab9f24ae70b..0c8b19e6a4c8 100644 |
| --- a/drivers/pci/host/pcie-rcar.c |
| +++ b/drivers/pci/host/pcie-rcar.c |
| @@ -459,7 +459,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) |
| |
| rcar_pcie_setup(&bridge->windows, pcie); |
| |
| - pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS); |
| + pci_add_flags(PCI_REASSIGN_ALL_BUS); |
| |
| bridge->dev.parent = dev; |
| bridge->sysdata = pcie; |
| -- |
| 2.19.0 |
| |