]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/sparc64/kernel/pci_sabre.c
[ARM] xsc3: fix xsc3_l2_inv_range
[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / pci_sabre.c
index ade5184e75d132591f42139cab37a33e285bfa1a..713257b6963c0c163b8a42340e82fafb1ce5fe6a 100644 (file)
 #include <asm/apb.h>
 #include <asm/iommu.h>
 #include <asm/irq.h>
-#include <asm/smp.h>
-#include <asm/oplib.h>
 #include <asm/prom.h>
+#include <asm/upa.h>
 
 #include "pci_impl.h"
 #include "iommu_common.h"
+#include "psycho_common.h"
 
-/* All SABRE registers are 64-bits.  The following accessor
- * routines are how they are accessed.  The REG parameter
- * is a physical address.
- */
-#define sabre_read(__reg) \
-({     u64 __ret; \
-       __asm__ __volatile__("ldxa [%1] %2, %0" \
-                            : "=r" (__ret) \
-                            : "r" (__reg), "i" (ASI_PHYS_BYPASS_EC_E) \
-                            : "memory"); \
-       __ret; \
-})
-#define sabre_write(__reg, __val) \
-       __asm__ __volatile__("stxa %0, [%1] %2" \
-                            : /* no outputs */ \
-                            : "r" (__val), "r" (__reg), \
-                              "i" (ASI_PHYS_BYPASS_EC_E) \
-                            : "memory")
+#define DRIVER_NAME    "sabre"
+#define PFX            DRIVER_NAME ": "
 
 /* SABRE PCI controller register offsets and definitions. */
 #define SABRE_UE_AFSR          0x0030UL
 static int hummingbird_p;
 static struct pci_bus *sabre_root_bus;
 
-/* SABRE error handling support. */
-static void sabre_check_iommu_error(struct pci_pbm_info *pbm,
-                                   unsigned long afsr,
-                                   unsigned long afar)
-{
-       struct iommu *iommu = pbm->iommu;
-       unsigned long iommu_tag[16];
-       unsigned long iommu_data[16];
-       unsigned long flags;
-       u64 control;
-       int i;
-
-       spin_lock_irqsave(&iommu->lock, flags);
-       control = sabre_read(iommu->iommu_control);
-       if (control & SABRE_IOMMUCTRL_ERR) {
-               char *type_string;
-
-               /* Clear the error encountered bit.
-                * NOTE: On Sabre this is write 1 to clear,
-                *       which is different from Psycho.
-                */
-               sabre_write(iommu->iommu_control, control);
-               switch((control & SABRE_IOMMUCTRL_ERRSTS) >> 25UL) {
-               case 1:
-                       type_string = "Invalid Error";
-                       break;
-               case 3:
-                       type_string = "ECC Error";
-                       break;
-               default:
-                       type_string = "Unknown";
-                       break;
-               };
-               printk("%s: IOMMU Error, type[%s]\n",
-                      pbm->name, type_string);
-
-               /* Enter diagnostic mode and probe for error'd
-                * entries in the IOTLB.
-                */
-               control &= ~(SABRE_IOMMUCTRL_ERRSTS | SABRE_IOMMUCTRL_ERR);
-               sabre_write(iommu->iommu_control,
-                           (control | SABRE_IOMMUCTRL_DENAB));
-               for (i = 0; i < 16; i++) {
-                       unsigned long base = pbm->controller_regs;
-
-                       iommu_tag[i] =
-                               sabre_read(base + SABRE_IOMMU_TAG + (i * 8UL));
-                       iommu_data[i] =
-                               sabre_read(base + SABRE_IOMMU_DATA + (i * 8UL));
-                       sabre_write(base + SABRE_IOMMU_TAG + (i * 8UL), 0);
-                       sabre_write(base + SABRE_IOMMU_DATA + (i * 8UL), 0);
-               }
-               sabre_write(iommu->iommu_control, control);
-
-               for (i = 0; i < 16; i++) {
-                       unsigned long tag, data;
-
-                       tag = iommu_tag[i];
-                       if (!(tag & SABRE_IOMMUTAG_ERR))
-                               continue;
-
-                       data = iommu_data[i];
-                       switch((tag & SABRE_IOMMUTAG_ERRSTS) >> 23UL) {
-                       case 1:
-                               type_string = "Invalid Error";
-                               break;
-                       case 3:
-                               type_string = "ECC Error";
-                               break;
-                       default:
-                               type_string = "Unknown";
-                               break;
-                       };
-                       printk("%s: IOMMU TAG(%d)[RAW(%016lx)error(%s)wr(%d)sz(%dK)vpg(%08lx)]\n",
-                              pbm->name, i, tag, type_string,
-                              ((tag & SABRE_IOMMUTAG_WRITE) ? 1 : 0),
-                              ((tag & SABRE_IOMMUTAG_SIZE) ? 64 : 8),
-                              ((tag & SABRE_IOMMUTAG_VPN) << IOMMU_PAGE_SHIFT));
-                       printk("%s: IOMMU DATA(%d)[RAW(%016lx)valid(%d)used(%d)cache(%d)ppg(%016lx)\n",
-                              pbm->name, i, data,
-                              ((data & SABRE_IOMMUDATA_VALID) ? 1 : 0),
-                              ((data & SABRE_IOMMUDATA_USED) ? 1 : 0),
-                              ((data & SABRE_IOMMUDATA_CACHE) ? 1 : 0),
-                              ((data & SABRE_IOMMUDATA_PPN) << IOMMU_PAGE_SHIFT));
-               }
-       }
-       spin_unlock_irqrestore(&iommu->lock, flags);
-}
-
 static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
 {
        struct pci_pbm_info *pbm = dev_id;
@@ -306,8 +201,8 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
        int reported;
 
        /* Latch uncorrectable error status. */
-       afar = sabre_read(afar_reg);
-       afsr = sabre_read(afsr_reg);
+       afar = upa_readq(afar_reg);
+       afsr = upa_readq(afsr_reg);
 
        /* Clear the primary/secondary error status bits. */
        error_bits = afsr &
@@ -316,7 +211,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
                 SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE);
        if (!error_bits)
                return IRQ_NONE;
-       sabre_write(afsr_reg, error_bits);
+       upa_writeq(error_bits, afsr_reg);
 
        /* Log the error. */
        printk("%s: Uncorrectable Error, primary error type[%s%s]\n",
@@ -352,7 +247,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
        printk("]\n");
 
        /* Interrogate IOMMU for error status. */
-       sabre_check_iommu_error(pbm, afsr, afar);
+       psycho_check_iommu_error(pbm, afsr, afar, UE_ERR);
 
        return IRQ_HANDLED;
 }
@@ -366,8 +261,8 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)
        int reported;
 
        /* Latch error status. */
