This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / arch / ppc64 / kernel / pSeries_pci.c
index 9c5a313..bfbad68 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/threads.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppcdebug.h>
 #include <asm/naca.h>
 #include <asm/iommu.h>
 #include <asm/rtas.h>
 
-#include "mpic.h"
+#include "open_pic.h"
 #include "pci.h"
 
 /* RTAS tokens */
@@ -51,7 +53,7 @@ static int ibm_write_pci_config;
 
 static int s7a_workaround;
 
-extern struct mpic *pSeries_mpic;
+extern unsigned long pci_probe_only;
 
 static int rtas_read_config(struct device_node *dn, int where, int size, u32 *val)
 {
@@ -149,49 +151,13 @@ struct pci_ops rtas_pci_ops = {
        rtas_pci_write_config
 };
 
-static int is_python(struct device_node *dev)
+static void python_countermeasures(unsigned long addr)
 {
-       char *model = (char *)get_property(dev, "model", NULL);
-
-       if (model && strstr(model, "Python"))
-               return 1;
-
-       return 0;
-}
-
-static int get_phb_reg_prop(struct device_node *dev,
-                           unsigned int addr_size_words,
-                           struct reg_property64 *reg)
-{
-       unsigned int *ui_ptr = NULL, len;
-
-       /* Found a PHB, now figure out where his registers are mapped. */
-       ui_ptr = (unsigned int *)get_property(dev, "reg", &len);
-       if (ui_ptr == NULL)
-               return 1;
-
-       if (addr_size_words == 1) {
-               reg->address = ((struct reg_property32 *)ui_ptr)->address;
-               reg->size    = ((struct reg_property32 *)ui_ptr)->size;
-       } else {
-               *reg = *((struct reg_property64 *)ui_ptr);
-       }
-
-       return 0;
-}
-
-static void python_countermeasures(struct device_node *dev,
-                                  unsigned int addr_size_words)
-{
-       struct reg_property64 reg_struct;
-       void __iomem *chip_regs;
-       volatile u32 val;
-
-       if (get_phb_reg_prop(dev, addr_size_words, &reg_struct))
-               return;
+       void *chip_regs;
+       volatile u32 *tmp, i;
 
        /* Python's register file is 1 MB in size. */
-       chip_regs = ioremap(reg_struct.address & ~(0xfffffUL), 0x100000);
+       chip_regs = ioremap(addr & ~(0xfffffUL), 0x100000); 
 
        /* 
         * Firmware doesn't always clear this bit which is critical
@@ -200,17 +166,17 @@ static void python_countermeasures(struct device_node *dev,
 
 #define PRG_CL_RESET_VALID 0x00010000
 
-       val = in_be32(chip_regs + 0xf6030);
-       if (val & PRG_CL_RESET_VALID) {
+       tmp = (u32 *)((unsigned long)chip_regs + 0xf6030);
+
+       if (*tmp & PRG_CL_RESET_VALID) {
                printk(KERN_INFO "Python workaround: ");
-               val &= ~PRG_CL_RESET_VALID;
-               out_be32(chip_regs + 0xf6030, val);
+               *tmp &= ~PRG_CL_RESET_VALID;
                /*
                 * We must read it back for changes to
                 * take effect
                 */
-               val = in_be32(chip_regs + 0xf6030);
-               printk("reg0: %x\n", val);
+               i = *tmp;
+               printk("reg0: %x\n", i);
        }
 
        iounmap(chip_regs);
@@ -254,8 +220,56 @@ unsigned long __devinit get_phb_buid (struct device_node *phb)
        return buid;
 }
 
