logic_pio: Use _inX() and _outX()

Use _inX() and _outX(), which include memory barriers which may be
overridden per arch.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/lib/logic_pio.c b/lib/logic_pio.c
index 21dc731bec8838e5cc88e439d317ad82e61e79b6..f32fe481b4922bc1329b6e12e90ece534214d120 100644 (file)
--- a/lib/logic_pio.c
+++ b/lib/logic_pio.c
@@ -235,7 +235,7 @@ type logic_in##bwl(unsigned long addr)                                      \
        type ret = (type)~0;                                            \
                                                                        \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               ret = read##bwl(PCI_IOBASE + addr);                     \
+               ret = _in##bwl(addr);                                   \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \
@@ -251,7 +251,7 @@ type logic_in##bwl(unsigned long addr)                                      \
 void logic_out##bwl(type value, unsigned long addr)                    \
 {                                                                      \
        if (addr < MMIO_UPPER_LIMIT) {                                  \
-               write##bwl(value, PCI_IOBASE + addr);                   \
+               _out##bwl(value, addr);                         \
        } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
                struct logic_pio_hwaddr *entry = find_io_range(addr);   \
                                                                        \