From owner-svn-src-stable-8@FreeBSD.ORG Wed Dec 30 21:00:54 2009 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 794FA10658AE; Wed, 30 Dec 2009 21:00:54 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5EE908FC13; Wed, 30 Dec 2009 21:00:54 +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 nBUL0svl071028; Wed, 30 Dec 2009 21:00:54 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBUL0srM071026; Wed, 30 Dec 2009 21:00:54 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200912302100.nBUL0srM071026@svn.freebsd.org> From: Marcel Moolenaar Date: Wed, 30 Dec 2009 21:00:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201281 - stable/8/sys/ia64/include X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2009 21:00:54 -0000 Author: marcel Date: Wed Dec 30 21:00:54 2009 New Revision: 201281 URL: http://svn.freebsd.org/changeset/base/201281 Log: MFC rev 201032: Use unordered memory loads and stores for the in* and out* family of functions. Modified: stable/8/sys/ia64/include/cpufunc.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/ia64/include/cpufunc.h ============================================================================== --- stable/8/sys/ia64/include/cpufunc.h Wed Dec 30 20:49:13 2009 (r201280) +++ stable/8/sys/ia64/include/cpufunc.h Wed Dec 30 21:00:54 2009 (r201281) @@ -64,11 +64,10 @@ extern void *ia64_ioport_address(u_int); static __inline uint8_t inb(unsigned int port) { - __volatile uint8_t *p; uint8_t v; - p = __PIO_ADDR(port); + ia64_mf(); - v = *p; + v = ia64_ld1(__PIO_ADDR(port)); ia64_mf_a(); ia64_mf(); return (v); @@ -77,11 +76,10 @@ inb(unsigned int port) static __inline uint16_t inw(unsigned int port) { - __volatile uint16_t *p; uint16_t v; - p = __PIO_ADDR(port); + ia64_mf(); - v = *p; + v = ia64_ld2(__PIO_ADDR(port)); ia64_mf_a(); ia64_mf(); return (v); @@ -90,11 +88,10 @@ inw(unsigned int port) static __inline uint32_t inl(unsigned int port) { - volatile uint32_t *p; uint32_t v; - p = __PIO_ADDR(port); + ia64_mf(); - v = *p; + v = ia64_ld4(__PIO_ADDR(port)); ia64_mf_a(); ia64_mf(); return (v); @@ -127,10 +124,9 @@ insl(unsigned int port, void *addr, size static __inline void outb(unsigned int port, uint8_t data) { - volatile uint8_t *p; - p = __PIO_ADDR(port); + ia64_mf(); - *p = data; + ia64_st1(__PIO_ADDR(port), data); ia64_mf_a(); ia64_mf(); } @@ -138,10 +134,9 @@ outb(unsigned int port, uint8_t data) static __inline void outw(unsigned int port, uint16_t data) { - volatile uint16_t *p; - p = __PIO_ADDR(port); + ia64_mf(); - *p = data; + ia64_st2(__PIO_ADDR(port), data); ia64_mf_a(); ia64_mf(); } @@ -149,10 +144,9 @@ outw(unsigned int port, uint16_t data) static __inline void outl(unsigned int port, uint32_t data) { - volatile uint32_t *p; - p = __PIO_ADDR(port); + ia64_mf(); - *p = data; + ia64_st4(__PIO_ADDR(port), data); ia64_mf_a(); ia64_mf(); }