lkml.org 
[lkml]   [2009]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH V2] x86: SGU UV Add volatile semantics to macros that access chipset registers
    Add volatile-semantics to the SGI UV read/write macros that are
    used to access chipset memory mapped registers. No direct
    references to volatile are made. Instead the readq/writeq
    macros are used.

    Signed-off-by: Jack Steiner <steiner@sgi.com>


    ---
    arch/x86/include/asm/uv/uv_hub.h | 17 +++++++++--------
    1 file changed, 9 insertions(+), 8 deletions(-)

    Index: linux/arch/x86/include/asm/uv/uv_hub.h
    ===================================================================
    --- linux.orig/arch/x86/include/asm/uv/uv_hub.h 2009-09-09 01:34:02.000000000 -0500
    +++ linux/arch/x86/include/asm/uv/uv_hub.h 2009-09-09 20:51:53.000000000 -0500
    @@ -15,6 +15,7 @@
    #include <linux/numa.h>
    #include <linux/percpu.h>
    #include <linux/timer.h>
    +#include <linux/io.h>
    #include <asm/types.h>
    #include <asm/percpu.h>
    #include <asm/uv/uv_mmrs.h>
    @@ -258,13 +259,13 @@ static inline unsigned long *uv_global_m
    static inline void uv_write_global_mmr32(int pnode, unsigned long offset,
    unsigned long val)
    {
    - *uv_global_mmr32_address(pnode, offset) = val;
    + writeq(val, uv_global_mmr32_address(pnode, offset));
    }

    static inline unsigned long uv_read_global_mmr32(int pnode,
    unsigned long offset)
    {
    - return *uv_global_mmr32_address(pnode, offset);
    + return readq(uv_global_mmr32_address(pnode, offset));
    }

    /*
    @@ -281,13 +282,13 @@ static inline unsigned long *uv_global_m
    static inline void uv_write_global_mmr64(int pnode, unsigned long offset,
    unsigned long val)
    {
    - *uv_global_mmr64_address(pnode, offset) = val;
    + writeq(val, uv_global_mmr64_address(pnode, offset));
    }

    static inline unsigned long uv_read_global_mmr64(int pnode,
    unsigned long offset)
    {
    - return *uv_global_mmr64_address(pnode, offset);
    + return readq(uv_global_mmr64_address(pnode, offset));
    }

    /*
    @@ -301,22 +302,22 @@ static inline unsigned long *uv_local_mm

    static inline unsigned long uv_read_local_mmr(unsigned long offset)
    {
    - return *uv_local_mmr_address(offset);
    + return readq(uv_local_mmr_address(offset));
    }

    static inline void uv_write_local_mmr(unsigned long offset, unsigned long val)
    {
    - *uv_local_mmr_address(offset) = val;
    + writeq(val, uv_local_mmr_address(offset));
    }

    static inline unsigned char uv_read_local_mmr8(unsigned long offset)
    {
    - return *((unsigned char *)uv_local_mmr_address(offset));
    + return readq(uv_local_mmr_address(offset));
    }

    static inline void uv_write_local_mmr8(unsigned long offset, unsigned char val)
    {
    - *((unsigned char *)uv_local_mmr_address(offset)) = val;
    + writeq(val, uv_local_mmr_address(offset));
    }

    /*

    \
     
     \ /
      Last update: 2009-09-10 04:25    [W:0.028 / U:121.296 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site