August 2018 - U-Boot

[U-Boot] [PATCH] phy: rcar: Add R-Car Gen2 PHY driver
by Marek Vasut 08 Aug '18

08 Aug '18

Add a PHY driver for the R-Car Gen2 which allows configuring the mux connected to the EHCI controllers and USBHS controller. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- drivers/phy/Kconfig | 8 ++ drivers/phy/Makefile | 1 + drivers/phy/phy-rcar-gen2.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 drivers/phy/phy-rcar-gen2.c diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 8fc2295d03..e0822bb775 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -110,6 +110,14 @@ config STI_USB_PHY used by USB2 and USB3 Host controllers available on STiH407 SoC families. +config PHY_RCAR_GEN2 + tristate "Renesas R-Car Gen2 USB PHY" + depends on PHY && RCAR_GEN2 + help + Support for the Renesas R-Car Gen2 USB PHY. This driver operates the + PHY connected to USBHS module, PCI EHCI module and USB3.0 module and + allows configuring the module multiplexing. + config PHY_STM32_USBPHYC tristate "STMicroelectronics STM32 SoC USB HS PHY driver" depends on PHY && ARCH_STM32MP diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index ba0803cd04..178fb4530e 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -12,5 +12,6 @@ obj-$(CONFIG_BCM6368_USBH_PHY) += bcm6368-usbh-phy.o obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o +obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c new file mode 100644 index 0000000000..ee70b81d88 --- /dev/null +++ b/drivers/phy/phy-rcar-gen2.c @@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Renesas RCar Gen2 USB PHY driver + * + * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> + */ + +#include <common.h> +#include <clk.h> +#include <div64.h> +#include <dm.h> +#include <fdtdec.h> +#include <generic-phy.h> +#include <reset.h> +#include <syscon.h> +#include <usb.h> +#include <asm/io.h> +#include <linux/bitops.h> +#include <power/regulator.h> + +#define USBHS_LPSTS 0x02 +#define USBHS_UGCTRL 0x80 +#define USBHS_UGCTRL2 0x84 +#define USBHS_UGSTS 0x88 /* From technical update */ + +/* Low Power Status register (LPSTS) */ +#define USBHS_LPSTS_SUSPM 0x4000 + +/* USB General control register (UGCTRL) */ +#define USBHS_UGCTRL_CONNECT BIT(2) +#define USBHS_UGCTRL_PLLRESET BIT(0) + +/* USB General control register 2 (UGCTRL2) */ +#define USBHS_UGCTRL2_USB2SEL 0x80000000 +#define USBHS_UGCTRL2_USB2SEL_PCI 0x00000000 +#define USBHS_UGCTRL2_USB2SEL_USB30 0x80000000 +#define USBHS_UGCTRL2_USB0SEL 0x00000030 +#define USBHS_UGCTRL2_USB0SEL_PCI 0x00000010 +#define USBHS_UGCTRL2_USB0SEL_HS_USB 0x00000030 + +/* USB General status register (UGSTS) */ +#define USBHS_UGSTS_LOCK 0x00000100 /* From technical update */ + +#define PHYS_PER_CHANNEL 2 + +struct rcar_gen2_phy { + fdt_addr_t regs; + struct clk clk; +}; + +static int rcar_gen2_phy_phy_init(struct phy *phy) +{ + struct rcar_gen2_phy *priv = dev_get_priv(phy->dev); + u16 chan = phy->id & 0xffff; + u16 mode = (phy->id >> 16) & 0xffff; + u32 clrmask, setmask; + + if (chan == 0) { + clrmask = USBHS_UGCTRL2_USB0SEL; + setmask = mode ? USBHS_UGCTRL2_USB0SEL_HS_USB : + USBHS_UGCTRL2_USB0SEL_PCI; + } else { + clrmask = USBHS_UGCTRL2_USB2SEL; + setmask = mode ? USBHS_UGCTRL2_USB2SEL_USB30 : + USBHS_UGCTRL2_USB2SEL_PCI; + } + clrsetbits_le32(priv->regs + USBHS_UGCTRL2, clrmask, setmask); + + return 0; +} + +static int rcar_gen2_phy_phy_power_on(struct phy *phy) +{ + struct rcar_gen2_phy *priv = dev_get_priv(phy->dev); + int i; + u32 value; + + /* Power on USBHS PHY */ + clrbits_le32(priv->regs + USBHS_UGCTRL, USBHS_UGCTRL_PLLRESET); + + setbits_le16(priv->regs + USBHS_LPSTS, USBHS_LPSTS_SUSPM); + + for (i = 0; i < 20; i++) { + value = readl(priv->regs + USBHS_UGSTS); + if ((value & USBHS_UGSTS_LOCK) == USBHS_UGSTS_LOCK) { + setbits_le32(priv->regs + USBHS_UGCTRL, + USBHS_UGCTRL_CONNECT); + return 0; + } + udelay(1); + } + + return -ETIMEDOUT; +} + +static int rcar_gen2_phy_phy_power_off(struct phy *phy) +{ + struct rcar_gen2_phy *priv = dev_get_priv(phy->dev); + + /* Power off USBHS PHY */ + clrbits_le32(priv->regs + USBHS_UGCTRL, USBHS_UGCTRL_CONNECT); + + clrbits_le16(priv->regs + USBHS_LPSTS, USBHS_LPSTS_SUSPM); + + setbits_le32(priv->regs + USBHS_UGCTRL, USBHS_UGCTRL_PLLRESET); + + return 0; +} + +static int rcar_gen2_phy_of_xlate(struct phy *phy, + struct ofnode_phandle_args *args) +{ + if (args->args_count != 2) { + dev_err(phy->dev, "Invalid DT PHY argument count: %d\n", + args->args_count); + return -EINVAL; + } + + if (args->args[0] != 0 && args->args[0] != 2) { + dev_err(phy->dev, "Invalid DT PHY channel: %d\n", + args->args[0]); + return -EINVAL; + } + + if (args->args[1] != 0 && args->args[1] != 1) { + dev_err(phy->dev, "Invalid DT PHY mode: %d\n", + args->args[1]); + return -EINVAL; + } + + if (args->args_count) + phy->id = args->args[0] | (args->args[1] << 16); + else + phy->id = 0; + + return 0; +} + +static const struct phy_ops rcar_gen2_phy_phy_ops = { + .init = rcar_gen2_phy_phy_init, + .power_on = rcar_gen2_phy_phy_power_on, + .power_off = rcar_gen2_phy_phy_power_off, + .of_xlate = rcar_gen2_phy_of_xlate, +}; + +static int rcar_gen2_phy_probe(struct udevice *dev) +{ + struct rcar_gen2_phy *priv = dev_get_priv(dev); + int ret; + + priv->regs = dev_read_addr(dev); + if (priv->regs == FDT_ADDR_T_NONE) + return -EINVAL; + + /* Enable clock */ + ret = clk_get_by_index(dev, 0, &priv->clk); + if (ret) + return ret; + + ret = clk_enable(&priv->clk); + if (ret) + return ret; + + return 0; +} + +static int rcar_gen2_phy_remove(struct udevice *dev) +{ + struct rcar_gen2_phy *priv = dev_get_priv(dev); + + clk_disable(&priv->clk); + clk_free(&priv->clk); + + return 0; +} + +static const struct udevice_id rcar_gen2_phy_of_match[] = { + { .compatible = "renesas,rcar-gen2-usb-phy", }, + { }, +}; + +U_BOOT_DRIVER(rcar_gen2_phy) = { + .name = "rcar-gen2-phy", + .id = UCLASS_PHY, + .of_match = rcar_gen2_phy_of_match, + .ops = &rcar_gen2_phy_phy_ops, + .probe = rcar_gen2_phy_probe, + .remove = rcar_gen2_phy_remove, + .priv_auto_alloc_size = sizeof(struct rcar_gen2_phy), +}; -- 2.16.2

1 0

[U-Boot] [PATCH] usb: ehci: Add PHY support to ehci-pci
by Marek Vasut 08 Aug '18

08 Aug '18

Add support for operating a PHY attached to ehci-pci. There are systems where the EHCI controller is internally wired to a PCI bus and has a PHY connected to it as well, ie. the R-Car Gen2. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> --- drivers/usb/host/ehci-pci.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index a56e5bd144..fa0b88bafd 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -10,23 +10,30 @@ #include <pci.h> #include <usb.h> #include <asm/io.h> +#include <generic-phy.h> #include "ehci.h" /* Information about a USB port */ struct ehci_pci_priv { struct ehci_ctrl ehci; + struct phy phy; }; #ifdef CONFIG_DM_USB - -static void ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr, +static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr, struct ehci_hcor **ret_hcor) { + struct ehci_pci_priv *priv = dev_get_priv(dev); struct ehci_hccr *hccr; struct ehci_hcor *hcor; + int ret; u32 cmd; + ret = ehci_setup_phy(dev, &priv->phy, 0); + if (ret) + return ret; + hccr = (struct ehci_hccr *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, PCI_REGION_MEM); hcor = (struct ehci_hcor *)((uintptr_t) hccr + @@ -43,6 +50,8 @@ static void ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr, dm_pci_read_config32(dev, PCI_COMMAND, &cmd); cmd |= PCI_COMMAND_MASTER; dm_pci_write_config32(dev, PCI_COMMAND, cmd); + + return 0; } #else @@ -120,12 +129,27 @@ static int ehci_pci_probe(struct udevice *dev) { struct ehci_hccr *hccr; struct ehci_hcor *hcor; + int ret; - ehci_pci_init(dev, &hccr, &hcor); + ret = ehci_pci_init(dev, &hccr, &hcor); + if (ret) + return ret; return ehci_register(dev, hccr, hcor, NULL, 0, USB_INIT_HOST); } +static int ehci_pci_remove(struct udevice *dev) +{ + struct ehci_pci_priv *priv = dev_get_priv(dev); + int ret; + + ret = ehci_deregister(dev); + if (ret) + return ret; + + return ehci_shutdown_phy(dev, &priv->phy); +} + static const struct udevice_id ehci_pci_ids[] = { { .compatible = "ehci-pci" }, { } @@ -135,7 +159,7 @@ U_BOOT_DRIVER(ehci_pci) = { .name = "ehci_pci", .id = UCLASS_USB, .probe = ehci_pci_probe, - .remove = ehci_deregister, + .remove = ehci_pci_remove, .of_match = ehci_pci_ids, .ops = &ehci_usb_ops, .platdata_auto_alloc_size = sizeof(struct usb_platdata), -- 2.16.2

1 0

[U-Boot] [PATCH] usb: ehci: Make the PHY handling generic
by Marek Vasut 08 Aug '18

08 Aug '18

Pull out the EHCI PHY functions into the ehci-hcd.c to let other EHCI drivers use them. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> --- drivers/usb/host/ehci-generic.c | 56 +++------------------------------------- drivers/usb/host/ehci-hcd.c | 57 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/ehci.h | 4 +++ 3 files changed, 64 insertions(+), 53 deletions(-) diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 5a56f66cfa..cc2f33826a 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -26,56 +26,6 @@ struct generic_ehci { int reset_count; }; -static int ehci_setup_phy(struct udevice *dev, int index) -{ - struct generic_ehci *priv = dev_get_priv(dev); - int ret; - - ret = generic_phy_get_by_index(dev, index, &priv->phy); - if (ret) { - if (ret != -ENOENT) { - dev_err(dev, "failed to get usb phy\n"); - return ret; - } - } else { - ret = generic_phy_init(&priv->phy); - if (ret) { - dev_err(dev, "failed to init usb phy\n"); - return ret; - } - - ret = generic_phy_power_on(&priv->phy); - if (ret) { - dev_err(dev, "failed to power on usb phy\n"); - return generic_phy_exit(&priv->phy); - } - } - - return 0; -} - -static int ehci_shutdown_phy(struct udevice *dev) -{ - struct generic_ehci *priv = dev_get_priv(dev); - int ret = 0; - - if (generic_phy_valid(&priv->phy)) { - ret = generic_phy_power_off(&priv->phy); - if (ret) { - dev_err(dev, "failed to power off usb phy\n"); - return ret; - } - - ret = generic_phy_exit(&priv->phy); - if (ret) { - dev_err(dev, "failed to power off usb phy\n"); - return ret; - } - } - - return 0; -} - static int ehci_usb_probe(struct udevice *dev) { struct generic_ehci *priv = dev_get_priv(dev); @@ -145,7 +95,7 @@ static int ehci_usb_probe(struct udevice *dev) } } - err = ehci_setup_phy(dev, 0); + err = ehci_setup_phy(dev, &priv->phy, 0); if (err) goto reset_err; @@ -160,7 +110,7 @@ static int ehci_usb_probe(struct udevice *dev) return 0; phy_err: - ret = ehci_shutdown_phy(dev); + ret = ehci_shutdown_phy(dev, &priv->phy); if (ret) dev_err(dev, "failed to shutdown usb phy\n"); @@ -185,7 +135,7 @@ static int ehci_usb_remove(struct udevice *dev) if (ret) return ret; - ret = ehci_shutdown_phy(dev); + ret = ehci_shutdown_phy(dev, &priv->phy); if (ret) return ret; diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 663f748ffc..03758c2313 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -13,6 +13,7 @@ #include <asm/unaligned.h> #include <usb.h> #include <asm/io.h> +#include <generic-phy.h> #include <malloc.h> #include <memalign.h> #include <watchdog.h> @@ -1675,3 +1676,59 @@ struct dm_usb_ops ehci_usb_ops = { }; #endif + +#ifdef CONFIG_PHY +int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index) +{ + int ret; + + if (!phy) + return 0; + + ret = generic_phy_get_by_index(dev, index, phy); + if (ret) { + if (ret != -ENOENT) { + dev_err(dev, "failed to get usb phy\n"); + return ret; + } + } else { + ret = generic_phy_init(phy); + if (ret) { + dev_err(dev, "failed to init usb phy\n"); + return ret; + } + + ret = generic_phy_power_on(phy); + if (ret) { + dev_err(dev, "failed to power on usb phy\n"); + return generic_phy_exit(phy); + } + } + + return 0; +} + +int ehci_shutdown_phy(struct udevice *dev, struct phy *phy) +{ + int ret = 0; + + if (!phy) + return 0; + + if (generic_phy_valid(phy)) { + ret = generic_phy_power_off(phy); + if (ret) { + dev_err(dev, "failed to power off usb phy\n"); + return ret; + } + + ret = generic_phy_exit(phy); + if (ret) { + dev_err(dev, "failed to power off usb phy\n"); + return ret; + } + } + + return 0; +} +#endif diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 07de472f91..a03dbb0039 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -288,4 +288,8 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr, int ehci_deregister(struct udevice *dev); extern struct dm_usb_ops ehci_usb_ops; +/* EHCI PHY functions */ +int ehci_setup_phy(struct udevice *dev, struct phy *phy, int index); +int ehci_shutdown_phy(struct udevice *dev, struct phy *phy); + #endif /* USB_EHCI_H */ -- 2.16.2