-       afar = sabre_read(afar_reg);
-       afsr = sabre_read(afsr_reg);
+       afar = upa_readq(afar_reg);
+       afsr = upa_readq(afsr_reg);
 
        /* Clear primary/secondary error status bits. */
        error_bits = afsr &
@@ -375,7 +270,7 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)
                 SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR);
        if (!error_bits)
                return IRQ_NONE;
-       sabre_write(afsr_reg, error_bits);
+       upa_writeq(error_bits, afsr_reg);
 
        /* Log the error. */
        printk("%s: Correctable Error, primary error type[%s]\n",
@@ -413,136 +308,9 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t sabre_pcierr_intr_other(struct pci_pbm_info *pbm)
-{
-       unsigned long csr_reg, csr, csr_error_bits;
-       irqreturn_t ret = IRQ_NONE;
-       u16 stat;
-
-       csr_reg = pbm->controller_regs + SABRE_PCICTRL;
-       csr = sabre_read(csr_reg);
-       csr_error_bits =
-               csr & SABRE_PCICTRL_SERR;
-       if (csr_error_bits) {
-               /* Clear the errors.  */
-               sabre_write(csr_reg, csr);
-
-               /* Log 'em.  */
-               if (csr_error_bits & SABRE_PCICTRL_SERR)
-                       printk("%s: PCI SERR signal asserted.\n",
-                              pbm->name);
-               ret = IRQ_HANDLED;
-       }
-       pci_bus_read_config_word(sabre_root_bus, 0,
-                                PCI_STATUS, &stat);
-       if (stat & (PCI_STATUS_PARITY |
-                   PCI_STATUS_SIG_TARGET_ABORT |
-                   PCI_STATUS_REC_TARGET_ABORT |
-                   PCI_STATUS_REC_MASTER_ABORT |
-                   PCI_STATUS_SIG_SYSTEM_ERROR)) {
-               printk("%s: PCI bus error, PCI_STATUS[%04x]\n",
-                      pbm->name, stat);
-               pci_bus_write_config_word(sabre_root_bus, 0,
-                                         PCI_STATUS, 0xffff);
-               ret = IRQ_HANDLED;
-       }
-       return ret;
-}
-
-static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id)
-{
-       struct pci_pbm_info *pbm = dev_id;
-       unsigned long afsr_reg, afar_reg;
-       unsigned long afsr, afar, error_bits;
-       int reported;
-
-       afsr_reg = pbm->controller_regs + SABRE_PIOAFSR;
-       afar_reg = pbm->controller_regs + SABRE_PIOAFAR;
-
-       /* Latch error status. */
-       afar = sabre_read(afar_reg);
-       afsr = sabre_read(afsr_reg);
-
-       /* Clear primary/secondary error status bits. */
-       error_bits = afsr &
-               (SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_PTA |
-                SABRE_PIOAFSR_PRTRY | SABRE_PIOAFSR_PPERR |
-                SABRE_PIOAFSR_SMA | SABRE_PIOAFSR_STA |
-                SABRE_PIOAFSR_SRTRY | SABRE_PIOAFSR_SPERR);
-       if (!error_bits)
-               return sabre_pcierr_intr_other(pbm);
-       sabre_write(afsr_reg, error_bits);
-
-       /* Log the error. */
-       printk("%s: PCI Error, primary error type[%s]\n",
-              pbm->name,
-              (((error_bits & SABRE_PIOAFSR_PMA) ?
-                "Master Abort" :
-                ((error_bits & SABRE_PIOAFSR_PTA) ?
-                 "Target Abort" :
-                 ((error_bits & SABRE_PIOAFSR_PRTRY) ?
-                  "Excessive Retries" :
-                  ((error_bits & SABRE_PIOAFSR_PPERR) ?
-                   "Parity Error" : "???"))))));
-       printk("%s: bytemask[%04lx] was_block(%d)\n",
-              pbm->name,
-              (afsr & SABRE_PIOAFSR_BMSK) >> 32UL,
-              (afsr & SABRE_PIOAFSR_BLK) ? 1 : 0);
-       printk("%s: PCI AFAR [%016lx]\n", pbm->name, afar);
-       printk("%s: PCI Secondary errors [", pbm->name);
-       reported = 0;
-       if (afsr & SABRE_PIOAFSR_SMA) {
-               reported++;
-               printk("(Master Abort)");
-       }
-       if (afsr & SABRE_PIOAFSR_STA) {
-               reported++;
-               printk("(Target Abort)");
-       }
-       if (afsr & SABRE_PIOAFSR_SRTRY) {
-               reported++;
-               printk("(Excessive Retries)");
-       }
-       if (afsr & SABRE_PIOAFSR_SPERR) {
-               reported++;
-               printk("(Parity Error)");
-       }
-       if (!reported)
-               printk("(none)");
-       printk("]\n");
-
-       /* For the error types shown, scan both PCI buses for devices
-        * which have logged that error type.
-        */
-
-       /* If we see a Target Abort, this could be the result of an
-        * IOMMU translation error of some sort.  It is extremely
-        * useful to log this information as usually it indicates
-        * a bug in the IOMMU support code or a PCI device driver.
-        */
-       if (error_bits & (SABRE_PIOAFSR_PTA | SABRE_PIOAFSR_STA)) {
-               sabre_check_iommu_error(pbm, afsr, afar);
-               pci_scan_for_target_abort(pbm, pbm->pci_bus);
-       }
-       if (error_bits & (SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_SMA))
-               pci_scan_for_master_abort(pbm, pbm->pci_bus);
-
-       /* For excessive retries, SABRE/PBM will abort the device
-        * and there is no way to specifically check for excessive
-        * retries in the config space status registers.  So what
-        * we hope is that we'll catch it via the master/target
-        * abort events.
-        */
-
-       if (error_bits & (SABRE_PIOAFSR_PPERR | SABRE_PIOAFSR_SPERR))
-               pci_scan_for_parity_error(pbm, pbm->pci_bus);
-
-       return IRQ_HANDLED;
-}
-
 static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
 {
-       struct device_node *dp = pbm->prom_node;
+       struct device_node *dp = pbm->op->node;
        struct of_device *op;
        unsigned long base = pbm->controller_regs;
        u64 tmp;
@@ -568,33 +336,34 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
         * registering the handler so that we don't get spurious
         * interrupts.
         */
-       sabre_write(base + SABRE_UE_AFSR,
-                   (SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR |
-                    SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |
-                    SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));
+       upa_writeq((SABRE_UEAFSR_PDRD | SABRE_UEAFSR_PDWR |
+                   SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |
+                   SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE),
+                  base + SABRE_UE_AFSR);
 
        err = request_irq(op->irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);
        if (err)
                printk(KERN_WARNING "%s: Couldn't register UE, err=%d.\n",
                       pbm->name, err);
 
-       sabre_write(base + SABRE_CE_AFSR,
-                   (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |
-                    SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));
+       upa_writeq((SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |
+                   SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR),
+                  base + SABRE_CE_AFSR);
+
 
        err = request_irq(op->irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);
        if (err)
                printk(KERN_WARNING "%s: Couldn't register CE, err=%d.\n",
                       pbm->name, err);
-       err = request_irq(op->irqs[0], sabre_pcierr_intr, 0,
+       err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
                          "SABRE_PCIERR", pbm);
        if (err)
                printk(KERN_WARNING "%s: Couldn't register PCIERR, err=%d.\n",
                       pbm->name, err);
 
-       tmp = sabre_read(base + SABRE_PCICTRL);
+       tmp = upa_readq(base + SABRE_PCICTRL);
        tmp |= SABRE_PCICTRL_ERREN;
-       sabre_write(base + SABRE_PCICTRL, tmp);
+       upa_writeq(tmp, base + SABRE_PCICTRL);
 }
 
 static void apb_init(struct pci_bus *sabre_bus)
