lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mips/PCI: replace pci_probe_only with pci_flags

Browse Source 
Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag.  Others use PCI_PROBE_ONLY in pci_flags for
the same purpose.  This moves mips to the pci_flags approach so
generic code can use the same test across all architectures.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas
2012-02-23 20:18:57 -07:00
parent e5b3684181
commit 2909060699
7 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/include/asm/pci.h
View File

@@ -92,6 +92,7 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm-generic/pci-bridge.h>
struct pci_dev; struct pci_dev;
@@ -145,8 +146,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
#define arch_setup_msi_irqs arch_setup_msi_irqs #define arch_setup_msi_irqs arch_setup_msi_irqs
#endif #endif
extern int pci_probe_only;
extern char * (*pcibios_plat_setup)(char *str); extern char * (*pcibios_plat_setup)(char *str);
#endif /* _ASM_PCI_H */ #endif /* _ASM_PCI_H */

2
arch/mips/pci/pci-bcm1480.c
View File

@@ -204,7 +204,7 @@ static int __init bcm1480_pcibios_init(void)
uint64_t reg; uint64_t reg;
/* CFE will assign PCI resources */ /* CFE will assign PCI resources */
pci_probe_only = 1; pci_set_flags(PCI_PROBE_ONLY);
/* Avoid ISA compat ranges. */ /* Avoid ISA compat ranges. */
PCIBIOS_MIN_IO = 0x00008000UL; PCIBIOS_MIN_IO = 0x00008000UL;

2
arch/mips/pci/pci-ip27.c
View File

@@ -50,7 +50,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
bridge_t *bridge; bridge_t *bridge;
int slot; int slot;
pci_probe_only = 1; pci_set_flags(PCI_PROBE_ONLY);
printk("a bridge\n"); printk("a bridge\n");

3
arch/mips/pci/pci-lantiq.c
View File

@@ -270,7 +270,8 @@ static int __devinit ltq_pci_probe(struct platform_device *pdev)
{ {
struct ltq_pci_data *ltq_pci_data = struct ltq_pci_data *ltq_pci_data =
(struct ltq_pci_data *) pdev->dev.platform_data; (struct ltq_pci_data *) pdev->dev.platform_data;
pci_probe_only = 0;
pci_clear_flags(PCI_PROBE_ONLY);
ltq_pci_irq_map = ltq_pci_data->irq; ltq_pci_irq_map = ltq_pci_data->irq;
ltq_pci_membase = ioremap_nocache(PCI_CR_BASE_ADDR, PCI_CR_SIZE); ltq_pci_membase = ioremap_nocache(PCI_CR_BASE_ADDR, PCI_CR_SIZE);
ltq_pci_mapped_cfg = ltq_pci_mapped_cfg =

2
arch/mips/pci/pci-sb1250.c
View File

@@ -213,7 +213,7 @@ static int __init sb1250_pcibios_init(void)
uint64_t reg; uint64_t reg;
/* CFE will assign PCI resources */ /* CFE will assign PCI resources */
pci_probe_only = 1; pci_set_flags(PCI_PROBE_ONLY);
/* Avoid ISA compat ranges. */ /* Avoid ISA compat ranges. */
PCIBIOS_MIN_IO = 0x00008000UL; PCIBIOS_MIN_IO = 0x00008000UL;

2
arch/mips/pci/pci-xlr.c
View File

@@ -292,7 +292,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
static int __init pcibios_init(void) static int __init pcibios_init(void)
{ {
/* PSB assigns PCI resources */ /* PSB assigns PCI resources */
pci_probe_only = 1; pci_set_flags(PCI_PROBE_ONLY);
pci_config_base = ioremap(DEFAULT_PCI_CONFIG_BASE, 16 << 20); pci_config_base = ioremap(DEFAULT_PCI_CONFIG_BASE, 16 << 20);
/* Extend IO port for memory mapped io */ /* Extend IO port for memory mapped io */

13
arch/mips/pci/pci.c
View File

@@ -20,12 +20,9 @@
#include <asm/cpu-info.h> #include <asm/cpu-info.h>
/* /*
* Indicate whether we respect the PCI setup left by the firmware. * If PCI_PROBE_ONLY in pci_flags is set, we don't change any PCI resource
* * assignments.
* Make this long-lived so that we know when shutting down
* whether we probed only or not.
*/ */
int pci_probe_only;
#define PCI_ASSIGN_ALL_BUSSES 1 #define PCI_ASSIGN_ALL_BUSSES 1
@@ -92,7 +89,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
if (!hose->iommu) if (!hose->iommu)
PCI_DMA_BUS_IS_PHYS = 1; PCI_DMA_BUS_IS_PHYS = 1;
if (hose->get_busno && pci_probe_only) if (hose->get_busno && pci_has_flag(PCI_PROBE_ONLY))
next_busno = (*hose->get_busno)(); next_busno = (*hose->get_busno)();
pci_add_resource(&resources, hose->mem_resource); pci_add_resource(&resources, hose->mem_resource);
@@ -115,7 +112,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose)
need_domain_info = 1; need_domain_info = 1;
} }
if (!pci_probe_only) { if (!pci_has_flag(PCI_PROBE_ONLY)) {
pci_bus_size_bridges(bus); pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus); pci_bus_assign_resources(bus);
pci_enable_bridges(bus); pci_enable_bridges(bus);
@@ -282,7 +279,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
struct list_head *ln; struct list_head *ln;
struct pci_dev *dev = bus->self; struct pci_dev *dev = bus->self;
if (pci_probe_only && dev && if (pci_has_flag(PCI_PROBE_ONLY) && dev &&
(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
pcibios_fixup_device_resources(dev, bus); pcibios_fixup_device_resources(dev, bus);