Unverified Commit 2b12ae1f authored by Boris Brezillon's avatar Boris Brezillon Committed by Tudor Ambarus
Browse files

mtd: spi-nor: Add post_sfdp() hook to tweak flash config 



SFDP tables are sometimes wrong and we need a way to override the
config chosen by the SFDP parsing logic without discarding all of it.

Add a new hook called after the SFDP parsing has taken place to deal
with such problems.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent dff97245

drivers/mtd/spi-nor/spi-nor.c

+32 −1
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ struct sfdp_bfpt { 
 *                flash parameters when information provided by the flash_info

 *                table is incomplete or wrong.

 * @post_bfpt: called after the BFPT table has been parsed

 * @post_sfdp: called after SFDP has been parsed (is also called for SPI NORs

 *             that do not support RDSFDP). Typically used to tweak various

 *             parameters that could not be extracted by other means (i.e.

 *             when information provided by the SFDP/flash_info tables are

 *             incomplete or wrong).

 *

 * Those hooks can be used to tweak the SPI NOR configuration when the SFDP

 * table is broken or not available.
@@ -168,6 +173,7 @@ struct spi_nor_fixups { 
			 const struct sfdp_parameter_header *bfpt_header,

			 const struct sfdp_bfpt *bfpt,

			 struct spi_nor_flash_parameter *params);

	void (*post_sfdp)(struct spi_nor *nor);

};



struct flash_info {
@@ -4298,6 +4304,22 @@ static void spi_nor_info_init_params(struct spi_nor *nor) 
	spi_nor_init_uniform_erase_map(map, erase_mask, params->size);

}



/**

 * spi_nor_post_sfdp_fixups() - Updates the flash's parameters and settings

 * after SFDP has been parsed (is also called for SPI NORs that do not

 * support RDSFDP).

 * @nor:	pointer to a 'struct spi_nor'

 *

 * Typically used to tweak various parameters that could not be extracted by

 * other means (i.e. when information provided by the SFDP/flash_info tables

 * are incomplete or wrong).

 */

static void spi_nor_post_sfdp_fixups(struct spi_nor *nor)

{

	if (nor->info->fixups && nor->info->fixups->post_sfdp)

		nor->info->fixups->post_sfdp(nor);

}



/**

 * spi_nor_late_init_params() - Late initialization of default flash parameters.

 * @nor:	pointer to a 'struct spi_nor'
@@ -4341,7 +4363,14 @@ static void spi_nor_late_init_params(struct spi_nor *nor) 
 *    the flash parameters and settings immediately after parsing the Basic

 *    Flash Parameter Table.

 *

 * 4/ Late default flash parameters initialization, used when the

 * which can be overwritten by:

 * 4/ Post SFDP flash parameters initialization. Used to tweak various

 *    parameters that could not be extracted by other means (i.e. when

 *    information provided by the SFDP/flash_info tables are incomplete or

 *    wrong).

 *		spi_nor_post_sfdp_fixups()

 *

 * 5/ Late default flash parameters initialization, used when the

 * ->default_init() hook or the SFDP parser do not set specific params.

 *		spi_nor_late_init_params()

 */
@@ -4355,6 +4384,8 @@ static void spi_nor_init_params(struct spi_nor *nor) 
	    !(nor->info->flags & SPI_NOR_SKIP_SFDP))

		spi_nor_sfdp_init_params(nor);



	spi_nor_post_sfdp_fixups(nor);



	spi_nor_late_init_params(nor);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE