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

Commit 673c9756 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

powerpc/PCI: replace pci_probe_only with pci_flags 



We already use pci_flags, so this just sets pci_flags directly and removes
the intermediate step of figuring out pci_probe_only, then using it to set
pci_flags.

The PCI core provides a pci_flags definition (currently __weak), so drop
the powerpc definitions in favor of that.

CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3c13be01

arch/powerpc/include/asm/ppc-pci.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ extern void init_pci_config_tokens (void); 
extern unsigned long get_phb_buid (struct device_node *);

extern int rtas_setup_phb(struct pci_controller *phb);



extern unsigned long pci_probe_only;



/* ---- EEH internal-use-only related routines ---- */

#ifdef CONFIG_EEH

arch/powerpc/kernel/pci-common.c

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static int global_phb_number; /* Global phb counter */ 
/* ISA Memory physical address */

resource_size_t isa_mem_base;



/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */

unsigned int pci_flags = 0;





static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;

arch/powerpc/kernel/pci_64.c

+0 −5
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include <asm/machdep.h>

#include <asm/ppc-pci.h>



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),

 * and it *must* be the start of ISA space if an ISA bus exists because
@@ -55,9 +53,6 @@ static int __init pcibios_init(void) 
	 */

	ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;



	if (pci_probe_only)

		pci_add_flags(PCI_PROBE_ONLY);



	/* On ppc64, we always enable PCI domains and we keep domain 0

	 * backward compatible in /proc for video cards

	 */

arch/powerpc/kernel/rtas_pci.c

+7 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ void __init find_and_init_phbs(void) 
	pci_devs_phb_init();



	/*

	 * pci_probe_only and pci_assign_all_buses can be set via properties

	 * PCI_PROBE_ONLY and PCI_REASSIGN_ALL_BUS can be set via properties

	 * in chosen.

	 */

	if (of_chosen) {
@@ -284,8 +284,12 @@ void __init find_and_init_phbs(void) 


		prop = of_get_property(of_chosen,

				"linux,pci-probe-only", NULL);

		if (prop)

			pci_probe_only = *prop;

		if (prop) {

			if (*prop)

				pci_add_flags(PCI_PROBE_ONLY);

			else

				pci_clear_flags(PCI_PROBE_ONLY);

		}



#ifdef CONFIG_PPC32 /* Will be made generic soon */

		prop = of_get_property(of_chosen,

arch/powerpc/platforms/iseries/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ void __init iSeries_pcibios_init(void) 
	/* Install IO hooks */

	ppc_pci_io = iseries_pci_io;



	pci_probe_only = 1;

	pci_add_flags(PCI_PROBE_ONLY);



	/* iSeries has no IO space in the common sense, it needs to set

	 * the IO base to 0