November 2018 - U-Boot

[U-Boot] [PATCH] ARM: zynq: Guard zynq_help_text with CONFIG_SYS_LONGHELP
by Michal Simek 21 Nov '18

21 Nov '18

If SYS_LONGHELP is disabled the following warning is generated: board/xilinx/zynq/cmds.c:496:13: warning: ‘zynq_help_text’ defined but not used [-Wunused-variable] Normal way for fixing this is to guard the whole variable. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/cmds.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c index 0b2a8178d62c..8b48ea3a03ab 100644 --- a/board/xilinx/zynq/cmds.c +++ b/board/xilinx/zynq/cmds.c @@ -493,6 +493,7 @@ static int do_zynq(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return cmd_process_error(zynq_cmd, ret); } +#ifdef CONFIG_SYS_LONGHELP static char zynq_help_text[] = "" #ifdef CONFIG_CMD_ZYNQ_RSA @@ -507,6 +508,7 @@ static char zynq_help_text[] = " destination address\n" #endif ; +#endif U_BOOT_CMD(zynq, 6, 0, do_zynq, "Zynq specific commands", zynq_help_text -- 1.9.1

1 0

[U-Boot] [PATCH] mtd: nand: Arasan: Add subpage configuration support
by Michal Simek 21 Nov '18

21 Nov '18

From: Martin Lund <malu(a)gomspace.com> Add support for disabling subpage write support via CONFIG_SYS_NAND_NO_SUBPAGE_WRITE. Currently the Linux Arasan driver does not support subpage writes and in case of running UBI and accessing the same UBI volume from both U-Boot and Linux it is required to have the same subpage write configuration else the location of the UBI headers (EC + VID) will be misaligned (subpage vs page) and incompatible. Hence the need for disabling subpage write support in the U-Boot Arasan NAND driver. Signed-off-by: Martin Lund <malu(a)gomspace.com> Acked-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/nand/raw/arasan_nfc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index 41db9f8bb9b1..dc531ccb6822 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -1201,6 +1201,10 @@ static int arasan_nand_init(struct nand_chip *nand_chip, int devnum) mtd = nand_to_mtd(nand_chip); nand_set_controller_data(nand_chip, nand); +#ifdef CONFIG_SYS_NAND_NO_SUBPAGE_WRITE + nand_chip->options |= NAND_NO_SUBPAGE_WRITE; +#endif + /* Set the driver entry points for MTD */ nand_chip->cmdfunc = arasan_nand_cmd_function; nand_chip->select_chip = arasan_nand_select_chip; -- 1.9.1

1 0

[U-Boot] [PATCH] arm: zynq: cse_qspi: Fix overwriting spi-rx-bus-width property
by Michal Simek 21 Nov '18

21 Nov '18

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> spi-rx-bus-width property is part of flash, so it should be moved to flash node from qspi node. This patch fixes the incorrect read of spi-rx-bus-width property by moving it to flash node. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/dts/zynq-cse-qspi-single.dts | 2 +- arch/arm/dts/zynq-cse-qspi.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/zynq-cse-qspi-single.dts b/arch/arm/dts/zynq-cse-qspi-single.dts index 3252d6a44409..0d680dfc0688 100644 --- a/arch/arm/dts/zynq-cse-qspi-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-single.dts @@ -7,6 +7,6 @@ #include "zynq-cse-qspi.dtsi" -&qspi { +&flash0 { spi-rx-bus-width = <4>; }; diff --git a/arch/arm/dts/zynq-cse-qspi.dtsi b/arch/arm/dts/zynq-cse-qspi.dtsi index 2b169468b06d..65af4081ff4f 100644 --- a/arch/arm/dts/zynq-cse-qspi.dtsi +++ b/arch/arm/dts/zynq-cse-qspi.dtsi @@ -59,7 +59,7 @@ #address-cells = <1>; #size-cells = <0>; num-cs = <1>; - flash@0 { + flash0: flash@0 { compatible = "n25q128a11"; reg = <0x0>; spi-tx-bus-width = <1>; -- 1.9.1

1 0

[U-Boot] [PATCH] usb: Introduce CONFIG_SPL_DM_USB
by Sven Schwermer 21 Nov '18

21 Nov '18

