mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-30 19:32:16 +00:00
492151b209
spi_flash_mtd_register() can be called several times and each time it
will register the same mtd_info instance like if it was a new one.
The MTD ID allocation gets crazy when that happens, so let's track the
status of the sf_mtd_info object to avoid that.
Fixes: 9fe6d8716e ("mtd, spi: Add MTD layer driver")
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Tested-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Jagan Teki <jagan@openedev.com>
114 lines
2.3 KiB
C
114 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2012-2014 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <malloc.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <spi_flash.h>
|
|
|
|
static struct mtd_info sf_mtd_info;
|
|
static bool sf_mtd_registered;
|
|
static char sf_mtd_name[8];
|
|
|
|
static int spi_flash_mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
|
|
{
|
|
struct spi_flash *flash = mtd->priv;
|
|
int err;
|
|
|
|
instr->state = MTD_ERASING;
|
|
|
|
err = spi_flash_erase(flash, instr->addr, instr->len);
|
|
if (err) {
|
|
instr->state = MTD_ERASE_FAILED;
|
|
instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
|
|
return -EIO;
|
|
}
|
|
|
|
instr->state = MTD_ERASE_DONE;
|
|
mtd_erase_callback(instr);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int spi_flash_mtd_read(struct mtd_info *mtd, loff_t from, size_t len,
|
|
size_t *retlen, u_char *buf)
|
|
{
|
|
struct spi_flash *flash = mtd->priv;
|
|
int err;
|
|
|
|
err = spi_flash_read(flash, from, len, buf);
|
|
if (!err)
|
|
*retlen = len;
|
|
|
|
return err;
|
|
}
|
|
|
|
static int spi_flash_mtd_write(struct mtd_info *mtd, loff_t to, size_t len,
|
|
size_t *retlen, const u_char *buf)
|
|
{
|
|
struct spi_flash *flash = mtd->priv;
|
|
int err;
|
|
|
|
err = spi_flash_write(flash, to, len, buf);
|
|
if (!err)
|
|
*retlen = len;
|
|
|
|
return err;
|
|
}
|
|
|
|
static void spi_flash_mtd_sync(struct mtd_info *mtd)
|
|
{
|
|
}
|
|
|
|
static int spi_flash_mtd_number(void)
|
|
{
|
|
#ifdef CONFIG_SYS_MAX_FLASH_BANKS
|
|
return CONFIG_SYS_MAX_FLASH_BANKS;
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
int spi_flash_mtd_register(struct spi_flash *flash)
|
|
{
|
|
int ret;
|
|
|
|
if (sf_mtd_registered)
|
|
del_mtd_device(&sf_mtd_info);
|
|
|
|
sf_mtd_registered = false;
|
|
memset(&sf_mtd_info, 0, sizeof(sf_mtd_info));
|
|
sprintf(sf_mtd_name, "nor%d", spi_flash_mtd_number());
|
|
|
|
sf_mtd_info.name = sf_mtd_name;
|
|
sf_mtd_info.type = MTD_NORFLASH;
|
|
sf_mtd_info.flags = MTD_CAP_NORFLASH;
|
|
sf_mtd_info.writesize = 1;
|
|
sf_mtd_info.writebufsize = flash->page_size;
|
|
|
|
sf_mtd_info._erase = spi_flash_mtd_erase;
|
|
sf_mtd_info._read = spi_flash_mtd_read;
|
|
sf_mtd_info._write = spi_flash_mtd_write;
|
|
sf_mtd_info._sync = spi_flash_mtd_sync;
|
|
|
|
sf_mtd_info.size = flash->size;
|
|
sf_mtd_info.priv = flash;
|
|
|
|
/* Only uniform flash devices for now */
|
|
sf_mtd_info.numeraseregions = 0;
|
|
sf_mtd_info.erasesize = flash->sector_size;
|
|
|
|
ret = add_mtd_device(&sf_mtd_info);
|
|
if (!ret)
|
|
sf_mtd_registered = true;
|
|
|
|
return ret;
|
|
}
|
|
|
|
void spi_flash_mtd_unregister(void)
|
|
{
|
|
del_mtd_device(&sf_mtd_info);
|
|
}
|