alpha/PCI: replace pci_probe_only with pci_flags
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 alpha to the pci_flags approach so generic code can use the same test across all architectures. CC: linux-alpha@vger.kernel.org Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
parent
dcce6dc486
commit
151d16d531
|
@ -7,6 +7,7 @@
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <asm/scatterlist.h>
|
#include <asm/scatterlist.h>
|
||||||
#include <asm/machvec.h>
|
#include <asm/machvec.h>
|
||||||
|
#include <asm-generic/pci-bridge.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following structure is used to manage multiple PCI busses.
|
* The following structure is used to manage multiple PCI busses.
|
||||||
|
|
|
@ -43,12 +43,10 @@ const char *const pci_mem_names[] = {
|
||||||
|
|
||||||
const char pci_hae0_name[] = "HAE0";
|
const char pci_hae0_name[] = "HAE0";
|
||||||
|
|
||||||
/* Indicate whether we respect the PCI setup left by console. */
|
|
||||||
/*
|
/*
|
||||||
* Make this long-lived so that we know when shutting down
|
* If PCI_PROBE_ONLY in pci_flags is set, we don't change any PCI resource
|
||||||
* whether we probed only or not.
|
* assignments.
|
||||||
*/
|
*/
|
||||||
int pci_probe_only;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The PCI controller list.
|
* The PCI controller list.
|
||||||
|
@ -215,7 +213,7 @@ pdev_save_srm_config(struct pci_dev *dev)
|
||||||
struct pdev_srm_saved_conf *tmp;
|
struct pdev_srm_saved_conf *tmp;
|
||||||
static int printed = 0;
|
static int printed = 0;
|
||||||
|
|
||||||
if (!alpha_using_srm || pci_probe_only)
|
if (!alpha_using_srm || pci_has_flag(PCI_PROBE_ONLY))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!printed) {
|
if (!printed) {
|
||||||
|
@ -242,7 +240,7 @@ pci_restore_srm_config(void)
|
||||||
struct pdev_srm_saved_conf *tmp;
|
struct pdev_srm_saved_conf *tmp;
|
||||||
|
|
||||||
/* No need to restore if probed only. */
|
/* No need to restore if probed only. */
|
||||||
if (pci_probe_only)
|
if (pci_has_flag(PCI_PROBE_ONLY))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Restore SRM config. */
|
/* Restore SRM config. */
|
||||||
|
@ -283,7 +281,7 @@ pcibios_fixup_bus(struct pci_bus *bus)
|
||||||
{
|
{
|
||||||
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);
|
||||||
|
@ -374,7 +372,8 @@ pcibios_claim_one_bus(struct pci_bus *b)
|
||||||
|
|
||||||
if (r->parent || !r->start || !r->flags)
|
if (r->parent || !r->start || !r->flags)
|
||||||
continue;
|
continue;
|
||||||
if (pci_probe_only || (r->flags & IORESOURCE_PCI_FIXED))
|
if (pci_has_flag(PCI_PROBE_ONLY) ||
|
||||||
|
(r->flags & IORESOURCE_PCI_FIXED))
|
||||||
pci_claim_resource(dev, i);
|
pci_claim_resource(dev, i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,9 +173,6 @@ extern void pci_restore_srm_config(void);
|
||||||
extern struct pci_controller *hose_head, **hose_tail;
|
extern struct pci_controller *hose_head, **hose_tail;
|
||||||
extern struct pci_controller *pci_isa_hose;
|
extern struct pci_controller *pci_isa_hose;
|
||||||
|
|
||||||
/* Indicate that we trust the console to configure things properly. */
|
|
||||||
extern int pci_probe_only;
|
|
||||||
|
|
||||||
extern unsigned long alpha_agpgart_size;
|
extern unsigned long alpha_agpgart_size;
|
||||||
|
|
||||||
extern void common_init_pci(void);
|
extern void common_init_pci(void);
|
||||||
|
|
|
@ -384,7 +384,8 @@ marvel_init_pci(void)
|
||||||
|
|
||||||
marvel_register_error_handlers();
|
marvel_register_error_handlers();
|
||||||
|
|
||||||
pci_probe_only = 1;
|
/* Indicate that we trust the console to configure things properly */
|
||||||
|
pci_set_flags(PCI_PROBE_ONLY);
|
||||||
common_init_pci();
|
common_init_pci();
|
||||||
locate_and_init_vga(NULL);
|
locate_and_init_vga(NULL);
|
||||||
|
|
||||||
|
|
|
@ -331,7 +331,8 @@ titan_init_pci(void)
|
||||||
*/
|
*/
|
||||||
titan_late_init();
|
titan_late_init();
|
||||||
|
|
||||||
pci_probe_only = 1;
|
/* Indicate that we trust the console to configure things properly */
|
||||||
|
pci_set_flags(PCI_PROBE_ONLY);
|
||||||
common_init_pci();
|
common_init_pci();
|
||||||
SMC669_Init(0);
|
SMC669_Init(0);
|
||||||
locate_and_init_vga(NULL);
|
locate_and_init_vga(NULL);
|
||||||
|
|
Loading…
Reference in New Issue