-static int phb_set_bus_ranges(struct device_node *dev,
-                             struct pci_controller *phb)
+static enum phb_types get_phb_type(struct device_node *dev)
+{
+       enum phb_types type;
+       char *model;
+
+       model = (char *)get_property(dev, "model", NULL);
+
+       if (!model) {
+               printk(KERN_ERR "%s: phb has no model property\n",
+                               __FUNCTION__);
+               model = "<empty>";
+       }
+
+       if (strstr(model, "Python")) {
+               type = phb_type_python;
+       } else if (strstr(model, "Speedwagon")) {
+               type = phb_type_speedwagon;
+       } else if (strstr(model, "Winnipeg")) {
+               type = phb_type_winnipeg;
+       } else {
+               printk(KERN_ERR "%s: unknown PHB %s\n", __FUNCTION__, model);
+               type = phb_type_unknown;
+       }
+
+       return type;
+}
+
+int get_phb_reg_prop(struct device_node *dev, unsigned int addr_size_words,
+               struct reg_property64 *reg)
+{
+       unsigned int *ui_ptr = NULL, len;
+
+       /* Found a PHB, now figure out where his registers are mapped. */
+       ui_ptr = (unsigned int *) get_property(dev, "reg", &len);
+       if (ui_ptr == NULL) {
+               PPCDBG(PPCDBG_PHBINIT, "\tget reg failed.\n"); 
+               return 1;
+       }
+
+       if (addr_size_words == 1) {
+               reg->address = ((struct reg_property32 *)ui_ptr)->address;
+               reg->size    = ((struct reg_property32 *)ui_ptr)->size;
+       } else {
+               *reg = *((struct reg_property64 *)ui_ptr);
+       }
+
+       return 0;
+}
+
+int phb_set_bus_ranges(struct device_node *dev, struct pci_controller *phb)
 {
        int *bus_range;
        unsigned int len;
@@ -264,63 +278,58 @@ static int phb_set_bus_ranges(struct device_node *dev,
        if (bus_range == NULL || len < 2 * sizeof(int)) {
                return 1;
        }
+
        phb->first_busno =  bus_range[0];
        phb->last_busno  =  bus_range[1];
 
        return 0;
 }
 
-static int __devinit setup_phb(struct device_node *dev,
-                              struct pci_controller *phb,
-                              unsigned int addr_size_words)
+static struct pci_controller *alloc_phb(struct device_node *dev,
+                                unsigned int addr_size_words)
 {
-       pci_setup_pci_controller(phb);
+       struct pci_controller *phb;
+       struct reg_property64 reg_struct;
+       enum phb_types phb_type;
+       struct property *of_prop;
+       int rc;
 
-       if (is_python(dev))
-               python_countermeasures(dev, addr_size_words);
+       phb_type = get_phb_type(dev);
 
-       if (phb_set_bus_ranges(dev, phb))
-               return 1;
+       rc = get_phb_reg_prop(dev, addr_size_words, &reg_struct);
+       if (rc)
+               return NULL;
 
-       phb->arch_data = dev;
-       phb->ops = &rtas_pci_ops;
-       phb->buid = get_phb_buid(dev);
+       phb = pci_alloc_pci_controller(phb_type);
+       if (phb == NULL)
+               return NULL;
 
-       return 0;
-}
+       if (phb_type == phb_type_python)
+               python_countermeasures(reg_struct.address);
+
+       rc = phb_set_bus_ranges(dev, phb);
+       if (rc)
+               return NULL;
+
+       of_prop = (struct property *)alloc_bootmem(sizeof(struct property) +
+                       sizeof(phb->global_number));        
+
+       if (!of_prop) {
+               kfree(phb);
+               return NULL;
+       }
 
-static void __devinit add_linux_pci_domain(struct device_node *dev,
-                                          struct pci_controller *phb,
-                                          struct property *of_prop)
-{
        memset(of_prop, 0, sizeof(struct property));
        of_prop->name = "linux,pci-domain";
        of_prop->length = sizeof(phb->global_number);
        of_prop->value = (unsigned char *)&of_prop[1];
        memcpy(of_prop->value, &phb->global_number, sizeof(phb->global_number));
        prom_add_property(dev, of_prop);
-}
 
-static struct pci_controller * __init alloc_phb(struct device_node *dev,
-                                               unsigned int addr_size_words)
-{
-       struct pci_controller *phb;
-       struct property *of_prop;
-
-       phb = alloc_bootmem(sizeof(struct pci_controller));
-       if (phb == NULL)
-               return NULL;
-
-       of_prop = alloc_bootmem(sizeof(struct property) +
-                               sizeof(phb->global_number));
-       if (!of_prop)
-               return NULL;
-
-       if (setup_phb(dev, phb, addr_size_words))
-               return NULL;
+       phb->arch_data   = dev;
+       phb->ops = &rtas_pci_ops;
 
-       add_linux_pci_domain(dev, phb, of_prop);
+       phb->buid = get_phb_buid(dev);
 
        return phb;
 }
@@ -328,19 +337,34 @@ static struct pci_controller * __init alloc_phb(struct device_node *dev,
 static struct pci_controller * __devinit alloc_phb_dynamic(struct device_node *dev, unsigned int addr_size_words)
 {
        struct pci_controller *phb;
+       struct reg_property64 reg_struct;
+       enum phb_types phb_type;
+       int rc;
 
-       phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller),
-                                              GFP_KERNEL);
-       if (phb == NULL)
+       phb_type = get_phb_type(dev);
+
+       rc = get_phb_reg_prop(dev, addr_size_words, &reg_struct);
+       if (rc)
                return NULL;
 
-       if (setup_phb(dev, phb, addr_size_words))
+       phb = pci_alloc_phb_dynamic(phb_type);
+       if (phb == NULL)
                return NULL;
 
-       phb->is_dynamic = 1;
+       if (phb_type == phb_type_python)
+               python_countermeasures(reg_struct.address);
+
+       rc = phb_set_bus_ranges(dev, phb);
+       if (rc)
+               return NULL;
 
        /* TODO: linux,pci-domain? */
 
+       phb->arch_data   = dev;
+       phb->ops = &rtas_pci_ops;
+
+       phb->buid = get_phb_buid(dev);
+
        return phb;
 }
 
@@ -375,9 +399,9 @@ unsigned long __init find_and_init_phbs(void)
                pci_process_bridge_OF_ranges(phb, node);
                pci_setup_phb_io(phb, index == 0);
 
-               if (naca->interrupt_controller == IC_OPEN_PIC && pSeries_mpic) {
+               if (naca->interrupt_controller == IC_OPEN_PIC) {
                        int addr = root_size_cells * (index + 2) - 1;
-                       mpic_assign_isu(pSeries_mpic, index, opprop[addr]);
+                       openpic_setup_ISU(index, opprop[addr]); 
                }
 
                index++;
@@ -386,24 +410,6 @@ unsigned long __init find_and_init_phbs(void)
        of_node_put(root);
        pci_devs_phb_init();
 
-       /*
-        * pci_probe_only and pci_assign_all_buses can be set via properties
-        * in chosen.
-        */
-       if (of_chosen) {
-               int *prop;
-
-               prop = (int *)get_property(of_chosen, "linux,pci-probe-only",
-                                          NULL);
-               if (prop)
-                       pci_probe_only = *prop;
-
-               prop = (int *)get_property(of_chosen,
-                                          "linux,pci-assign-all-buses", NULL);
-               if (prop)
-                       pci_assign_all_buses = *prop;
-       }
-
        return 0;
 }
 
@@ -475,6 +481,115 @@ static void check_s7a(void)
        }
 }
 