@@ -633,7 +402,8 @@ static void apb_init(struct pci_bus *sabre_bus)
        }
 }
 
-static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
+static void __init sabre_scan_bus(struct pci_pbm_info *pbm,
+                                 struct device *parent)
 {
        static int once;
 
@@ -656,12 +426,12 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
         * to live at bus 0.
         */
        if (once != 0) {
-               prom_printf("SABRE: Multiple controllers unsupported.\n");
-               prom_halt();
+               printk(KERN_ERR PFX "Multiple controllers unsupported.\n");
+               return;
        }
        once++;
 
-       pbm->pci_bus = pci_scan_one_pbm(pbm);
+       pbm->pci_bus = pci_scan_one_pbm(pbm, parent);
        if (!pbm->pci_bus)
                return;
 
@@ -672,133 +442,58 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
        sabre_register_error_handlers(pbm);
 }
 
-static int sabre_iommu_init(struct pci_pbm_info *pbm,
-                           int tsbsize, unsigned long dvma_offset,
-                           u32 dma_mask)
-{
-       struct iommu *iommu = pbm->iommu;
-       unsigned long i;
-       u64 control;
-       int err;
-
-       /* Register addresses. */
-       iommu->iommu_control  = pbm->controller_regs + SABRE_IOMMU_CONTROL;
-       iommu->iommu_tsbbase  = pbm->controller_regs + SABRE_IOMMU_TSBBASE;
-       iommu->iommu_flush    = pbm->controller_regs + SABRE_IOMMU_FLUSH;
-       iommu->iommu_tags     = iommu->iommu_flush + (0xa580UL - 0x0210UL);
-       iommu->write_complete_reg = pbm->controller_regs + SABRE_WRSYNC;
-       /* Sabre's IOMMU lacks ctx flushing. */
-       iommu->iommu_ctxflush = 0;
-                                        
-       /* Invalidate TLB Entries. */
-       control = sabre_read(pbm->controller_regs + SABRE_IOMMU_CONTROL);
-       control |= SABRE_IOMMUCTRL_DENAB;
-       sabre_write(pbm->controller_regs + SABRE_IOMMU_CONTROL, control);
-
-       for(i = 0; i < 16; i++) {
-               sabre_write(pbm->controller_regs + SABRE_IOMMU_TAG + (i * 8UL), 0);
-               sabre_write(pbm->controller_regs + SABRE_IOMMU_DATA + (i * 8UL), 0);
-       }
-
-       /* Leave diag mode enabled for full-flushing done
-        * in pci_iommu.c
-        */
-       err = iommu_table_init(iommu, tsbsize * 1024 * 8,
-                              dvma_offset, dma_mask, pbm->numa_node);
-       if (err)
-               return err;
-
-       sabre_write(pbm->controller_regs + SABRE_IOMMU_TSBBASE,
-                   __pa(iommu->page_table));
-
-       control = sabre_read(pbm->controller_regs + SABRE_IOMMU_CONTROL);
-       control &= ~(SABRE_IOMMUCTRL_TSBSZ | SABRE_IOMMUCTRL_TBWSZ);
-       control |= SABRE_IOMMUCTRL_ENAB;
-       switch(tsbsize) {
-       case 64:
-               control |= SABRE_IOMMU_TSBSZ_64K;
-               break;
-       case 128:
-               control |= SABRE_IOMMU_TSBSZ_128K;
-               break;
-       default:
-               prom_printf("iommu_init: Illegal TSB size %d\n", tsbsize);
-               prom_halt();
-               break;
-       }
-       sabre_write(pbm->controller_regs + SABRE_IOMMU_CONTROL, control);
-
-       return 0;
-}
-
-static void __init sabre_pbm_init(struct pci_controller_info *p,
-                                 struct pci_pbm_info *pbm, struct device_node *dp)
+static void __init sabre_pbm_init(struct pci_pbm_info *pbm,
+                                 struct of_device *op)
 {
-       pbm->name = dp->full_name;
-       printk("%s: SABRE PCI Bus Module\n", pbm->name);
-
-       pbm->numa_node = -1;
-
-       pbm->scan_bus = sabre_scan_bus;
-       pbm->pci_ops = &sun4u_pci_ops;
-       pbm->config_space_reg_bits = 8;
-
-       pbm->index = pci_num_pbms++;
-
-       pbm->chip_type = PBM_CHIP_TYPE_SABRE;
-       pbm->parent = p;
-       pbm->prom_node = dp;
-       pci_get_pbm_props(pbm);
-
-       pci_determine_mem_io_space(pbm);
+       psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);
+       pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;
+       pbm->pci_afar = pbm->controller_regs + SABRE_PIOAFAR;
+       pbm->pci_csr = pbm->controller_regs + SABRE_PCICTRL;
+       sabre_scan_bus(pbm, &op->dev);
 }
 
