diff options
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxfau.c | 6 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxfpavar.h | 6 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxpkovar.h | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/include/octeonvar.h | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 4 |
5 files changed, 10 insertions, 18 deletions
diff --git a/sys/arch/octeon/dev/cn30xxfau.c b/sys/arch/octeon/dev/cn30xxfau.c index 70f9d44dde6..4950bbc4484 100644 --- a/sys/arch/octeon/dev/cn30xxfau.c +++ b/sys/arch/octeon/dev/cn30xxfau.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfau.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ +/* $OpenBSD: cn30xxfau.c,v 1.3 2013/06/01 21:25:26 jasper Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -54,7 +54,7 @@ cn30xxfau_op_load(uint64_t args) ((uint64_t)(CN30XXFAU_MAJORDID & 0x1f) << 43) | ((uint64_t)(CN30XXFAU_SUBDID & 0x7) << 40) | ((uint64_t)(args & 0xfffffffffULL) << 0); - return octeon_read_csr(addr); + return octeon_xkphys_read_8(addr); } static void @@ -67,7 +67,7 @@ cn30xxfau_op_store(uint64_t args, int64_t value) ((uint64_t)(CN30XXFAU_MAJORDID & 0x1f) << 43) | ((uint64_t)(CN30XXFAU_SUBDID & 0x7) << 40) | ((uint64_t)(args & 0xfffffffffULL) << 0); - octeon_write_csr(addr, value); + octeon_xkphys_write_8(addr, value); } /* ---- operation primitives */ diff --git a/sys/arch/octeon/dev/cn30xxfpavar.h b/sys/arch/octeon/dev/cn30xxfpavar.h index 8040b13496c..8743d057391 100644 --- a/sys/arch/octeon/dev/cn30xxfpavar.h +++ b/sys/arch/octeon/dev/cn30xxfpavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfpavar.h,v 1.1 2011/06/16 11:22:30 syuu Exp $ */ +/* $OpenBSD: cn30xxfpavar.h,v 1.2 2013/06/01 21:25:26 jasper Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. * All rights reserved. @@ -100,7 +100,7 @@ cn30xxfpa_load(uint64_t fpapool) (0x5ULL << 43) | (fpapool & 0x07ULL) << 40; - return octeon_read_csr(addr); + return octeon_xkphys_read_8(addr); } #ifdef notyet @@ -124,7 +124,7 @@ cn30xxfpa_store(uint64_t addr, uint64_t fpapool, uint64_t dwbcount) (addr & 0xffffffffffULL); OCTEON_SYNCWS; - octeon_write_csr(ptr, (dwbcount & 0x0ffULL)); + octeon_xkphys_write_8(ptr, (dwbcount & 0x0ffULL)); } static inline paddr_t diff --git a/sys/arch/octeon/dev/cn30xxpkovar.h b/sys/arch/octeon/dev/cn30xxpkovar.h index 24e5bcfc648..4c24f517ac9 100644 --- a/sys/arch/octeon/dev/cn30xxpkovar.h +++ b/sys/arch/octeon/dev/cn30xxpkovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpkovar.h,v 1.2 2011/06/24 02:13:23 yasuoka Exp $ */ +/* $OpenBSD: cn30xxpkovar.h,v 1.3 2013/06/01 21:25:26 jasper Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -149,7 +149,7 @@ cn30xxpko_op_store(uint64_t args, uint64_t value) ((uint64_t)args); /* XXX */ OCTEON_SYNCW; - octeon_write_csr(addr, value); + octeon_xkphys_write_8(addr, value); } static inline void diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h index 07248255c62..1a3023a2e2f 100644 --- a/sys/arch/octeon/include/octeonvar.h +++ b/sys/arch/octeon/include/octeonvar.h @@ -358,14 +358,6 @@ octeon_xkphys_write_8(paddr_t address, uint64_t value) *(volatile uint64_t *)(PHYS_TO_XKPHYS(address, CCA_NC)) = value; } -/* XXX backward compatibility */ -#if 1 -#define octeon_read_csr(address) \ - octeon_xkphys_read_8(address) -#define octeon_write_csr(address, value) \ - octeon_xkphys_write_8(address, value) -#endif - static inline void octeon_iobdma_write_8(uint64_t value) { diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 41fc3963a85..64fc34baae4 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.34 2013/06/01 17:08:26 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.35 2013/06/01 21:25:26 jasper Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -705,7 +705,7 @@ haltsys: (void)disableintr(); tlb_set_wired(0); tlb_flush(bootcpu_hwinfo.tlbsize); - octeon_write_csr(OCTEON_CIU_BASE + CIU_SOFT_RST, 1); + octeon_xkphys_write_8(OCTEON_CIU_BASE + CIU_SOFT_RST, 1); } for (;;) ; |