Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c13be01 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

powerpc/PCI: make pci_probe_only default to 0 



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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 14be538c

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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),

arch/powerpc/platforms/powermac/pci.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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();

arch/powerpc/platforms/powernv/pci.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -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

arch/powerpc/platforms/pseries/setup.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -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();

arch/powerpc/platforms/wsp/wsp_pci.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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;