This allows building the SPL without driver model for USB. So far, support has only been added to the iMX6/7 host driver. Other boards will keep their existing behaviour. Signed-off-by: Sven Schwermer <sven(a)svenschwermer.de> --- This solves the dependency problem I described in [1]. [1]: http://u-boot.10912.n7.nabble.com/-td347224.html common/usb_storage.c | 34 +++++++++++++++++----------------- drivers/usb/Kconfig | 5 +++++ drivers/usb/gadget/ci_udc.c | 2 +- drivers/usb/host/Makefile | 3 ++- drivers/usb/host/ehci-hcd.c | 12 ++++++------ drivers/usb/host/ehci-mx6.c | 2 +- include/usb.h | 12 ++++++------ 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index d92ebb6eb1..ff881aa0c9 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -66,7 +66,7 @@ static __u32 CBWTag; static int usb_max_devs; /* number of highest available usb device */ -#ifndef CONFIG_BLK +#if !CONFIG_IS_ENABLED(BLK) static struct blk_desc usb_dev_desc[USB_MAX_STOR_DEV]; #endif @@ -99,7 +99,7 @@ struct us_data { unsigned short max_xfer_blk; /* maximum transfer blocks */ }; -#ifndef CONFIG_BLK +#if !CONFIG_IS_ENABLED(BLK) static struct us_data usb_stor[USB_MAX_STOR_DEV]; #endif @@ -111,7 +111,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *us, struct blk_desc *dev_desc); int usb_storage_probe(struct usb_device *dev, unsigned int ifnum, struct us_data *ss); -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer); static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr, @@ -136,7 +136,7 @@ static void usb_show_progress(void) int usb_stor_info(void) { int count = 0; -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) struct udevice *dev; for (blk_first_device(IF_TYPE_USB, &dev); @@ -186,7 +186,7 @@ static int usb_stor_probe_device(struct usb_device *udev) { int lun, max_lun; -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) struct us_data *data; int ret; #else @@ -197,7 +197,7 @@ static int usb_stor_probe_device(struct usb_device *udev) #endif debug("\n\nProbing for storage\n"); -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) /* * We store the us_data in the mass storage device's platdata. It * is shared by all LUNs (block devices) attached to this mass storage @@ -301,7 +301,7 @@ int usb_stor_scan(int mode) if (mode == 1) printf(" scanning usb for storage devices... "); -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) unsigned char i; usb_disable_asynch(1); /* asynch transfer not allowed */ @@ -944,7 +944,7 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev, size_t __maybe_unused size; int __maybe_unused ret; -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_EHCI_HCD /* * The U-Boot EHCI driver can handle any transfer length as long as @@ -1121,7 +1121,7 @@ static void usb_bin_fixup(struct usb_device_descriptor descriptor, } #endif /* CONFIG_USB_BIN_FIXUP */ -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer) #else @@ -1136,14 +1136,14 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr, struct us_data *ss; int retry; struct scsi_cmd *srb = &usb_ccb; -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) struct blk_desc *block_dev; #endif if (blkcnt == 0) return 0; /* Setup device */ -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) block_dev = dev_get_uclass_platdata(dev); udev = dev_get_parent_priv(dev_get_parent(dev)); debug("\nusb_read: udev %d\n", block_dev->devnum); @@ -1202,7 +1202,7 @@ retry_it: return blkcnt; } -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer) #else @@ -1217,7 +1217,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr, struct us_data *ss; int retry; struct scsi_cmd *srb = &usb_ccb; -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) struct blk_desc *block_dev; #endif @@ -1225,7 +1225,7 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr, return 0; /* Setup device */ -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) block_dev = dev_get_uclass_platdata(dev); udev = dev_get_parent_priv(dev_get_parent(dev)); debug("\nusb_read: udev %d\n", block_dev->devnum); @@ -1497,7 +1497,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss, return 1; } -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int usb_mass_storage_probe(struct udevice *dev) { @@ -1521,7 +1521,7 @@ U_BOOT_DRIVER(usb_mass_storage) = { .id = UCLASS_MASS_STORAGE, .of_match = usb_mass_storage_ids, .probe = usb_mass_storage_probe, -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) .platdata_auto_alloc_size = sizeof(struct us_data), #endif }; @@ -1542,7 +1542,7 @@ static const struct usb_device_id mass_storage_id_table[] = { U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table); #endif -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) static const struct blk_ops usb_storage_ops = { .read = usb_stor_read, .write = usb_stor_write, diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 4fbe172e05..03746dd12f 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -47,6 +47,11 @@ config DM_USB declared with the U_BOOT_USB_DEVICE() macro and will be automatically probed when found on the bus. +config SPL_DM_USB + bool "Enable driver model for USB in SPL" + depends on DM_USB + default y + source "drivers/usb/host/Kconfig" source "drivers/usb/dwc3/Kconfig" diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 0a84f6850d..bd596ce977 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1015,7 +1015,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH) return -EINVAL; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) ret = usb_setup_ehci_gadget(&controller.ctrl); #else ret = usb_lowlevel_init(0, USB_INIT_DEVICE, (void **)&controller.ctrl); diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index cb8c315a15..94839ffd97 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -3,8 +3,9 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +obj-$(CONFIG_$(SPL_)DM_USB) += usb-uclass.o + ifdef CONFIG_DM_USB -obj-$(CONFIG_CMD_USB) += usb-uclass.o obj-$(CONFIG_SANDBOX) += usb-sandbox.o endif diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index d1d8f08d98..4b28db70a5 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -30,7 +30,7 @@ */ #define HCHALT_TIMEOUT (8 * 1000) -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; #endif @@ -111,7 +111,7 @@ static struct descriptor { static struct ehci_ctrl *ehci_get_ctrl(struct usb_device *udev) { -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) return dev_get_priv(usb_get_bus(udev->dev)); #else return udev->controller; @@ -973,7 +973,7 @@ static void ehci_setup_ops(struct ehci_ctrl *ctrl, const struct ehci_ops *ops) } } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) void ehci_set_controller_priv(int index, void *priv, const struct ehci_ops *ops) { struct ehci_ctrl *ctrl = &ehcic[index]; @@ -1097,7 +1097,7 @@ static int ehci_common_init(struct ehci_ctrl *ctrl, uint tweaks) return 0; } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) int usb_lowlevel_stop(int index) { ehci_shutdown(&ehcic[index]); @@ -1518,7 +1518,7 @@ static int _ehci_submit_int_msg(struct usb_device *dev, unsigned long pipe, return result; } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int length) { @@ -1556,7 +1556,7 @@ int destroy_int_queue(struct usb_device *dev, struct int_queue *queue) } #endif -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) static int ehci_submit_control_msg(struct udevice *dev, struct usb_device *udev, unsigned long pipe, void *buffer, int length, struct devrequest *setup) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index be010b1adb..1acf08dfb7 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -335,7 +335,7 @@ int ehci_mx6_common_init(struct usb_ehci *ehci, int index) return 0; } -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { diff --git a/include/usb.h b/include/usb.h index b6b48a8c60..420a30e49f 100644 --- a/include/usb.h +++ b/include/usb.h @@ -140,7 +140,7 @@ struct usb_device { int act_len; /* transferred bytes */ int maxchild; /* Number of ports if hub */ int portnr; /* Port number, 1=first */ -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) /* parent hub, or NULL if this is the root hub */ struct usb_device *parent; struct usb_device *children[USB_MAXCHILDREN]; @@ -148,7 +148,7 @@ struct usb_device { #endif /* slot_id - for xHCI enabled devices */ unsigned int slot_id; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) struct udevice *dev; /* Pointer to associated device */ struct udevice *controller_dev; /* Pointer to associated controller */ #endif @@ -173,7 +173,7 @@ enum usb_init_type { int usb_lowlevel_init(int index, enum usb_init_type init, void **controller); int usb_lowlevel_stop(int index); -#if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_DM_USB) +#if defined(CONFIG_USB_MUSB_HOST) || CONFIG_IS_ENABLED(DM_USB) int usb_reset_root_port(struct usb_device *dev); #else #define usb_reset_root_port(dev) @@ -187,7 +187,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, int interval); #if defined CONFIG_USB_EHCI_HCD || defined CONFIG_USB_MUSB_HOST \ - || defined(CONFIG_DM_USB) + || CONFIG_IS_ENABLED(DM_USB) struct int_queue *create_int_queue(struct usb_device *dev, unsigned long pipe, int queuesize, int elementsize, void *buffer, int interval); int destroy_int_queue(struct usb_device *dev, struct int_queue *queue); @@ -588,7 +588,7 @@ struct usb_hub_device { struct usb_tt tt; /* Transaction Translator */ }; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) /** * struct usb_platdata - Platform data about a USB controller * @@ -912,7 +912,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp); */ void usb_stor_reset(void); -#else /* !CONFIG_DM_USB */ +#else /* !CONFIG_IS_ENABLED(DM_USB) */ struct usb_device *usb_get_dev_index(int index); -- 2.17.1