-void __init sabre_init(struct device_node *dp, char *model_name)
+static int __devinit sabre_probe(struct of_device *op,
+                                const struct of_device_id *match)
 {
        const struct linux_prom64_registers *pr_regs;
-       struct pci_controller_info *p;
+       struct device_node *dp = op->node;
        struct pci_pbm_info *pbm;
+       u32 upa_portid, dma_mask;
        struct iommu *iommu;
-       int tsbsize;
+       int tsbsize, err;
        const u32 *vdma;
-       u32 upa_portid, dma_mask;
        u64 clear_irq;
 
-       hummingbird_p = 0;
-       if (!strcmp(model_name, "pci108e,a001"))
-               hummingbird_p = 1;
-       else if (!strcmp(model_name, "SUNW,sabre")) {
-               const char *compat = of_get_property(dp, "compatible", NULL);
-               if (compat && !strcmp(compat, "pci108e,a001"))
-                       hummingbird_p = 1;
-               if (!hummingbird_p) {
-                       struct device_node *dp;
-
-                       /* Of course, Sun has to encode things a thousand
-                        * different ways, inconsistently.
-                        */
-                       for_each_node_by_type(dp, "cpu") {
-                               if (!strcmp(dp->name, "SUNW,UltraSPARC-IIe"))
-                                       hummingbird_p = 1;
-                       }
+       hummingbird_p = (match->data != NULL);
+       if (!hummingbird_p) {
+               struct device_node *cpu_dp;
+
+               /* Of course, Sun has to encode things a thousand
+                * different ways, inconsistently.
+                */
+               for_each_node_by_type(cpu_dp, "cpu") {
+                       if (!strcmp(cpu_dp->name, "SUNW,UltraSPARC-IIe"))
+                               hummingbird_p = 1;
                }
        }
 
-       p = kzalloc(sizeof(*p), GFP_ATOMIC);
-       if (!p)
-               goto fatal_memory_error;
+       err = -ENOMEM;
+       pbm = kzalloc(sizeof(*pbm), GFP_KERNEL);
+       if (!pbm) {
+               printk(KERN_ERR PFX "Cannot allocate pci_pbm_info.\n");
+               goto out_err;
+       }
+
+       iommu = kzalloc(sizeof(*iommu), GFP_KERNEL);
+       if (!iommu) {
+               printk(KERN_ERR PFX "Cannot allocate PBM iommu.\n");
+               goto out_free_controller;
+       }
 
-       iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
-       if (!iommu)
-               goto fatal_memory_error;
-       pbm = &p->pbm_A;
        pbm->iommu = iommu;
 
        upa_portid = of_getintprop_default(dp, "upa-portid", 0xff);
 
-       pbm->next = pci_pbm_root;
-       pci_pbm_root = pbm;
-
        pbm->portid = upa_portid;
 
        /*
@@ -806,6 +501,11 @@ void __init sabre_init(struct device_node *dp, char *model_name)
         */
        
        pr_regs = of_get_property(dp, "reg", NULL);
+       err = -ENODEV;
+       if (!pr_regs) {
+               printk(KERN_ERR PFX "No reg property\n");
+               goto out_free_iommu;
+       }
 
        /*
         * First REG in property is base of entire SABRE register space.
@@ -816,22 +516,25 @@ void __init sabre_init(struct device_node *dp, char *model_name)
 
        /* PCI first */
        for (clear_irq = SABRE_ICLR_A_SLOT0; clear_irq < SABRE_ICLR_B_SLOT0 + 0x80; clear_irq += 8)
-               sabre_write(pbm->controller_regs + clear_irq, 0x0UL);
+               upa_writeq(0x0UL, pbm->controller_regs + clear_irq);
 
        /* Then OBIO */
        for (clear_irq = SABRE_ICLR_SCSI; clear_irq < SABRE_ICLR_SCSI + 0x80; clear_irq += 8)
-               sabre_write(pbm->controller_regs + clear_irq, 0x0UL);
+               upa_writeq(0x0UL, pbm->controller_regs + clear_irq);
 
        /* Error interrupts are enabled later after the bus scan. */
-       sabre_write(pbm->controller_regs + SABRE_PCICTRL,
-                   (SABRE_PCICTRL_MRLEN   | SABRE_PCICTRL_SERR |
-                    SABRE_PCICTRL_ARBPARK | SABRE_PCICTRL_AEN));
+       upa_writeq((SABRE_PCICTRL_MRLEN   | SABRE_PCICTRL_SERR |
+                   SABRE_PCICTRL_ARBPARK | SABRE_PCICTRL_AEN),
+                  pbm->controller_regs + SABRE_PCICTRL);
 
        /* Now map in PCI config space for entire SABRE. */
-       pbm->config_space =
-               (pbm->controller_regs + SABRE_CONFIGSPACE);
+       pbm->config_space = pbm->controller_regs + SABRE_CONFIGSPACE;
 
        vdma = of_get_property(dp, "virtual-dma", NULL);
+       if (!vdma) {
+               printk(KERN_ERR PFX "No virtual-dma property\n");
+               goto out_free_iommu;
+       }
 
        dma_mask = vdma[0];
        switch(vdma[1]) {
@@ -849,20 +552,58 @@ void __init sabre_init(struct device_node *dp, char *model_name)
                        tsbsize = 128;
                        break;
                default:
-                       prom_printf("SABRE: strange virtual-dma size.\n");
-                       prom_halt();
+                       printk(KERN_ERR PFX "Strange virtual-dma size.\n");
+                       goto out_free_iommu;
        }
 
-       if (sabre_iommu_init(pbm, tsbsize, vdma[0], dma_mask))
-               goto fatal_memory_error;
+       err = psycho_iommu_init(pbm, tsbsize, vdma[0], dma_mask, SABRE_WRSYNC);
+       if (err)
+               goto out_free_iommu;
 
        /*
         * Look for APB underneath.
         */
-       sabre_pbm_init(p, pbm, dp);
-       return;
+       sabre_pbm_init(pbm, op);
 
-fatal_memory_error:
-       prom_printf("SABRE: Fatal memory allocation error.\n");
-       prom_halt();
+       pbm->next = pci_pbm_root;
+       pci_pbm_root = pbm;
+
+       dev_set_drvdata(&op->dev, pbm);
+
+       return 0;
+
+out_free_iommu:
+       kfree(pbm->iommu);
+
+out_free_controller:
+       kfree(pbm);
+
+out_err:
+       return err;
+}
+
+static struct of_device_id __initdata sabre_match[] = {
+       {
+               .name = "pci",
+               .compatible = "pci108e,a001",
+               .data = (void *) 1,
+       },
+       {
+               .name = "pci",
+               .compatible = "pci108e,a000",
+       },
+       {},
+};
+
+static struct of_platform_driver sabre_driver = {
+       .name           = DRIVER_NAME,
+       .match_table    = sabre_match,
+       .probe          = sabre_probe,
+};
+
+static int __init sabre_init(void)
+{
+       return of_register_driver(&sabre_driver, &of_bus_type);
 }
+
+subsys_initcall(sabre_init);