1 0

[U-Boot] [PATCH v1 00/17] cmd: fpga: Fix fpga command handling and add some fpga tests
by Michal Simek 08 Aug '18

08 Aug '18

Hi, We are using this framework for a while and by adding more and more features it requires small redesigned how commands are handled. This is something what I have put together to improve readability of this code and also remove code which is bogus and completely untested. The patch https://lists.denx.de/pipermail/u-boot/2018-June/330651.html is also included in this series to have full picture. Thanks, Michal Changes in v1: - Remove debug message checking (unfortunatelly we can't parse them) - Add dependency on image_format_legacy and gzip - Setup all FIT tests and legacy uimage tests Michal Simek (17): cmd: fpga: Remove fit image support passed without fpga device test/py: Extend fpga command to test all fpga load types cmd: fpga: Move error handling to do_fpga() cmd: fpga: Move fpga_get_op to avoid local function declaration cmd: fpga: Cleanup error handling in connection to FPGA_NONE cmd: fpga: Move parameter checking for loadfs/loads cmd: fpga: Remove parameter checking from fpga loadfs command cmd: fpga: Clean wrong_parms handling cmd: fpga: Create new do_fpga_wrapper for using u-boot subcommands cmd: fpga: Extract fpga info command to separate function cmd: fpga: Fix dump and all direct fpga load commands cmd: fpga: Fix loadfs command cmd: fpga: Fix loadmk command cmd: fpga: Add support for missing fpga loadmk commands cmd: fpga: Use CMD_RET_FAILURE instead of simple 1 cmd: fpga: Fix loads command MAINTAINERS: Add myself as the FPGA maintainer MAINTAINERS | 8 + cmd/fpga.c | 652 +++++++++++++++++++++++---------------------- test/py/tests/test_fpga.py | 552 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 896 insertions(+), 316 deletions(-) create mode 100644 test/py/tests/test_fpga.py -- 1.9.1

2 25

[U-Boot] [PATCH v6 00/27] SPI-NAND support
by Miquel Raynal 08 Aug '18

08 Aug '18

During the last months, Boris Brezillon shared his work to support serial flashes within Linux. First, he delivered (and merged) a new layer called spi-mem. He also initiated in Linux MTD subsystem the move of all 'raw' NAND related code to a raw/ subdirectory, adding at the same time a NAND core that would be shared with all NAND devices. Then, he contributed a generic SPI-NAND driver, making use of this NAND core, as well as some vendor code to drive a few chips. On top of this work, I added an 'mtd' U-Boot command to handle all sort of MTD devices. This should become the default command instead of having one per flash flavor ('sf', 'nand', 'spi-nand' ?). The series has been tested on an Ocelot board PCB123 (VSC7514), featuring a Macronix SPI NAND chip. TL;DR: the series contains: - A few patches from Linux to resynchronize some areas of the MTD layer. - Various fixes and re-organization of the MTD subsystem. - The introduction of the SPI-mem interface. - The addition of the generic SPI-NAND driver (and its bindings). - Several SPI NAND chip drivers (Macronix, Micron, Winbond). - A new 'mtd' command. - Support for spi-nand devices in mtdparts. To test your SPI-NAND device with U-Boot simply follow these lines: > setenv mtdparts mtdparts=spi-nand0:1m(foo),-(bar) > setenv mtdids spi-nand0=spi-nand0 > mtdparts # show the spi-nand device partitions > ubi part bar # create a static UBI volume in the bar partition Thanks, Miquèl Changes since v5: ----------------- * Included Boris fixup about the build issues. * Added Rb/Ab tags from Jagan on patchs 20/21. Changes since v4: ----------------- * Added Jagan's Acked-by tags to every patch related to the SPI-mem/SPI-NAND addition. * Rebased on top of master. Changes since v3: ----------------- * Fixed the debug messages in spi-mem to print either Rx or Tx data. * Fixed a Kconfig error that prevented to build mtdparts with plain defconfig. * Fixed a compilation error due to the above error that prevented one file to be compiled. * Adapted the mtd command to probe MTD partitions also. * Declared mtd_probe_devices() in a header so mtdparts or UBI could use it too (to probe all devices and MTD partitions in a clean way). * As I worked on mtdparts, I found annoying and completely useless the fact that we need to prefix the environment variable with "mtdparts=". Canceled this obligation. * Added one patch to allow spi-nand devices to be recognized by mtdparts (this is purely useless but needed to be done in order to use this command). * Removed useless definitions of MTD device types in UBI code. * Wrote a generic mtdparts environment variable parser, used by the mtd command. * Used the mtd_probe_devices() function from get_mtd_info() in cmd/mtdparts.c to be sure the desired partition really does not exist (otherwise it will be probed and then found). Changes since v2: ----------------- * Rebased on u-boot master branch. * Removed extra-parenthesis in "mtd: Fallback to ->_read/write() when ->_read/write_oob() is missing" * s/fiels/files/ in "mtd: move NAND fiels into a raw/ subdirectory" * Do not describe generic SPI device properties in SPI NAND bindings. * Changes in the mtd command: * Printing more information in 'mtd list' (device type, device characteristics) * Switch to do_div() instead of '(u32)value64b % value32b' which only worked because value32b was a power of 2. * Removed erase.chip option. * By default, erase/read/write happen on the full MTD device while a dump will only work on a single page. Changes since v1: ----------------- * Fixed the nand_memorg structure of the MX35LF2GE4AB chip. * Added Reviewed-by tags from Jagan. * Backported and squashed two patches fixing things in the SPI NAND core received on the Linux ML. * Backported more changes in mtdcore.c from Linux. * Added a patch to add a fallback on mtd->_read/_write() in mtdcore.c when mtd->_read/write_oob() is not supported. * Removed the DT changes, useless as the DTs are not available in mainline yet. * Addressed Boris/Stefan comments on the 'mtd' command. * Added support for multi-pages OOB read/write. Boris Brezillon (7): mtd: Fallback to ->_read/write_oob() when ->_read/write() is missing mtd: Add sanity checks in mtd_write/read_oob() mtd: nand: Add core infrastructure to deal with NAND devices mtd: nand: Pass mode information to nand_page_io_req spi: Extend the core to ease integration of SPI memory controllers mtd: spinand: Add initial support for the MX35LF1GE4AB chip dt-bindings: Add bindings for SPI NAND devices Brian Norris (1): mtd: add get/set of_node/flash_node helpers Ezequiel Garcia (1): mtd: Uninline mtd_write_oob and move it to mtdcore.c Frieder Schrempf (1): mtd: spinand: Add initial support for Winbond W25M02GV Miquel Raynal (15): mtd: Fallback to ->_read/write() when ->_read/write_oob() is missing mtd: fix build issue with includes mtd: move definitions to enlarge their range mtd: move all flash categories inside MTD submenu mtd: move NAND files into a raw/ subdirectory mtd: rename nand into rawnand in Kconfig prompt mtd: spinand: Add initial support for the MX35LF2GE4AB chip mtd: declare MTD_PARTITIONS symbol in Kconfig cmd: ubi: delete useless and misleading definitions cmd: mtdparts: accept spi-nand devices cmd: mtdparts: add a generic 'mtdparts' parser cmd: mtdparts: remove useless 'mtdparts=' prefix mtd: uclass: add probe function cmd: mtd: add 'mtd' command cmd: mtdparts: try to probe the MTD devices as a fallback Peter Pan (2): mtd: nand: Add core infrastructure to support SPI NANDs mtd: spinand: Add initial support for Micron MT29F2G01ABAGD MAINTAINERS | 6 +- Makefile | 2 +- README | 6 +- arch/arm/mach-uniphier/board_late_init.c | 2 +- cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/mtd.c | 392 ++++++++ cmd/mtdparts.c | 113 ++- cmd/ubi.c | 5 - common/spl/Kconfig | 2 +- common/spl/spl_spi.c | 2 +- doc/README.SPL | 4 +- doc/README.arm-relocation | 2 +- doc/README.nand | 6 +- doc/README.zynq | 2 +- doc/device-tree-bindings/mtd/spi-nand.txt | 5 + drivers/Makefile | 2 +- drivers/mtd/Kconfig | 7 +- drivers/mtd/Makefile | 4 +- drivers/mtd/mtd-uclass.c | 9 + drivers/mtd/mtdcore.c | 106 ++- drivers/mtd/mtdcore.h | 6 - drivers/mtd/mtdpart.c | 6 +- drivers/mtd/nand/Kconfig | 299 +----- drivers/mtd/nand/Makefile | 78 +- drivers/mtd/nand/bbt.c | 132 +++ drivers/mtd/nand/core.c | 243 +++++ drivers/mtd/nand/raw/Kconfig | 297 ++++++ drivers/mtd/nand/raw/Makefile | 77 ++ drivers/mtd/nand/{ => raw}/am335x_spl_bch.c | 0 drivers/mtd/nand/{ => raw}/arasan_nfc.c | 0 drivers/mtd/nand/{ => raw}/atmel_nand.c | 0 drivers/mtd/nand/{ => raw}/atmel_nand_ecc.h | 0 drivers/mtd/nand/{ => raw}/davinci_nand.c | 2 +- drivers/mtd/nand/{ => raw}/denali.c | 0 drivers/mtd/nand/{ => raw}/denali.h | 0 drivers/mtd/nand/{ => raw}/denali_dt.c | 0 drivers/mtd/nand/{ => raw}/denali_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c | 0 drivers/mtd/nand/{ => raw}/fsl_elbc_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c | 0 drivers/mtd/nand/{ => raw}/fsl_ifc_spl.c | 0 drivers/mtd/nand/{ => raw}/fsl_upm.c | 0 drivers/mtd/nand/{ => raw}/fsmc_nand.c | 0 drivers/mtd/nand/{ => raw}/kb9202_nand.c | 0 drivers/mtd/nand/{ => raw}/kirkwood_nand.c | 0 drivers/mtd/nand/{ => raw}/kmeter1_nand.c | 0 drivers/mtd/nand/{ => raw}/lpc32xx_nand_mlc.c | 0 drivers/mtd/nand/{ => raw}/lpc32xx_nand_slc.c | 0 drivers/mtd/nand/{ => raw}/mxc_nand.c | 0 drivers/mtd/nand/{ => raw}/mxc_nand.h | 0 drivers/mtd/nand/{ => raw}/mxc_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand.h | 0 drivers/mtd/nand/{ => raw}/mxs_nand_dt.c | 0 drivers/mtd/nand/{ => raw}/mxs_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/nand.c | 0 drivers/mtd/nand/{ => raw}/nand_base.c | 56 -- drivers/mtd/nand/{ => raw}/nand_bbt.c | 0 drivers/mtd/nand/{ => raw}/nand_bch.c | 0 drivers/mtd/nand/{ => raw}/nand_ecc.c | 2 +- drivers/mtd/nand/{ => raw}/nand_ids.c | 0 drivers/mtd/nand/{ => raw}/nand_plat.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_load.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_loaders.c | 0 drivers/mtd/nand/{ => raw}/nand_spl_simple.c | 0 drivers/mtd/nand/{ => raw}/nand_timings.c | 0 drivers/mtd/nand/{ => raw}/nand_util.c | 2 +- drivers/mtd/nand/{ => raw}/omap_elm.c | 0 drivers/mtd/nand/{ => raw}/omap_gpmc.c | 0 drivers/mtd/nand/{ => raw}/pxa3xx_nand.c | 2 +- drivers/mtd/nand/{ => raw}/pxa3xx_nand.h | 0 drivers/mtd/nand/{ => raw}/sunxi_nand.c | 0 drivers/mtd/nand/{ => raw}/sunxi_nand_spl.c | 0 drivers/mtd/nand/{ => raw}/tegra_nand.c | 0 drivers/mtd/nand/{ => raw}/tegra_nand.h | 0 drivers/mtd/nand/{ => raw}/vf610_nfc.c | 0 drivers/mtd/nand/{ => raw}/zynq_nand.c | 0 drivers/mtd/nand/spi/Kconfig | 7 + drivers/mtd/nand/spi/Makefile | 4 + drivers/mtd/nand/spi/core.c | 1254 +++++++++++++++++++++++++ drivers/mtd/nand/spi/macronix.c | 146 +++ drivers/mtd/nand/spi/micron.c | 135 +++ drivers/mtd/nand/spi/winbond.c | 143 +++ drivers/mtd/onenand/onenand_base.c | 60 -- drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/spi-mem.c | 500 ++++++++++ include/configs/MPC8313ERDB.h | 2 +- include/jffs2/load_kernel.h | 7 +- include/linux/mtd/mtd.h | 34 +- include/linux/mtd/nand.h | 734 +++++++++++++++ include/linux/mtd/partitions.h | 3 + include/linux/mtd/spinand.h | 432 +++++++++ include/spi-mem.h | 258 +++++ include/spi.h | 11 + 96 files changed, 5064 insertions(+), 561 deletions(-) create mode 100644 cmd/mtd.c create mode 100644 doc/device-tree-bindings/mtd/spi-nand.txt create mode 100644 drivers/mtd/nand/bbt.c create mode 100644 drivers/mtd/nand/core.c create mode 100644 drivers/mtd/nand/raw/Kconfig create mode 100644 drivers/mtd/nand/raw/Makefile rename drivers/mtd/nand/{ => raw}/am335x_spl_bch.c (100%) rename drivers/mtd/nand/{ => raw}/arasan_nfc.c (100%) rename drivers/mtd/nand/{ => raw}/atmel_nand.c (100%) rename drivers/mtd/nand/{ => raw}/atmel_nand_ecc.h (100%) rename drivers/mtd/nand/{ => raw}/davinci_nand.c (99%) rename drivers/mtd/nand/{ => raw}/denali.c (100%) rename drivers/mtd/nand/{ => raw}/denali.h (100%) rename drivers/mtd/nand/{ => raw}/denali_dt.c (100%) rename drivers/mtd/nand/{ => raw}/denali_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_elbc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_elbc_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_ifc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_ifc_spl.c (100%) rename drivers/mtd/nand/{ => raw}/fsl_upm.c (100%) rename drivers/mtd/nand/{ => raw}/fsmc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kb9202_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kirkwood_nand.c (100%) rename drivers/mtd/nand/{ => raw}/kmeter1_nand.c (100%) rename drivers/mtd/nand/{ => raw}/lpc32xx_nand_mlc.c (100%) rename drivers/mtd/nand/{ => raw}/lpc32xx_nand_slc.c (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand.c (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand.h (100%) rename drivers/mtd/nand/{ => raw}/mxc_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand.h (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand_dt.c (100%) rename drivers/mtd/nand/{ => raw}/mxs_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/nand.c (100%) rename drivers/mtd/nand/{ => raw}/nand_base.c (98%) rename drivers/mtd/nand/{ => raw}/nand_bbt.c (100%) rename drivers/mtd/nand/{ => raw}/nand_bch.c (100%) rename drivers/mtd/nand/{ => raw}/nand_ecc.c (99%) rename drivers/mtd/nand/{ => raw}/nand_ids.c (100%) rename drivers/mtd/nand/{ => raw}/nand_plat.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_load.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_loaders.c (100%) rename drivers/mtd/nand/{ => raw}/nand_spl_simple.c (100%) rename drivers/mtd/nand/{ => raw}/nand_timings.c (100%) rename drivers/mtd/nand/{ => raw}/nand_util.c (99%) rename drivers/mtd/nand/{ => raw}/omap_elm.c (100%) rename drivers/mtd/nand/{ => raw}/omap_gpmc.c (100%) rename drivers/mtd/nand/{ => raw}/pxa3xx_nand.c (99%) rename drivers/mtd/nand/{ => raw}/pxa3xx_nand.h (100%) rename drivers/mtd/nand/{ => raw}/sunxi_nand.c (100%) rename drivers/mtd/nand/{ => raw}/sunxi_nand_spl.c (100%) rename drivers/mtd/nand/{ => raw}/tegra_nand.c (100%) rename drivers/mtd/nand/{ => raw}/tegra_nand.h (100%) rename drivers/mtd/nand/{ => raw}/vf610_nfc.c (100%) rename drivers/mtd/nand/{ => raw}/zynq_nand.c (100%) create mode 100644 drivers/mtd/nand/spi/Kconfig create mode 100644 drivers/mtd/nand/spi/Makefile create mode 100644 drivers/mtd/nand/spi/core.c create mode 100644 drivers/mtd/nand/spi/macronix.c create mode 100644 drivers/mtd/nand/spi/micron.c create mode 100644 drivers/mtd/nand/spi/winbond.c create mode 100644 drivers/spi/spi-mem.c create mode 100644 include/linux/mtd/nand.h create mode 100644 include/linux/mtd/spinand.h create mode 100644 include/spi-mem.h -- 2.14.1

