[SPARC64]: Don't expect cfg space in PCI PBM ranges on SUN4V.
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 12 Feb 2006 07:38:00 +0000 (23:38 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:12:30 +0000 (01:12 -0800)
PCI cfg space is accessed transparently through the Hypervisor and not
through direct cpu PIO operations.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/pci_sun4v.c

index 3f0e3c09f4d3d910128a679555fa17978de6ad33..699e91e3e4293553959b7b181926a7cc8c0762c7 100644 (file)
@@ -639,9 +639,9 @@ static void pci_sun4v_resource_adjust(struct pci_dev *pdev,
  */
 static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
 {
-       int i, saw_cfg, saw_mem, saw_io;
+       int i, saw_mem, saw_io;
 
-       saw_cfg = saw_mem = saw_io = 0;
+       saw_mem = saw_io = 0;
        for (i = 0; i < pbm->num_pbm_ranges; i++) {
                struct linux_prom_pci_ranges *pr = &pbm->pbm_ranges[i];
                unsigned long a;
@@ -652,12 +652,6 @@ static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
                     ((unsigned long)pr->parent_phys_lo  <<  0UL));
 
                switch (type) {
-               case 0:
-                       /* PCI config space, 16MB */
-                       pbm->config_space = a;
-                       saw_cfg = 1;
-                       break;
-
                case 1:
                        /* 16-bit IO space, 16MB */
                        pbm->io_space.start = a;
@@ -679,19 +673,15 @@ static void pci_sun4v_determine_mem_io_space(struct pci_pbm_info *pbm)
                };
        }
 
-       if (!saw_cfg || !saw_io || !saw_mem) {
+       if (!saw_io || !saw_mem) {
                prom_printf("%s: Fatal error, missing %s PBM range.\n",
                            pbm->name,
-                           ((!saw_cfg ?
-                             "CFG" :
-                             (!saw_io ?
-                              "IO" : "MEM"))));
+                           (!saw_io ? "IO" : "MEM"));
                prom_halt();
        }
 
-       printk("%s: PCI CFG[%lx] IO[%lx] MEM[%lx]\n",
+       printk("%s: PCI IO[%lx] MEM[%lx]\n",
               pbm->name,
-              pbm->config_space,
               pbm->io_space.start,
               pbm->mem_space.start);
 }