| Message ID | 20230807-mtd-flash-info-db-rework-v3-0-e60548861b10@kernel.org |
|---|---|
| Headers | show |
| Series | mtd: spi-nor: clean the flash_info database up | expand |
On 08.09.2023 13:16, Michael Walle wrote: > - w25q32dw/layerscape spi > - w25q32dw (with empty size and empty no_sfdp_flags)/layerscape spi > - w25q16dw/mediatek spi all looks good, Michael, thanks for specifying the tests done. I'll queue the patches with or without the small comments addressed, just waiting for a couple of hours to get a response from you. Cheers, ta
Am 2023-09-19 11:39, schrieb Tudor Ambarus: > On 08.09.2023 13:16, Michael Walle wrote: >> - w25q32dw/layerscape spi >> - w25q32dw (with empty size and empty no_sfdp_flags)/layerscape spi >> - w25q16dw/mediatek spi > > all looks good, Michael, thanks for specifying the tests done. > I'll queue the patches with or without the small comments addressed, > just waiting for a couple of hours to get a response from you. Thanks, there is one small piece missing, see my reply in patch 10. It would be great if you can amend that. -michael
On Fri, 08 Sep 2023 12:16:18 +0200, Michael Walle wrote: > The goal is to have slim entries for *new* entries and to have a > flexible macro to specify the flash ID and get rid of the former > INFOx() macros with the hardcoded ID length. > > Here is are some examples how an entry of flash_info will look like > after the conversion: > { > .id = SNOR_ID(0xef, 0x80, 0x20), > .name = "w25q512nwm", > .otp = SNOR_OTP(256, 3, 0x1000, 0x1000), > } > > [...] Made the agreed adjustments and applied to git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git, spi-nor/next branch. Thanks! [01/41] mtd: spi-nor: remove catalyst 'flashes' https://git.kernel.org/mtd/c/022545e057f3 [02/41] mtd: spi-nor: remove Fujitsu MB85RS1MT support https://git.kernel.org/mtd/c/d9cd5c9a6fe2 [03/41] mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() https://git.kernel.org/mtd/c/74b7ad768353 [04/41] mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() https://git.kernel.org/mtd/c/afbfb8c5fb57 [05/41] mtd: spi-nor: convert .n_sectors to .size https://git.kernel.org/mtd/c/0554effe99f6 [06/41] mtd: spi-nor: default page_size to 256 bytes https://git.kernel.org/mtd/c/d0cfd228b34c [07/41] mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter https://git.kernel.org/mtd/c/9983e6da917d [08/41] mtd: spi-nor: default .n_banks to 1 https://git.kernel.org/mtd/c/e255a79162b6 [09/41] mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() https://git.kernel.org/mtd/c/9b6bb07eadaf [10/41] mtd: spi-nor: make sector_size optional https://git.kernel.org/mtd/c/6dec24b1a34c [11/41] mtd: spi-nor: drop .parse_sfdp https://git.kernel.org/mtd/c/3ea3f0ac242c [12/41] mtd: spi-nor: introduce (temporary) INFO0() https://git.kernel.org/mtd/c/95c6e3d26691 [13/41] mtd: spi-nor: move the .id and .id_len into an own structure https://git.kernel.org/mtd/c/2d7f3a08875b [14/41] mtd: spi-nor: rename .otp_org to .otp and make it a pointer https://git.kernel.org/mtd/c/83e62ffa7d1b [15/41] mtd: spi-nor: add SNOR_ID() and SNOR_OTP() https://git.kernel.org/mtd/c/3e85be98875a [16/41] mtd: spi-nor: remove or move flash_info comments https://git.kernel.org/mtd/c/da7e48db514b [17/41] mtd: spi-nor: atmel: convert flash_info to new format https://git.kernel.org/mtd/c/f9d52efb3953 [18/41] mtd: spi-nor: eon: convert flash_info to new format https://git.kernel.org/mtd/c/ca7fb359d0a1 [19/41] mtd: spi-nor: esmt: convert flash_info to new format https://git.kernel.org/mtd/c/5a329c40894b [20/41] mtd: spi-nor: everspin: convert flash_info to new format https://git.kernel.org/mtd/c/6ecc52e44dbf [21/41] mtd: spi-nor: gigadevice: convert flash_info to new format https://git.kernel.org/mtd/c/29cd12e08cd3 [22/41] mtd: spi-nor: intel: convert flash_info to new format https://git.kernel.org/mtd/c/3de6404725df [23/41] mtd: spi-nor: issi: convert flash_info to new format https://git.kernel.org/mtd/c/856f61797cbc [24/41] mtd: spi-nor: macronix: convert flash_info to new format https://git.kernel.org/mtd/c/09e5a29fa3ad [25/41] mtd: spi-nor: micron-st: convert flash_info to new format https://git.kernel.org/mtd/c/8eb4eb838f9f [26/41] mtd: spi-nor: spansion: convert flash_info to new format https://git.kernel.org/mtd/c/bb2d5c67b926 [27/41] mtd: spi-nor: sst: convert flash_info to new format https://git.kernel.org/mtd/c/47541a60636a [28/41] mtd: spi-nor: winbond: convert flash_info to new format https://git.kernel.org/mtd/c/348d772d04fa [29/41] mtd: spi-nor: xilinx: use new macros in S3AN_INFO() https://git.kernel.org/mtd/c/8e52f54ca994 [30/41] mtd: spi-nor: xmc: convert flash_info to new format https://git.kernel.org/mtd/c/9e02cb5b1d09 [31/41] mtd: spi-nor: atmel: sort flash_info database https://git.kernel.org/mtd/c/a16ae25022d9 [32/41] mtd: spi-nor: eon: sort flash_info database https://git.kernel.org/mtd/c/bc16dfcbf27f [33/41] mtd: spi-nor: gigadevice: sort flash_info database https://git.kernel.org/mtd/c/1d8e64f40b24 [34/41] mtd: spi-nor: issi: sort flash_info database https://git.kernel.org/mtd/c/947bb8f24b61 [35/41] mtd: spi-nor: macronix: sort flash_info database https://git.kernel.org/mtd/c/b0eea634d086 [36/41] mtd: spi-nor: micron-st: sort flash_info database https://git.kernel.org/mtd/c/9df3c9ac6ea6 [37/41] mtd: spi-nor: spansion: sort flash_info database https://git.kernel.org/mtd/c/8770a6a89b15 [38/41] mtd: spi-nor: sst: sort flash_info database https://git.kernel.org/mtd/c/1de410815768 [39/41] mtd: spi-nor: winbond: sort flash_info entries https://git.kernel.org/mtd/c/d3b5ea3cc5ba [40/41] mtd: spi-nor: atmel: drop duplicate entry https://git.kernel.org/mtd/c/1d4c725453c8 [41/41] mtd: spi-nor: core: get rid of the INFOx() macros https://git.kernel.org/mtd/c/914efd602a80 Cheers,
The goal is to have slim entries for *new* entries and to have a flexible macro to specify the flash ID and get rid of the former INFOx() macros with the hardcoded ID length. Here is are some examples how an entry of flash_info will look like after the conversion: { .id = SNOR_ID(0xef, 0x80, 0x20), .name = "w25q512nwm", .otp = SNOR_OTP(256, 3, 0x1000, 0x1000), } { .id = SNOR_ID(0x01, 0x02, 0x19, 0x4d, 0x00, 0x80), .name = "s25fl256s0", .size = SZ_32M, .sector_size = SZ_256K, .no_sfdp_flags = SPI_NOR_SKIP_SFDP | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, .mfr_flags = USE_CLSR, } Please note that the second entry might even be slimmed down if the flash supports SFDP, which is very likely. But apart from one exception, this patchset shouldn't change any information in the flash_info database. The exception is the removal of very old SPI EEPROMs and a Fujitsu MRAM. Both should use the at25 EEPROM driver. The latter even has device tree bindings for the at25 driver. To make the entries as slim as possible, we introduce sane default values so the actual flash_info entries, doesn't need to specify them. This mostly applies to old non-SFDP flashes anyway. Patches 01-02 remove the old catalyst EEPROMs and the Fujitsu MRAM. Patches 03-16 are preparation patches to either convert properties (like .n_sectors) or to make properties optional. These patches will also modify the old INFOx() macros. This is important because with this we can actually make sure, the conversion doesn't have any unwanted changes. We can compare the .rodata segment before and after the conversion to make sure, there are no mistakes in the patches, because they are impossible to review. To make sure there are no changes you can compare the output of objdump -j.rodata -s drivers/mtd/spi-nor/built-in.a (or individual objects like drivers/mtd/spi-nor/winbond.o) before and after the conversion, that is before patch 17 and after patch 30. FWIW, before the conversion it was impossible to use coccinelle, eg. "spatch --parse-c winbond.c" flagged almost all lines in the flash_info structure as bad. Now after the conversion is completed, patches 31-39 sort the entries by their IDs. Patch 40 removes a duplicate entry in atmel which surfaced during the sorting. Patch 41 then finally removes the old INFOx() macros. Tested with the following flashes: - w25q32dw/layerscape spi - w25q32dw (with empty size and empty no_sfdp_flags)/layerscape spi - w25q16dw/mediatek spi Signed-off-by: Michael Walle <mwalle@kernel.org> --- Changes in v3: - rebase to latest next - collected tags - fixed parse_sfdp logic - also see individual patches for changes - Link to v2: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v2-0-291a0f39f8d8@kernel.org Changes in v1: - rebase to latest next, esp. include the sst26vf032b changes - fixed the makefiles found by the kernel test robot - fixed small typos and nitpicks noticed by Miquel - collected Rb tags - Link to v1: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v1-0-3d3d5bef4ba4@kernel.org --- Michael Walle (41): mtd: spi-nor: remove catalyst 'flashes' mtd: spi-nor: remove Fujitsu MB85RS1MT support mtd: spi-nor: xilinx: use SPI_NOR_ID() in S3AN_INFO() mtd: spi-nor: xilinx: remove addr_nbytes from S3AN_INFO() mtd: spi-nor: convert .n_sectors to .size mtd: spi-nor: default page_size to 256 bytes mtd: spi-nor: store .n_banks in struct spi_nor_flash_parameter mtd: spi-nor: default .n_banks to 1 mtd: spi-nor: push 4k SE handling into spi_nor_select_uniform_erase() mtd: spi-nor: make sector_size optional mtd: spi-nor: drop .parse_sfdp mtd: spi-nor: introduce (temporary) INFO0() mtd: spi-nor: move the .id and .id_len into an own structure mtd: spi-nor: rename .otp_org to .otp and make it a pointer mtd: spi-nor: add SNOR_ID() and SNOR_OTP() mtd: spi-nor: remove or move flash_info comments mtd: spi-nor: atmel: convert flash_info to new format mtd: spi-nor: eon: convert flash_info to new format mtd: spi-nor: esmt: convert flash_info to new format mtd: spi-nor: everspin: convert flash_info to new format mtd: spi-nor: gigadevice: convert flash_info to new format mtd: spi-nor: intel: convert flash_info to new format mtd: spi-nor: issi: convert flash_info to new format mtd: spi-nor: macronix: convert flash_info to new format mtd: spi-nor: micron-st: convert flash_info to new format mtd: spi-nor: spansion: convert flash_info to new format mtd: spi-nor: sst: convert flash_info to new format mtd: spi-nor: winbond: convert flash_info to new format mtd: spi-nor: xilinx: use new macros in S3AN_INFO() mtd: spi-nor: xmc: convert flash_info to new format mtd: spi-nor: atmel: sort flash_info database mtd: spi-nor: eon: sort flash_info database mtd: spi-nor: gigadevice: sort flash_info database mtd: spi-nor: issi: sort flash_info database mtd: spi-nor: macronix: sort flash_info database mtd: spi-nor: micron-st: sort flash_info database mtd: spi-nor: spansion: sort flash_info database mtd: spi-nor: sst: sort flash_info database mtd: spi-nor: winbond: sort flash_info entries mtd: spi-nor: atmel: drop duplicate entry mtd: spi-nor: core: get rid of the INFOx() macros drivers/mtd/spi-nor/Makefile | 2 - drivers/mtd/spi-nor/atmel.c | 116 +++++++---- drivers/mtd/spi-nor/catalyst.c | 24 --- drivers/mtd/spi-nor/core.c | 63 +++--- drivers/mtd/spi-nor/core.h | 138 ++++++------- drivers/mtd/spi-nor/eon.c | 74 +++++-- drivers/mtd/spi-nor/esmt.c | 29 ++- drivers/mtd/spi-nor/everspin.c | 34 +++- drivers/mtd/spi-nor/fujitsu.c | 21 -- drivers/mtd/spi-nor/gigadevice.c | 82 ++++---- drivers/mtd/spi-nor/intel.c | 23 ++- drivers/mtd/spi-nor/issi.c | 118 +++++++---- drivers/mtd/spi-nor/macronix.c | 220 ++++++++++++++------- drivers/mtd/spi-nor/micron-st.c | 411 ++++++++++++++++++++++++++------------- drivers/mtd/spi-nor/spansion.c | 389 ++++++++++++++++++++++-------------- drivers/mtd/spi-nor/sst.c | 164 ++++++++++------ drivers/mtd/spi-nor/swp.c | 13 +- drivers/mtd/spi-nor/sysfs.c | 6 +- drivers/mtd/spi-nor/winbond.c | 288 +++++++++++++++++---------- drivers/mtd/spi-nor/xilinx.c | 32 ++- drivers/mtd/spi-nor/xmc.c | 19 +- 21 files changed, 1394 insertions(+), 872 deletions(-) --- base-commit: 66d9573193967138cd12e232d4b5bc2b57e0d1ac change-id: 20230807-mtd-flash-info-db-rework-8a52d60f0023