diff options
| author |   visa <visa@openbsd.org> | 2017-11-01 14:29:04 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-11-01 14:29:04 +0000 |
| commit | 7b8d932a3f99d4cac985c31b7208e784dcce155e (patch) | |
| tree | 1be7bba58acf03234aa7692461d041b72384a6ed | |
| parent | Make ip-transparent option work by using SO_BINDANY. (diff) | |
| download | wireguard-openbsd-7b8d932a3f99d4cac985c31b7208e784dcce155e.tar.xz wireguard-openbsd-7b8d932a3f99d4cac985c31b7208e784dcce155e.zip | |
Fix the addressing of CVMSEG. The base address already points to
the correct address space for direct referencing. Previous code has
worked because the address conversion has only set bits that are
already on.
| -rw-r--r-- | sys/arch/octeon/include/octeonvar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h index b7898fe87a6..fd25d378260 100644 --- a/sys/arch/octeon/include/octeonvar.h +++ b/sys/arch/octeon/include/octeonvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeonvar.h,v 1.37 2017/07/31 14:53:56 visa Exp $ */ +/* $OpenBSD: octeonvar.h,v 1.38 2017/11/01 14:29:04 visa Exp $ */ /* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */ /*- @@ -363,13 +363,13 @@ octeon_iobdma_write_8(uint64_t value) static inline uint64_t octeon_cvmseg_read_8(size_t offset) { - return octeon_xkphys_read_8(0xffffffffffff8000ULL + offset); + return *(volatile uint64_t *)(0xffffffffffff8000ULL + offset); } static inline void octeon_cvmseg_write_8(size_t offset, uint64_t value) { - octeon_xkphys_write_8(0xffffffffffff8000ULL + offset, value); + *(volatile uint64_t *)(0xffffffffffff8000ULL + offset) = value; } static inline uint64_t |