Skip to content

Commit

Permalink
powerpc/PCI: make pci_probe_only default to 0
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas committed Feb 24, 2012
1 parent 14be538 commit 3c13be0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <asm/machdep.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.
* This is the lowest I/O base address (so bar values are always positive),
Expand Down
3 changes: 0 additions & 3 deletions arch/powerpc/platforms/powermac/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1059,9 +1059,6 @@ void __init pmac_pci_init(void)
}
/* pmac_check_ht_link(); */

/* We can allocate missing resources if any */
pci_probe_only = 0;

#else /* CONFIG_PPC64 */
init_p2pbridge();
init_second_ohare();
Expand Down
3 changes: 0 additions & 3 deletions arch/powerpc/platforms/powernv/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,6 @@ void __init pnv_pci_init(void)

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 */
if (!firmware_has_feature(FW_FEATURE_OPAL)) {
#ifdef CONFIG_PPC_POWERNV_RTAS
Expand Down
3 changes: 3 additions & 0 deletions arch/powerpc/platforms/pseries/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,9 @@ static void __init pSeries_setup_arch(void)

fwnmi_init();

/* By default, only probe PCI (can be overriden by rtas_pci */
pci_probe_only = 1;

/* Find and initialize PCI host bridges */
init_pci_config_tokens();
find_and_init_phbs();
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/platforms/wsp/wsp_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,6 @@ static int __init wsp_setup_one_phb(struct device_node *np)
/* XXX Force re-assigning of everything for now */
pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC |
PCI_ENABLE_PROC_DOMAINS);
pci_probe_only = 0;

/* Calculate how the TCE space is divided */
phb->dma32_base = 0;
Expand Down

0 comments on commit 3c13be0

Please sign in to comment.