5 40

[U-Boot] [PATCH] ls1088ardb_pb: Add support for ls1088ardb_pb board.
by Pramod Kumar 08 Aug '18

08 Aug '18

ls1088ardb-pb is another varinat of the ls1088ardb. This board support two m.2 x2 gen 3 pcie card slot. There is no support of sata, pcie standard slot, miniPCIE slot and TDM in this board. Signed-off-by: Pramod Kumar <pramod.kumar_1(a)nxp.com> --- arch/arm/Kconfig | 14 +++ arch/arm/cpu/armv8/Kconfig | 1 + board/freescale/ls1088a/Kconfig | 43 +++++++++ board/freescale/ls1088a/MAINTAINERS | 18 ++++ board/freescale/ls1088a/Makefile | 1 + board/freescale/ls1088a/ddr.h | 4 +- board/freescale/ls1088a/ls1088a.c | 23 ++++- ... ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} | 2 +- ...defconfig => ls1088ardb_pb_qspi_defconfig} | 2 +- ...ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} | 2 +- ...ig => ls1088ardb_pb_sdcard_qspi_defconfig} | 2 +- include/configs/ls1088ardb_pb.h | 87 +++++++++++++++++++ 12 files changed, 189 insertions(+), 10 deletions(-) copy configs/{ls1088ardb_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_qspi_SECURE_BOOT_defconfig} (97%) copy configs/{ls1088ardb_qspi_defconfig => ls1088ardb_pb_qspi_defconfig} (97%) copy configs/{ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig => ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig} (98%) copy configs/{ls1088ardb_sdcard_qspi_defconfig => ls1088ardb_pb_sdcard_qspi_defconfig} (98%) create mode 100644 include/configs/ls1088ardb_pb.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 63ec02403a..fec588c817 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1120,6 +1120,20 @@ config TARGET_LS1088ARDB development platform that supports the QorIQ LS1088A Layerscape Architecture processor. +config TARGET_LS1088ARDB_PB + bool "Support ls1088ardb_pb" + select ARCH_LS1088A + select ARM64 + select ARMV8_MULTIENTRY + select ARCH_MISC_INIT + select BOARD_LATE_INIT + select SUPPORT_SPL + help + Support for NXP LS1088ARDB_PB platform. + The LS1088A Reference design board (RDB_PB) is a high-performance + development platform that supports the QorIQ LS1088A + Layerscape Architecture processor. + config TARGET_LS1021AQDS bool "Support ls1021aqds" select ARCH_LS1021A diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index c8bebabdf6..8ede276b65 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -100,6 +100,7 @@ config PSCI_RESET !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \ + !TARGET_LS1088ARDB_PB && \ !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \ !TARGET_LS1012A2G5RDB && !TARGET_LS1012AQDS && \ !TARGET_LS1012AFRWY && \ diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index 8bb828e3fd..9f20d7247f 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -59,3 +59,46 @@ endif source "board/freescale/common/Kconfig" endif + +if TARGET_LS1088ARDB_PB + +config SYS_BOARD + default "ls1088a" + +config SYS_VENDOR + default "freescale" + +config SYS_SOC + default "fsl-layerscape" + +config SYS_CONFIG_NAME + default "ls1088ardb_pb" + +if SYS_LS_PPA_FW_IN_XIP + +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif +endif + +if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) + +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif +endif + +source "board/freescale/common/Kconfig" +endif diff --git a/board/freescale/ls1088a/MAINTAINERS b/board/freescale/ls1088a/MAINTAINERS index 4d804d9447..dbcac49a60 100644 --- a/board/freescale/ls1088a/MAINTAINERS +++ b/board/freescale/ls1088a/MAINTAINERS @@ -7,6 +7,14 @@ F: include/configs/ls1088ardb.h F: configs/ls1088ardb_qspi_defconfig F: configs/ls1088ardb_sdcard_qspi_defconfig +LS1088ARDB_PB BOARD +M: Pramod Kumar <Pramod.Kumar(a)nxp.com> +S: Maintained +F: board/freescale/ls1088a/ +F: include/configs/ls1088ardb_pb.h +F: configs/ls1088ardb_pb_qspi_defconfig +F: configs/ls1088ardb_pb_sdcard_qspi_defconfig + LS1088AQDS BOARD M: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> M: Ashish Kumar <Ashish.Kumar(a)nxp.com> @@ -34,3 +42,13 @@ LS1088ARDB_SD_SECURE_BOOT BOARD M: Sumit Garg <sumit.garg(a)nxp.com> S: Maintained F: configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig + +LS1088ARDB_PB_QSPI_SECURE_BOOT BOARD +M: Udit Agarwal <udit.agarwal(a)nxp.com> +S: Maintained +F: configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig + +LS1088ARDB_PB_SD_SECURE_BOOT BOARD +M: Udit Agarwal <udit.agarwal(a)nxp.com> +S: Maintained +F: configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig diff --git a/board/freescale/ls1088a/Makefile b/board/freescale/ls1088a/Makefile index c2b0e7dc0f..dd5f365378 100644 --- a/board/freescale/ls1088a/Makefile +++ b/board/freescale/ls1088a/Makefile @@ -6,5 +6,6 @@ obj-y += ls1088a.o obj-y += ddr.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o +obj-$(CONFIG_TARGET_LS1088ARDB_PB) += eth_ls1088ardb.o obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o endif diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h index b35c4ae2da..b643442152 100644 --- a/board/freescale/ls1088a/ddr.h +++ b/board/freescale/ls1088a/ddr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2017 NXP + * Copyright 2017-2018 NXP */ #ifndef __LS1088A_DDR_H__ @@ -27,7 +27,7 @@ static const struct board_specific_parameters udimm0[] = { * num| hi| rank| clk| wrlvl | wrlvl | wrlvl * ranks| mhz| GB |adjst| start | ctl2 | ctl3 */ -#if defined(CONFIG_TARGET_LS1088ARDB) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) {2, 1666, 0, 8, 8, 0x090A0B0E, 0x0F10110D,}, {2, 1900, 0, 8, 9, 0x0A0B0C10, 0x1112140E,}, diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index a0dab6fc2e..12c7616757 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017 NXP + * Copyright 2017-2018 NXP */ #include <common.h> #include <i2c.h> @@ -28,6 +28,15 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_TARGET_LS1088ARDB_PB +int fixup_ls1088ardb_pb_banner(void *fdt) +{ + fdt_setprop_string(fdt, 0, "model", "LS1088ARDB-PB Board"); + + return 0; +} +#endif + int board_early_init_f(void) { #if defined(CONFIG_SYS_I2C_EARLY_INIT) && defined(CONFIG_TARGET_LS1088AQDS) @@ -78,6 +87,9 @@ int checkboard(void) #ifdef CONFIG_TARGET_LS1088AQDS printf("Board: LS1088A-QDS, "); + +#elif CONFIG_TARGET_LS1088ARDB_PB + printf("Board: LS1088ARDB-PB, "); #else printf("Board: LS1088A-RDB, "); #endif @@ -327,7 +339,7 @@ void board_retimer_init(void) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { -#ifdef CONFIG_TARGET_LS1088ARDB +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) u8 brdcfg5; if (hwconfig("esdhc-force-sd")) { @@ -459,7 +471,7 @@ exit: int board_init(void) { init_final_memctl_regs(); -#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET) u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE; #endif @@ -470,7 +482,7 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#if defined(CONFIG_TARGET_LS1088ARDB) && defined(CONFIG_FSL_MC_ENET) +#if defined(CONFIG_TARGET_LS1088ARDB) || defined(CONFIG_TARGET_LS1088ARDB_PB) && defined(CONFIG_FSL_MC_ENET) /* invert AQR105 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif @@ -584,6 +596,9 @@ int ft_board_setup(void *blob, bd_t *bd) return err; #endif +#ifdef CONFIG_TARGET_LS1088ARDB_PB +fixup_ls1088ardb_pb_banner(blob); +#endif return 0; } #endif diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig similarity index 97% copy from configs/ls1088ardb_qspi_SECURE_BOOT_defconfig copy to configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig index d0334a239f..d2faf25f39 100644 --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_pb_qspi_SECURE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_pb_qspi_defconfig similarity index 97% copy from configs/ls1088ardb_qspi_defconfig copy to configs/ls1088ardb_pb_qspi_defconfig index d806966540..cb9eac88a9 100644 --- a/configs/ls1088ardb_qspi_defconfig +++ b/configs/ls1088ardb_pb_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig similarity index 98% copy from configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig copy to configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig index 59356095cd..75ad7c26d1 100644 --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088ardb_pb_sdcard_qspi_SECURE_BOOT_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_pb_sdcard_qspi_defconfig similarity index 98% copy from configs/ls1088ardb_sdcard_qspi_defconfig copy to configs/ls1088ardb_pb_sdcard_qspi_defconfig index bf1c0a2d7b..c501795ef0 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_pb_sdcard_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_TARGET_LS1088ARDB=y +CONFIG_TARGET_LS1088ARDB_PB=y CONFIG_SYS_TEXT_BASE=0x80400000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/include/configs/ls1088ardb_pb.h b/include/configs/ls1088ardb_pb.h new file mode 100644 index 0000000000..24eb5730d2 --- /dev/null +++ b/include/configs/ls1088ardb_pb.h @@ -0,0 +1,87 @@ +/* + * Copyright 2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __LS1088A_RDB_PB_H +#define __LS1088A_RDB_PB_H + +#include "ls1088a_common.h" +#include "ls1088ardb.h" + +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "BOARD=ls1088ardb_pb\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "ramdisk_addr=0x800000\0" \ + "ramdisk_size=0x2000000\0" \ + "fdt_high=0xa0000000\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "fdt_addr=0x64f00000\0" \ + "kernel_addr=0x1000000\0" \ + "kernel_addr_sd=0x8000\0" \ + "kernelhdr_addr_sd=0x4000\0" \ + "kernel_start=0x580100000\0" \ + "kernelheader_start=0x580800000\0" \ + "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ + "fdtheader_addr_r=0x80100000\0" \ + "kernelheader_addr=0x800000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernel_addr_r=0x81000000\0" \ + "kernelheader_size=0x40000\0" \ + "fdt_addr_r=0x90000000\0" \ + "load_addr=0xa0000000\0" \ + "kernel_size=0x2800000\0" \ + "kernel_size_sd=0x14000\0" \ + "kernelhdr_size_sd=0x10\0" \ + MC_INIT_CMD \ + BOOTENV \ + "boot_scripts=ls1088ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1088ardb_bs.out\0" \ + "scan_dev_for_boot_part=" \ + "part list ${devtype} ${devnum} devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for distro_bootpart in ${devplist}; do " \ + "if fstype ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "bootfstype; then " \ + "run scan_dev_for_boot; " \ + "fi; " \ + "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ + "installer=load mmc 0:2 $load_addr " \ + "/flex_installer_arm64.itb; " \ + "env exists mcinitcmd && run mcinitcmd && " \ + "mmc read 0x80001000 0x6800 0x800;" \ + "fsl_mc lazyapply dpl 0x80001000;" \ + "bootm $load_addr#ls1088ardb\0" \ + "qspi_bootcmd=echo Trying load from qspi..;" \ + "sf probe && sf read $load_addr " \ + "$kernel_addr $kernel_size ; env exists secureboot " \ + "&& sf read $kernelheader_addr_r $kernelheader_addr " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ + "bootm $load_addr#ls1088ardb\0" \ + "sd_bootcmd=echo Trying load from sd card..;" \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd ;" \ + "env exists secureboot && mmc read $kernelheader_addr_r "\ + "$kernelhdr_addr_sd $kernelhdr_size_sd " \ + " && esbc_validate ${kernelheader_addr_r};" \ + "bootm $load_addr#ls1088ardb\0" + +#endif /* __LS1088A_RDB_H */ -- 2.17.1

