x86: Move PCI IO ECS code to x86/pci

"Form follows function". Code is now where it belongs to.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 9 insertions, 7 deletions

diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index 27d61b63def6..9915293500fb 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -265,14 +265,16 @@ void __init pci_direct_init(int type)
                  type);
         if (type == 1) {
                 raw_pci_ops = &pci_direct_conf1;
-                if (!raw_pci_ext_ops && cpu_has_pci_ext_cfg) {
-                        printk(KERN_INFO "PCI: Using configuration type 1 "
-                               "for extended access\n");
-                        raw_pci_ext_ops = &pci_direct_conf1;
-                }
-        } else {
-                raw_pci_ops = &pci_direct_conf2;
+                if (raw_pci_ext_ops)
+                        return;
+                if (!(pci_probe & PCI_HAS_IO_ECS))
+                        return;
+                printk(KERN_INFO "PCI: Using configuration type 1 "
+                       "for extended access\n");
+                raw_pci_ext_ops = &pci_direct_conf1;
+                return;
         }
+        raw_pci_ops = &pci_direct_conf2;
 }
 
 int __init pci_direct_probe(void)