svn commit: r201281 - stable/8/sys/ia64/include
Marcel Moolenaar
marcel at FreeBSD.org
Wed Dec 30 21:00:54 UTC 2009
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();
}
More information about the svn-src-stable-8
mailing list