From 175bc1c65b39be0f5251bc3141b699cf39d63cdc Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 13 Feb 2023 10:46:24 +0100 Subject: [PATCH 1/7] MAINTAINERS: Add entry for SPI NAND framework and drivers In [1] Michael agreed on taking patches for SPI NAND through the RAW NAND tree. Add a dedicated entry to the MAINTAINERS file which adds Michael and Dario as maintainers and myself as reviewer. [1] https://lists.denx.de/pipermail/u-boot/2023-February/508571.html Signed-off-by: Frieder Schrempf Cc: Jagan Teki Cc: Dario Binacchi Cc: Michael Nazzareno Trimarchi Cc: Tom Rini Link: https://lore.kernel.org/all/20230213094626.50957-1-frieder@fris.de/ Signed-off-by: Dario Binacchi --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4c17c6cb9f1..d188e9fff7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1398,6 +1398,14 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-spi.git F: drivers/spi/ F: include/spi* +SPI NAND +M: Dario Binacchi +M: Michael Trimarchi +R: Frieder Schrempf +S: Maintained +T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git +F: drivers/mtd/nand/spi/ + SPI-NOR M: Jagan Teki M: Vignesh R From 28b395ccc42cb7301733d8eb46a360189308bd71 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 13 Feb 2023 10:46:25 +0100 Subject: [PATCH 2/7] MAINTAINERS: Rename NAND FLASH to RAW NAND As there are other types of NAND flashes like SPI NAND, let's be more specific. Signed-off-by: Frieder Schrempf Link: https://lore.kernel.org/all/20230213094626.50957-2-frieder@fris.de/ Signed-off-by: Dario Binacchi --- MAINTAINERS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d188e9fff7b..02a5a8682f8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1181,13 +1181,6 @@ S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mmc.git F: drivers/mmc/ -NAND FLASH -M: Dario Binacchi -M: Michael Trimarchi -S: Maintained -T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git -F: drivers/mtd/nand/raw/ - NETWORK M: Joe Hershberger M: Ramon Fried @@ -1306,6 +1299,13 @@ S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git F: arch/powerpc/cpu/mpc85xx/ +RAW NAND +M: Dario Binacchi +M: Michael Trimarchi +S: Maintained +T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git +F: drivers/mtd/nand/raw/ + RISC-V M: Rick Chen M: Leo From ff33d3c87c2a1ab576607c2f67a9cb7690a4e7ca Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 8 Mar 2023 22:28:51 +0100 Subject: [PATCH 3/7] mtd: rawnand: nand_base: Handle algorithm selection For BRCMNAND with 1-bit BCH ECC (BCH-1) such as used on the D-Link DIR-885L and DIR-890L routers, we need to explicitly select the ECC like this in the device tree: nand-ecc-algo = "bch"; nand-ecc-strength = <1>; nand-ecc-step-size = <512>; This is handled by the Linux kernel but U-Boot core does not respect this. Fix it up by parsing the algorithm and preserve the behaviour using this property to select software BCH as far as possible. Signed-off-by: Linus Walleij Reviewed-by: Michael Trimarchi Acked-by: William Zhang Link: https://lore.kernel.org/all/20230308212851.370939-1-linus.walleij@linaro.org/ Signed-off-by: Dario Binacchi --- drivers/mtd/nand/raw/nand_base.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9eba360d55f..c173fd09237 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4487,6 +4487,7 @@ EXPORT_SYMBOL(nand_detect); static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode node) { int ret, ecc_mode = -1, ecc_strength, ecc_step; + int ecc_algo = NAND_ECC_UNKNOWN; const char *str; ret = ofnode_read_s32_default(node, "nand-bus-width", -1); @@ -4512,10 +4513,13 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod ecc_mode = NAND_ECC_SOFT_BCH; } - if (ecc_mode == NAND_ECC_SOFT) { - str = ofnode_read_string(node, "nand-ecc-algo"); - if (str && !strcmp(str, "bch")) + str = ofnode_read_string(node, "nand-ecc-algo"); + if (str && !strcmp(str, "bch")) { + ecc_algo = NAND_ECC_BCH; + if (ecc_mode == NAND_ECC_SOFT) ecc_mode = NAND_ECC_SOFT_BCH; + } else if (!strcmp(str, "hamming")) { + ecc_algo = NAND_ECC_HAMMING; } ecc_strength = ofnode_read_s32_default(node, @@ -4529,6 +4533,8 @@ static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, ofnode nod return -EINVAL; } + chip->ecc.algo = ecc_algo; + if (ecc_mode >= 0) chip->ecc.mode = ecc_mode; From eb3a6e32837a099ae63c0afe7fa465a31f5c3c43 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 8 Mar 2023 22:42:31 +0100 Subject: [PATCH 4/7] nand: brcmnand: add iproc support Add support for the iproc Broadcom NAND controller, used in Northstar SoCs for example. Based on the Linux driver. Cc: Philippe Reynes Cc: Dario Binacchi Reviewed-by: Michael Trimarchi Signed-off-by: Linus Walleij Acked-by: William Zhang Link: https://lore.kernel.org/all/20230308214231.378013-1-linus.walleij@linaro.org/ Signed-off-by: Dario Binacchi --- drivers/mtd/nand/raw/Kconfig | 7 + drivers/mtd/nand/raw/brcmnand/Makefile | 1 + drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 148 +++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 drivers/mtd/nand/raw/brcmnand/iproc_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 5c7b0d9dcc1..d115fcf841f 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -156,6 +156,13 @@ config NAND_BRCMNAND_63158 help Enable support for broadcom nand driver on bcm63158. +config NAND_BRCMNAND_IPROC + bool "Support Broadcom NAND controller on the iproc family" + depends on NAND_BRCMNAND + help + Enable support for broadcom nand driver on the Broadcom + iproc family such as Northstar (BCM5301x, BCM4708...) + config NAND_DAVINCI bool "Support TI Davinci NAND controller" select SYS_NAND_SELF_INIT if TARGET_DA850EVM diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index f46a7edae32..0c6325aaa61 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_NAND_BRCMNAND_6753) += bcm6753_nand.o obj-$(CONFIG_NAND_BRCMNAND_68360) += bcm68360_nand.o obj-$(CONFIG_NAND_BRCMNAND_6838) += bcm6838_nand.o obj-$(CONFIG_NAND_BRCMNAND_6858) += bcm6858_nand.o +obj-$(CONFIG_NAND_BRCMNAND_IPROC) += iproc_nand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand_compat.o diff --git a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c new file mode 100644 index 00000000000..69711d98ce1 --- /dev/null +++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Code borrowed from the Linux driver + * Copyright (C) 2015 Broadcom Corporation + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "brcmnand.h" + +struct iproc_nand_soc { + struct brcmnand_soc soc; + void __iomem *idm_base; + void __iomem *ext_base; +}; + +#define IPROC_NAND_CTLR_READY_OFFSET 0x10 +#define IPROC_NAND_CTLR_READY BIT(0) + +#define IPROC_NAND_IO_CTRL_OFFSET 0x00 +#define IPROC_NAND_APB_LE_MODE BIT(24) +#define IPROC_NAND_INT_CTRL_READ_ENABLE BIT(6) + +static bool iproc_nand_intc_ack(struct brcmnand_soc *soc) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->ext_base + IPROC_NAND_CTLR_READY_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (val & IPROC_NAND_CTLR_READY) { + brcmnand_writel(IPROC_NAND_CTLR_READY, mmio); + return true; + } + + return false; +} + +static void iproc_nand_intc_set(struct brcmnand_soc *soc, bool en) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (en) + val |= IPROC_NAND_INT_CTRL_READ_ENABLE; + else + val &= ~IPROC_NAND_INT_CTRL_READ_ENABLE; + + brcmnand_writel(val, mmio); +} + +static void iproc_nand_apb_access(struct brcmnand_soc *soc, bool prepare, + bool is_param) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val; + + val = brcmnand_readl(mmio); + + /* + * In the case of BE or when dealing with NAND data, always configure + * the APB bus to LE mode before accessing the FIFO and back to BE mode + * after the access is done + */ + if (IS_ENABLED(CONFIG_SYS_BIG_ENDIAN) || !is_param) { + if (prepare) + val |= IPROC_NAND_APB_LE_MODE; + else + val &= ~IPROC_NAND_APB_LE_MODE; + } else { /* when in LE accessing the parameter page, keep APB in BE */ + val &= ~IPROC_NAND_APB_LE_MODE; + } + + brcmnand_writel(val, mmio); +} + +static int iproc_nand_probe(struct udevice *dev) +{ + struct udevice *pdev = dev; + struct iproc_nand_soc *priv = dev_get_priv(dev); + struct brcmnand_soc *soc; + struct resource res; + int ret; + + soc = &priv->soc; + + ret = dev_read_resource_byname(pdev, "iproc-idm", &res); + if (ret) + return ret; + + priv->idm_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->idm_base)) + return PTR_ERR(priv->idm_base); + + ret = dev_read_resource_byname(pdev, "iproc-ext", &res); + if (ret) + return ret; + + priv->ext_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->ext_base)) + return PTR_ERR(priv->ext_base); + + soc->ctlrdy_ack = iproc_nand_intc_ack; + soc->ctlrdy_set_enabled = iproc_nand_intc_set; + soc->prepare_data_bus = iproc_nand_apb_access; + + return brcmnand_probe(pdev, soc); +} + +static const struct udevice_id iproc_nand_dt_ids[] = { + { + .compatible = "brcm,nand-iproc", + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(iproc_nand) = { + .name = "iproc-nand", + .id = UCLASS_MTD, + .of_match = iproc_nand_dt_ids, + .probe = iproc_nand_probe, + .priv_auto = sizeof(struct iproc_nand_soc), +}; + +void board_nand_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MTD, + DM_DRIVER_GET(iproc_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); +} From 982e28be1d857e32263c95e367e29f24095be9e0 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Wed, 5 Apr 2023 22:38:37 +0800 Subject: [PATCH 5/7] nand: raw: octeontx: Make list static octeontx_bch_devices and octeontx_pci_nand_deferred_devices are only referenced in the files where they are defined. Make them static. Signed-off-by: Bin Meng Acked-by: Michael Trimarchi Link: https://lore.kernel.org/all/20230405143837.785082-1-bmeng@tinylab.org/ Signed-off-by: Dario Binacchi --- drivers/mtd/nand/raw/octeontx_bch.c | 2 +- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/octeontx_bch.c b/drivers/mtd/nand/raw/octeontx_bch.c index fc16b77416b..056a6857822 100644 --- a/drivers/mtd/nand/raw/octeontx_bch.c +++ b/drivers/mtd/nand/raw/octeontx_bch.c @@ -27,7 +27,7 @@ #include #include "octeontx_bch.h" -LIST_HEAD(octeontx_bch_devices); +static LIST_HEAD(octeontx_bch_devices); static unsigned int num_vfs = BCH_NR_VF; static void *bch_pf; static void *bch_vf; diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c index 1ffadad9cae..65a03d22c1d 100644 --- a/drivers/mtd/nand/raw/octeontx_nand.c +++ b/drivers/mtd/nand/raw/octeontx_nand.c @@ -354,7 +354,7 @@ struct octeontx_probe_device { static struct bch_vf *bch_vf; /** Deferred devices due to BCH not being ready */ -LIST_HEAD(octeontx_pci_nand_deferred_devices); +static LIST_HEAD(octeontx_pci_nand_deferred_devices); /** default parameters used for probing chips */ #define MAX_ONFI_MODE 5 From cba9668e63a2e525b696c6de5720d5d5994f0766 Mon Sep 17 00:00:00 2001 From: Francesco Dolcini Date: Mon, 6 Feb 2023 23:48:37 +0100 Subject: [PATCH 6/7] colibri-imx7: specify MTD partitions on command line Disable fdt_fixup_mtdparts() and pass MTD partition on the command line. Dynamically editing the fdt with a static partitions configuration is not required and there is no advantages compared to using the command line. This change should prevent boot failures as the one in [0]. Cc: Marek Vasut Cc: Miquel Raynal Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ [0] Link: https://lore.kernel.org/all/20230105123334.7f90c289@xps-13/ Signed-off-by: Francesco Dolcini Link: https://lore.kernel.org/all/20230206224838.75963-3-francesco@dolcini.it/ Signed-off-by: Dario Binacchi --- board/toradex/colibri_imx7/colibri_imx7.c | 10 ---------- configs/colibri_imx7_defconfig | 1 - include/configs/colibri_imx7.h | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index 6ce4fa376ac..3e79ab93a98 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -303,16 +303,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_status_disabled(blob, off); } #endif -#if defined(CONFIG_FDT_FIXUP_PARTITIONS) - static const struct node_info nodes[] = { - { "fsl,imx7d-gpmi-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */ - { "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, }, - }; - - /* Update partition nodes using info from mtdparts env var */ - puts(" Updating MTD partitions...\n"); - fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); -#endif return ft_common_board_setup(blob, bd); } diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 3a67ea38508..8439742afaa 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -102,4 +102,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index c568643977c..03f8ed14787 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -141,7 +141,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \ From 156968211ef0e155a198a2fe9e94187a91186ab9 Mon Sep 17 00:00:00 2001 From: Francesco Dolcini Date: Mon, 6 Feb 2023 23:48:38 +0100 Subject: [PATCH 7/7] colibri-imx6ull: specify MTD partitions on command line Disable fdt_fixup_mtdparts() and pass MTD partition on the command line. Dynamically editing the fdt with a static partitions configuration is not required and there is no advantages compared to using the command line. This change should prevent boot failures as the one in [0]. Cc: Marek Vasut Cc: Miquel Raynal Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ [0] Link: https://lore.kernel.org/all/20230105123334.7f90c289@xps-13/ Signed-off-by: Francesco Dolcini Link: https://lore.kernel.org/all/20230206224838.75963-4-francesco@dolcini.it/ Signed-off-by: Dario Binacchi --- board/toradex/colibri-imx6ull/colibri-imx6ull.c | 11 ----------- configs/colibri-imx6ull_defconfig | 1 - include/configs/colibri-imx6ull.h | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 6007f110e4b..48fdb1e0971 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -212,17 +212,6 @@ int checkboard(void) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) int ft_board_setup(void *blob, struct bd_info *bd) { -#if defined(CONFIG_FDT_FIXUP_PARTITIONS) - static struct node_info nodes[] = { - { "fsl,imx6ull-gpmi-nand", MTD_DEV_TYPE_NAND, }, - { "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, }, - }; - - /* Update partition nodes using info from mtdparts env var */ - puts(" Updating MTD partitions...\n"); - fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); -#endif - return ft_common_board_setup(blob, bd); } #endif diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index b50577f9068..2f1a201919c 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -104,4 +104,3 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index ba45ee4efd3..561a61ebc03 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -99,7 +99,7 @@ "${board}/flash_blk.img && source ${loadaddr}\0" \ "setup=setenv setupargs " \ "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + ",${baudrate}n8 ${memargs} ${mtdparts} consoleblank=0\0" \ "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} " \