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>
This commit is contained in:
John Garry 2020-03-28 00:06:14 +08:00 committed by Wei Xu
parent 26c4c6ce80
commit 4acaa93ef6

View File

@ -235,7 +235,7 @@ type logic_in##bwl(unsigned long addr) \
type ret = (type)~0; \ type ret = (type)~0; \
\ \
if (addr < MMIO_UPPER_LIMIT) { \ 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) { \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \ 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) \ void logic_out##bwl(type value, unsigned long addr) \
{ \ { \
if (addr < MMIO_UPPER_LIMIT) { \ 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) { \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \
struct logic_pio_hwaddr *entry = find_io_range(addr); \ struct logic_pio_hwaddr *entry = find_io_range(addr); \
\ \