From eb446ef625bcff969f3e1d3a6874ce9d56113e9b Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Fri, 25 Oct 2019 19:39:29 +0200 Subject: [PATCH] cmd: nand/sf: isolate legacy code The 'sf' command is not supposed to rely on the MTD stack, but both 'sf' and 'nand' commands use helpers located in mtd_uboot.c. Despite their location, these functions do not depend at all on the MTD stack. This file (drivers/mtd/mtd_uboot.c) is only compiled if CONFIG_MTD is selected, which is inconsistent with the current situation. Solve this by moving these three functions (which are only used by the above two commands) out of mtd_uboot.c and put them in a C file only compiled with cmd/sf.c and cmd/nand.c. Signed-off-by: Miquel Raynal [trini: Don't export get_part function now] Signed-off-by: Tom Rini --- arch/arm/mach-imx/cmd_nandbcb.c | 2 + cmd/Makefile | 3 + cmd/legacy-mtd-utils.c | 99 +++++++++++++++++++++++++++++++++ cmd/legacy-mtd-utils.h | 12 ++++ cmd/nand.c | 2 + cmd/sf.c | 2 + drivers/mtd/Makefile | 2 +- drivers/mtd/mtd_uboot.c | 94 ------------------------------- include/linux/mtd/mtd.h | 6 -- 9 files changed, 121 insertions(+), 101 deletions(-) create mode 100644 cmd/legacy-mtd-utils.c create mode 100644 cmd/legacy-mtd-utils.h diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 09c4356529..9d3ed1aac3 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -24,6 +24,8 @@ #include #include +#include "../../../cmd/legacy-mtd-utils.h" + #define BF_VAL(v, bf) (((v) & bf##_MASK) >> bf##_OFFSET) #define GETBIT(v, n) (((v) >> (n)) & 0x1) diff --git a/cmd/Makefile b/cmd/Makefile index f823d16755..36b3ceca39 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -97,6 +97,9 @@ obj-$(CONFIG_CMD_MMC) += mmc.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_CMD_MTD) += mtd.o obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o +ifneq ($(CONFIG_CMD_NAND)$(CONFIG_CMD_SF),) +obj-y += legacy-mtd-utils.o +endif obj-$(CONFIG_CMD_NAND) += nand.o obj-$(CONFIG_CMD_NET) += net.o obj-$(CONFIG_CMD_NVEDIT_EFI) += nvedit_efi.o diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c new file mode 100644 index 0000000000..ac7139f84d --- /dev/null +++ b/cmd/legacy-mtd-utils.c @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include +#include + +static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size, + loff_t *maxsize, int devtype) +{ +#ifdef CONFIG_CMD_MTDPARTS + struct mtd_device *dev; + struct part_info *part; + u8 pnum; + int ret; + + ret = mtdparts_init(); + if (ret) + return ret; + + ret = find_dev_and_part(partname, &dev, &pnum, &part); + if (ret) + return ret; + + if (dev->id->type != devtype) { + printf("not same typ %d != %d\n", dev->id->type, devtype); + return -1; + } + + *off = part->offset; + *size = part->size; + *maxsize = part->size; + *idx = dev->id->num; + + return 0; +#else + puts("mtdparts support missing.\n"); + return -1; +#endif +} + +int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size, + loff_t *maxsize, int devtype, uint64_t chipsize) +{ + if (!str2off(arg, off)) + return get_part(arg, idx, off, size, maxsize, devtype); + + if (*off >= chipsize) { + puts("Offset exceeds device limit\n"); + return -1; + } + + *maxsize = chipsize - *off; + *size = *maxsize; + return 0; +} + +int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, + loff_t *size, loff_t *maxsize, int devtype, + uint64_t chipsize) +{ + int ret; + + if (argc == 0) { + *off = 0; + *size = chipsize; + *maxsize = *size; + goto print; + } + + ret = mtd_arg_off(argv[0], idx, off, size, maxsize, devtype, + chipsize); + if (ret) + return ret; + + if (argc == 1) + goto print; + + if (!str2off(argv[1], size)) { + printf("'%s' is not a number\n", argv[1]); + return -1; + } + + if (*size > *maxsize) { + puts("Size exceeds partition or device limit\n"); + return -1; + } + +print: + printf("device %d ", *idx); + if (*size == chipsize) + puts("whole chip\n"); + else + printf("offset 0x%llx, size 0x%llx\n", + (unsigned long long)*off, (unsigned long long)*size); + return 0; +} diff --git a/cmd/legacy-mtd-utils.h b/cmd/legacy-mtd-utils.h new file mode 100644 index 0000000000..ac441d5558 --- /dev/null +++ b/cmd/legacy-mtd-utils.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef __LEGACY_MTD_UTILS_H +#define __LEGACY_MTD_UTILS_H + +int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size, + loff_t *maxsize, int devtype, uint64_t chipsize); +int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, + loff_t *size, loff_t *maxsize, int devtype, + uint64_t chipsize); + +#endif /* LEGACY_MTD_UTILS_H */ diff --git a/cmd/nand.c b/cmd/nand.c index 24c9df89c1..5bda69e819 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -30,6 +30,8 @@ #include #include +#include "legacy-mtd-utils.h" + #if defined(CONFIG_CMD_MTDPARTS) /* partition handling routines */ diff --git a/cmd/sf.c b/cmd/sf.c index 6ccf98ae51..e993b3e5ad 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -18,6 +18,8 @@ #include #include +#include "legacy-mtd-utils.h" + static struct spi_flash *flash; /* diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index bd4f533705..c742bc671a 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifneq (,$(findstring y,$(CONFIG_MTD)$(CONFIG_CMD_NAND)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_SF)$(CONFIG_CMD_MTD))) +ifneq (,$(findstring y,$(CONFIG_MTD)$(CONFIG_CMD_ONENAND)$(CONFIG_CMD_MTD))) obj-y += mtdcore.o mtd_uboot.o endif obj-$(CONFIG_DM_MTD) += mtd-uclass.o diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index 7c6c9ac0bc..8aeccb016d 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -7,7 +7,6 @@ #include #include #include -#include /* LEGACY */ #include #include #include @@ -356,96 +355,3 @@ int mtd_probe_devices(void) return 0; } #endif /* defined(CONFIG_MTD_PARTITIONS) */ - -/* Legacy */ - -static int get_part(const char *partname, int *idx, loff_t *off, loff_t *size, - loff_t *maxsize, int devtype) -{ -#ifdef CONFIG_CMD_MTDPARTS - struct mtd_device *dev; - struct part_info *part; - u8 pnum; - int ret; - - ret = mtdparts_init(); - if (ret) - return ret; - - ret = find_dev_and_part(partname, &dev, &pnum, &part); - if (ret) - return ret; - - if (dev->id->type != devtype) { - printf("not same typ %d != %d\n", dev->id->type, devtype); - return -1; - } - - *off = part->offset; - *size = part->size; - *maxsize = part->size; - *idx = dev->id->num; - - return 0; -#else - puts("mtdparts support missing.\n"); - return -1; -#endif -} - -int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size, - loff_t *maxsize, int devtype, uint64_t chipsize) -{ - if (!str2off(arg, off)) - return get_part(arg, idx, off, size, maxsize, devtype); - - if (*off >= chipsize) { - puts("Offset exceeds device limit\n"); - return -1; - } - - *maxsize = chipsize - *off; - *size = *maxsize; - return 0; -} - -int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, - loff_t *size, loff_t *maxsize, int devtype, - uint64_t chipsize) -{ - int ret; - - if (argc == 0) { - *off = 0; - *size = chipsize; - *maxsize = *size; - goto print; - } - - ret = mtd_arg_off(argv[0], idx, off, size, maxsize, devtype, - chipsize); - if (ret) - return ret; - - if (argc == 1) - goto print; - - if (!str2off(argv[1], size)) { - printf("'%s' is not a number\n", argv[1]); - return -1; - } - - if (*size > *maxsize) { - puts("Size exceeds partition or device limit\n"); - return -1; - } - -print: - printf("device %d ", *idx); - if (*size == chipsize) - puts("whole chip\n"); - else - printf("offset 0x%llx, size 0x%llx\n", - (unsigned long long)*off, (unsigned long long)*size); - return 0; -} diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index e3549f0a46..ceffd994de 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -588,12 +588,6 @@ struct mtd_info *__mtd_next_device(int i); (mtd) != NULL; \ (mtd) = __mtd_next_device(mtd->index + 1)) -int mtd_arg_off(const char *arg, int *idx, loff_t *off, loff_t *size, - loff_t *maxsize, int devtype, uint64_t chipsize); -int mtd_arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, - loff_t *size, loff_t *maxsize, int devtype, - uint64_t chipsize); - /* drivers/mtd/mtdcore.c */ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset, const uint64_t length, uint64_t *len_incl_bad,