1 0

[U-Boot] [RESEND 1/3] imx: mx7: psci: add cpu hotplug support
by Anson Huang 08 Aug '18

08 Aug '18

This patch adds cpu hotplug support, previous cpu_off implementation is NOT safe, a CPU can NOT power down itself in runtime, it will cause system bus hang due to pending transaction. So need to use other online CPU to kill it when it is ready for killed. Here use SRC parameter register and a magic number of ~0 as handshake for killing a offline CPU, when the online CPU checks the psci_affinity_info, it will help kill the offline CPU according to the magic number stored in SRC parameter register. Signed-off-by: Anson Huang <Anson.Huang(a)nxp.com> --- arch/arm/mach-imx/mx7/psci-mx7.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index aae96c5..d6c4263 100644 --- a/arch/arm/mach-imx/mx7/psci-mx7.c +++ b/arch/arm/mach-imx/mx7/psci-mx7.c @@ -44,6 +44,14 @@ #error "invalid value for CONFIG_ARMV7_PSCI_NR_CPUS" #endif +#define imx_cpu_gpr_entry_offset(cpu) \ + (SRC_BASE_ADDR + SRC_GPR1_MX7D + cpu * 8) +#define imx_cpu_gpr_para_offset(cpu) \ + (imx_cpu_gpr_entry_offset(cpu) + 4) + +#define IMX_CPU_SYNC_OFF ~0 +#define IMX_CPU_SYNC_ON 0 + u8 psci_state[IMX7D_PSCI_NR_CPUS] __secure_data = { PSCI_AFFINITY_LEVEL_ON, PSCI_AFFINITY_LEVEL_OFF}; @@ -116,7 +124,7 @@ __secure s32 psci_cpu_on(u32 __always_unused function_id, u32 mpidr, u32 ep, psci_save(cpu, ep, context_id); - writel((u32)psci_cpu_entry, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D); + writel((u32)psci_cpu_entry, imx_cpu_gpr_entry_offset(cpu)); psci_set_state(cpu, PSCI_AFFINITY_LEVEL_ON_PENDING); @@ -137,7 +145,11 @@ __secure s32 psci_cpu_off(void) imx_enable_cpu_ca7(cpu, false); imx_gpcv2_set_core_power(cpu, false); - writel(0, SRC_BASE_ADDR + cpu * 8 + SRC_GPR1_MX7D + 4); + /* + * We use the cpu jumping argument register to sync with + * psci_affinity_info() which is running on cpu0 to kill the cpu. + */ + writel(IMX_CPU_SYNC_OFF, imx_cpu_gpr_para_offset(cpu)); while (1) wfi(); @@ -198,6 +210,13 @@ __secure s32 psci_affinity_info(u32 __always_unused function_id, if (cpu >= IMX7D_PSCI_NR_CPUS) return ARM_PSCI_RET_INVAL; + /* CPU is waiting for killed */ + if (readl(imx_cpu_gpr_para_offset(cpu)) == IMX_CPU_SYNC_OFF) { + imx_enable_cpu_ca7(cpu, false); + imx_gpcv2_set_core_power(cpu, false); + writel(IMX_CPU_SYNC_ON, imx_cpu_gpr_para_offset(cpu)); + } + return psci_state[cpu]; } -- 2.7.4

