malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc/PCI: make pci_probe_only default to 0

Browse Source 
pci_probe_only is set on ppc64 to prevent resource re-allocation
by the core. It's meant to be used in very specific circumstances
such as when operating under a hypervisor that may prevent such
re-allocation.

Instead of default to 1, we make it default to 0 and explicitly
set it in the few cases where we need it.

This fixes FSL PCI which wants it clear among others.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2012-02-23 20:18:58 -07:00
parent 14be538c56
commit 3c13be017a
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/pci_64.c
View File

@ -33,7 +33,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
unsigned long pci_probe_only = 1; unsigned long pci_probe_only = 0;
/* pci_io_base -- the base address from which io bars are offsets. /* pci_io_base -- the base address from which io bars are offsets.
* This is the lowest I/O base address (so bar values are always positive), * This is the lowest I/O base address (so bar values are always positive),

3
arch/powerpc/platforms/powermac/pci.c
View File

@ -1059,9 +1059,6 @@ void __init pmac_pci_init(void)
} }
/* pmac_check_ht_link(); */ /* pmac_check_ht_link(); */
/* We can allocate missing resources if any */
pci_probe_only = 0;
#else /* CONFIG_PPC64 */ #else /* CONFIG_PPC64 */
init_p2pbridge(); init_p2pbridge();
init_second_ohare(); init_second_ohare();

3
arch/powerpc/platforms/powernv/pci.c
View File

@ -557,9 +557,6 @@ void __init pnv_pci_init(void)
pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN); pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN);
/* We do not want to just probe */
pci_probe_only = 0;
/* OPAL absent, try POPAL first then RTAS detection of PHBs */ /* OPAL absent, try POPAL first then RTAS detection of PHBs */
if (!firmware_has_feature(FW_FEATURE_OPAL)) { if (!firmware_has_feature(FW_FEATURE_OPAL)) {
#ifdef CONFIG_PPC_POWERNV_RTAS #ifdef CONFIG_PPC_POWERNV_RTAS

3
arch/powerpc/platforms/pseries/setup.c
View File

@ -380,6 +380,9 @@ static void __init pSeries_setup_arch(void)
fwnmi_init(); fwnmi_init();
/* By default, only probe PCI (can be overriden by rtas_pci */
pci_probe_only = 1;
/* Find and initialize PCI host bridges */ /* Find and initialize PCI host bridges */
init_pci_config_tokens(); init_pci_config_tokens();
find_and_init_phbs(); find_and_init_phbs();

1
arch/powerpc/platforms/wsp/wsp_pci.c
View File

@ -682,7 +682,6 @@ static int __init wsp_setup_one_phb(struct device_node *np)
/* XXX Force re-assigning of everything for now */ /* XXX Force re-assigning of everything for now */
pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC | pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC |
PCI_ENABLE_PROC_DOMAINS); PCI_ENABLE_PROC_DOMAINS);
pci_probe_only = 0;
/* Calculate how the TCE space is divided */ /* Calculate how the TCE space is divided */
phb->dma32_base = 0; phb->dma32_base = 0;