From owner-svn-src-user@FreeBSD.ORG Fri Mar 5 20:31:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74284106564A; Fri, 5 Mar 2010 20:31:29 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 756BB8FC23; Fri, 5 Mar 2010 20:31:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o25KVTun004339; Fri, 5 Mar 2010 20:31:29 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o25KVTPI004337; Fri, 5 Mar 2010 20:31:29 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201003052031.o25KVTPI004337@svn.freebsd.org> From: Juli Mallett Date: Fri, 5 Mar 2010 20:31:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204768 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2010 20:31:30 -0000 Author: jmallett Date: Fri Mar 5 20:31:29 2010 New Revision: 204768 URL: http://svn.freebsd.org/changeset/base/204768 Log: Disable and restore interrupts around the times when there may be 64 significant bits in registers. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Modified: user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Fri Mar 5 20:00:43 2010 (r204767) +++ user/jmallett/octeon/sys/mips/cavium/octeon_pcmap_regs.h Fri Mar 5 20:31:29 2010 (r204768) @@ -159,6 +159,8 @@ OCT_READ(64, uint64_t, "ld"); * I'd be a lot happier if csr_addr were a physical address and we mapped it * into XKPHYS here so that we could guarantee that interrupts were the only * kind of exception we needed to worry about. + * + * Also, some of this inline assembly is needlessly verbose. Oh, well. */ static inline void oct_write64 (uint64_t csr_addr, uint64_t val64) { @@ -169,6 +171,9 @@ static inline void oct_write64 (uint64_t uint32_t tmp1; uint32_t tmp2; uint32_t tmp3; + register_t sr; + + sr = intr_disable(); __asm __volatile ( ".set push\n" @@ -187,6 +192,8 @@ static inline void oct_write64 (uint64_t ".set pop\n" : "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3) : "r" (valh), "r" (vall), "r" (csr_addrh), "r" (csr_addrl)); + + intr_restore(sr); } static inline void oct_write8_x8 (uint64_t csr_addr, uint8_t val8) @@ -195,6 +202,9 @@ static inline void oct_write8_x8 (uint64 uint32_t csr_addrl = csr_addr; uint32_t tmp1; uint32_t tmp2; + register_t sr; + + sr = intr_disable(); __asm __volatile ( ".set push\n" @@ -209,6 +219,8 @@ static inline void oct_write8_x8 (uint64 ".set pop\n" : "=&r" (tmp1), "=&r" (tmp2) : "r" (val8), "r" (csr_addrh), "r" (csr_addrl)); + + intr_restore(sr); } #define OCT_READ(n, t, insn) \ @@ -217,6 +229,9 @@ static inline t oct_read ## n(uint64_t c uint32_t csr_addrh = csr_addr >> 32; \ uint32_t csr_addrl = csr_addr; \ uint32_t tmp1, tmp2; \ + register_t sr; \ + \ + sr = intr_disable(); \ \ __asm __volatile ( \ ".set push\n" \ @@ -231,6 +246,9 @@ static inline t oct_read ## n(uint64_t c ".set pop\n" \ : "=&r" (tmp1), "=&r" (tmp2) \ : "r" (csr_addrh), "r" (csr_addrl)); \ + \ + intr_restore(sr); \ + \ return ((t)tmp2); \ } @@ -244,6 +262,9 @@ static inline uint64_t oct_read64 (uint6 uint32_t csr_addrl = csr_addr; uint32_t valh; uint32_t vall; + register_t sr; + + sr = intr_disable(); __asm __volatile ( ".set push\n" @@ -261,6 +282,9 @@ static inline uint64_t oct_read64 (uint6 ".set pop\n" : "=&r" (valh), "=&r" (vall) : "r" (csr_addrh), "r" (csr_addrl)); + + intr_restore(sr); + return ((uint64_t)valh << 32) | vall; } #endif