3 11

[U-Boot] [GIT PULL] Xilinx fixes for v2018.09-rc2
by Michal Simek 08 Aug '18

08 Aug '18

Hi Tom, please pull these fixes to your tree. Buildman and travis are not showing any issue. https://travis-ci.org/michalsimek/u-boot/builds/413020221 Thanks, Michal The following changes since commit bb694d4e898b1368ba96e01481dc0a79c491e77c: Merge branch 'master' of git://git.denx.de/u-boot-spi (2018-08-04 19:41:43 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git tags/xilinx-for-v2018.09-rc2 for you to fetch changes up to a492fdffa3c86f6b8420b6433a2ce07271597324: arm: zynq: dts: add spi flash node to zedboard (2018-08-07 11:03:43 +0200) ---------------------------------------------------------------- Xilinx fixes for v2018.09-rc2 xilinx: - Add support for zybo z7 and ultra96 - Tune zynq and zynqmp mini configurations - Move SYS_MALLOC_LEN to Kconfig fdt - make static funcs gpio: - Fix soft gpio driver - Fix Zynq gpio driver by using platdata microblaze: - Fix Kconfig entry spi - Move ISSI to Kconfig ---------------------------------------------------------------- Luis Araneda (2): arm: zynq: add support for the zybo z7 board arm: zynq: dts: add spi flash node to zedboard Michal Simek (16): spi: Kconfig: Create ISSI Kconfig entry arm: zynqmp: Move NR_DRAM_BANKS for mini confiration arm: zynqmp: Fix sdhci clock in emmc1 mini configuration arm: zynq: Remove fclk-enable property for cse-nor target arm: zynq: Fix indentation for zynq-cse targets microblaze: Add missing quotes around XILINX_MICROBLAZE0_HW_VER arm64: zynqmp: Enable soft gpio driver for zcu102 and zcu100 arm64: zynqmp: Add support for Avnet Ultra96 gpio: xilinx: Find out bank before use in xilinx_gpio_get_function() gpio: xilinx: Remove !DM driver gpio: xilinx: Set value before changing direction gpio: xilinx: Simplify logic in xilinx_gpio_set_value common: fdt: Make fdt_del_subnodes/fdt_del_partition static gpio: xilinx: Not read output values via regs gpio: xilinx: Return 0 from xilinx_gpio_set_value gpio: xilinx: Add support for using label property Siva Durga Prasad Paladugu (1): Kconfig: Move config SYS_MALLOC_LEN to Kconfig for zynq Vipul Kumar (1): gpio: zynq: Used platdata structure for storing static data instead of priv Kconfig | 7 +++ MAINTAINERS | 1 + arch/arm/dts/Makefile | 4 +- arch/arm/dts/avnet-ultra96-rev1.dts | 19 ++++++++ arch/arm/dts/zynq-cse-nand.dts | 3 +- arch/arm/dts/zynq-cse-nor.dts | 2 - arch/arm/dts/zynq-zed.dts | 7 +++ arch/arm/dts/zynq-zybo-z7.dts | 81 ++++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-mini-emmc1.dts | 3 +- arch/arm/mach-zynq/Kconfig | 3 ++ board/xilinx/microblaze-generic/Kconfig | 2 +- board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/avnet-ultra96-rev1 | 1 + common/fdt_support.c | 4 +- configs/avnet_ultra96_rev1_defconfig | 92 ++++++++++++++++++++++++++++++++++++ configs/stmark2_defconfig | 1 + configs/xilinx_zynqmp_zcu100_revC_defconfig | 1 + configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/zynq_cc108_defconfig | 1 + configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 2 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zybo_z7_defconfig | 68 +++++++++++++++++++++++++++ drivers/gpio/xilinx_gpio.c | 409 ++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------- drivers/gpio/zynq_gpio.c | 77 ++++++++++++++++-------------- drivers/mtd/spi/Kconfig | 5 ++ include/configs/stmark2.h | 1 - include/configs/topic_miami.h | 1 - include/configs/xilinx_zynqmp_mini.h | 1 + include/configs/xilinx_zynqmp_mini_emmc.h | 1 - include/configs/xilinx_zynqmp_mini_nand.h | 1 - include/configs/xilinx_zynqmp_mini_qspi.h | 1 - include/configs/zynq-common.h | 3 -- include/configs/zynq_cse.h | 3 -- 40 files changed, 703 insertions(+), 408 deletions(-) create mode 100644 arch/arm/dts/avnet-ultra96-rev1.dts create mode 100644 arch/arm/dts/zynq-zybo-z7.dts create mode 100644 board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c create mode 120000 board/xilinx/zynqmp/avnet-ultra96-rev1 create mode 100644 configs/avnet_ultra96_rev1_defconfig create mode 100644 configs/zynq_zybo_z7_defconfig