4 59

[U-Boot] [PATCH] imx: hab: extend hab_auth_img to calculate ivt_offset
by Parthiban Nallathambi 21 Nov '18

21 Nov '18

Current implementation of hab_auth_img command needs ivt_offset to authenticate the image. But ivt header is placed at the end of image date after padding. This leaves the usage of hab_auth_img command to fixed size or static offset for ivt header. New function "get_image_ivt_offset" is introduced to find the ivt offset during runtime. The case conditional check in this function is same as boot_get_kernel in common/bootm.c With this variable length image e.g. FIT image with any random size can have IVT at the end and ivt_offset option can be left optional Can be used as "hab_auth_img $loadaddr $filesize" from u-boot script Signed-off-by: Parthiban Nallathambi <pn(a)denx.de> --- arch/arm/mach-imx/hab.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index b88acd13da..060d0866b3 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -6,6 +6,8 @@ #include <common.h> #include <config.h> #include <fuse.h> +#include <mapmem.h> +#include <image.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/clock.h> @@ -302,18 +304,41 @@ static int do_hab_status(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } +static ulong get_image_ivt_offset(ulong img_addr, ulong length) +{ + const void *buf; + + buf = map_sysmem(img_addr, 0); + switch (genimg_get_format(buf)) { +#if defined(CONFIG_IMAGE_FORMAT_LEGACY) + case IMAGE_FORMAT_LEGACY: + return (image_get_image_size((image_header_t *)img_addr) + + 0x1000 - 1) & ~(0x1000 - 1); +#endif +#if IMAGE_ENABLE_FIT + case IMAGE_FORMAT_FIT: + return (fit_get_size(buf) + 0x1000 - 1) & ~(0x1000 - 1); +#endif + default: + return 0; + } +} + static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong addr, length, ivt_offset; int rcode = 0; - if (argc < 4) + if (argc < 3) return CMD_RET_USAGE; addr = simple_strtoul(argv[1], NULL, 16); length = simple_strtoul(argv[2], NULL, 16); - ivt_offset = simple_strtoul(argv[3], NULL, 16); + if (argc == 3) + ivt_offset = get_image_ivt_offset(addr, length); + else + ivt_offset = simple_strtoul(argv[3], NULL, 16); rcode = imx_hab_authenticate_image(addr, length, ivt_offset); if (rcode == 0) -- 2.17.2

