[U-Boot] [PATCH v8 1/4] include: Add log2 and fls64 header fi
From: Fabio Estevam fabio.estevam@freescale.com
Use the log2 and fls64 header files directly from the kernel.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Changes since v7: - None
include/asm-generic/bitops/fls64.h | 36 +++++++ include/linux/bitops.h | 9 ++ include/linux/log2.h | 208 +++++++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 include/asm-generic/bitops/fls64.h create mode 100644 include/linux/log2.h
diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h new file mode 100644 index 0000000..86d403f --- /dev/null +++ b/include/asm-generic/bitops/fls64.h @@ -0,0 +1,36 @@ +#ifndef _ASM_GENERIC_BITOPS_FLS64_H_ +#define _ASM_GENERIC_BITOPS_FLS64_H_ + +#include <asm/types.h> + +/** + * fls64 - find last set bit in a 64-bit word + * @x: the word to search + * + * This is defined in a similar way as the libc and compiler builtin + * ffsll, but returns the position of the most significant set bit. + * + * fls64(value) returns 0 if value is 0 or the position of the last + * set bit if value is nonzero. The last (most significant) bit is + * at position 64. + */ +#if BITS_PER_LONG == 32 +static inline int fls64(__u64 x) +{ + __u32 h = x >> 32; + if (h) + return fls(h) + 32; + return fls(x); +} +#elif BITS_PER_LONG == 64 +static inline int fls64(__u64 x) +{ + if (x == 0) + return 0; + return __fls(x) + 1; +} +#else +#error BITS_PER_LONG not 32 or 64 +#endif + +#endif /* _ASM_GENERIC_BITOPS_FLS64_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 7d30ace..647733f 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -129,6 +129,15 @@ static inline unsigned int generic_hweight8(unsigned int w) # define fls generic_fls #endif
+#include <asm-generic/bitops/fls64.h> + +static inline unsigned fls_long(unsigned long l) +{ + if (sizeof(l) == 4) + return fls(l); + return fls64(l); +} + /** * __set_bit - Set a bit in memory * @nr: the bit to set diff --git a/include/linux/log2.h b/include/linux/log2.h new file mode 100644 index 0000000..fd7ff3d --- /dev/null +++ b/include/linux/log2.h @@ -0,0 +1,208 @@ +/* Integer base 2 logarithm calculation + * + * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells@redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#ifndef _LINUX_LOG2_H +#define _LINUX_LOG2_H + +#include <linux/types.h> +#include <linux/bitops.h> + +/* + * deal with unrepresentable constant logarithms + */ +extern __attribute__((const, noreturn)) +int ____ilog2_NaN(void); + +/* + * non-constant log of base 2 calculators + * - the arch may override these in asm/bitops.h if they can be implemented + * more efficiently than using fls() and fls64() + * - the arch is not required to handle n==0 if implementing the fallback + */ +#ifndef CONFIG_ARCH_HAS_ILOG2_U32 +static inline __attribute__((const)) +int __ilog2_u32(u32 n) +{ + return fls(n) - 1; +} +#endif + +#ifndef CONFIG_ARCH_HAS_ILOG2_U64 +static inline __attribute__((const)) +int __ilog2_u64(u64 n) +{ + return fls64(n) - 1; +} +#endif + +/* + * Determine whether some value is a power of two, where zero is + * *not* considered a power of two. + */ + +static inline __attribute__((const)) +bool is_power_of_2(unsigned long n) +{ + return (n != 0 && ((n & (n - 1)) == 0)); +} + +/* + * round up to nearest power of two + */ +static inline __attribute__((const)) +unsigned long __roundup_pow_of_two(unsigned long n) +{ + return 1UL << fls_long(n - 1); +} + +/* + * round down to nearest power of two + */ +static inline __attribute__((const)) +unsigned long __rounddown_pow_of_two(unsigned long n) +{ + return 1UL << (fls_long(n) - 1); +} + +/** + * ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value + * @n - parameter + * + * constant-capable log of base 2 calculation + * - this can be used to initialise global variables from constant data, hence + * the massive ternary operator construction + * + * selects the appropriately-sized optimised version depending on sizeof(n) + */ +#define ilog2(n) \ +( \ + __builtin_constant_p(n) ? ( \ + (n) < 1 ? ____ilog2_NaN() : \ + (n) & (1ULL << 63) ? 63 : \ + (n) & (1ULL << 62) ? 62 : \ + (n) & (1ULL << 61) ? 61 : \ + (n) & (1ULL << 60) ? 60 : \ + (n) & (1ULL << 59) ? 59 : \ + (n) & (1ULL << 58) ? 58 : \ + (n) & (1ULL << 57) ? 57 : \ + (n) & (1ULL << 56) ? 56 : \ + (n) & (1ULL << 55) ? 55 : \ + (n) & (1ULL << 54) ? 54 : \ + (n) & (1ULL << 53) ? 53 : \ + (n) & (1ULL << 52) ? 52 : \ + (n) & (1ULL << 51) ? 51 : \ + (n) & (1ULL << 50) ? 50 : \ + (n) & (1ULL << 49) ? 49 : \ + (n) & (1ULL << 48) ? 48 : \ + (n) & (1ULL << 47) ? 47 : \ + (n) & (1ULL << 46) ? 46 : \ + (n) & (1ULL << 45) ? 45 : \ + (n) & (1ULL << 44) ? 44 : \ + (n) & (1ULL << 43) ? 43 : \ + (n) & (1ULL << 42) ? 42 : \ + (n) & (1ULL << 41) ? 41 : \ + (n) & (1ULL << 40) ? 40 : \ + (n) & (1ULL << 39) ? 39 : \ + (n) & (1ULL << 38) ? 38 : \ + (n) & (1ULL << 37) ? 37 : \ + (n) & (1ULL << 36) ? 36 : \ + (n) & (1ULL << 35) ? 35 : \ + (n) & (1ULL << 34) ? 34 : \ + (n) & (1ULL << 33) ? 33 : \ + (n) & (1ULL << 32) ? 32 : \ + (n) & (1ULL << 31) ? 31 : \ + (n) & (1ULL << 30) ? 30 : \ + (n) & (1ULL << 29) ? 29 : \ + (n) & (1ULL << 28) ? 28 : \ + (n) & (1ULL << 27) ? 27 : \ + (n) & (1ULL << 26) ? 26 : \ + (n) & (1ULL << 25) ? 25 : \ + (n) & (1ULL << 24) ? 24 : \ + (n) & (1ULL << 23) ? 23 : \ + (n) & (1ULL << 22) ? 22 : \ + (n) & (1ULL << 21) ? 21 : \ + (n) & (1ULL << 20) ? 20 : \ + (n) & (1ULL << 19) ? 19 : \ + (n) & (1ULL << 18) ? 18 : \ + (n) & (1ULL << 17) ? 17 : \ + (n) & (1ULL << 16) ? 16 : \ + (n) & (1ULL << 15) ? 15 : \ + (n) & (1ULL << 14) ? 14 : \ + (n) & (1ULL << 13) ? 13 : \ + (n) & (1ULL << 12) ? 12 : \ + (n) & (1ULL << 11) ? 11 : \ + (n) & (1ULL << 10) ? 10 : \ + (n) & (1ULL << 9) ? 9 : \ + (n) & (1ULL << 8) ? 8 : \ + (n) & (1ULL << 7) ? 7 : \ + (n) & (1ULL << 6) ? 6 : \ + (n) & (1ULL << 5) ? 5 : \ + (n) & (1ULL << 4) ? 4 : \ + (n) & (1ULL << 3) ? 3 : \ + (n) & (1ULL << 2) ? 2 : \ + (n) & (1ULL << 1) ? 1 : \ + (n) & (1ULL << 0) ? 0 : \ + ____ilog2_NaN() \ + ) : \ + (sizeof(n) <= 4) ? \ + __ilog2_u32(n) : \ + __ilog2_u64(n) \ + ) + +/** + * roundup_pow_of_two - round the given value up to nearest power of two + * @n - parameter + * + * round the given value up to the nearest power of two + * - the result is undefined when n == 0 + * - this can be used to initialise global variables from constant data + */ +#define roundup_pow_of_two(n) \ +( \ + __builtin_constant_p(n) ? ( \ + (n == 1) ? 1 : \ + (1UL << (ilog2((n) - 1) + 1)) \ + ) : \ + __roundup_pow_of_two(n) \ + ) + +/** + * rounddown_pow_of_two - round the given value down to nearest power of two + * @n - parameter + * + * round the given value down to the nearest power of two + * - the result is undefined when n == 0 + * - this can be used to initialise global variables from constant data + */ +#define rounddown_pow_of_two(n) \ +( \ + __builtin_constant_p(n) ? ( \ + (1UL << ilog2(n))) : \ + __rounddown_pow_of_two(n) \ + ) + +/** + * order_base_2 - calculate the (rounded up) base 2 order of the argument + * @n: parameter + * + * The first few values calculated by this routine: + * ob2(0) = 0 + * ob2(1) = 0 + * ob2(2) = 1 + * ob2(3) = 2 + * ob2(4) = 2 + * ob2(5) = 3 + * ... and so on. + */ + +#define order_base_2(n) ilog2(roundup_pow_of_two(n)) + +#endif /* _LINUX_LOG2_H */
From: Fabio Estevam fabio.estevam@freescale.com
Use the is_power_of_2() definition from log2.h to align with the kernel implementation.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Changes since v7: - None
arch/arm/mach-mvebu/mbus.c | 2 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/ubi/build.c | 2 +- fs/ubifs/super.c | 2 +- include/linux/compat.h | 6 ------ 5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c index 771cce6..346278e 100644 --- a/arch/arm/mach-mvebu/mbus.c +++ b/arch/arm/mach-mvebu/mbus.c @@ -52,7 +52,7 @@ #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> -#include <linux/compat.h> +#include <linux/log2.h> #include <linux/mbus.h>
/* DDR target is the same on all platforms */ diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 2f2172b..81be0f7 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -27,8 +27,8 @@ #include <linux/gfp.h> #include <linux/slab.h> #else -#include <linux/compat.h> #include <linux/err.h> +#include <linux/log2.h> #include <ubi_uboot.h> #endif
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 290d524..6ed7667 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -30,7 +30,7 @@ #include <linux/slab.h> #include <linux/major.h> #else -#include <linux/compat.h> +#include <linux/log2.h> #endif #include <linux/err.h> #include <ubi_uboot.h> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 41763a1..eaae5fb 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -31,7 +31,7 @@ #include <common.h> #include <malloc.h> #include <memalign.h> -#include <linux/compat.h> +#include <linux/log2.h> #include <linux/stat.h> #include <linux/err.h> #include "ubifs.h" diff --git a/include/linux/compat.h b/include/linux/compat.h index fbebf91..7a99599 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -104,12 +104,6 @@ static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {} static inline void led_trigger_event(struct led_trigger *trigger, enum led_brightness event) {}
-/* include/linux/log2.h */ -static inline int is_power_of_2(unsigned long n) -{ - return (n != 0 && ((n & (n - 1)) == 0)); -} - /* uapi/linux/limits.h */ #define XATTR_LIST_MAX 65536 /* size of extended attribute namelist (64k) */
From: Fabio Estevam fabio.estevam@freescale.com
Add the SPI NOR protection mechanism from the kernel.
This code is based on the work from Brian Norris computersforpeace@gmail.com
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/driv...
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Changes since v7: - Move BP macros to header file (Jagan) - Remove else block (Jagan)
drivers/mtd/spi/sf_ops.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++ include/spi_flash.h | 4 ++ 2 files changed, 174 insertions(+)
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 900ec1f..928f9c1 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -15,6 +15,7 @@ #include <spi_flash.h> #include <watchdog.h> #include <linux/compiler.h> +#include <linux/log2.h>
#include "sf_internal.h"
@@ -573,3 +574,172 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, return ret; } #endif + +#ifdef CONFIG_SPI_FLASH_STMICRO +static void stm_get_locked_range(struct spi_flash *flash, u8 sr, loff_t *ofs, + u32 *len) +{ + u8 mask = SR_BP2 | SR_BP1 | SR_BP0; + int shift = ffs(mask) - 1; + int pow; + + if (!(sr & mask)) { + /* No protection */ + *ofs = 0; + *len = 0; + } else { + pow = ((sr & mask) ^ mask) >> shift; + *len = flash->size >> pow; + *ofs = flash->size - *len; + } +} + +/* + * Return 1 if the entire region is locked, 0 otherwise + */ +static int stm_is_locked_sr(struct spi_flash *flash, loff_t ofs, u32 len, + u8 sr) +{ + loff_t lock_offs; + u32 lock_len; + + stm_get_locked_range(flash, sr, &lock_offs, &lock_len); + + return (ofs + len <= lock_offs + lock_len) && (ofs >= lock_offs); +} + +/* + * Check if a region of the flash is (completely) locked. See stm_lock() for + * more info. + * + * Returns 1 if entire region is locked, 0 if any portion is unlocked, and + * negative on errors. + */ +int stm_is_locked(struct spi_flash *flash, loff_t ofs, u32 len) +{ + int status; + u8 sr; + + status = spi_flash_cmd_read_status(flash, &sr); + if (status < 0) + return status; + + return stm_is_locked_sr(flash, ofs, len, sr); +} + +/* + * Lock a region of the flash. Compatible with ST Micro and similar flash. + * Supports only the block protection bits BP{0,1,2} in the status register + * (SR). Does not support these features found in newer SR bitfields: + * - TB: top/bottom protect - only handle TB=0 (top protect) + * - SEC: sector/block protect - only handle SEC=0 (block protect) + * - CMP: complement protect - only support CMP=0 (range is not complemented) + * + * Sample table portion for 8MB flash (Winbond w25q64fw): + * + * SEC | TB | BP2 | BP1 | BP0 | Prot Length | Protected Portion + * -------------------------------------------------------------------------- + * X | X | 0 | 0 | 0 | NONE | NONE + * 0 | 0 | 0 | 0 | 1 | 128 KB | Upper 1/64 + * 0 | 0 | 0 | 1 | 0 | 256 KB | Upper 1/32 + * 0 | 0 | 0 | 1 | 1 | 512 KB | Upper 1/16 + * 0 | 0 | 1 | 0 | 0 | 1 MB | Upper 1/8 + * 0 | 0 | 1 | 0 | 1 | 2 MB | Upper 1/4 + * 0 | 0 | 1 | 1 | 0 | 4 MB | Upper 1/2 + * X | X | 1 | 1 | 1 | 8 MB | ALL + * + * Returns negative on errors, 0 on success. + */ +int stm_lock(struct spi_flash *flash, u32 ofs, u32 len) +{ + u8 status_old, status_new; + u8 mask = SR_BP2 | SR_BP1 | SR_BP0; + u8 shift = ffs(mask) - 1, pow, val; + + spi_flash_cmd_read_status(flash, &status_old); + + /* SPI NOR always locks to the end */ + if (ofs + len != flash->size) { + /* Does combined region extend to end? */ + if (!stm_is_locked_sr(flash, ofs + len, flash->size - ofs - len, + status_old)) + return -EINVAL; + len = flash->size - ofs; + } + + /* + * Need smallest pow such that: + * + * 1 / (2^pow) <= (len / size) + * + * so (assuming power-of-2 size) we do: + * + * pow = ceil(log2(size / len)) = log2(size) - floor(log2(len)) + */ + pow = ilog2(flash->size) - ilog2(len); + val = mask - (pow << shift); + if (val & ~mask) + return -EINVAL; + + /* Don't "lock" with no region! */ + if (!(val & mask)) + return -EINVAL; + + status_new = (status_old & ~mask) | val; + + /* Only modify protection if it will not unlock other areas */ + if ((status_new & mask) <= (status_old & mask)) + return -EINVAL; + + spi_flash_cmd_write_status(flash, status_new); + + return 0; +} + +/* + * Unlock a region of the flash. See stm_lock() for more info + * + * Returns negative on errors, 0 on success. + */ +int stm_unlock(struct spi_flash *flash, u32 ofs, u32 len) +{ + uint8_t status_old, status_new; + u8 mask = SR_BP2 | SR_BP1 | SR_BP0; + u8 shift = ffs(mask) - 1, pow, val; + + spi_flash_cmd_read_status(flash, &status_old); + + /* Cannot unlock; would unlock larger region than requested */ + if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size, + flash->erase_size)) + return -EINVAL; + /* + * Need largest pow such that: + * + * 1 / (2^pow) >= (len / size) + * + * so (assuming power-of-2 size) we do: + * + * pow = floor(log2(size / len)) = log2(size) - ceil(log2(len)) + */ + pow = ilog2(flash->size) - order_base_2(flash->size - (ofs + len)); + if (ofs + len == flash->size) { + val = 0; /* fully unlocked */ + } else { + val = mask - (pow << shift); + /* Some power-of-two sizes are not supported */ + if (val & ~mask) + return -EINVAL; + } + + status_new = (status_old & ~mask) | val; + + /* Only modify protection if it will not lock other areas */ + if ((status_new & mask) >= (status_old & mask)) + return -EINVAL; + + spi_flash_cmd_write_status(flash, status_new); + + return 0; +} +#endif /* CONFIG_SPI_FLASH_STMICRO */ diff --git a/include/spi_flash.h b/include/spi_flash.h index 3b2d555..73b2b0a 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -31,6 +31,10 @@ # define CONFIG_SF_DEFAULT_BUS 0 #endif
+#define SR_BP0 BIT(2) /* Block protect 0 */ +#define SR_BP1 BIT(3) /* Block protect 1 */ +#define SR_BP2 BIT(4) /* Block protect 2 */ + struct spi_slave;
/**
From: Fabio Estevam fabio.estevam@freescale.com
Many SPI flashes have protection bits (BP2, BP1 and BP0) in the status register that can protect selected regions of the SPI NOR.
Take these bits into account when performing erase operations, making sure that the protected areas are skipped.
Tested on a mx6qsabresd:
=> sf probe SF: Detected M25P32 with page size 256 Bytes, erase size 64 KiB, total 4 MiB => sf protect lock 0x3f0000 0x10000 => sf erase 0x3f0000 0x10000 offset 0x3f0000 is protected and cannot be erased SF: 65536 bytes @ 0x3f0000 Erased: ERROR => sf protect unlock 0x3f0000 0x10000 => sf erase 0x3f0000 0x10000 SF: 65536 bytes @ 0x3f0000 Erased: OK
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Changes since v7: - Fix build error when DM_SPI_FLASH=y (Jagan) - Return -EOPNOTSUPP when flash->lock == NULL (Jagan) - Only add new hooks when STMICRO is defined (Jagan)
common/cmd_sf.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi/sf-uclass.c | 8 ++++++++ drivers/mtd/spi/sf_internal.h | 8 ++++++++ drivers/mtd/spi/sf_ops.c | 25 +++++++++++++++++++++++++ drivers/mtd/spi/sf_probe.c | 31 +++++++++++++++++++++++++++++++ include/spi_flash.h | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+)
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index ac7f5df..42862d9 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -348,6 +348,37 @@ static int do_spi_flash_erase(int argc, char * const argv[]) return ret == 0 ? 0 : 1; }
+static int do_spi_protect(int argc, char * const argv[]) +{ + int ret = 0; + loff_t start, len; + bool prot = false; + + if (argc != 4) + return -1; + + if (!str2off(argv[2], &start)) { + puts("start sector is not a valid number\n"); + return 1; + } + + if (!str2off(argv[3], &len)) { + puts("len is not a valid number\n"); + return 1; + } + + if (strcmp(argv[1], "lock") == 0) + prot = true; + else if (strcmp(argv[1], "unlock") == 0) + prot = false; + else + return -1; /* Unknown parameter */ + + ret = spi_flash_protect(flash, start, len, prot); + + return ret == 0 ? 0 : 1; +} + #ifdef CONFIG_CMD_SF_TEST enum { STAGE_ERASE, @@ -540,6 +571,8 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, ret = do_spi_flash_read_write(argc, argv); else if (strcmp(cmd, "erase") == 0) ret = do_spi_flash_erase(argc, argv); + else if (strcmp(cmd, "protect") == 0) + ret = do_spi_protect(argc, argv); #ifdef CONFIG_CMD_SF_TEST else if (!strcmp(cmd, "test")) ret = do_spi_flash_test(argc, argv); @@ -579,5 +612,7 @@ U_BOOT_CMD( "sf update addr offset|partition len - erase and write `len' bytes from memory\n" " at `addr' to flash at `offset'\n" " or to start of mtd `partition'\n" + "sf protect lock/unlock sector len - protect/unprotect 'len' bytes starting\n" + " at address 'sector'\n" SF_TEST_HELP ); diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 350e21a..7663885 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -27,6 +27,14 @@ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len) return sf_get_ops(dev)->erase(dev, offset, len); }
+int spi_flash_protect_dm(struct udevice *dev, u32 offset, size_t len, bool prot) +{ + if (prot) + return sf_get_ops(dev)->lock(dev, offset, len); + else + return sf_get_ops(dev)->unlock(dev, offset, len); +} + /* * TODO(sjg@chromium.org): This is an old-style function. We should remove * it when all SPI flash drivers use dm diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 9c95d56..33be598 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -168,6 +168,10 @@ int spi_flash_cmd_read_status(struct spi_flash *flash, u8 *rs); /* Program the status register */ int spi_flash_cmd_write_status(struct spi_flash *flash, u8 ws);
+int stm_is_locked(struct spi_flash *nor, loff_t ofs, u32 len); +int stm_lock(struct spi_flash *nor, u32 ofs, u32 len); +int stm_unlock(struct spi_flash *nor, u32 ofs, u32 len); + /* Read the config register */ int spi_flash_cmd_read_config(struct spi_flash *flash, u8 *rc);
@@ -222,6 +226,10 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, size_t len, void *data);
+int spi_flash_cmd_lock_ops(struct spi_flash *flash, u32 offset, size_t len); +int spi_flash_cmd_unlock_ops(struct spi_flash *flash, u32 offset, size_t len); +int spi_flash_cmd_is_locked_ops(struct spi_flash *flash, u32 offset, size_t len); + #ifdef CONFIG_SPI_FLASH_MTD int spi_flash_mtd_register(struct spi_flash *flash); void spi_flash_mtd_unregister(void); diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 928f9c1..ee23bb2 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -277,6 +277,11 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) return -1; }
+ if (flash->is_locked(flash, offset, len) > 0) { + printf("offset 0x%x is protected and cannot be erased\n", offset); + return -EINVAL; + } + cmd[0] = flash->erase_cmd; while (len) { erase_addr = offset; @@ -319,6 +324,11 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
page_size = flash->page_size;
+ if (flash->is_locked(flash, offset, len) > 0) { + printf("offset 0x%x is protected and cannot be written\n", offset); + return -EINVAL; + } + cmd[0] = flash->write_cmd; for (actual = 0; actual < len; actual += chunk_len) { write_addr = offset; @@ -357,6 +367,21 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, return ret; }
+int spi_flash_cmd_lock_ops(struct spi_flash *flash, u32 offset, size_t len) +{ + return stm_lock(flash, offset, len); +} + +int spi_flash_cmd_unlock_ops(struct spi_flash *flash, u32 offset, size_t len) +{ + return stm_unlock(flash, offset, len); +} + +int spi_flash_cmd_is_locked_ops(struct spi_flash *flash, u32 offset, size_t len) +{ + return stm_is_locked(flash, offset, len); +} + int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, size_t cmd_len, void *data, size_t data_len) { diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 954376d..0975a2f 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -149,6 +149,11 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, #endif flash->erase = spi_flash_cmd_erase_ops; flash->read = spi_flash_cmd_read_ops; +#if defined(CONFIG_SPI_FLASH_STMICRO) + flash->lock = spi_flash_cmd_lock_ops; + flash->unlock = spi_flash_cmd_unlock_ops; + flash->is_locked = spi_flash_cmd_is_locked_ops; +#endif #endif
/* Compute the flash size */ @@ -469,6 +474,27 @@ int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) return spi_flash_cmd_erase_ops(flash, offset, len); }
+int spi_flash_std_lock(struct udevice *dev, u32 offset, size_t len) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + + return spi_flash_cmd_lock_ops(flash, offset, len); +} + +int spi_flash_std_unlock(struct udevice *dev, u32 offset, size_t len) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + + return spi_flash_cmd_unlock_ops(flash, offset, len); +} + +int spi_flash_std_is_locked(struct udevice *dev, u32 offset, size_t len) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + + return spi_flash_cmd_is_locked_ops(flash, offset, len); +} + int spi_flash_std_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parentdata(dev); @@ -485,6 +511,11 @@ static const struct dm_spi_flash_ops spi_flash_std_ops = { .read = spi_flash_std_read, .write = spi_flash_std_write, .erase = spi_flash_std_erase, +#if defined(CONFIG_SPI_FLASH_STMICRO) + .lock = spi_flash_std_lock, + .unlock = spi_flash_std_unlock, + .is_locked = spi_flash_std_is_locked, +#endif };
static const struct udevice_id spi_flash_std_ids[] = { diff --git a/include/spi_flash.h b/include/spi_flash.h index 73b2b0a..4d55ba7 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -110,6 +110,9 @@ struct spi_flash { const void *buf); int (*erase)(struct spi_flash *flash, u32 offset, size_t len); #endif + int (*lock)(struct spi_flash *flash, u32 offset, size_t len); + int (*unlock)(struct spi_flash *flash, u32 offset, size_t len); + int (*is_locked)(struct spi_flash *flash, u32 offset, size_t len); };
struct dm_spi_flash_ops { @@ -117,6 +120,9 @@ struct dm_spi_flash_ops { int (*write)(struct udevice *dev, u32 offset, size_t len, const void *buf); int (*erase)(struct udevice *dev, u32 offset, size_t len); + int (*lock)(struct udevice *dev, u32 offset, size_t len); + int (*unlock)(struct udevice *dev, u32 offset, size_t len); + int (*is_locked)(struct udevice *dev, u32 offset, size_t len); };
/* Access the serial operations for a device */ @@ -158,6 +164,20 @@ int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len, */ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len);
+/** + * spi_flash_protect_dm() - Protect/unprotect blocks of the SPI flash + * + * Note that @len must be a muiltiple of the flash sector size. + * + * @dev: SPI flash device + * @offset: Offset into device in bytes to start erasing + * @len: Number of bytes to erase + * @prot: True: lock the block or False: unlock the block + * @return 0 if OK, -ve on error + */ +int spi_flash_protect_dm(struct udevice *dev, u32 offset, size_t len, + bool prot); + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp); @@ -189,6 +209,15 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, return spi_flash_erase_dm(flash->dev, offset, len); }
+static inline int spi_flash_protect(struct spi_flash *flash, loff_t ofs, + u32 len, bool prot) +{ + if (!flash->lock) + return -EOPNOTSUPP; + + return spi_flash_protect_dm(flash->dev, ofs, len, prot); +} + struct sandbox_state;
int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs, @@ -231,6 +260,18 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, { return flash->erase(flash, offset, len); } + +static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len, + bool prot) +{ + if (!flash->lock) + return -EOPNOTSUPP; + + if (prot) + return flash->lock(flash, ofs, len); + else + return flash->unlock(flash, ofs, len); +} #endif
void spi_boot(void) __noreturn;
On 17 October 2015 at 02:11, Fabio Estevam festevam@gmail.com wrote:
From: Fabio Estevam fabio.estevam@freescale.com
Use the log2 and fls64 header files directly from the kernel.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Changes since v7:
- None
include/asm-generic/bitops/fls64.h | 36 +++++++ include/linux/bitops.h | 9 ++ include/linux/log2.h | 208 +++++++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 include/asm-generic/bitops/fls64.h create mode 100644 include/linux/log2.h
diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h new file mode 100644 index 0000000..86d403f --- /dev/null +++ b/include/asm-generic/bitops/fls64.h @@ -0,0 +1,36 @@ +#ifndef _ASM_GENERIC_BITOPS_FLS64_H_ +#define _ASM_GENERIC_BITOPS_FLS64_H_
+#include <asm/types.h>
+/**
- fls64 - find last set bit in a 64-bit word
- @x: the word to search
- This is defined in a similar way as the libc and compiler builtin
- ffsll, but returns the position of the most significant set bit.
- fls64(value) returns 0 if value is 0 or the position of the last
- set bit if value is nonzero. The last (most significant) bit is
- at position 64.
- */
+#if BITS_PER_LONG == 32 +static inline int fls64(__u64 x) +{
__u32 h = x >> 32;if (h)return fls(h) + 32;return fls(x);+} +#elif BITS_PER_LONG == 64 +static inline int fls64(__u64 x) +{
if (x == 0)return 0;return __fls(x) + 1;+} +#else +#error BITS_PER_LONG not 32 or 64 +#endif
+#endif /* _ASM_GENERIC_BITOPS_FLS64_H_ */ diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 7d30ace..647733f 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -129,6 +129,15 @@ static inline unsigned int generic_hweight8(unsigned int w) # define fls generic_fls #endif
+#include <asm-generic/bitops/fls64.h>
Please check this include, we can't assume to use generic one in common header file there is one more fls64 from powerpc?
+static inline unsigned fls_long(unsigned long l) +{
if (sizeof(l) == 4)return fls(l);return fls64(l);+}
/**
- __set_bit - Set a bit in memory
- @nr: the bit to set
diff --git a/include/linux/log2.h b/include/linux/log2.h new file mode 100644 index 0000000..fd7ff3d --- /dev/null +++ b/include/linux/log2.h @@ -0,0 +1,208 @@ +/* Integer base 2 logarithm calculation
- Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
- Written by David Howells (dhowells@redhat.com)
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version
- 2 of the License, or (at your option) any later version.
- */
Wolfgang Denk/Tom,
This file is copied from Linux, will this license notes will also be same or any changes?
+#ifndef _LINUX_LOG2_H +#define _LINUX_LOG2_H
+#include <linux/types.h> +#include <linux/bitops.h>
+/*
- deal with unrepresentable constant logarithms
- */
+extern __attribute__((const, noreturn)) +int ____ilog2_NaN(void);
+/*
- non-constant log of base 2 calculators
- the arch may override these in asm/bitops.h if they can be implemented
- more efficiently than using fls() and fls64()
- the arch is not required to handle n==0 if implementing the fallback
- */
+#ifndef CONFIG_ARCH_HAS_ILOG2_U32 +static inline __attribute__((const)) +int __ilog2_u32(u32 n) +{
return fls(n) - 1;+} +#endif
+#ifndef CONFIG_ARCH_HAS_ILOG2_U64 +static inline __attribute__((const)) +int __ilog2_u64(u64 n) +{
return fls64(n) - 1;+} +#endif
+/*
- Determine whether some value is a power of two, where zero is
- *not* considered a power of two.
- */
+static inline __attribute__((const)) +bool is_power_of_2(unsigned long n) +{
return (n != 0 && ((n & (n - 1)) == 0));+}
+/*
- round up to nearest power of two
- */
+static inline __attribute__((const)) +unsigned long __roundup_pow_of_two(unsigned long n) +{
return 1UL << fls_long(n - 1);+}
+/*
- round down to nearest power of two
- */
+static inline __attribute__((const)) +unsigned long __rounddown_pow_of_two(unsigned long n) +{
return 1UL << (fls_long(n) - 1);+}
+/**
- ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value
- @n - parameter
- constant-capable log of base 2 calculation
- this can be used to initialise global variables from constant data, hence
- the massive ternary operator construction
- selects the appropriately-sized optimised version depending on sizeof(n)
- */
+#define ilog2(n) \ +( \
__builtin_constant_p(n) ? ( \(n) < 1 ? ____ilog2_NaN() : \(n) & (1ULL << 63) ? 63 : \(n) & (1ULL << 62) ? 62 : \(n) & (1ULL << 61) ? 61 : \(n) & (1ULL << 60) ? 60 : \(n) & (1ULL << 59) ? 59 : \(n) & (1ULL << 58) ? 58 : \(n) & (1ULL << 57) ? 57 : \(n) & (1ULL << 56) ? 56 : \(n) & (1ULL << 55) ? 55 : \(n) & (1ULL << 54) ? 54 : \(n) & (1ULL << 53) ? 53 : \(n) & (1ULL << 52) ? 52 : \(n) & (1ULL << 51) ? 51 : \(n) & (1ULL << 50) ? 50 : \(n) & (1ULL << 49) ? 49 : \(n) & (1ULL << 48) ? 48 : \(n) & (1ULL << 47) ? 47 : \(n) & (1ULL << 46) ? 46 : \(n) & (1ULL << 45) ? 45 : \(n) & (1ULL << 44) ? 44 : \(n) & (1ULL << 43) ? 43 : \(n) & (1ULL << 42) ? 42 : \(n) & (1ULL << 41) ? 41 : \(n) & (1ULL << 40) ? 40 : \(n) & (1ULL << 39) ? 39 : \(n) & (1ULL << 38) ? 38 : \(n) & (1ULL << 37) ? 37 : \(n) & (1ULL << 36) ? 36 : \(n) & (1ULL << 35) ? 35 : \(n) & (1ULL << 34) ? 34 : \(n) & (1ULL << 33) ? 33 : \(n) & (1ULL << 32) ? 32 : \(n) & (1ULL << 31) ? 31 : \(n) & (1ULL << 30) ? 30 : \(n) & (1ULL << 29) ? 29 : \(n) & (1ULL << 28) ? 28 : \(n) & (1ULL << 27) ? 27 : \(n) & (1ULL << 26) ? 26 : \(n) & (1ULL << 25) ? 25 : \(n) & (1ULL << 24) ? 24 : \(n) & (1ULL << 23) ? 23 : \(n) & (1ULL << 22) ? 22 : \(n) & (1ULL << 21) ? 21 : \(n) & (1ULL << 20) ? 20 : \(n) & (1ULL << 19) ? 19 : \(n) & (1ULL << 18) ? 18 : \(n) & (1ULL << 17) ? 17 : \(n) & (1ULL << 16) ? 16 : \(n) & (1ULL << 15) ? 15 : \(n) & (1ULL << 14) ? 14 : \(n) & (1ULL << 13) ? 13 : \(n) & (1ULL << 12) ? 12 : \(n) & (1ULL << 11) ? 11 : \(n) & (1ULL << 10) ? 10 : \(n) & (1ULL << 9) ? 9 : \(n) & (1ULL << 8) ? 8 : \(n) & (1ULL << 7) ? 7 : \(n) & (1ULL << 6) ? 6 : \(n) & (1ULL << 5) ? 5 : \(n) & (1ULL << 4) ? 4 : \(n) & (1ULL << 3) ? 3 : \(n) & (1ULL << 2) ? 2 : \(n) & (1ULL << 1) ? 1 : \(n) & (1ULL << 0) ? 0 : \____ilog2_NaN() \) : \(sizeof(n) <= 4) ? \__ilog2_u32(n) : \__ilog2_u64(n) \- )
+/**
- roundup_pow_of_two - round the given value up to nearest power of two
- @n - parameter
- round the given value up to the nearest power of two
- the result is undefined when n == 0
- this can be used to initialise global variables from constant data
- */
+#define roundup_pow_of_two(n) \ +( \
__builtin_constant_p(n) ? ( \(n == 1) ? 1 : \(1UL << (ilog2((n) - 1) + 1)) \) : \__roundup_pow_of_two(n) \- )
+/**
- rounddown_pow_of_two - round the given value down to nearest power of two
- @n - parameter
- round the given value down to the nearest power of two
- the result is undefined when n == 0
- this can be used to initialise global variables from constant data
- */
+#define rounddown_pow_of_two(n) \ +( \
__builtin_constant_p(n) ? ( \(1UL << ilog2(n))) : \__rounddown_pow_of_two(n) \- )
+/**
- order_base_2 - calculate the (rounded up) base 2 order of the argument
- @n: parameter
- The first few values calculated by this routine:
- ob2(0) = 0
- ob2(1) = 0
- ob2(2) = 1
- ob2(3) = 2
- ob2(4) = 2
- ob2(5) = 3
- ... and so on.
- */
+#define order_base_2(n) ilog2(roundup_pow_of_two(n))
+#endif /* _LINUX_LOG2_H */
1.9.1
-- Jagan.
On Fri, Oct 16, 2015 at 05:41:12PM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
Use the log2 and fls64 header files directly from the kernel.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Please update based on http://www.denx.de/wiki/view/U-Boot/Patches#Attributing_Code_Copyrights_Sign to note which kernel hash this comes from. Similar for the other parts as needed.
Hi Tom,
On Mon, Oct 19, 2015 at 9:06 PM, Tom Rini trini@konsulko.com wrote:
On Fri, Oct 16, 2015 at 05:41:12PM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
Use the log2 and fls64 header files directly from the kernel.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Please update based on http://www.denx.de/wiki/view/U-Boot/Patches#Attributing_Code_Copyrights_Sign to note which kernel hash this comes from. Similar for the other parts as needed.
The need to state the kernel hash or version is clear.
My question is: if we import a file from the kernel should we keep the license text intact or should it be adapted to the SPDX-License-Identifier style?
On Thu, Oct 22, 2015 at 07:30:21PM -0200, Fabio Estevam wrote:
Hi Tom,
On Mon, Oct 19, 2015 at 9:06 PM, Tom Rini trini@konsulko.com wrote:
On Fri, Oct 16, 2015 at 05:41:12PM -0300, Fabio Estevam wrote:
From: Fabio Estevam fabio.estevam@freescale.com
Use the log2 and fls64 header files directly from the kernel.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com
Please update based on http://www.denx.de/wiki/view/U-Boot/Patches#Attributing_Code_Copyrights_Sign to note which kernel hash this comes from. Similar for the other parts as needed.
The need to state the kernel hash or version is clear.
My question is: if we import a file from the kernel should we keep the license text intact or should it be adapted to the SPDX-License-Identifier style?
We don't have a hard rule here as we know the kernel will not adopt SPDX tags currently. For rare sync ups like this probably is, switching to a tag might make sense, for stuff we'll resync every few kernel releases, it's just resync noise possibly so I'll leave that to the people doing the sync.
Dear Tom,
In message 20151022222627.GO23893@bill-the-cat you wrote:
We don't have a hard rule here as we know the kernel will not adopt SPDX tags currently. For rare sync ups like this probably is, switching to a tag might make sense, for stuff we'll resync every few kernel releases, it's just resync noise possibly so I'll leave that to the people doing the sync.
In any case the SPDX tag must be added.
Best regards,
Wolfgang Denk
On Fri, Oct 23, 2015 at 06:36:27AM +0200, Wolfgang Denk wrote:
Dear Tom,
In message 20151022222627.GO23893@bill-the-cat you wrote:
We don't have a hard rule here as we know the kernel will not adopt SPDX tags currently. For rare sync ups like this probably is, switching to a tag might make sense, for stuff we'll resync every few kernel releases, it's just resync noise possibly so I'll leave that to the people doing the sync.
In any case the SPDX tag must be added.
Well, it comes down to how much of a PITA that makes re-syncing. The tags make life easier but the end goal is the reports. This reminds me that I need to go ping some people about the SPDX tooling, there's some funny things to re-sync and some files to tag.
Dear Fabio,
In message CAOMZO5Bz_0=z-yp5SKvYM_VXeKVL-6yO7+EFqZyb9outqVm1WQ@mail.gmail.com you wrote:
My question is: if we import a file from the kernel should we keep the license text intact or should it be adapted to the SPDX-License-Identifier style?
We adapt it and use SPDX tags only.
Best regards,
Wolfgang Denk
participants (4)
-
Fabio Estevam -
Jagan Teki -
Tom Rini -
Wolfgang Denk