First probe if type1/2 accesses work, but then only initialize them at the end.
This is useful for a later patch that needs this information inbetween.
Signed-off-by: Andi Kleen <ak@suse.de>
-void __init pci_direct_init(void)
+void __init pci_direct_init(int type)
+{
+ printk(KERN_INFO "PCI: Using configuration type %d\n", type);
+ if (type == 1)
+ raw_pci_ops = &pci_direct_conf1;
+ else
+ raw_pci_ops = &pci_direct_conf2;
+}
+
+int __init pci_direct_probe(void)
{
struct resource *region, *region2;
{
struct resource *region, *region2;
- if (pci_check_type1()) {
- printk(KERN_INFO "PCI: Using configuration type 1\n");
- raw_pci_ops = &pci_direct_conf1;
- return;
- }
+ if (pci_check_type1())
+ return 1;
release_resource(region);
type2:
if ((pci_probe & PCI_PROBE_CONF2) == 0)
release_resource(region);
type2:
if ((pci_probe & PCI_PROBE_CONF2) == 0)
region = request_region(0xCF8, 4, "PCI conf2");
if (!region)
region = request_region(0xCF8, 4, "PCI conf2");
if (!region)
region2 = request_region(0xC000, 0x1000, "PCI conf2");
if (!region2)
goto fail2;
region2 = request_region(0xC000, 0x1000, "PCI conf2");
if (!region2)
goto fail2;
if (pci_check_type2()) {
printk(KERN_INFO "PCI: Using configuration type 2\n");
raw_pci_ops = &pci_direct_conf2;
if (pci_check_type2()) {
printk(KERN_INFO "PCI: Using configuration type 2\n");
raw_pci_ops = &pci_direct_conf2;
}
release_resource(region2);
fail2:
release_resource(region);
}
release_resource(region2);
fail2:
release_resource(region);
in the right sequence from here. */
static __init int pci_access_init(void)
{
in the right sequence from here. */
static __init int pci_access_init(void)
{
+ int type = 0;
+
+#ifdef CONFIG_PCI_DIRECT
+ type = pci_direct_probe();
+#endif
#ifdef CONFIG_PCI_MMCONFIG
#ifdef CONFIG_PCI_MMCONFIG
#endif
if (raw_pci_ops)
return 0;
#endif
if (raw_pci_ops)
return 0;
* fails.
*/
#ifdef CONFIG_PCI_DIRECT
* fails.
*/
#ifdef CONFIG_PCI_DIRECT
-void __init pci_mmcfg_init(void)
+void __init pci_mmcfg_init(int type)
{
if ((pci_probe & PCI_PROBE_MMCONF) == 0)
return;
{
if ((pci_probe & PCI_PROBE_MMCONF) == 0)
return;
extern int pci_conf1_read(unsigned int seg, unsigned int bus,
unsigned int devfn, int reg, int len, u32 *value);
extern int pci_conf1_read(unsigned int seg, unsigned int bus,
unsigned int devfn, int reg, int len, u32 *value);
-extern void pci_direct_init(void);
+extern int pci_direct_probe(void);
+extern void pci_direct_init(int type);
extern void pci_pcbios_init(void);
extern void pci_pcbios_init(void);
-extern void pci_mmcfg_init(void);
+extern void pci_mmcfg_init(int type);
extern void pcibios_sort(void);
extern void pcibios_sort(void);
-void __init pci_mmcfg_init(void)
+void __init pci_mmcfg_init(int type)