From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Thu, 13 Dec 2018 10:40:06 +0100 Subject: [U-Boot] [PATCH 09/16] sf_mtd: Simply mtd operations In-Reply-To: <1f79f57b-fb79-0493-7f6b-d45a37a9ba81@ti.com> References: <20181212173228.12281-1-vigneshr@ti.com> <20181212173228.12281-10-vigneshr@ti.com> <1f79f57b-fb79-0493-7f6b-d45a37a9ba81@ti.com> Message-ID: <09ce5a25-a998-917f-2708-5ce8abfcc1f9@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On 13.12.18 09:24, Vignesh R wrote: > Boris, Stefan, Daniel > > On 12/12/18 11:02 PM, Vignesh R wrote: >> Now that there is new SPI NOR framework, simplify mtd device >> registration and read/write/erase operations. >> >> Signed-off-by: Vignesh R >> --- > > Oops, sorry I messed up rebase-ing this patch onto latest mainline. At > this time it looks like MTD kconfig changes [1] are needed before I can > simplify sf_mtd.c. Things should work even w/o this patch. I think I > will drop this patch for now. With this patch removed from this series, all seems to work just fine on my board with the strapped to 4-byte mode SPI NOR chip. Feel free to add my: Tested-by: Stefan Roese Thanks, Stefan > [1] https://patchwork.ozlabs.org/cover/1010033/ > >> drivers/mtd/spi/sf_internal.h | 2 +- >> drivers/mtd/spi/sf_mtd.c | 52 ++++++++++++++--------------------- >> drivers/mtd/spi/sf_probe.c | 5 ++-- >> 3 files changed, 24 insertions(+), 35 deletions(-) >> >> diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h >> index 7e7d400cdbdf..8b445bb0b506 100644 >> --- a/drivers/mtd/spi/sf_internal.h >> +++ b/drivers/mtd/spi/sf_internal.h >> @@ -99,6 +99,6 @@ int spi_flash_cmd_get_sw_write_prot(struct spi_flash *flash); >> >> #ifdef CONFIG_SPI_FLASH_MTD >> int spi_flash_mtd_register(struct spi_flash *flash); >> -void spi_flash_mtd_unregister(void); >> +void spi_flash_mtd_unregister(struct spi_flash *flash); >> #endif >> #endif /* _SF_INTERNAL_H_ */ >> diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c >> index 68c36002bee2..65185b7c57dc 100644 >> --- a/drivers/mtd/spi/sf_mtd.c >> +++ b/drivers/mtd/spi/sf_mtd.c >> @@ -9,21 +9,19 @@ >> #include >> #include >> >> -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) >> + if (!mtd || !mtd->priv) >> return -ENODEV; >> >> instr->state = MTD_ERASING; >> >> - err = spi_flash_erase(flash, instr->addr, instr->len); >> + err = mtd->_erase(mtd, instr); >> if (err) { >> instr->state = MTD_ERASE_FAILED; >> instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN; >> @@ -39,13 +37,12 @@ static int spi_flash_mtd_erase(struct mtd_info *mtd, struct erase_info *instr) >> 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) >> + if (!mtd || !mtd->priv) >> return -ENODEV; >> >> - err = spi_flash_read(flash, from, len, buf); >> + err = mtd->_read(mtd, from, len, retlen, buf); >> if (!err) >> *retlen = len; >> >> @@ -55,13 +52,12 @@ static int spi_flash_mtd_read(struct mtd_info *mtd, loff_t from, size_t len, >> 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) >> + if (!mtd || !mtd->priv) >> return -ENODEV; >> >> - err = spi_flash_write(flash, to, len, buf); >> + err = mtd->_write(mtd, to, len, retlen, buf); >> if (!err) >> *retlen = len; >> >> @@ -83,10 +79,11 @@ static int spi_flash_mtd_number(void) >> >> int spi_flash_mtd_register(struct spi_flash *flash) >> { >> + struct mtd_info *mtd = &flash->mtd; >> int ret; >> >> if (sf_mtd_registered) { >> - ret = del_mtd_device(&sf_mtd_info); >> + ret = del_mtd_device(mtd); >> if (ret) >> return ret; >> >> @@ -94,42 +91,33 @@ int spi_flash_mtd_register(struct spi_flash *flash) >> } >> >> 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; >> + mtd->name = sf_mtd_name; >> + mtd->_erase = spi_flash_mtd_erase; >> + mtd->_read = spi_flash_mtd_read; >> + mtd->_write = spi_flash_mtd_write; >> + mtd->_sync = spi_flash_mtd_sync; >> >> /* Only uniform flash devices for now */ >> - sf_mtd_info.numeraseregions = 0; >> - sf_mtd_info.erasesize = flash->sector_size; >> + mtd->numeraseregions = 0; >> >> - ret = add_mtd_device(&sf_mtd_info); >> + ret = add_mtd_device(mtd); >> if (!ret) >> sf_mtd_registered = true; >> >> return ret; >> } >> >> -void spi_flash_mtd_unregister(void) >> +void spi_flash_mtd_unregister(struct spi_flash *flash) >> { >> + struct mtd_info *mtd = &flash->mtd; >> int ret; >> >> if (!sf_mtd_registered) >> return; >> >> - ret = del_mtd_device(&sf_mtd_info); >> + ret = del_mtd_device(mtd); >> if (!ret) { >> sf_mtd_registered = false; >> return; >> @@ -141,7 +129,7 @@ void spi_flash_mtd_unregister(void) >> * 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; >> + mtd->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); >> + sf_mtd_name); >> } >> diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c >> index 7f1378f4946d..05a38dcb91c8 100644 >> --- a/drivers/mtd/spi/sf_probe.c >> +++ b/drivers/mtd/spi/sf_probe.c >> @@ -84,7 +84,7 @@ struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs, >> void spi_flash_free(struct spi_flash *flash) >> { >> #ifdef CONFIG_SPI_FLASH_MTD >> - spi_flash_mtd_unregister(); >> + spi_flash_mtd_unregister(flash); >> #endif >> spi_free_slave(flash->spi); >> free(flash); >> @@ -153,7 +153,8 @@ static int spi_flash_std_probe(struct udevice *dev) >> static int spi_flash_std_remove(struct udevice *dev) >> { >> #ifdef CONFIG_SPI_FLASH_MTD >> - spi_flash_mtd_unregister(); >> + struct spi_flash *flash = dev_get_uclass_priv(dev); >> + spi_flash_mtd_unregister(flash); >> #endif >> return 0; >> } >> > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de