gpio_flash: fix the CPLB miss bug for gpio expanded flash
PATCH 1/1 gpio_flash: fix the CPLB miss bug for gpio expanded flash
In this bug, the address operation range may exceed the window size defined by gpio expanded flash MTD partition.
Signed-off-by Aaron Wu <[email protected]>
--- drivers/mtd/maps/gpio-addr-flash.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
drivers/mtd/maps/gpio-addr-flash.c +28 -6
@@ -108,13 +108,24 @@ static void gf_copy_from(struct map_info *map, void *to, unsigned long from, ssi {struct async_state *state =gf_map_info_to_state (map); -gf_set_gpios (state, from); +int this_len;/* BUG if operation crosses the win_size */ BUG_ON (!((from + len) % state->win_size <= (from + len))); -/* operation does not cross the win_size, so one shot it */ -memcpy_fromio (to, map->virt + (from % state->win_size), len); +while (len) { +if ((from % state->win_size) + len > state->win_size) + this_len = state->win_size - (from % state->win_size); +else + this_len = len; + +gf_set_gpios (state, from); +memcpy_fromio (to, map->virt + (from % state->win_size) + , this_len); + len -= this_len; + from += this_len; + to += this_len; + } }/**
@@ -147,13 +158,24 @@ static void gf_copy_to(struct map_info *map, unsigned long to, {struct async_state *state =gf_map_info_to_state (map); -gf_set_gpios (state, to); +int this_len;/* BUG if operation crosses the win_size */ BUG_ON (!((to + len) % state->win_size <= (to + len))); -/* operation does not cross the win_size, so one shot it */ -memcpy_toio (map->virt + (to % state->win_size), from, len); +while (len) { +if ((to % state->win_size) + len > state->win_size) + this_len = state->win_size - (to % state->win_size); +else + this_len = len; + +gf_set_gpios (state, to); +memcpy_toio (map->virt + (to % state->win_size), from, len); + + len -= this_len; + to += this_len; + from += this_len; + } }static const char *const part_probe_types[] = {
Signature · 1 line
1.7.9.5