3 4

[U-Boot] Query regarding Uboot Bootcount save in RAM
by Manas Marwah 21 Nov '18

21 Nov '18

Hi, I am trying to understand the uboot support to store the bootcount in RAM and working on aarch64 platform. Relevant configuration: 1. CONFIG_BOOTCOUNT_LIMIT 2. CONFIG_BOOTCOUNT_RAM 3. BOOTCOUNT_ADDR <RAM address> Relevant code: drivers/bootcount/bootcount_ram.c >From the code it is clear along with bootcount, uboot writes a MAGIC number and a BIG pattern. *Memory writing pattern in Uboot: *(In unsigned long: 8 bytes) <Bootcount><MAGIC Number><void><Pattern1><Pattern2><Pattern3><Pattern4><Pattern5>…… Pattern * 1000 times So effectively to save a counter we would need: 8 (Bootcount) + 8 (MAGIC Number) + 8 (void) + (8*1000) BIG PATTERN => 8024 bytes => ~8KB contiguous reserved memory in RAM. *Queries*: 1. If, I reduce the REPEAT times for pattern from 1000 to 100 the only consequence I see is the reduction in possibility of detecting bit errors. a. Do you see any other consequence if I reduce REPEAT times for pattern? 2. While reading the boot count Uboot always fail in pattern checking and reverts the bootcount to 0. a. It seems a *bug* to me in bootcount_ram.c line 59 where comparison between tmp and pattern[1] (0xFFFFFFFF) always fails. b. It works well with cast “if (tmp != *(int)* patterns[i % NBR_OF_PATTERNS])” -- Thanks & Regards, Manas Marwah

1 0

[U-Boot] SPI NOR controller with direct mapping support
by Miquel Raynal 21 Nov '18

21 Nov '18

Hello Jagan, I have a SoC which has a portion of memory where we can map a SPI NOR portion to do direct accesses. This is only for reading requests, otherwise regular SPI transfers must be used. While there is no real support for spi-mem in spi-flash, what is the right way to implement a driver for such controller? It is more a SPI controller driver and should probably inherit from UCLASS_SPI. But inside the driver, it looks like we must access the spi_flash structure. Also, we would make use of functions like spi_flash_std_xxx from drivers/mtd/spi/ while I would definitely put the driver itself in drivers/spi/. Can you please comment on all these points? Thanks, Miquèl

1 0

[U-Boot] [PATCHv2 0/8] pci: Add PCIe Gen4 controller driver for NXP Layerscape SoCs
by Z.q. Hou 21 Nov '18

21 Nov '18

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> Add PCIe Gen4 driver for the NXP Layerscape series SoCs. Hou Zhiqiang (8): armv8: fsl-layerscpae: correct the PCIe controllers' region size armv8: lx2160a: add MMU table entries for PCIe pci: Add PCIe Gen4 controller driver for NXP Layerscape SoCs kconfig: add dependency PCIE_LAYERSCAPE_GEN4 for FSL_PCIE_COMPAT pci: ls_pcie_g4: add device tree fixups for PCI Stream IDs armv8: lx2160a: add PCIe controller DT nodes armv8: lx2160a: enable PCIe support on RDB defconfig armv8: lx2160a: enable the pci command Depends on the following patches: https://patchwork.ozlabs.org/patch/990088/ https://patchwork.ozlabs.org/patch/990093/ https://patchwork.ozlabs.org/patch/990097/ https://patchwork.ozlabs.org/patch/990098/ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 2 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 12 + arch/arm/dts/fsl-lx2160a.dtsi | 85 +++ .../arm/include/asm/arch-fsl-layerscape/cpu.h | 9 + .../asm/arch-fsl-layerscape/immap_lsch3.h | 14 +- configs/lx2160ardb_tfa_defconfig | 5 + drivers/pci/Kconfig | 8 + drivers/pci/Makefile | 2 + drivers/pci/pcie_layerscape_gen4.c | 604 ++++++++++++++++++ drivers/pci/pcie_layerscape_gen4.h | 259 ++++++++ drivers/pci/pcie_layerscape_gen4_fixup.c | 234 +++++++ include/configs/lx2160a_common.h | 1 + 12 files changed, 1233 insertions(+), 2 deletions(-) create mode 100644 drivers/pci/pcie_layerscape_gen4.c create mode 100644 drivers/pci/pcie_layerscape_gen4.h create mode 100644 drivers/pci/pcie_layerscape_gen4_fixup.c -- 2.17.1

1 8

[U-Boot] [PATCH v2 0/3] ARM: meson: Use syscon/regmap for clock driver
by Loic Devulder 21 Nov '18

21 Nov '18

This patch series modifies the meson clock driver to use syscon/regmap like the Linux kernel does. It is needed if we want to share the same DTS files with the Linux kernel, as last changes in clock-controller break U-Boot. These patches also update all meson DTS files to last versions from Linux kernel v4.19. It was successfully tested on kvim, kvim2 and libretech-cc, both with the old and new DTS files. I don't have any p212, nanopi-k2 nor odroid-c2 boards to test with. As kvim and libretech-cc boards share a lot with p212 I don't expect any issue with that board, but if someone is able to test on nanopo-k2 and odroid-c2 it could be great :-) I opened this patch series as a RFC, as it's not a tricky part (for me!) and pretty new to me, so any feedback are welcome and wanted! Changes since v1: - rebased on the "Amlogic Meson cleanup for AXG SoC support" patchset from Neil Loic Devulder (3): ARM: meson: Add regmap support for clock driver ARM: meson: Enable syscon on all supported boards ARM: dts: meson: Update dts files from Linux v4.19 arch/arm/dts/meson-gx.dtsi | 31 +++++++++++++---- arch/arm/dts/meson-gxbb-nanopi-k2.dts | 48 ++++++++++++++++++++++++++ arch/arm/dts/meson-gxbb.dtsi | 14 ++++---- arch/arm/dts/meson-gxl-mali.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 5 +-- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 8 ++--- arch/arm/dts/meson-gxl.dtsi | 26 ++++++-------- arch/arm/dts/meson-gxm-khadas-vim2.dts | 24 +++++++++++++ configs/khadas-vim2_defconfig | 1 + configs/khadas-vim_defconfig | 1 + configs/libretech-cc_defconfig | 1 + configs/nanopi-k2_defconfig | 1 + configs/odroid-c2_defconfig | 1 + configs/p212_defconfig | 1 + drivers/clk/clk_meson.c | 61 ++++++++++++++------------- 15 files changed, 158 insertions(+), 67 deletions(-) -- 2.16.4

2 6

[U-Boot] [PATCH u-boot 00/19] Amlogic Meson cleanup for AXG SoC support
by Neil Armstrong 21 Nov '18

21 Nov '18

This patchset will refactor the Amlogic Meson SoC support in order to easily add support for the Amlogic AXg SoC family, and later the G12x SoCs. In order : - Cleanup the mach-meson configs - Move board support to reference design common boards - Move board Kconfig into mach-meson - Add AXG pinctrl & clock support - Add AXG device tree and mach-meson support - Add support for S400 reference design - Do a final factorization of the code - Add USB boot support in U-boot At the end of the patches, the board code is lighter and we maintain only the reference designs, where each board will differ in the defconfig. It will be simpler to add custom board support for future boards with more changes against the reference designs. The complete AXG support depends on the : - mmc: meson-gx: Add AXG compatible - net: designware: add meson meson axg compatible patches submitted to the U-Boot mailing list. Jerome Brunet (12): ARM: meson: clean-up platform selection configs: meson: remove unnecessary MESON_FDTFILE_SETTING board: amlogic: remove p212 derivatives board: amlogic: factorise gxbb boards ARM: rework amlogic configuration configs: meson: change default load addresses pinctrl: meson: rework gx pmx function pinctrl: meson: select generic pinctrl pinctrl: meson: add axg support clk: meson: silence debug print ARM: meson: rework soc arch file to prepare for new SoC ARM: meson: factorize common code out amlogic's boards Neil Armstrong (7): board: amlogic: move khadas-vim2 as q200 ref board clk: meson: add static to meson_gates table ARM: meson: Add support for AXG family ARM: dts: Sync Amlogic Meson AXG DT from Linux 4.20-rc1 clk: Add clock driver for AXG board: amlogic: add support for S400 board ARM: meson: Add boot device discovery arch/arm/dts/Makefile | 3 +- arch/arm/dts/meson-axg-s400.dts | 554 +++++++ arch/arm/dts/meson-axg.dtsi | 1589 ++++++++++++++++++++ arch/arm/include/asm/arch-meson/axg.h | 52 + arch/arm/include/asm/arch-meson/boot.h | 20 + arch/arm/include/asm/arch-meson/clock-axg.h | 104 ++ arch/arm/include/asm/arch-meson/clock-gx.h | 117 ++ arch/arm/include/asm/arch-meson/clock.h | 117 -- arch/arm/include/asm/arch-meson/eth.h | 6 +- arch/arm/include/asm/arch-meson/gx.h | 1 + arch/arm/include/asm/arch-meson/mem.h | 3 +- arch/arm/mach-meson/Kconfig | 132 +- arch/arm/mach-meson/Makefile | 4 +- arch/arm/mach-meson/board-axg.c | 118 ++ arch/arm/mach-meson/board-common.c | 118 ++ arch/arm/mach-meson/board-gx.c | 138 ++ arch/arm/mach-meson/board.c | 130 -- arch/arm/mach-meson/eth.c | 53 - arch/arm/mach-meson/sm.c | 1 - board/amlogic/khadas-vim/Kconfig | 12 - board/amlogic/khadas-vim/MAINTAINERS | 6 - board/amlogic/khadas-vim/Makefile | 6 - board/amlogic/khadas-vim/README | 102 -- board/amlogic/khadas-vim/khadas-vim.c | 57 - board/amlogic/khadas-vim2/Kconfig | 12 - board/amlogic/khadas-vim2/MAINTAINERS | 6 - board/amlogic/khadas-vim2/Makefile | 6 - board/amlogic/khadas-vim2/README | 103 -- board/amlogic/khadas-vim2/khadas-vim2.c | 62 - board/amlogic/libretech-cc/Kconfig | 12 - board/amlogic/libretech-cc/MAINTAINERS | 6 - board/amlogic/libretech-cc/Makefile | 6 - board/amlogic/libretech-cc/README | 102 -- board/amlogic/libretech-cc/libretech-cc.c | 57 - board/amlogic/nanopi-k2/Kconfig | 12 - board/amlogic/nanopi-k2/MAINTAINERS | 6 - board/amlogic/nanopi-k2/Makefile | 7 - board/amlogic/nanopi-k2/README | 99 -- board/amlogic/nanopi-k2/nanopi-k2.c | 55 - board/amlogic/odroid-c2/Kconfig | 12 - board/amlogic/odroid-c2/MAINTAINERS | 1 + board/amlogic/odroid-c2/README | 66 - board/amlogic/odroid-c2/README.nanopi-k2 | 99 ++ board/amlogic/odroid-c2/README.odroid-c2 | 66 + board/amlogic/odroid-c2/odroid-c2.c | 16 +- board/amlogic/p212/Kconfig | 12 - board/amlogic/p212/README | 103 -- board/amlogic/p212/README.khadas-vim | 102 ++ board/amlogic/p212/README.libretech-cc | 102 ++ board/amlogic/p212/README.p212 | 103 ++ board/amlogic/p212/p212.c | 16 +- board/amlogic/q200/MAINTAINERS | 6 + board/amlogic/q200/Makefile | 6 + board/amlogic/q200/README.khadas-vim2 | 103 ++ board/amlogic/q200/README.q200 | 102 ++ board/amlogic/q200/q200.c | 50 + board/amlogic/s400/MAINTAINERS | 6 + board/amlogic/s400/Makefile | 6 + board/amlogic/s400/README | 110 ++ board/amlogic/s400/s400.c | 21 + configs/khadas-vim2_defconfig | 1 - configs/khadas-vim_defconfig | 1 - configs/libretech-cc_defconfig | 1 - configs/nanopi-k2_defconfig | 2 - configs/odroid-c2_defconfig | 1 - configs/p212_defconfig | 1 - configs/s400_defconfig | 38 + drivers/clk/Makefile | 2 +- drivers/clk/clk_meson.c | 6 +- drivers/clk/clk_meson_axg.c | 316 ++++ drivers/pinctrl/meson/Kconfig | 18 +- drivers/pinctrl/meson/Makefile | 3 + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 125 ++ drivers/pinctrl/meson/pinctrl-meson-axg.c | 979 ++++++++++++ drivers/pinctrl/meson/pinctrl-meson-axg.h | 66 + drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 97 ++ drivers/pinctrl/meson/pinctrl-meson-gx.h | 48 + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 6 +- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 6 +- drivers/pinctrl/meson/pinctrl-meson.c | 109 +- drivers/pinctrl/meson/pinctrl-meson.h | 37 +- include/configs/khadas-vim.h | 16 - include/configs/khadas-vim2.h | 18 - include/configs/libretech-cc.h | 16 - include/configs/meson-gx-common.h | 52 - include/configs/meson64.h | 73 + include/configs/nanopi-k2.h | 16 - include/configs/odroid-c2.h | 16 - include/configs/p212.h | 18 - include/dt-bindings/clock/axg-aoclkc.h | 26 + include/dt-bindings/clock/axg-audio-clkc.h | 94 ++ include/dt-bindings/clock/axg-clkc.h | 76 + include/dt-bindings/gpio/meson-axg-gpio.h | 116 ++ .../reset/amlogic,meson-axg-audio-arb.h | 17 + .../dt-bindings/reset/amlogic,meson-axg-reset.h | 124 ++ include/dt-bindings/reset/axg-aoclkc.h | 20 + 96 files changed, 6038 insertions(+), 1625 deletions(-) create mode 100644 arch/arm/dts/meson-axg-s400.dts create mode 100644 arch/arm/dts/meson-axg.dtsi create mode 100644 arch/arm/include/asm/arch-meson/axg.h create mode 100644 arch/arm/include/asm/arch-meson/boot.h create mode 100644 arch/arm/include/asm/arch-meson/clock-axg.h create mode 100644 arch/arm/include/asm/arch-meson/clock-gx.h delete mode 100644 arch/arm/include/asm/arch-meson/clock.h create mode 100644 arch/arm/mach-meson/board-axg.c create mode 100644 arch/arm/mach-meson/board-common.c create mode 100644 arch/arm/mach-meson/board-gx.c delete mode 100644 arch/arm/mach-meson/board.c delete mode 100644 arch/arm/mach-meson/eth.c delete mode 100644 board/amlogic/khadas-vim/Kconfig delete mode 100644 board/amlogic/khadas-vim/MAINTAINERS delete mode 100644 board/amlogic/khadas-vim/Makefile delete mode 100644 board/amlogic/khadas-vim/README delete mode 100644 board/amlogic/khadas-vim/khadas-vim.c delete mode 100644 board/amlogic/khadas-vim2/Kconfig delete mode 100644 board/amlogic/khadas-vim2/MAINTAINERS delete mode 100644 board/amlogic/khadas-vim2/Makefile delete mode 100644 board/amlogic/khadas-vim2/README delete mode 100644 board/amlogic/khadas-vim2/khadas-vim2.c delete mode 100644 board/amlogic/libretech-cc/Kconfig delete mode 100644 board/amlogic/libretech-cc/MAINTAINERS delete mode 100644 board/amlogic/libretech-cc/Makefile delete mode 100644 board/amlogic/libretech-cc/README delete mode 100644 board/amlogic/libretech-cc/libretech-cc.c delete mode 100644 board/amlogic/nanopi-k2/Kconfig delete mode 100644 board/amlogic/nanopi-k2/MAINTAINERS delete mode 100644 board/amlogic/nanopi-k2/Makefile delete mode 100644 board/amlogic/nanopi-k2/README delete mode 100644 board/amlogic/nanopi-k2/nanopi-k2.c delete mode 100644 board/amlogic/odroid-c2/Kconfig delete mode 100644 board/amlogic/odroid-c2/README create mode 100644 board/amlogic/odroid-c2/README.nanopi-k2 create mode 100644 board/amlogic/odroid-c2/README.odroid-c2 delete mode 100644 board/amlogic/p212/Kconfig delete mode 100644 board/amlogic/p212/README create mode 100644 board/amlogic/p212/README.khadas-vim create mode 100644 board/amlogic/p212/README.libretech-cc create mode 100644 board/amlogic/p212/README.p212 create mode 100644 board/amlogic/q200/MAINTAINERS create mode 100644 board/amlogic/q200/Makefile create mode 100644 board/amlogic/q200/README.khadas-vim2 create mode 100644 board/amlogic/q200/README.q200 create mode 100644 board/amlogic/q200/q200.c create mode 100644 board/amlogic/s400/MAINTAINERS create mode 100644 board/amlogic/s400/Makefile create mode 100644 board/amlogic/s400/README create mode 100644 board/amlogic/s400/s400.c create mode 100644 configs/s400_defconfig create mode 100644 drivers/clk/clk_meson_axg.c create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg.c create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg.h create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gx.h delete mode 100644 include/configs/khadas-vim.h delete mode 100644 include/configs/khadas-vim2.h delete mode 100644 include/configs/libretech-cc.h delete mode 100644 include/configs/meson-gx-common.h create mode 100644 include/configs/meson64.h delete mode 100644 include/configs/nanopi-k2.h delete mode 100644 include/configs/odroid-c2.h delete mode 100644 include/configs/p212.h create mode 100644 include/dt-bindings/clock/axg-aoclkc.h create mode 100644 include/dt-bindings/clock/axg-audio-clkc.h create mode 100644 include/dt-bindings/clock/axg-clkc.h create mode 100644 include/dt-bindings/gpio/meson-axg-gpio.h create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-reset.h create mode 100644 include/dt-bindings/reset/axg-aoclkc.h -- 2.7.4

3 26