aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip22/ip28-berr.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/sgi-ip22/ip28-berr.c')
-rw-r--r--arch/mips/sgi-ip22/ip28-berr.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/sgi-ip22/ip28-berr.c b/arch/mips/sgi-ip22/ip28-berr.c
index 0626555fd1a3..3f47346608d7 100644
--- a/arch/mips/sgi-ip22/ip28-berr.c
+++ b/arch/mips/sgi-ip22/ip28-berr.c
@@ -136,14 +136,14 @@ static void save_and_clear_buserr(void)
136 hpc3.scsi[1].cbp = hpc3c0->scsi_chan1.cbptr; 136 hpc3.scsi[1].cbp = hpc3c0->scsi_chan1.cbptr;
137 hpc3.scsi[1].ndptr = hpc3c0->scsi_chan1.ndptr; 137 hpc3.scsi[1].ndptr = hpc3c0->scsi_chan1.ndptr;
138 138
139 hpc3.ethrx.addr = (unsigned long)&hpc3c0->ethregs.rx_cbptr; 139 hpc3.ethrx.addr = (unsigned long)&hpc3c0->ethregs.rx_cbptr;
140 hpc3.ethrx.ctrl = hpc3c0->ethregs.rx_ctrl; /* HPC3_ERXCTRL_ACTIVE ? */ 140 hpc3.ethrx.ctrl = hpc3c0->ethregs.rx_ctrl; /* HPC3_ERXCTRL_ACTIVE ? */
141 hpc3.ethrx.cbp = hpc3c0->ethregs.rx_cbptr; 141 hpc3.ethrx.cbp = hpc3c0->ethregs.rx_cbptr;
142 hpc3.ethrx.ndptr = hpc3c0->ethregs.rx_ndptr; 142 hpc3.ethrx.ndptr = hpc3c0->ethregs.rx_ndptr;
143 143
144 hpc3.ethtx.addr = (unsigned long)&hpc3c0->ethregs.tx_cbptr; 144 hpc3.ethtx.addr = (unsigned long)&hpc3c0->ethregs.tx_cbptr;
145 hpc3.ethtx.ctrl = hpc3c0->ethregs.tx_ctrl; /* HPC3_ETXCTRL_ACTIVE ? */ 145 hpc3.ethtx.ctrl = hpc3c0->ethregs.tx_ctrl; /* HPC3_ETXCTRL_ACTIVE ? */
146 hpc3.ethtx.cbp = hpc3c0->ethregs.tx_cbptr; 146 hpc3.ethtx.cbp = hpc3c0->ethregs.tx_cbptr;
147 hpc3.ethtx.ndptr = hpc3c0->ethregs.tx_ndptr; 147 hpc3.ethtx.ndptr = hpc3c0->ethregs.tx_ndptr;
148 148
149 for (i = 0; i < 8; ++i) { 149 for (i = 0; i < 8; ++i) {
@@ -196,11 +196,11 @@ static void print_cache_tags(void)
196 scb | (1 << 12)*i); 196 scb | (1 << 12)*i);
197 } 197 }
198 i = read_c0_config(); 198 i = read_c0_config();
199 scb = i & (1 << 13) ? 7:6; /* scblksize = 2^[7..6] */ 199 scb = i & (1 << 13) ? 7:6; /* scblksize = 2^[7..6] */
200 scw = ((i >> 16) & 7) + 19 - 1; /* scwaysize = 2^[24..19] / 2 */ 200 scw = ((i >> 16) & 7) + 19 - 1; /* scwaysize = 2^[24..19] / 2 */
201 201
202 i = ((1 << scw) - 1) & ~((1 << scb) - 1); 202 i = ((1 << scw) - 1) & ~((1 << scb) - 1);
203 printk(KERN_ERR "S: 0: %08x %08x, 1: %08x %08x (PA[%u:%u] %05x)\n", 203 printk(KERN_ERR "S: 0: %08x %08x, 1: %08x %08x (PA[%u:%u] %05x)\n",
204 cache_tags.tags[0][0].hi, cache_tags.tags[0][0].lo, 204 cache_tags.tags[0][0].hi, cache_tags.tags[0][0].lo,
205 cache_tags.tags[0][1].hi, cache_tags.tags[0][1].lo, 205 cache_tags.tags[0][1].hi, cache_tags.tags[0][1].lo,
206 scw-1, scb, i & (unsigned)cache_tags.err_addr); 206 scw-1, scb, i & (unsigned)cache_tags.err_addr);