2 5

[U-Boot] [PATCH v4 01/13] test: regmap: Increase size of syscon0 memory
by Mario Six 08 Aug '18

08 Aug '18

The upcoming changes to the regmap interface will contain a proper check for plausibility when reading/writing from/to a register map. To still have the current tests pass, increase the size of the memory region for the syscon0 device, since one of the tests reads and writes beyond this range. Reviewed-by: Anatolij Gustschin <agust(a)denx.de> Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v3 -> v4: No changes v2 -> v3: New in v3 --- arch/sandbox/dts/test.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index e941cea3e5c..47cc961890f 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -406,7 +406,7 @@ syscon@0 { compatible = "sandbox,syscon0"; - reg = <0x10 4>; + reg = <0x10 16>; }; syscon@1 { -- 2.11.0

3 34

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 08 Aug '18

08 Aug '18

Hi Tom, I'm a bit late because of a longer week vacation from which I just returned. Here my patch queue for the Marvell MVEBU SoC family. Thanks, Stefan The following changes since commit bb694d4e898b1368ba96e01481dc0a79c491e77c: Merge branch 'master' of git://git.denx.de/u-boot-spi (2018-08-04 19:41:43 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to 79a0188679df53862e06fd7c8fecb7f3d7d44502: arm64: a37xx: add CONFIG_MTD_DEVICE and CONFIG_MTD_PARTITIONS (2018-08-07 10:53:52 +0200) ---------------------------------------------------------------- Baruch Siach (9): mvebu: turris_omnia: use u-boot-spl-dtb.bin mvebu: a38x: drop duplicate platform id symbols mvebu: consolidate SPL boot device config symbols mvebu: select boot device at SoC level mvebu: support UART boot image mvebu: clearfog: use kconfig symbols to select boot device arm: mvebu: solidrun-microsom: update SPI flash compatible arm: mvebu: clearfog: use the microsom .dtsi arm: mvebu: helios4: remove duplicate sdhci pins node Chris Packham (4): configs: kirkwood: ds109: switch to DM_I2C configs: move RTC_MV config from mv-plug-common.h to boards configs: kirkwood: Move RTC_MV to DM and Kconfig ARM: kirkwood: add SBx81LIFXCAT board Jon Nettleton (2): arm: mvebu: Better align Clearfog dts file with Linux kernel arm: mvebu: clearfog: add u-boot, dm-spl tag for spi Vladimir Vid (1): arm64: a37xx: add CONFIG_MTD_DEVICE and CONFIG_MTD_PARTITIONS Willy Tarreau (2): tools: kwboot: unbreak terminal-only mode tools: kwboot: properly quit when read() returns 0 arch/arm/Kconfig | 1 - arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 9 + arch/arm/dts/armada-388-clearfog.dts | 449 +++++++-------------- arch/arm/dts/armada-388-helios4.dts | 8 +- arch/arm/dts/armada-38x-solidrun-microsom.dtsi | 2 +- arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts | 145 +++++++ arch/arm/mach-kirkwood/Kconfig | 4 + .../gdsys/a38x => arch/arm/mach-mvebu}/.gitignore | 0 arch/arm/mach-mvebu/Kconfig | 17 +- arch/arm/mach-mvebu/Makefile | 33 ++ arch/arm/mach-mvebu/include/mach/config.h | 4 +- .../a38x => arch/arm/mach-mvebu}/kwbimage.cfg.in | 0 board/CZ.NIC/turris_omnia/kwbimage.cfg | 12 - board/Marvell/db-88f6720/kwbimage.cfg | 12 - board/Marvell/db-88f6820-amc/kwbimage.cfg | 12 - board/Marvell/db-88f6820-gp/kwbimage.cfg | 12 - board/Marvell/db-mv784mp-gp/kwbimage.cfg | 12 - board/Synology/ds414/kwbimage.cfg | 12 - board/alliedtelesis/SBx81LIFXCAT/Kconfig | 12 + board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS | 7 + board/alliedtelesis/SBx81LIFXCAT/Makefile | 7 + board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg | 49 +++ board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 134 ++++++ board/gdsys/a38x/Kconfig | 36 -- board/gdsys/a38x/Makefile | 31 -- board/kobol/helios4/kwbimage.cfg | 13 - board/maxbcm/kwbimage.cfg | 12 - board/solidrun/clearfog/kwbimage.cfg | 12 - board/theadorable/kwbimage.cfg | 12 - configs/SBx81LIFKW_defconfig | 2 + configs/SBx81LIFXCAT_defconfig | 44 ++ configs/clearfog_defconfig | 2 +- configs/dns325_defconfig | 5 +- configs/dreamplug_defconfig | 5 +- configs/ds109_defconfig | 7 +- configs/goflexhome_defconfig | 5 +- configs/guruplug_defconfig | 5 +- configs/helios4_defconfig | 1 + configs/nas220_defconfig | 5 +- configs/sheevaplug_defconfig | 5 +- include/configs/SBx81LIFKW.h | 5 - include/configs/SBx81LIFXCAT.h | 114 ++++++ include/configs/clearfog.h | 16 +- include/configs/dns325.h | 7 - include/configs/goflexhome.h | 7 - include/configs/mv-plug-common.h | 7 - include/configs/mvebu_armada-37xx.h | 2 + include/configs/nas220.h | 7 - include/configs/turris_omnia.h | 4 +- tools/kwboot.c | 6 +- 50 files changed, 772 insertions(+), 558 deletions(-) create mode 100644 arch/arm/dts/armada-388-clearfog-u-boot.dtsi create mode 100644 arch/arm/dts/kirkwood-atl-sbx81lifxcat.dts rename {board/gdsys/a38x => arch/arm/mach-mvebu}/.gitignore (100%) rename {board/gdsys/a38x => arch/arm/mach-mvebu}/kwbimage.cfg.in (100%) delete mode 100644 board/CZ.NIC/turris_omnia/kwbimage.cfg delete mode 100644 board/Marvell/db-88f6720/kwbimage.cfg delete mode 100644 board/Marvell/db-88f6820-amc/kwbimage.cfg delete mode 100644 board/Marvell/db-88f6820-gp/kwbimage.cfg delete mode 100644 board/Marvell/db-mv784mp-gp/kwbimage.cfg delete mode 100644 board/Synology/ds414/kwbimage.cfg create mode 100644 board/alliedtelesis/SBx81LIFXCAT/Kconfig create mode 100644 board/alliedtelesis/SBx81LIFXCAT/MAINTAINERS create mode 100644 board/alliedtelesis/SBx81LIFXCAT/Makefile create mode 100644 board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg create mode 100644 board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c delete mode 100644 board/gdsys/a38x/Kconfig delete mode 100644 board/kobol/helios4/kwbimage.cfg delete mode 100644 board/maxbcm/kwbimage.cfg delete mode 100644 board/solidrun/clearfog/kwbimage.cfg delete mode 100644 board/theadorable/kwbimage.cfg create mode 100644 configs/SBx81LIFXCAT_defconfig create mode 100644 include/configs/SBx81LIFXCAT.h

2 1