x86/pci: Changing subsystem init for visws
I don't know, if this new code boots, but at least it compiles. Someone should really test it. Signed-off-by: Robert Richter <robert.richter@amd.com> Cc: Robert Richter <robert.richter@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>hifive-unleashed-5.1
parent
e27cf3a2e1
commit
3cabf37f61
|
@ -62,6 +62,9 @@ int __init pci_subsys_init(void)
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ACPI
|
#ifdef CONFIG_ACPI
|
||||||
pci_acpi_init();
|
pci_acpi_init();
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_X86_VISWS
|
||||||
|
pci_visws_init();
|
||||||
#endif
|
#endif
|
||||||
pci_legacy_init();
|
pci_legacy_init();
|
||||||
pcibios_irq_init();
|
pcibios_irq_init();
|
||||||
|
|
|
@ -107,6 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);
|
||||||
/* some common used subsys_initcalls */
|
/* some common used subsys_initcalls */
|
||||||
extern int __init pci_acpi_init(void);
|
extern int __init pci_acpi_init(void);
|
||||||
extern int __init pcibios_irq_init(void);
|
extern int __init pcibios_irq_init(void);
|
||||||
|
extern int __init pci_visws_init(void);
|
||||||
extern int __init pci_numaq_init(void);
|
extern int __init pci_numaq_init(void);
|
||||||
extern int __init pcibios_init(void);
|
extern int __init pcibios_init(void);
|
||||||
|
|
||||||
|
|
|
@ -86,8 +86,14 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
|
||||||
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init pci_visws_init(void)
|
int __init pci_visws_init(void)
|
||||||
{
|
{
|
||||||
|
if (!is_visws_box())
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
pcibios_enable_irq = &pci_visws_enable_irq;
|
||||||
|
pcibios_disable_irq = &pci_visws_disable_irq;
|
||||||
|
|
||||||
/* The VISWS supports configuration access type 1 only */
|
/* The VISWS supports configuration access type 1 only */
|
||||||
pci_probe = (pci_probe | PCI_PROBE_CONF1) &
|
pci_probe = (pci_probe | PCI_PROBE_CONF1) &
|
||||||
~(PCI_PROBE_BIOS | PCI_PROBE_CONF2);
|
~(PCI_PROBE_BIOS | PCI_PROBE_CONF2);
|
||||||
|
@ -105,18 +111,3 @@ static int __init pci_visws_init(void)
|
||||||
pcibios_resource_survey();
|
pcibios_resource_survey();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __init int pci_subsys_init(void)
|
|
||||||
{
|
|
||||||
if (!is_visws_box())
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
pcibios_enable_irq = &pci_visws_enable_irq;
|
|
||||||
pcibios_disable_irq = &pci_visws_disable_irq;
|
|
||||||
|
|
||||||
pci_visws_init();
|
|
||||||
pcibios_init();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
subsys_initcall(pci_subsys_init);
|
|
||||||
|
|
Loading…
Reference in New Issue