On Mon, Mar 26, 2018 at 4:38 PM, Eugeniy Paltsev <eugeniy.palt...@synopsys.com> wrote: > sst26wf flash series block protection implementation differs > from other SST series, so add implementation for sst26wf > lock/unlock/is_locked functions.
Look like all this series add only protection ops, try to change the commit head according to that. > > Signed-off-by: Eugeniy Paltsev <eugeniy.palt...@synopsys.com> > --- > Changes v1->v2: > * Use generic defines from linux/sizes.h instead of custom ones. > > drivers/mtd/spi/spi_flash.c | 188 > ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 188 insertions(+) > > diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c > index 2e61685d3e..4149a17990 100644 > --- a/drivers/mtd/spi/spi_flash.c > +++ b/drivers/mtd/spi/spi_flash.c > @@ -16,6 +16,7 @@ > #include <spi.h> > #include <spi_flash.h> > #include <linux/log2.h> > +#include <linux/sizes.h> > #include <dma.h> > > #include "sf_internal.h" > @@ -842,6 +843,183 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t > len) > } > #endif > > +#if defined(CONFIG_SPI_FLASH_SST) We have SST code inside this macro, try to move this on that area. > +#define SST26_CMD_READ_BPR 0x72 > +#define SST26_CMD_WRITE_BPR 0x42 > + > +#define MAX_BPR_REG_LEN (18 + 1) > +#define SST26WF_BOUND_REG_SIZE ((32 + 4 * 8) * SZ_1K) Move all these macros on sf_internal.h with SST prefix where we have SST ifdef. > + > +bool sst26_check_bpr(u32 bpr_size, u8 *cmd, u32 bit) > +{ > + return !!(cmd[bpr_size - (bit / 8) - 1] & BIT(bit % 8)); > +} > + > +bool sst26_clear_bpr(u32 bpr_size, u8 *cmd, u32 bit) > +{ > + cmd[bpr_size - (bit / 8) - 1] &= ~BIT(bit % 8); > + return false; > +} > + > +bool sst26_set_bpr(u32 bpr_size, u8 *cmd, u32 bit) > +{ > + cmd[bpr_size - (bit / 8) - 1] |= BIT(bit % 8); > + return false; > +} static functions? > + > +enum lock_ctl { > + CTL_LOCK, > + CTL_UNLOCK, > + CTL_CHECK > +}; > + > +/* > + * sst26wf016/sst26wf032/sst26wf064 have next block protection: > + * 4x - 8 KByte blocks - read & write protection bits - upper addresses > + * 1x - 32 KByte blocks - write protection bits > + * rest - 64 KByte blocks - write protection bits > + * 1x - 32 KByte blocks - write protection bits > + * 4x - 8 KByte blocks - read & write protection bits - lower addresses > + * > + * We'll support only per 64k lock/unlock so lower and upper 64 KByte region > + * will be treated as single block. > + */ > + > +/* > + * Lock, unlock or check lock status of the flash region of the flash > (depending > + * on the lock_ctl value) > + */ > +int sst26_lock_ctl(struct spi_flash *flash, u32 ofs, size_t len, enum > lock_ctl ctl) > +{ > + u32 i, bpr_ptr, rptr_64k, lptr_64k, bpr_size; > + bool lower_64k = false, upper_64k = false; > + u8 cmd, bpr_buff[MAX_BPR_REG_LEN] = {}; > + int ret; > + > + bool (* bpr_bit_process) (u32 bpr_size, u8 *, u32); Deceleration inside function definition? try to avoid this. > + > + /* Check length and offset for 64k alignment */ > + if ((ofs & (SZ_64K - 1)) || (len & (SZ_64K - 1))) > + return -EINVAL; > + > + if (ofs + len > flash->size) > + return -EINVAL; > + > + /* SST26 family has only 16 Mbit, 32 Mbit and 64 Mbit IC */ > + if (flash->size != SZ_2M && > + flash->size != SZ_4M && > + flash->size != SZ_8M) > + return -EINVAL; > + > + bpr_size = 2 + (flash->size / SZ_64K / 8); > + > + cmd = SST26_CMD_READ_BPR; > + ret = spi_flash_read_common(flash, &cmd, 1, bpr_buff, bpr_size); > + if (ret < 0) { > + printf("SF: fail to read block-protection register\n"); > + return ret; > + } > + > + if (ctl == CTL_LOCK) > + bpr_bit_process = sst26_set_bpr; > + else if (ctl == CTL_UNLOCK) > + bpr_bit_process = sst26_clear_bpr; > + else > + bpr_bit_process = sst26_check_bpr; These functions do single step, avoid these function pointers and call single function and check the ctl and do accordingly. > + > + rptr_64k = min_t(u32, ofs + len , flash->size - > SST26WF_BOUND_REG_SIZE); > + lptr_64k = max_t(u32, ofs, SST26WF_BOUND_REG_SIZE); > + > + upper_64k = ((ofs + len) > (flash->size - SST26WF_BOUND_REG_SIZE)); > + lower_64k = (ofs < SST26WF_BOUND_REG_SIZE); > + > + /* Lower bits in block-protection register are about 64k region */ > + bpr_ptr = lptr_64k / SZ_64K - 1; > + > + /* Process 64K blocks region */ > + while (lptr_64k < rptr_64k) { > + if (bpr_bit_process(bpr_size, bpr_buff, bpr_ptr)) > + return 1; error code? > + > + bpr_ptr++; > + lptr_64k += SZ_64K; > + } > + > + /* 32K and 8K region bits in BPR are after 64k region bits */ > + bpr_ptr = (flash->size - 2 * SST26WF_BOUND_REG_SIZE) / SZ_64K; > + > + /* Process lower 32K block region */ > + if (lower_64k) > + if (bpr_bit_process(bpr_size, bpr_buff, bpr_ptr)) > + return 1; error code? > + > + bpr_ptr++; > + > + /* Process upper 32K block region */ > + if (upper_64k) > + if (bpr_bit_process(bpr_size, bpr_buff, bpr_ptr)) > + return 1; error code? > + > + bpr_ptr++; > + > + /* Process lower 8K block regions */ > + for (i = 0; i < 4; i++) { > + if (lower_64k) > + if (bpr_bit_process(bpr_size, bpr_buff, bpr_ptr)) > + return 1; > + error code > + /* In 8K area BPR has both read and write protection bits */ > + bpr_ptr += 2; > + } > + > + /* Process upper 8K block regions */ > + for (i = 0; i < 4; i++) { > + if (upper_64k) > + if (bpr_bit_process(bpr_size, bpr_buff, bpr_ptr)) > + return 1; > + error code > + /* In 8K area BPR has both read and write protection bits */ > + bpr_ptr += 2; > + } > + > + /* If we check region status we don't need to write BPR back */ > + if (ctl == CTL_CHECK) > + return 0; > + > + cmd = SST26_CMD_WRITE_BPR; > + ret = spi_flash_write_common(flash, &cmd, 1, bpr_buff, bpr_size); > + if (ret < 0) { > + printf("SF: fail to write block-protection register\n"); > + return ret; > + } > + > + return 0; > +} > + > +int sst26_unlock(struct spi_flash *flash, u32 ofs, size_t len) > +{ > + return sst26_lock_ctl(flash, ofs, len, CTL_UNLOCK); > +} > + > +int sst26_lock(struct spi_flash *flash, u32 ofs, size_t len) > +{ > + return sst26_lock_ctl(flash, ofs, len, CTL_LOCK); > +} > + > +int sst26_is_locked(struct spi_flash *flash, u32 ofs, size_t len) > +{ > + /* > + * is_locked function is used for check before reading or erasing > flash > + * region, so offset and length might be not 64k allighned, so adjust > + * them to be 64k allighned as sst26_lock_ctl works only with 64k > + * allighned regions. > + */ > + ofs -= ofs & (SZ_64K - 1); > + len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len; > + > + return sst26_lock_ctl(flash, ofs, len, CTL_CHECK); > +} > +#endif > > #ifdef CONFIG_SPI_FLASH_MACRONIX > static int macronix_quad_enable(struct spi_flash *flash) > @@ -1033,6 +1211,16 @@ int spi_flash_scan(struct spi_flash *flash) > } > #endif > > +/* sst26wf series block protection implementation differs from other series > */ > +#if defined(CONFIG_SPI_FLASH_SST) > + if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SST && > + (JEDEC_ID(info) >> 8) == 0x26) { You can directly use JEDEC_ID that may cover id[0], id[1]? or does this only for id[0]? > + flash->flash_lock = sst26_lock; > + flash->flash_unlock = sst26_unlock; > + flash->flash_is_locked = sst26_is_locked; > + } > +#endif Try to integrated this ifdef to existing lock cases? switch case would be more preferable? Jagan. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot