--- zzzz-none-000/linux-4.4.60/drivers/mtd/maps/physmap.c 2017-04-08 07:53:53.000000000 +0000 +++ dragonfly-4020-701/linux-4.4.60/drivers/mtd/maps/physmap.c 2018-11-08 13:36:17.000000000 +0000 @@ -31,6 +31,66 @@ int vpp_refcnt; }; +static struct platform_device *physmap_map2pdev(struct map_info *map) +{ + return (struct platform_device *) map->map_priv_1; +} + +static void physmap_lock(struct map_info *map) +{ + struct platform_device *pdev; + struct physmap_flash_data *physmap_data; + + pdev = physmap_map2pdev(map); + physmap_data = pdev->dev.platform_data; + physmap_data->lock(pdev); +} + +static void physmap_unlock(struct map_info *map) +{ + struct platform_device *pdev; + struct physmap_flash_data *physmap_data; + + pdev = physmap_map2pdev(map); + physmap_data = pdev->dev.platform_data; + physmap_data->unlock(pdev); +} + +static map_word physmap_flash_read_lock(struct map_info *map, unsigned long ofs) +{ + map_word ret; + + physmap_lock(map); + ret = inline_map_read(map, ofs); + physmap_unlock(map); + + return ret; +} + +static void physmap_flash_write_lock(struct map_info *map, map_word d, + unsigned long ofs) +{ + physmap_lock(map); + inline_map_write(map, d, ofs); + physmap_unlock(map); +} + +static void physmap_flash_copy_from_lock(struct map_info *map, void *to, + unsigned long from, ssize_t len) +{ + physmap_lock(map); + inline_map_copy_from(map, to, from, len); + physmap_unlock(map); +} + +static void physmap_flash_copy_to_lock(struct map_info *map, unsigned long to, + const void *from, ssize_t len) +{ + physmap_lock(map); + inline_map_copy_to(map, to, from, len); + physmap_unlock(map); +} + static int physmap_flash_remove(struct platform_device *dev) { struct physmap_flash_info *info; @@ -153,6 +213,13 @@ simple_map_init(&info->map[i]); + if (physmap_data->lock && physmap_data->unlock) { + info->map[i].read = physmap_flash_read_lock; + info->map[i].write = physmap_flash_write_lock; + info->map[i].copy_from = physmap_flash_copy_from_lock; + info->map[i].copy_to = physmap_flash_copy_to_lock; + } + probe_type = rom_probe_types; if (physmap_data->probe_type == NULL) { for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)