Module Name: src
Committed By: matt
Date: Mon Nov 23 18:28:47 UTC 2009
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbgbus.c sbjcn.c
sbmac.c sbobio.c sbscn.c sbtimer.c sbwdog.c
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: cpu.c rtc.c sb1250_icu.c
src/sys/arch/sgimips/mace [matt-nb5-mips64]: mace.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: bus.c
Log Message:
mips3_ld/mips3_sd need to be passed a volatile uint64_t *
To generate a diff of this commit:
cvs rdiff -u -r1.78.36.1.2.4 -r1.78.36.1.2.5 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.10 -r1.10.96.1 src/sys/arch/mips/sibyte/dev/sbgbus.c
cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/arch/mips/sibyte/dev/sbjcn.c
cvs rdiff -u -r1.28.24.1 -r1.28.24.2 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.16 -r1.16.98.1 src/sys/arch/mips/sibyte/dev/sbobio.c
cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/arch/mips/sibyte/dev/sbscn.c
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/arch/mips/sibyte/dev/sbtimer.c
cvs rdiff -u -r1.7 -r1.7.94.1 src/sys/arch/mips/sibyte/dev/sbwdog.c
cvs rdiff -u -r1.18 -r1.18.16.1 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.16 -r1.16.38.1 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.9 -r1.9.36.1 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.15.12.1 -r1.15.12.2 src/sys/arch/sgimips/mace/mace.c
cvs rdiff -u -r1.55.16.1 -r1.55.16.2 src/sys/arch/sgimips/sgimips/bus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.4 src/sys/arch/mips/include/locore.h:1.78.36.1.2.5
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.4 Sat Sep 5 03:18:49 2009
+++ src/sys/arch/mips/include/locore.h Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.4 2009/09/05 03:18:49 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.5 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -140,7 +140,7 @@
#if defined(__GNUC__) && !defined(__mips_o32)
static inline uint64_t
-mips3_ld(const uint64_t *va)
+mips3_ld(const volatile uint64_t *va)
{
uint64_t rv;
#if defined(__mips_o32)
@@ -173,7 +173,7 @@
return rv;
}
static inline void
-mips3_sd(uint64_t *va, uint64_t v)
+mips3_sd(volatile uint64_t *va, uint64_t v)
{
#if defined(__mips_o32)
uint32_t sr;
@@ -202,8 +202,8 @@
#endif
}
#else
-uint64_t mips3_ld(uint64_t *va);
-void mips3_sd(uint64_t *, uint64_t);
+uint64_t mips3_ld(volatile uint64_t *va);
+void mips3_sd(volatile uint64_t *, uint64_t);
#endif /* __GNUC__ */
#endif /* MIPS3 || MIPS4 || MIPS32 || MIPS64 */
Index: src/sys/arch/mips/sibyte/dev/sbgbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10 src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10.96.1
--- src/sys/arch/mips/sibyte/dev/sbgbus.c:1.10 Sun Dec 11 12:18:12 2005
+++ src/sys/arch/mips/sibyte/dev/sbgbus.c Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbgbus.c,v 1.10 2005/12/11 12:18:12 christos Exp $ */
+/* $NetBSD: sbgbus.c,v 1.10.96.1 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.10 2005/12/11 12:18:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.10.96.1 2009/11/23 18:28:46 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,11 +132,11 @@
} else {
uint64_t rv;
- rv = mips3_ld((void *)MIPS_PHYS_TO_KSEG1(
+ rv = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(
A_IO_EXT_CS_BASE(sga.sga_chipsel) +
R_IO_EXT_START_ADDR));
sga.sga_startphys = (rv & M_IO_START_ADDR) << S_IO_ADDRBASE;
- rv = mips3_ld((void *)MIPS_PHYS_TO_KSEG1(
+ rv = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(
A_IO_EXT_CS_BASE(sga.sga_chipsel) +
R_IO_EXT_MULT_SIZE));
sga.sga_size = (rv & M_IO_MULT_SIZE) << S_IO_REGSIZE;
Index: src/sys/arch/mips/sibyte/dev/sbjcn.c
diff -u src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21 src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21.14.1
--- src/sys/arch/mips/sibyte/dev/sbjcn.c:1.21 Fri Jun 13 12:08:01 2008
+++ src/sys/arch/mips/sibyte/dev/sbjcn.c Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcn.c,v 1.21 2008/06/13 12:08:01 cegger Exp $ */
+/* $NetBSD: sbjcn.c,v 1.21.14.1 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbjcn.c,v 1.21 2008/06/13 12:08:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbjcn.c,v 1.21.14.1 2009/11/23 18:28:46 matt Exp $");
#define SBJCN_DEBUG
@@ -225,8 +225,8 @@
CFATTACH_DECL(sbjcn, sizeof(struct sbjcn_softc),
sbjcn_match, sbjcn_attach, NULL, NULL);
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(rp), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
#define JTAG_CONS_CONTROL 0x00
#define JTAG_CONS_INPUT 0x20
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.1 src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.2
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.1 Wed Aug 19 07:33:30 2009
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Mon Nov 23 18:28:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $ */
+/* $NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.1 2009/08/19 07:33:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -119,8 +119,8 @@
#define dprintf(x)
#endif
-#define SBMAC_READCSR(t) mips3_ld((uint64_t *) (t))
-#define SBMAC_WRITECSR(t, v) mips3_sd((uint64_t *) (t), (v))
+#define SBMAC_READCSR(t) mips3_ld((volatile uint64_t *) (t))
+#define SBMAC_WRITECSR(t, v) mips3_sd((volatile uint64_t *) (t), (v))
#define PKSEG1(x) ((sbmac_port_t) MIPS_PHYS_TO_KSEG1(x))
Index: src/sys/arch/mips/sibyte/dev/sbobio.c
diff -u src/sys/arch/mips/sibyte/dev/sbobio.c:1.16 src/sys/arch/mips/sibyte/dev/sbobio.c:1.16.98.1
--- src/sys/arch/mips/sibyte/dev/sbobio.c:1.16 Fri Nov 11 06:27:09 2005
+++ src/sys/arch/mips/sibyte/dev/sbobio.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbobio.c,v 1.16 2005/11/11 06:27:09 simonb Exp $ */
+/* $NetBSD: sbobio.c,v 1.16.98.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.16 2005/11/11 06:27:09 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.16.98.1 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -112,7 +112,7 @@
if (zap->za_locs.za_type != ZBBUS_ENTTYPE_OBIO)
return (0);
- sysrev = mips3_ld((u_int64_t *)MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_REVISION));
+ sysrev = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_REVISION));
switch (SYS_SOC_TYPE(sysrev)) {
case K_SYS_SOC_TYPE_BCM1120:
case K_SYS_SOC_TYPE_BCM1125:
@@ -137,7 +137,7 @@
int i, devcount;
int locs[SBOBIOCF_NLOCS];
- sysrev = mips3_ld((u_int64_t *)MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_REVISION));
+ sysrev = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_REVISION));
switch (SYS_SOC_TYPE(sysrev)) {
case K_SYS_SOC_TYPE_BCM1120:
case K_SYS_SOC_TYPE_BCM1125:
Index: src/sys/arch/mips/sibyte/dev/sbscn.c
diff -u src/sys/arch/mips/sibyte/dev/sbscn.c:1.27 src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.1
--- src/sys/arch/mips/sibyte/dev/sbscn.c:1.27 Fri Jun 13 12:08:01 2008
+++ src/sys/arch/mips/sibyte/dev/sbscn.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbscn.c,v 1.27 2008/06/13 12:08:01 cegger Exp $ */
+/* $NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -109,7 +109,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.27 2008/06/13 12:08:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $");
#define SBSCN_DEBUG
@@ -235,8 +235,8 @@
CFATTACH_DECL(sbscn, sizeof(struct sbscn_softc),
sbscn_match, sbscn_attach, NULL, NULL);
-#define READ_REG(rp) (mips3_ld((int64_t *)__UNVOLATILE(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)__UNVOLATILE(rp), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
/*
* input and output signals are actually the _inverse_ of the bits in the
Index: src/sys/arch/mips/sibyte/dev/sbtimer.c
diff -u src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13 src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.1
--- src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13 Tue Jan 8 14:38:47 2008
+++ src/sys/arch/mips/sibyte/dev/sbtimer.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbtimer.c,v 1.13 2008/01/08 14:38:47 simonb Exp $ */
+/* $NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbtimer.c,v 1.13 2008/01/08 14:38:47 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -55,8 +55,8 @@
#define SBTIMER_CLOCK 1
#define SBTIMER_STATCLOCK 2
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(rp), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
static int sbtimer_match(struct device *, struct cfdata *, void *);
static void sbtimer_attach(struct device *, struct device *, void *);
Index: src/sys/arch/mips/sibyte/dev/sbwdog.c
diff -u src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7 src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7.94.1
--- src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7 Thu Jan 12 04:40:50 2006
+++ src/sys/arch/mips/sibyte/dev/sbwdog.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbwdog.c,v 1.7 2006/01/12 04:40:50 simonb Exp $ */
+/* $NetBSD: sbwdog.c,v 1.7.94.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbwdog.c,v 1.7 2006/01/12 04:40:50 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbwdog.c,v 1.7.94.1 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,8 +73,8 @@
CFATTACH_DECL(sbwdog, sizeof(struct sbwdog_softc),
sbwdog_match, sbwdog_attach, NULL, NULL);
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(rp), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
static int
sbwdog_match(struct device *parent, struct cfdata *cf, void *aux)
Index: src/sys/arch/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.18 src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.1
--- src/sys/arch/sbmips/sbmips/cpu.c:1.18 Mon May 26 15:59:30 2008
+++ src/sys/arch/sbmips/sbmips/cpu.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.18 2008/05/26 15:59:30 tsutsui Exp $ */
+/* $NetBSD: cpu.c,v 1.18.16.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18 2008/05/26 15:59:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18.16.1 2009/11/23 18:28:47 matt Exp $");
#include "opt_multiprocessor.h"
@@ -53,7 +53,7 @@
#include <mips/sibyte/include/sb1250_scd.h>
#include <mips/sibyte/dev/sbscdvar.h>
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
static int cpu_match(struct device *, struct cfdata *, void *);
static void cpu_attach(struct device *, struct device *, void *);
Index: src/sys/arch/sbmips/sbmips/rtc.c
diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.16 src/sys/arch/sbmips/sbmips/rtc.c:1.16.38.1
--- src/sys/arch/sbmips/sbmips/rtc.c:1.16 Wed Oct 17 19:57:02 2007
+++ src/sys/arch/sbmips/sbmips/rtc.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.16 2007/10/17 19:57:02 garbled Exp $ */
+/* $NetBSD: rtc.c,v 1.16.38.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16 2007/10/17 19:57:02 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16.38.1 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -415,8 +415,8 @@
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_smbus.h>
-#define READ_REG(rp) (mips3_ld((uint64_t *)(MIPS_PHYS_TO_KSEG1(rp))))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(MIPS_PHYS_TO_KSEG1(rp)), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp))))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp)), (val)))
static void
time_smbus_init(int chan)
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.1
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9 Mon Dec 3 15:34:16 2007
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9 2007/12/03 15:34:16 ad Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.1 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9 2007/12/03 15:34:16 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.1 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,8 +69,8 @@
#define SB1250_I_MAP_I2 0x02
/* XXX */
-#define READ_REG(rp) (mips3_ld((uint64_t *)(rp)))
-#define WRITE_REG(rp, val) (mips3_sd((uint64_t *)(rp), (val)))
+#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
+#define WRITE_REG(rp, val) (mips3_sd((volatile uint64_t *)(rp), (val)))
static void sb1250_cpu_intr(uint32_t, uint32_t, uint32_t, uint32_t);
static void *sb1250_intr_establish(u_int, u_int,
Index: src/sys/arch/sgimips/mace/mace.c
diff -u src/sys/arch/sgimips/mace/mace.c:1.15.12.1 src/sys/arch/sgimips/mace/mace.c:1.15.12.2
--- src/sys/arch/sgimips/mace/mace.c:1.15.12.1 Thu Sep 10 01:51:32 2009
+++ src/sys/arch/sgimips/mace/mace.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mace.c,v 1.15.12.1 2009/09/10 01:51:32 matt Exp $ */
+/* $NetBSD: mace.c,v 1.15.12.2 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.15.12.1 2009/09/10 01:51:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.15.12.2 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,9 +301,9 @@
/* irq 4 is the ISA cascade interrupt. Must handle with care. */
if (irqs & (1 << 4)) {
- isa_mask = mips3_ld((uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
+ isa_mask = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
+ MACE_ISA_INT_MASK));
- isa_irq = mips3_ld((uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
+ isa_irq = mips3_ld((volatile uint64_t *)MIPS_PHYS_TO_KSEG1(MACE_BASE
+ MACE_ISA_INT_STATUS));
for (i = 0; i < MACE_NINTR; i++) {
if ((maceintrtab[i].irq == (1 << 4)) &&
Index: src/sys/arch/sgimips/sgimips/bus.c
diff -u src/sys/arch/sgimips/sgimips/bus.c:1.55.16.1 src/sys/arch/sgimips/sgimips/bus.c:1.55.16.2
--- src/sys/arch/sgimips/sgimips/bus.c:1.55.16.1 Thu Sep 10 01:51:32 2009
+++ src/sys/arch/sgimips/sgimips/bus.c Mon Nov 23 18:28:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.55.16.1 2009/09/10 01:51:32 matt Exp $ */
+/* $NetBSD: bus.c,v 1.55.16.2 2009/11/23 18:28:47 matt Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.55.16.1 2009/09/10 01:51:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.55.16.2 2009/11/23 18:28:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -375,14 +375,14 @@
s = splhigh();
delay(10);
#endif
- reg = mips3_ld( (u_int64_t *)(vaddr_t)(bsh + o));
+ reg = mips3_ld((volatile uint64_t *)(vaddr_t)(bsh + o));
#ifdef MACE_NEEDS_DELAYS
delay(10);
splx(s);
#endif
break;
default:
- reg = mips3_ld( (u_int64_t *)(vaddr_t)(bsh + o));
+ reg = mips3_ld((volatile uint64_t *)(vaddr_t)(bsh + o));
break;
}
return reg;
@@ -404,14 +404,14 @@
s = splhigh();
delay(10);
#endif
- mips3_sd( (u_int64_t *)(vaddr_t)(bsh + o), v);
+ mips3_sd((volatile uint64_t *)(vaddr_t)(bsh + o), v);
#ifdef MACE_NEEDS_DELAYS
delay(10);
splx(s);
#endif
break;
default:
- mips3_sd( (u_int64_t *)(vaddr_t)(bsh + o), v);
+ mips3_sd((volatile uint64_t *)(vaddr_t)(bsh + o), v);
break;
}
}
