p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib: logic_pio: Enforce LOGIC_PIO_INDIRECT region ops are set at registration 

Since the only LOGIC_PIO_INDIRECT host (hisi-lpc) now sets the ops prior
to registration, enforce this check for accessors ops at registration
instead of in the IO port accessors to simplify and marginally optimise
the code.

A slight misalignment is also tidied.

Also add myself as an author.

Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
This commit is contained in:
John Garry 2019-11-05 01:22:15 +08:00 committed by Wei Xu
parent 54ecb8f702
commit 0376fa72a4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/logic_pio.c
View File

@ -3,6 +3,7 @@
* Copyright (C) 2017 HiSilicon Limited, All Rights Reserved. * Copyright (C) 2017 HiSilicon Limited, All Rights Reserved.
* Author: Gabriele Paoloni <gabriele.paoloni@huawei.com> * Author: Gabriele Paoloni <gabriele.paoloni@huawei.com>
* Author: Zhichang Yuan <yuanzhichang@hisilicon.com> * Author: Zhichang Yuan <yuanzhichang@hisilicon.com>
* Author: John Garry <john.garry@huawei.com>
*/ */
#define pr_fmt(fmt) "LOGIC PIO: " fmt #define pr_fmt(fmt) "LOGIC PIO: " fmt
@ -39,7 +40,8 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range)
resource_size_t iio_sz = MMIO_UPPER_LIMIT; resource_size_t iio_sz = MMIO_UPPER_LIMIT;
int ret = 0; int ret = 0;
if (!new_range || !new_range->fwnode || !new_range->size) if (!new_range || !new_range->fwnode || !new_range->size ||
(new_range->flags == LOGIC_PIO_INDIRECT && !new_range->ops))
return -EINVAL; return -EINVAL;
start = new_range->hw_start; start = new_range->hw_start;
@ -237,7 +239,7 @@ type logic_in##bw(unsigned long 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); \
\ \
if (entry && entry->ops) \ if (entry) \
ret = entry->ops->in(entry->hostdata, \ ret = entry->ops->in(entry->hostdata, \
addr, sizeof(type)); \ addr, sizeof(type)); \
else \ else \
@ -253,7 +255,7 @@ void logic_out##bw(type value, unsigned long 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); \
\ \
if (entry && entry->ops) \ if (entry) \
entry->ops->out(entry->hostdata, \ entry->ops->out(entry->hostdata, \
addr, value, sizeof(type)); \ addr, value, sizeof(type)); \
else \ else \
@ -269,7 +271,7 @@ void logic_ins##bw(unsigned long addr, void *buffer, \
} 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); \
\ \
if (entry && entry->ops) \ if (entry) \
entry->ops->ins(entry->hostdata, \ entry->ops->ins(entry->hostdata, \
addr, buffer, sizeof(type), count); \ addr, buffer, sizeof(type), count); \
else \ else \
@ -286,7 +288,7 @@ void logic_outs##bw(unsigned long addr, const void *buffer, \
} 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); \
\ \
if (entry && entry->ops) \ if (entry) \
entry->ops->outs(entry->hostdata, \ entry->ops->outs(entry->hostdata, \
addr, buffer, sizeof(type), count); \ addr, buffer, sizeof(type), count); \
else \ else \