This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / sgi-ip32 / crime.c

diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index 7f771bf..a8c7a77 100644 (file)
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -10,14 +10,13 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <asm/bootinfo.h>
-#include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
 #include <asm/ip32/crime.h>
 #include <asm/ip32/mace.h>
 
-struct sgi_crime *crime;
+void *sgi_crime;
 struct sgi_mace *mace;
 
 void __init crime_init(void)
@@ -25,12 +24,13 @@ void __init crime_init(void)
        unsigned int id, rev;
        const int field = 2 * sizeof(unsigned long);
        
-       crime = ioremap(CRIME_BASE, sizeof(struct sgi_crime));
+       sgi_crime = ioremap(CRIME_BASE, 1);
        mace = ioremap(MACE_BASE, sizeof(struct sgi_mace));
 
-       id = crime->id;
+       id = crime_read(CRIME_ID);
        rev = id & CRIME_ID_REV;
        id = (id & CRIME_ID_IDBITS) >> 4;
+
        printk (KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
                id, rev, field, (unsigned long) CRIME_BASE);
 }
@@ -41,18 +41,19 @@ crime_memerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
        unsigned long stat, addr;
        int fatal = 0;
 
-       stat = crime->mem_error_stat & CRIME_MEM_ERROR_STAT_MASK;
-       addr = crime->mem_error_addr & CRIME_MEM_ERROR_ADDR_MASK;
+       stat = crime_read(CRIME_MEM_ERROR_STAT) & CRIME_MEM_ERROR_STAT_MASK;
+       addr = crime_read(CRIME_MEM_ERROR_ADDR) & CRIME_MEM_ERROR_ADDR_MASK;
 
        printk("CRIME memory error at 0x%08lx ST 0x%08lx<", addr, stat);
 
        if (stat & CRIME_MEM_ERROR_INV)
                printk("INV,");
        if (stat & CRIME_MEM_ERROR_ECC) {
-               unsigned long ecc_syn =
-                       crime->mem_ecc_syn & CRIME_MEM_ERROR_ECC_SYN_MASK;
-               unsigned long ecc_gen =
-                       crime->mem_ecc_chk & CRIME_MEM_ERROR_ECC_CHK_MASK;
+               unsigned long ecc_syn = crime_read(CRIME_MEM_ERROR_ECC_SYN) &
+                                       CRIME_MEM_ERROR_ECC_SYN_MASK;
+               unsigned long ecc_gen = crime_read(CRIME_MEM_ERROR_ECC_CHK) &
+                                       CRIME_MEM_ERROR_ECC_CHK_MASK;
+
                printk("ECC,SYN=0x%08lx,GEN=0x%08lx,", ecc_syn, ecc_gen);
        }
        if (stat & CRIME_MEM_ERROR_MULTIPLE) {
@@ -76,7 +77,7 @@ crime_memerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
        if (stat & CRIME_MEM_ERROR_MACE_ACCESS)
                printk("MACE,MACEID=0x%02lx,", stat & CRIME_MEM_ERROR_MACE_ID);
 
-       crime->mem_error_stat = 0;
+       crime_write(0, CRIME_MEM_ERROR_STAT);
 
        if (fatal) {
                printk("FATAL>\n");
@@ -90,12 +91,15 @@ crime_memerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
 irqreturn_t
 crime_cpuerr_intr (unsigned int irq, void *dev_id, struct pt_regs *regs)
 {
-       unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK;
-       unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;
-
+       unsigned long stat = crime_read(CRIME_CPU_ERROR_STAT) &
+                            CRIME_CPU_ERROR_MASK;
+       uint64_t addr = crime_read(CRIME_CPU_ERROR_ADDR) &
+                       CRIME_CPU_ERROR_ADDR_MASK;
        addr <<= 2;
+
        printk ("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
-       crime->cpu_error_stat = 0;
+
+       crime_write(0, CRIME_CPU_ERROR_STAT);
 
        return IRQ_HANDLED;
 }