+static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
+                               unsigned long *start_virt, unsigned long *size)
+{
+       struct pci_controller *hose = PCI_GET_PHB_PTR(bus);
+       struct pci_bus_region region;
+       struct resource *res;
+
+       if (bus->self) {
+               res = bus->resource[0];
+               pcibios_resource_to_bus(bus->self, &region, res);
+               *start_phys = hose->io_base_phys + region.start;
+               *start_virt = (unsigned long) hose->io_base_virt + 
+                               region.start;
+               if (region.end > region.start) 
+                       *size = region.end - region.start + 1;
+               else {
+                       printk("%s(): unexpected region 0x%lx->0x%lx\n", 
+                                       __FUNCTION__, region.start, region.end);
+                       return 1;
+               }
+               
+       } else {
+               /* Root Bus */
+               res = &hose->io_resource;
+               *start_phys = hose->io_base_phys;
+               *start_virt = (unsigned long) hose->io_base_virt;
+               if (res->end > res->start)
+                       *size = res->end - res->start + 1;
+               else {
+                       printk("%s(): unexpected region 0x%lx->0x%lx\n", 
+                                       __FUNCTION__, res->start, res->end);
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+int unmap_bus_range(struct pci_bus *bus)
+{
+       unsigned long start_phys;
+       unsigned long start_virt;
+       unsigned long size;
+
+       if (!bus) {
+               printk(KERN_ERR "%s() expected bus\n", __FUNCTION__);
+               return 1;
+       }
+       
+       if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
+               return 1;
+       if (iounmap_explicit((void *) start_virt, size))
+               return 1;
+
+       return 0;
+}
+EXPORT_SYMBOL(unmap_bus_range);
+
+int remap_bus_range(struct pci_bus *bus)
+{
+       unsigned long start_phys;
+       unsigned long start_virt;
+       unsigned long size;
+
+       if (!bus) {
+               printk(KERN_ERR "%s() expected bus\n", __FUNCTION__);
+               return 1;
+       }
+       
+       if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
+               return 1;
+       if (__ioremap_explicit(start_phys, start_virt, size, _PAGE_NO_CACHE))
+               return 1;
+
+       return 0;
+}
+EXPORT_SYMBOL(remap_bus_range);
+
+static void phbs_remap_io(void)
+{
+       struct pci_controller *hose, *tmp;
+
+       list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
+               remap_bus_range(hose->bus);
+}
+
+static void __init pSeries_request_regions(void)
+{
+       struct device_node *i8042;
+
+       request_region(0x20,0x20,"pic1");
+       request_region(0xa0,0x20,"pic2");
+       request_region(0x00,0x20,"dma1");
+       request_region(0x40,0x20,"timer");
+       request_region(0x80,0x10,"dma page reg");
+       request_region(0xc0,0x20,"dma2");
+
+#define I8042_DATA_REG 0x60
+
+       /*
+        * Some machines have an unterminated i8042 so check the device
+        * tree and reserve the region if it does not appear. Later on
+        * the i8042 code will try and reserve this region and fail.
+        */
+       if (!(i8042 = of_find_node_by_type(NULL, "8042")))
+               request_region(I8042_DATA_REG, 16, "reserved (no i8042)");
+       of_node_put(i8042);
+}
+
 /* RPA-specific bits for removing PHBs */
 int pcibios_remove_root_bus(struct pci_controller *phb)
 {
@@ -525,23 +640,13 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
 }
 EXPORT_SYMBOL(pcibios_remove_root_bus);
 
-static void __init pSeries_request_regions(void)
-{
-       request_region(0x20,0x20,"pic1");
-       request_region(0xa0,0x20,"pic2");
-       request_region(0x00,0x20,"dma1");
-       request_region(0x40,0x20,"timer");
-       request_region(0x80,0x10,"dma page reg");
-       request_region(0xc0,0x20,"dma2");
-}
-
 void __init pSeries_final_fixup(void)
 {
        struct pci_dev *dev = NULL;
 
        check_s7a();
 
-       for_each_pci_dev(dev) {
+       while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
                pci_read_irq_line(dev);
                if (s7a_workaround) {
                        if (dev->irq > 16) {
@@ -560,31 +665,3 @@ void __init pSeries_final_fixup(void)
 
        pci_addr_cache_build();
 }
-
-/*
- * Assume the winbond 82c105 is the IDE controller on a
- * p610.  We should probably be more careful in case
- * someone tries to plug in a similar adapter.
- */
-static void fixup_winbond_82c105(struct pci_dev* dev)
-{
-       int i;
-       unsigned int reg;
-
-       if (!(systemcfg->platform & PLATFORM_PSERIES))
-               return;
-
-       printk("Using INTC for W82c105 IDE controller.\n");
-       pci_read_config_dword(dev, 0x40, &reg);
-       /* Enable LEGIRQ to use INTC instead of ISA interrupts */
-       pci_write_config_dword(dev, 0x40, reg | (1<<11));
-
-       for (i = 0; i < DEVICE_COUNT_RESOURCE; ++i) {
-               /* zap the 2nd function of the winbond chip */
-               if (dev->resource[i].flags & IORESOURCE_IO
-                   && dev->bus->number == 0 && dev->devfn == 0x81)
-                       dev->resource[i].flags &= ~IORESOURCE_IO;
-       }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
-                        fixup_winbond_82c105);