mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-08-12 18:26:59 +02:00
d678a59d2d
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commitc8ffd1356d, reversing changes made to2ee6f3a5f7. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
164 lines
3.3 KiB
C
164 lines
3.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>
|
|
|
|
#if CONFIG_IS_ENABLED(DM_SPI_FLASH)
|
|
|
|
int spi_flash_mtd_register(struct spi_flash *flash)
|
|
{
|
|
return add_mtd_device(&flash->mtd);
|
|
}
|
|
|
|
void spi_flash_mtd_unregister(struct spi_flash *flash)
|
|
{
|
|
del_mtd_device(&flash->mtd);
|
|
}
|
|
|
|
#else /* !CONFIG_IS_ENABLED(DM_SPI_FLASH) */
|
|
|
|
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;
|
|
|
|
if (!flash)
|
|
return -ENODEV;
|
|
|
|
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;
|
|
|
|
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;
|
|
|
|
if (!flash)
|
|
return -ENODEV;
|
|
|
|
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;
|
|
|
|
if (!flash)
|
|
return -ENODEV;
|
|
|
|
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) {
|
|
ret = del_mtd_device(&sf_mtd_info);
|
|
if (ret)
|
|
return ret;
|
|
|
|
sf_mtd_registered = false;
|
|
}
|
|
|
|
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;
|
|
sf_mtd_info.dev = flash->dev;
|
|
|
|
/* 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(struct spi_flash *flash)
|
|
{
|
|
int ret;
|
|
|
|
if (!sf_mtd_registered)
|
|
return;
|
|
|
|
ret = del_mtd_device(&sf_mtd_info);
|
|
if (!ret) {
|
|
sf_mtd_registered = false;
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Setting mtd->priv to NULL is the best we can do. Thanks to that,
|
|
* the MTD layer can still call mtd hooks without risking a
|
|
* use-after-free bug. Still, things should be fixed to prevent the
|
|
* spi_flash object from being destroyed when del_mtd_device() fails.
|
|
*/
|
|
sf_mtd_info.priv = NULL;
|
|
printf("Failed to unregister MTD %s and the spi_flash object is going away: you're in deep trouble!",
|
|
sf_mtd_info.name);
|
|
}
|
|
|
|
#endif /* !CONFIG_IS_ENABLED(DM_SPI_FLASH) */
|