Commit 0304f8ea authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Boris Brezillon

mtd: maps: gpio-addr-flash: Replace array with an integer

By replacing the array with an integer we can avoid completely
the bit comparison loop if the value has not changed (by far
the most common case).
Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 460cdeca
...@@ -43,7 +43,7 @@ struct async_state { ...@@ -43,7 +43,7 @@ struct async_state {
struct map_info map; struct map_info map;
size_t gpio_count; size_t gpio_count;
unsigned *gpio_addrs; unsigned *gpio_addrs;
int *gpio_values; unsigned int gpio_values;
unsigned int win_order; unsigned int win_order;
}; };
#define gf_map_info_to_state(mi) ((struct async_state *)(mi)->map_priv_1) #define gf_map_info_to_state(mi) ((struct async_state *)(mi)->map_priv_1)
...@@ -55,22 +55,25 @@ struct async_state { ...@@ -55,22 +55,25 @@ struct async_state {
* *
* Rather than call the GPIO framework every time, cache the last-programmed * Rather than call the GPIO framework every time, cache the last-programmed
* value. This speeds up sequential accesses (which are by far the most common * value. This speeds up sequential accesses (which are by far the most common
* type). We rely on the GPIO framework to treat non-zero value as high so * type).
* that we don't have to normalize the bits.
*/ */
static void gf_set_gpios(struct async_state *state, unsigned long ofs) static void gf_set_gpios(struct async_state *state, unsigned long ofs)
{ {
size_t i = 0; int i;
int value;
ofs >>= state->win_order; ofs >>= state->win_order;
do {
value = ofs & (1 << i); if (ofs == state->gpio_values)
if (state->gpio_values[i] != value) { return;
gpio_set_value(state->gpio_addrs[i], value);
state->gpio_values[i] = value; for (i = 0; i < state->gpio_count; i++) {
} if ((ofs & BIT(i)) == (state->gpio_values & BIT(i)))
} while (++i < state->gpio_count); continue;
gpio_set_value(state->gpio_addrs[i], !!(ofs & BIT(i)));
}
state->gpio_values = ofs;
} }
/** /**
...@@ -202,7 +205,7 @@ static const char * const part_probe_types[] = { ...@@ -202,7 +205,7 @@ static const char * const part_probe_types[] = {
*/ */
static int gpio_flash_probe(struct platform_device *pdev) static int gpio_flash_probe(struct platform_device *pdev)
{ {
size_t i, arr_size; size_t i;
struct physmap_flash_data *pdata; struct physmap_flash_data *pdata;
struct resource *memory; struct resource *memory;
struct resource *gpios; struct resource *gpios;
...@@ -215,8 +218,7 @@ static int gpio_flash_probe(struct platform_device *pdev) ...@@ -215,8 +218,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
if (!memory || !gpios || !gpios->end) if (!memory || !gpios || !gpios->end)
return -EINVAL; return -EINVAL;
arr_size = sizeof(int) * gpios->end; state = devm_kzalloc(&pdev->dev, sizeof(*state), GFP_KERNEL);
state = devm_kzalloc(&pdev->dev, sizeof(*state) + arr_size, GFP_KERNEL);
if (!state) if (!state)
return -ENOMEM; return -ENOMEM;
...@@ -226,9 +228,7 @@ static int gpio_flash_probe(struct platform_device *pdev) ...@@ -226,9 +228,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
*/ */
state->gpio_count = gpios->end; state->gpio_count = gpios->end;
state->gpio_addrs = (void *)(unsigned long)gpios->start; state->gpio_addrs = (void *)(unsigned long)gpios->start;
state->gpio_values = (void *)(state + 1);
state->win_order = get_bitmask_order(resource_size(memory)) - 1; state->win_order = get_bitmask_order(resource_size(memory)) - 1;
memset(state->gpio_values, 0xff, arr_size);
state->map.name = DRIVER_NAME; state->map.name = DRIVER_NAME;
state->map.read = gf_read; state->map.read = gf_read;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment