mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map
Subsystems (2)
v3 cover mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map
From: Takahiro Kuwano <[email protected]>
In v3, reworked to remove LAST_REGION and OVERLAID_REGION flags. Updated and tested debugfs.
In v2, reworked spi_nor_erase_region to stop bitmask encoding in offset. And added n_regions member to spi_nor_erase_map.
*** BLURB HERE ***
Takahiro Kuwano (2):
Subject: [PATCH] mtd: spi-nor: core: rework erase map and erase region
structures
mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map
drivers/mtd/spi-nor/core.c | 109 ++++++++++++++++++++++++---------- drivers/mtd/spi-nor/core.h | 31 ++++------ drivers/mtd/spi-nor/debugfs.c | 18 +++--- drivers/mtd/spi-nor/sfdp.c | 42 +++++-------- 4 files changed, 112 insertions(+), 88 deletions(-)
Signature · 6 lines
2.34.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v3 1/2 mtd: spi-nor: core: rework erase map and erase region structures
From: Takahiro Kuwano <[email protected]>
Encoding bitmask flags into offset worsen the code readability. In the spi_nor_erase_region, erase type mask and flags should be stored in dedicated members. The SNOR_LAST_REGION flag is removed and the number of regions is added in the spi_nor_erase_map. Also, uniform_erase_type is removed as it is redundant.
--- drivers/mtd/spi-nor/core.c | 51 +++++++++++++++-------------------- drivers/mtd/spi-nor/core.h | 31 ++++++++------------- drivers/mtd/spi-nor/debugfs.c | 18 ++++++------- drivers/mtd/spi-nor/sfdp.c | 42 ++++++++++------------------- 4 files changed, 56 insertions(+), 86 deletions(-)
drivers/mtd/spi-nor/core.c +22 -29
@@ -1150,7 +1150,7 @@ static u8 spi_nor_convert_3to4_erase(u8 opcode)static bool spi_nor_has_uniform_erase (const struct spi_nor *nor) { -return !!nor->params->erase_map.uniform_erase_type; +return nor->params->erase_map.uniform_region.erase_mask; }static void spi_nor_set_4byte_opcodes (struct spi_nor *nor)
@@ -1534,7 +1534,6 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,const struct spi_nor_erase_type *erase;u32 rem;int i; -u8 erase_mask = region->offset &SNOR_ERASE_TYPE_MASK ;/* * Erase types are ordered by size, with the smallest erase type at
@@ -1542,7 +1541,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,*/ for (i =SNOR_ERASE_TYPE_MAX -1 ; i >=0 ; i--) {/* Does the erase region support the tested erase type? */ -if (!(erase_mask &BIT (i))) +if (!(region->erase_mask &BIT (i)))continue ; erase = &map->erase_type[i];
@@ -1550,8 +1549,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,continue ;/* Alignment is not mandatory for overlaid regions */ -if (region->offset &SNOR_OVERLAID_REGION && - region->size <= len) +if (region->overlaid && region->size <= len)return erase;/* Don't erase more than what the user has asked for. */
@@ -1566,26 +1564,25 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,return NULL ; } -static u64 spi_nor_region_is_last (const struct spi_nor_erase_region *region) -{ -return region->offset &SNOR_LAST_REGION ; -} -static u64 spi_nor_region_end (const struct spi_nor_erase_region *region) { -return (region->offset & ~SNOR_ERASE_FLAGS_MASK ) + region->size; +return region->offset + region->size; }/** * spi_nor_region_next() - get the next spi nor region +* @map: the erase map of the SPI NOR * @region: pointer to a structure that describes a SPI NOR erase region * * Return: the next spi nor region or NULL if last region. */ struct spi_nor_erase_region * -spi_nor_region_next (struct spi_nor_erase_region *region) +spi_nor_region_next (const struct spi_nor_erase_map *map, +struct spi_nor_erase_region *region) { -if (spi_nor_region_is_last (region)) +unsigned int region_idx = region - map->regions; + +if (region_idx +1 >= map->n_regions)return NULL ; region++;return region;
@@ -1604,16 +1601,14 @@ static struct spi_nor_erase_region * spi_nor_find_erase_region(const struct spi_nor_erase_map *map, u64 addr) {struct spi_nor_erase_region *region = map->regions; -u64 region_start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; -u64 region_end = region_start + region->size; +u64 region_end =spi_nor_region_end (region); -while (addr < region_start || addr >= region_end) { - region =spi_nor_region_next (region); +while (addr < region->offset || addr >= region_end) { + region =spi_nor_region_next (map, region);if (!region)return ERR_PTR (-EINVAL ); - region_start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; - region_end = region_start + region->size; + region_end =spi_nor_region_end (region); }return region;
@@ -1641,7 +1636,7 @@ spi_nor_init_erase_cmd(const struct spi_nor_erase_region *region, cmd->opcode = erase->opcode; cmd->count =1 ; -if (region->offset &SNOR_OVERLAID_REGION ) +if (region->overlaid) cmd->size = region->size;else cmd->size = erase->size;
@@ -1700,7 +1695,7 @@ static int spi_nor_init_erase_cmd_list(struct spi_nor *nor,if (prev_erase != erase || erase->size != cmd->size || - region->offset &SNOR_OVERLAID_REGION ) { + region->overlaid) { cmd =spi_nor_init_erase_cmd (region, erase);if (IS_ERR (cmd)) { ret =PTR_ERR (cmd);
@@ -1716,7 +1711,7 @@ static int spi_nor_init_erase_cmd_list(struct spi_nor *nor, len -= cmd->size;if (len && addr >= region_end) { - region =spi_nor_region_next (region); + region =spi_nor_region_next (map, region);if (!region) goto destroy_erase_cmd_list; region_end =spi_nor_region_end (region);
@@ -2439,12 +2434,11 @@ void spi_nor_mask_erase_type(struct spi_nor_erase_type *erase)void spi_nor_init_uniform_erase_map (struct spi_nor_erase_map *map,u8 erase_mask,u64 flash_size) { -/* Offset 0 with erase_mask and SNOR_LAST_REGION bit set */ - map->uniform_region.offset = (erase_mask &SNOR_ERASE_TYPE_MASK ) | -SNOR_LAST_REGION ; + map->uniform_region.offset =0 ; map->uniform_region.size = flash_size; + map->uniform_region.erase_mask = erase_mask; map->regions = &map->uniform_region; - map->uniform_erase_type = erase_mask; + map->n_regions =1 ; } int spi_nor_post_bfpt_fixups(struct spi_nor *nor,
@@ -2539,7 +2533,7 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map *map, {const struct spi_nor_erase_type *tested_erase, *erase =NULL ;int i; -u8 uniform_erase_type = map->uniform_erase_type; +u8 uniform_erase_type = map->uniform_region.erase_mask;for (i =SNOR_ERASE_TYPE_MAX -1 ; i >=0 ; i--) {if (!(uniform_erase_type &BIT (i)))
@@ -2573,8 +2567,7 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map *map,return NULL ;/* Disable all other Sector Erase commands. */ - map->uniform_erase_type &= ~SNOR_ERASE_TYPE_MASK ; - map->uniform_erase_type |=BIT (erase - map->erase_type); + map->uniform_region.erase_mask =BIT (erase - map->erase_type);return erase; }
drivers/mtd/spi-nor/core.h +11 -20
@@ -233,27 +233,21 @@ struct spi_nor_erase_command {/** * struct spi_nor_erase_region - Structure to describe a SPI NOR erase region * @offset: the offset in the data array of erase region start. -* LSB bits are used as a bitmask encoding flags to -* determine if this region is overlaid, if this region is -* the last in the SPI NOR flash memory and to indicate -* all the supported erase commands inside this region. -* The erase types are sorted in ascending order with the -* smallest Erase Type size being at BIT(0). * @size: the size of the region in bytes. +* @erase_mask: bitmask to indicate all the supported erase commands +* inside this region. The erase types are sorted in +* ascending order with the smallest Erase Type size being +* at BIT(0). +* @overlaid: determine if this region is overlaid. */ struct spi_nor_erase_region {u64 offset;u64 size; +u8 erase_mask; +bool overlaid; };#define SNOR_ERASE_TYPE_MAX 4 -#define SNOR_ERASE_TYPE_MASK GENMASK_ULL(SNOR_ERASE_TYPE_MAX - 1, 0) - -#define SNOR_LAST_REGION BIT(4) -#define SNOR_OVERLAID_REGION BIT(5) - -#define SNOR_ERASE_FLAGS_MAX 6 -#define SNOR_ERASE_FLAGS_MASK GENMASK_ULL(SNOR_ERASE_FLAGS_MAX - 1, 0)/** * struct spi_nor_erase_map - Structure to describe the SPI NOR erase map
@@ -266,17 +260,13 @@ struct spi_nor_erase_region {* The erase types are sorted in ascending order, with the * smallest Erase Type size being the first member in the * erase_type array. -* @uniform_erase_type: bitmask encoding erase types that can erase the -* entire memory. This member is completed at init by -* uniform and non-uniform SPI NOR flash memories if they -* support at least one erase type that can erase the -* entire memory. +* @n_regions: number of erase regions. */ struct spi_nor_erase_map {struct spi_nor_erase_region *regions;struct spi_nor_erase_region uniform_region;struct spi_nor_erase_type erase_type[SNOR_ERASE_TYPE_MAX ]; -u8 uniform_erase_type; +unsigned int n_regions; };/**
@@ -708,7 +698,8 @@ void spi_nor_set_erase_type(struct spi_nor_erase_type *erase, u32 size, u8 opcode);void spi_nor_mask_erase_type (struct spi_nor_erase_type *erase);struct spi_nor_erase_region * -spi_nor_region_next (struct spi_nor_erase_region *region); +spi_nor_region_next (const struct spi_nor_erase_map *map, +struct spi_nor_erase_region *region);void spi_nor_init_uniform_erase_map (struct spi_nor_erase_map *map,u8 erase_mask,u64 flash_size);
drivers/mtd/spi-nor/debugfs.c +9 -9
@@ -142,22 +142,22 @@ static int spi_nor_params_show(struct seq_file *s, void *data) }seq_puts (s,"\nsector map\n" ); -seq_puts (s," region (in hex) | erase mask | flags\n" ); +seq_puts (s," region (in hex) | erase mask | overlaid\n" );seq_puts (s," ------------------+------------+----------\n" );for (region = erase_map->regions; region; - region =spi_nor_region_next (region)) { -u64 start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; -u64 flags = region->offset &SNOR_ERASE_FLAGS_MASK ; + region =spi_nor_region_next (erase_map, region)) { +u64 start = region->offset;u64 end = start + region->size -1 ; +u8 mask = region->erase_mask;seq_printf (s," %08llx-%08llx | [%c%c%c%c] | %s\n" , start, end, - flags &BIT (0 ) ?'0' :' ' , - flags &BIT (1 ) ?'1' :' ' , - flags &BIT (2 ) ?'2' :' ' , - flags &BIT (3 ) ?'3' :' ' , - flags &SNOR_OVERLAID_REGION ?"overlaid" :"" ); + mask &BIT (0 ) ?'0' :' ' , + mask &BIT (1 ) ?'1' :' ' , + mask &BIT (2 ) ?'2' :' ' , + mask &BIT (3 ) ?'3' :' ' , + region->overlaid ?"yes" :"no" ); }return 0 ;
drivers/mtd/spi-nor/sfdp.c +14 -28
100 lines not on this page · raw message
Signature · 6 lines
2.34.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v3 1/2] mtd: spi-nor: core: rework erase map and erase region structures
Quoted 8 lines · On 2/6/24 04:37, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Encoding bitmask flags into offset worsen the code readability. In the
spi_nor_erase_region, erase type mask and flags should be stored in dedicated members. TheSNOR_LAST_REGIONflag is removed and the number of regions is added in thespi_nor_erase_map. Also,uniform_erase_typeis removed as it is redundant.
Hi, Takahiro!
I find the idea good, thanks for working on this! If this was Michael's idea we can add a Suggested-by tag.
Also, I find this a little difficult to review. Would it make sense to split this patch in a patch for each flag removed?
Thanks!
ta
Quoted 371 lines
Signed-off-by Takahiro Kuwano <[email protected]>--- drivers/mtd/spi-nor/core.c | 51 +++++++++++++++-------------------- drivers/mtd/spi-nor/core.h | 31 ++++++++------------- drivers/mtd/spi-nor/debugfs.c | 18 ++++++------- drivers/mtd/spi-nor/sfdp.c | 42 ++++++++++------------------- 4 files changed, 56 insertions(+), 86 deletions(-)drivers/mtd/spi-nor/core.c +22
-29@@ -1150,7 +1150,7 @@ static u8 spi_nor_convert_3to4_erase(u8 opcode)static bool spi_nor_has_uniform_erase (const struct spi_nor *nor) { -return !!nor->params->erase_map.uniform_erase_type; +return nor->params->erase_map.uniform_region.erase_mask; }static void spi_nor_set_4byte_opcodes (struct spi_nor *nor)@@ -1534,7 +1534,6 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,const struct spi_nor_erase_type *erase;u32 rem;int i; -u8 erase_mask = region->offset &SNOR_ERASE_TYPE_MASK ;/* * Erase types are ordered by size, with the smallest erase type at @@ -1542,7 +1541,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,*/ for (i =SNOR_ERASE_TYPE_MAX -1 ; i >=0 ; i--) {/* Does the erase region support the tested erase type? */ -if (!(erase_mask &BIT (i))) +if (!(region->erase_mask &BIT (i)))continue ; erase = &map->erase_type[i];@@ -1550,8 +1549,7 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,continue ;/* Alignment is not mandatory for overlaid regions */ -if (region->offset &SNOR_OVERLAID_REGION && - region->size <= len) +if (region->overlaid && region->size <= len)return erase;/* Don't erase more than what the user has asked for. */ @@ -1566,26 +1564,25 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,return NULL ; } -static u64 spi_nor_region_is_last (const struct spi_nor_erase_region *region) -{ -return region->offset &SNOR_LAST_REGION ; -} -static u64 spi_nor_region_end (const struct spi_nor_erase_region *region) { -return (region->offset & ~SNOR_ERASE_FLAGS_MASK ) + region->size; +return region->offset + region->size; }/** * spi_nor_region_next() - get the next spi nor region +* @map: the erase map of the SPI NOR * @region: pointer to a structure that describes a SPI NOR erase region * * Return: the next spi nor region or NULL if last region. */ struct spi_nor_erase_region * -spi_nor_region_next (struct spi_nor_erase_region *region) +spi_nor_region_next (const struct spi_nor_erase_map *map, +struct spi_nor_erase_region *region) { -if (spi_nor_region_is_last (region)) +unsigned int region_idx = region - map->regions; + +if (region_idx +1 >= map->n_regions)return NULL ; region++;return region;@@ -1604,16 +1601,14 @@ static struct spi_nor_erase_region * spi_nor_find_erase_region(const struct spi_nor_erase_map *map, u64 addr) {struct spi_nor_erase_region *region = map->regions; -u64 region_start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; -u64 region_end = region_start + region->size; +u64 region_end =spi_nor_region_end (region); -while (addr < region_start || addr >= region_end) { - region =spi_nor_region_next (region); +while (addr < region->offset || addr >= region_end) { + region =spi_nor_region_next (map, region);if (!region)return ERR_PTR (-EINVAL ); - region_start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; - region_end = region_start + region->size; + region_end =spi_nor_region_end (region); }return region;@@ -1641,7 +1636,7 @@ spi_nor_init_erase_cmd(const struct spi_nor_erase_region *region, cmd->opcode = erase->opcode; cmd->count =1 ; -if (region->offset &SNOR_OVERLAID_REGION ) +if (region->overlaid) cmd->size = region->size;else cmd->size = erase->size;@@ -1700,7 +1695,7 @@ static int spi_nor_init_erase_cmd_list(struct spi_nor *nor,if (prev_erase != erase || erase->size != cmd->size || - region->offset &SNOR_OVERLAID_REGION ) { + region->overlaid) { cmd =spi_nor_init_erase_cmd (region, erase);if (IS_ERR (cmd)) { ret =PTR_ERR (cmd);@@ -1716,7 +1711,7 @@ static int spi_nor_init_erase_cmd_list(struct spi_nor *nor, len -= cmd->size;if (len && addr >= region_end) { - region =spi_nor_region_next (region); + region =spi_nor_region_next (map, region);if (!region) goto destroy_erase_cmd_list; region_end =spi_nor_region_end (region);@@ -2439,12 +2434,11 @@ void spi_nor_mask_erase_type(struct spi_nor_erase_type *erase)void spi_nor_init_uniform_erase_map (struct spi_nor_erase_map *map,u8 erase_mask,u64 flash_size) { -/* Offset 0 with erase_mask and SNOR_LAST_REGION bit set */ - map->uniform_region.offset = (erase_mask &SNOR_ERASE_TYPE_MASK ) | -SNOR_LAST_REGION ; + map->uniform_region.offset =0 ; map->uniform_region.size = flash_size; + map->uniform_region.erase_mask = erase_mask; map->regions = &map->uniform_region; - map->uniform_erase_type = erase_mask; + map->n_regions =1 ; } int spi_nor_post_bfpt_fixups(struct spi_nor *nor,@@ -2539,7 +2533,7 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map *map, {const struct spi_nor_erase_type *tested_erase, *erase =NULL ;int i; -u8 uniform_erase_type = map->uniform_erase_type; +u8 uniform_erase_type = map->uniform_region.erase_mask;for (i =SNOR_ERASE_TYPE_MAX -1 ; i >=0 ; i--) {if (!(uniform_erase_type &BIT (i)))@@ -2573,8 +2567,7 @@ spi_nor_select_uniform_erase(struct spi_nor_erase_map *map,return NULL ;/* Disable all other Sector Erase commands. */ - map->uniform_erase_type &= ~SNOR_ERASE_TYPE_MASK ; - map->uniform_erase_type |=BIT (erase - map->erase_type); + map->uniform_region.erase_mask =BIT (erase - map->erase_type);return erase; }drivers/mtd/spi-nor/core.h +11
-20@@ -233,27 +233,21 @@ struct spi_nor_erase_command {/** * struct spi_nor_erase_region - Structure to describe a SPI NOR erase region * @offset: the offset in the data array of erase region start. -* LSB bits are used as a bitmask encoding flags to -* determine if this region is overlaid, if this region is -* the last in the SPI NOR flash memory and to indicate -* all the supported erase commands inside this region. -* The erase types are sorted in ascending order with the -* smallest Erase Type size being at BIT(0). * @size: the size of the region in bytes. +* @erase_mask: bitmask to indicate all the supported erase commands +* inside this region. The erase types are sorted in +* ascending order with the smallest Erase Type size being +* at BIT(0). +* @overlaid: determine if this region is overlaid. */ struct spi_nor_erase_region {u64 offset;u64 size; +u8 erase_mask; +bool overlaid; };#define SNOR_ERASE_TYPE_MAX 4 -#define SNOR_ERASE_TYPE_MASK GENMASK_ULL(SNOR_ERASE_TYPE_MAX - 1, 0) - -#define SNOR_LAST_REGION BIT(4) -#define SNOR_OVERLAID_REGION BIT(5) - -#define SNOR_ERASE_FLAGS_MAX 6 -#define SNOR_ERASE_FLAGS_MASK GENMASK_ULL(SNOR_ERASE_FLAGS_MAX - 1, 0)/** * struct spi_nor_erase_map - Structure to describe the SPI NOR erase map @@ -266,17 +260,13 @@ struct spi_nor_erase_region {* The erase types are sorted in ascending order, with the * smallest Erase Type size being the first member in the * erase_type array. -* @uniform_erase_type: bitmask encoding erase types that can erase the -* entire memory. This member is completed at init by -* uniform and non-uniform SPI NOR flash memories if they -* support at least one erase type that can erase the -* entire memory. +* @n_regions: number of erase regions. */ struct spi_nor_erase_map {struct spi_nor_erase_region *regions;struct spi_nor_erase_region uniform_region;struct spi_nor_erase_type erase_type[SNOR_ERASE_TYPE_MAX ]; -u8 uniform_erase_type; +unsigned int n_regions; };/** @@ -708,7 +698,8 @@ void spi_nor_set_erase_type(struct spi_nor_erase_type *erase, u32 size, u8 opcode);void spi_nor_mask_erase_type (struct spi_nor_erase_type *erase);struct spi_nor_erase_region * -spi_nor_region_next (struct spi_nor_erase_region *region); +spi_nor_region_next (const struct spi_nor_erase_map *map, +struct spi_nor_erase_region *region);void spi_nor_init_uniform_erase_map (struct spi_nor_erase_map *map,u8 erase_mask,u64 flash_size);drivers/mtd/spi-nor/debugfs.c +9
-9@@ -142,22 +142,22 @@ static int spi_nor_params_show(struct seq_file *s, void *data) }seq_puts (s,"\nsector map\n" ); -seq_puts (s," region (in hex) | erase mask | flags\n" ); +seq_puts (s," region (in hex) | erase mask | overlaid\n" );seq_puts (s," ------------------+------------+----------\n" );for (region = erase_map->regions; region; - region =spi_nor_region_next (region)) { -u64 start = region->offset & ~SNOR_ERASE_FLAGS_MASK ; -u64 flags = region->offset &SNOR_ERASE_FLAGS_MASK ; + region =spi_nor_region_next (erase_map, region)) { +u64 start = region->offset;u64 end = start + region->size -1 ; +u8 mask = region->erase_mask;seq_printf (s," %08llx-%08llx | [%c%c%c%c] | %s\n" , start, end, - flags &BIT (0 ) ?'0' :' ' , - flags &BIT (1 ) ?'1' :' ' , - flags &BIT (2 ) ?'2' :' ' , - flags &BIT (3 ) ?'3' :' ' , - flags &SNOR_OVERLAID_REGION ?"overlaid" :"" ); + mask &BIT (0 ) ?'0' :' ' , + mask &BIT (1 ) ?'1' :' ' , + mask &BIT (2 ) ?'2' :' ' , + mask &BIT (3 ) ?'3' :' ' , + region->overlaid ?"yes" :"no" ); }return 0 ;drivers/mtd/spi-nor/sfdp.c +13
-27@@ -389,19 +389,16 @@ static u8 spi_nor_sort_erase_mask(struct spi_nor_erase_map *map, u8 erase_mask)static void spi_nor_regions_sort_erase_types (struct spi_nor_erase_map *map) {struct spi_nor_erase_region *region = map->regions; -u8 region_erase_mask, sorted_erase_mask; +u8 sorted_erase_mask;while (region) { - region_erase_mask = region->offset &SNOR_ERASE_TYPE_MASK ; - sorted_erase_mask =spi_nor_sort_erase_mask (map, - region_erase_mask); + region->erase_mask);/* Overwrite erase mask. */ - region->offset = (region->offset & ~SNOR_ERASE_TYPE_MASK ) | - sorted_erase_mask; + region->erase_mask = sorted_erase_mask; - region =spi_nor_region_next (region); + region =spi_nor_region_next (map, region); } }@@ -553,8 +550,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,* selecting the uniform erase. */ spi_nor_regions_sort_erase_types (map); - map->uniform_erase_type = map->uniform_region.offset & -SNOR_ERASE_TYPE_MASK ;/* Stop here if not JESD216 rev A or later. */ if (bfpt_header->length ==BFPT_DWORD_MAX_JESD216 )@@ -779,16 +774,6 @@ static const u32 *spi_nor_get_map_in_use(struct spi_nor *nor, const u32 *smpt,return ret; } -static void spi_nor_region_mark_end (struct spi_nor_erase_region *region) -{ - region->offset |=SNOR_LAST_REGION ; -} - -static void spi_nor_region_mark_overlay (struct spi_nor_erase_region *region) -{ - region->offset |=SNOR_OVERLAID_REGION ; -} -/** * spi_nor_region_check_overlay() - set overlay bit when the region is overlaid * @region: pointer to a structure that describes a SPI NOR erase region @@ -806,7 +791,7 @@ spi_nor_region_check_overlay(struct spi_nor_erase_region *region,if (!(erase[i].size && erase_type &BIT (erase[i].idx)))continue ;if (region->size & erase[i].size_mask) { -spi_nor_region_mark_overlay (region); + region->overlaid = true;return ; } }@@ -841,6 +826,7 @@ static int spi_nor_init_non_uniform_erase_map(struct spi_nor *nor,if (!region)return -ENOMEM ; map->regions = region; + map->n_regions = region_count; uniform_erase_type =0xff ; regions_erase_type =0 ;@@ -848,9 +834,10 @@ static int spi_nor_init_non_uniform_erase_map(struct spi_nor *nor,/* Populate regions. */ for (i =0 ; i < region_count; i++) { j = i +1 ;/* index for the region dword */ + region[i].offset = offset; region[i].size =SMPT_MAP_REGION_SIZE (smpt[j]); erase_type =SMPT_MAP_REGION_ERASE_TYPE (smpt[j]); - region[i].offset = offset | erase_type; + region[i].erase_mask = erase_type;spi_nor_region_check_overlay (®ion[i], erase, erase_type);@@ -866,21 +853,20 @@ static int spi_nor_init_non_uniform_erase_map(struct spi_nor *nor,*/ regions_erase_type |= erase_type; - offset = (region[i].offset & ~SNOR_ERASE_FLAGS_MASK ) + - region[i].size; + offset = region[i].offset + region[i].size; } -spi_nor_region_mark_end (®ion[i -1 ]); - save_uniform_erase_type = map->uniform_erase_type; - map->uniform_erase_type =spi_nor_sort_erase_mask (map, - uniform_erase_type); + save_uniform_erase_type = map->uniform_region.erase_mask; + map->uniform_region.erase_mask = +spi_nor_sort_erase_mask (map, + uniform_erase_type);
drivers/mtd/spi-nor/sfdp.c static int spi_nor_init_non_uniform_erase_map(struct spi_nor *nor, · line 872
Quoted 10 lines
drivers/mtd/spi-nor/sfdp.c +1
-1if (!regions_erase_type) {/* * Roll back to the previous uniform_erase_type mask, SMPT is * broken. */ - map->uniform_erase_type = save_uniform_erase_type; + map->uniform_region.erase_mask = save_uniform_erase_type;return -EINVAL ; }
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v3 1/2] mtd: spi-nor: core: rework erase map and erase region structures
In reply to [email protected]Hi,
drivers/mtd/spi-nor/core.c spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map, · line 1583
Quoted 6 lines · CET,
drivers/mtd/spi-nor/core.c +3
-2-spi_nor_region_next(struct spi_nor_erase_region *region) +spi_nor_region_next(const struct spi_nor_erase_map *map, + struct spi_nor_erase_region *region) { -if (spi_nor_region_is_last (region)) + unsigned int region_idx = region - map->regions;
I really don't like this pointer arithmetic. Also it implicitly assumes that region is part of the array map->regions.
Can we drop spi_nor_region_next() altogether and let the outer loop just use an index into map->regions? We have n_regions now, so that should be possible.
-michael
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v3 1/2] mtd: spi-nor: core: rework erase map and erase region structures
Quoted 13 lines · Michael Walle
Hi,
drivers/mtd/spi-nor/core.c spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map,
Quoted 6 lines · CET,
drivers/mtd/spi-nor/core.c +3
-2-spi_nor_region_next(struct spi_nor_erase_region *region) +spi_nor_region_next(const struct spi_nor_erase_map *map, + struct spi_nor_erase_region *region) { -if (spi_nor_region_is_last (region)) + unsigned int region_idx =egion - map->regions;I really don't like this pointer arithmetic. Also it implicitly assumes that region is part of the array
map->regions.
Quoted 4 lines
Can we drop
spi_nor_region_next()altogether and let the outer loop just use an index intomap->regions? We haven_regionsnow, so that should be possible.
I hesitated to rework spi_nor_init_erase_cmd_list() that may degrade readability, but I will try now.
Thanks,
Takahiro
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v3 2/2 mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map
In reply to [email protected]From: Takahiro Kuwano <[email protected]>
Some of Infineon SPI NOR flash devices support hybrid sector layout that overlays 4KB sectors on a 256KB sector and SPI NOR framework recognizes that by parsing SMPT and construct params->erase_map. The hybrid sector layout is similar to CFI flash devices that have small sectors on top and/or bottom address. In case of CFI flash devices, the erase map information is parsed through CFI table and populated into mtd->eraseregions so that users can create MTD partitions that aligned with small sector boundaries. This patch provides the same capability to SPI NOR flash devices that have non-uniform erase map.
--- drivers/mtd/spi-nor/core.c | 58 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/core.c +56 -2
@@ -3401,7 +3401,54 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,return info; } -static void spi_nor_set_mtd_info (struct spi_nor *nor) +static u32 +spi_nor_get_region_erasesize (const struct spi_nor_erase_region *region, +const struct spi_nor_erase_type *erase_type) +{ +u8 i; + +if (region->overlaid) +return region->size; + +for (i =SNOR_ERASE_TYPE_MAX -1 ; i >=0 ; i--) { +if (region->erase_mask &BIT (i)) +return erase_type[i].size; + } + +return 0 ; +} + +static int spi_nor_set_mtd_eraseregions (struct spi_nor *nor) +{ +const struct spi_nor_erase_map *map = &nor->params->erase_map; +const struct spi_nor_erase_region *region = map->regions; +struct mtd_erase_region_info *mtd_region; +struct mtd_info *mtd = &nor->mtd; +u32 erasesize, i; + + mtd_region =devm_kcalloc (nor->dev, map->n_regions,sizeof (*mtd_region), +GFP_KERNEL ); +if (!mtd_region) +return -ENOMEM ; + +for (i =0 ; i < map->n_regions; i++) { + erasesize =spi_nor_get_region_erasesize (®ion[i], + map->erase_type); +if (!erasesize) +return -EINVAL ; + + mtd_region[i].erasesize = erasesize; + mtd_region[i].numblocks =div64_ul (region[i].size, erasesize); + mtd_region[i].offset = region[i].offset; + } + + mtd->numeraseregions = map->n_regions; + mtd->eraseregions = mtd_region; + +return 0 ; +} + +static int spi_nor_set_mtd_info (struct spi_nor *nor) {struct mtd_info *mtd = &nor->mtd;struct device *dev = nor->dev;
@@ -3432,6 +3479,11 @@ static void spi_nor_set_mtd_info(struct spi_nor *nor) mtd->_resume = spi_nor_resume; mtd->_get_device = spi_nor_get_device; mtd->_put_device = spi_nor_put_device; + +if (!spi_nor_has_uniform_erase (nor)) +return spi_nor_set_mtd_eraseregions (nor); + +return 0 ; }static int spi_nor_hw_reset (struct spi_nor *nor)
@@ -3524,7 +3576,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,return ret;/* No mtd_info fields should be used up to this point. */ -spi_nor_set_mtd_info (nor); + ret =spi_nor_set_mtd_info (nor); +if (ret) +return ret;dev_info (dev,"%s (%lld Kbytes)\n" , info->name, (long long )mtd->size >>10 );
Signature · 6 lines
2.34.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/