lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0253/1039] mtd: spi-nor: Fix mtd size for s3an flashes
    Date
    From: Tudor Ambarus <tudor.ambarus@microchip.com>

    [ Upstream commit f656b419d41aabafb6b526abc3988dfbf2e5c1ba ]

    As it was before the blamed commit, s3an_nor_scan() was called
    after mtd size was set with params->size, and it overwrote the mtd
    size value with '8 * nor->page_size * nor->info->n_sectors' when
    XSR_PAGESIZE was set. With the introduction of
    s3an_post_sfdp_fixups(), we missed to update the mtd size for the
    s3an flashes. Fix the mtd size by updating both nor->params->size,
    (which will update the mtd_info size later on) and nor->mtd.size
    (which is used in spi_nor_set_addr_width()).

    Fixes: 641edddb4f43 ("mtd: spi-nor: Add s3an_post_sfdp_fixups()")
    Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
    Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
    Link: https://lore.kernel.org/r/20211207140254.87681-2-tudor.ambarus@microchip.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/spi-nor/xilinx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/mtd/spi-nor/xilinx.c b/drivers/mtd/spi-nor/xilinx.c
    index 0658e47564bac..0ac1d681e84d5 100644
    --- a/drivers/mtd/spi-nor/xilinx.c
    +++ b/drivers/mtd/spi-nor/xilinx.c
    @@ -69,7 +69,8 @@ static int xilinx_nor_setup(struct spi_nor *nor,
    page_size = (nor->params->page_size == 264) ? 256 : 512;
    nor->params->page_size = page_size;
    nor->mtd.writebufsize = page_size;
    - nor->mtd.size = 8 * page_size * nor->info->n_sectors;
    + nor->params->size = 8 * page_size * nor->info->n_sectors;
    + nor->mtd.size = nor->params->size;
    nor->mtd.erasesize = 8 * page_size;
    } else {
    /* Flash in Default addressing mode */
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:4.063 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site