September 2018 - U-Boot

[U-Boot] [PATCH V5 00/31] imx: add i.MX8M support and i.MX8MQ EVK
by Peng Fan 07 Sep '18

07 Sep '18

This patchset is to add i.MX8M and i.MX8MQ-EVK support V5: Drop wait_mask_set/clr_timeout and switch to use readl_poll_timeout in the patchset. V4: Regenerate patchset based on Tom's master tree. In this patchset, https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom is included to avoid merge conflicts because the i.mx8m change also has some modification to bootaux and arch/arm/mach-imx/Makefile. Because CONFIG_GPT_TIMER change, I did a small modification to apply Tom's patch, no function change. Include ATF link in README. V3: This patchset based on https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom to avoid this patchset fail apply after Tom's patch merged. Previously "power: pmic/regulator allow dm be omited by SPL" broke other boards, in V3 patchset, only touch pfuze100 related options. Sharing code about get mac from fuse between mx7/mx8m Sharing code about bootaux between mx6/7/mx8m Sharing code about cpu speed grade between mx7/mx8m Sharing code about get boot device between mx7/mx8m Sharding code about mmc env between mx7/mx8m Introduce wait_mask_set/clr_timeout to avoid deadloop in clock pll configuration Correct authorship of fix building warning on fec arm64, patch 27/31. Switch to use structure for DDR Controller. For DDR PHY registers, there are about more than 10 thousands registers, I could not convert them with detailed register name, and the script is generated from IC team, So I use regs[0xxxxx] arrays here fo easily converting between IC team released script and uboot ddr phy cod. Improve REAMME file to include where to download firmware and imx-mkimage and how to build Add review tags on the V2 patchset. Hope this patchset could catch up next release :) V2: patch 02/23: convert to structure, drop is_boot_from_usb and disconnect_from_usb patch 04/23: conver to use structure for the clock driver, removed the CCM_xxx macros. Add static for local functons. Add init_usdhc_clk, init_uart_clk and etc to not enable them all at default. patch 05/23: Add more commit msg for the sip part. patch 08/23: Merge the spl boot device with i.MX7 patch 12/23: Typo fix and return error fix from Heiko for the SoC related part patch 22/23: Use a weak function ddr_init. If patch 23/23 could not be accepted at current stage, to make others still be could be compiled. The patchset depends on https://patchwork.ozlabs.org/patch/841934/ https://patchwork.ozlabs.org/patch/841958/ to be tested on real hardware. V1: patch: "power: pmic.h: include dm/ofnode.h" and "power: pmic/regulator allow dm be omited by SPL" is previously reviewed in mailist to not merged. If no issue, you may pick it up. The board support is a large patch because of the ddr related code. If it is not good, please first review/pick-up other patches if they are ok. Peng Fan (29): imx: add i.MX8M into Kconfig imx: mx8m: add register definition header file imx: mx8m: add pin header file imx: mx8m: add clock driver imx: add sip function imx: boot_mode: add USB_BOOT entry imx: cpu: update cpu file to support i.MX8M imx: spl: implement spl_boot_device for i.MX8M imx: add i.MX8MQ SoC Revision and is_mx8m helper imx: add pad settings bit definition for i.MX8M imx: cpu: move speed/temp to common cpu imx: cpu: add cpu speed/grade for i.MX8M imx: refactor imx_get_mac_from_fuse imx: cleanup bootaux imx: bootaux: support i.MX8M imx: mx7: move get_boot_device to cpu.c imx: cpu: support get_boot_device for i.MX8M imx: mx7: move mmc env code to mmc_env.c imx: mx8m: add soc related settings and files imx: makefile: compile files for i.MX8M misc: ocotp: add i.MX8M support mmc: fsl_esdhc: support i.MX8M imx: lcdif: include i.MX8M gpio: mxc: add i.MX8M support net: fec: do not access reserved register for i.MX8M imx: imx8mq: add dtsi file power: pmic/regulator allow dm be omitted by SPL imx: mx8m: add ddr controller memory map imx: add i.MX8MQ EVK support Tom Rini (1): arm: imx: Rework i.MX specific commands to be excluded from SPL Ye Li (1): net: fec: fix build warnings for 64bits support arch/arm/Kconfig | 14 +- arch/arm/Makefile | 4 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/fsl-imx8-ca53.dtsi | 92 ++ arch/arm/dts/fsl-imx8mq-evk.dts | 424 +++++++++ arch/arm/dts/fsl-imx8mq.dtsi | 429 +++++++++ arch/arm/include/asm/arch-imx/cpu.h | 6 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 9 +- arch/arm/include/asm/arch-mx7/imx-regs.h | 18 +- arch/arm/include/asm/arch-mx8m/clock.h | 657 +++++++++++++ arch/arm/include/asm/arch-mx8m/crm_regs.h | 10 + arch/arm/include/asm/arch-mx8m/ddr.h | 365 ++++++++ arch/arm/include/asm/arch-mx8m/gpio.h | 12 + arch/arm/include/asm/arch-mx8m/imx-regs.h | 468 ++++++++++ arch/arm/include/asm/arch-mx8m/mx8mq_pins.h | 623 +++++++++++++ arch/arm/include/asm/arch-mx8m/sys_proto.h | 18 + arch/arm/include/asm/mach-imx/boot_mode.h | 10 + arch/arm/include/asm/mach-imx/iomux-v3.h | 22 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 10 +- arch/arm/include/asm/mach-imx/sys_proto.h | 4 + arch/arm/mach-imx/Makefile | 23 +- arch/arm/mach-imx/cpu.c | 130 ++- arch/arm/mach-imx/imx_bootaux.c | 51 +- arch/arm/mach-imx/mac.c | 61 ++ arch/arm/mach-imx/mmc_env.c | 30 + arch/arm/mach-imx/mx5/clock.c | 4 +- arch/arm/mach-imx/mx6/soc.c | 72 -- arch/arm/mach-imx/mx7/clock.c | 2 + arch/arm/mach-imx/mx7/soc.c | 195 ---- arch/arm/mach-imx/mx7ulp/clock.c | 2 + arch/arm/mach-imx/mx8m/Kconfig | 22 + arch/arm/mach-imx/mx8m/Makefile | 8 + arch/arm/mach-imx/mx8m/clock.c | 795 ++++++++++++++++ arch/arm/mach-imx/mx8m/clock_slice.c | 742 +++++++++++++++ arch/arm/mach-imx/mx8m/lowlevel_init.S | 63 ++ arch/arm/mach-imx/mx8m/soc.c | 227 +++++ arch/arm/mach-imx/sip.c | 23 + arch/arm/mach-imx/spl.c | 10 +- board/freescale/mx8mq_evk/Kconfig | 12 + board/freescale/mx8mq_evk/Makefile | 12 + board/freescale/mx8mq_evk/README | 47 + board/freescale/mx8mq_evk/ddr/ddr_init.c | 246 +++++ board/freescale/mx8mq_evk/ddr/ddrphy_train.c | 1272 ++++++++++++++++++++++++++ board/freescale/mx8mq_evk/ddr/helper.c | 101 ++ board/freescale/mx8mq_evk/mx8mq_evk.c | 156 ++++ board/freescale/mx8mq_evk/spl.c | 230 +++++ configs/mx8mq_evk_defconfig | 27 + drivers/gpio/mxc_gpio.c | 22 +- drivers/misc/mxc_ocotp.c | 7 + drivers/mmc/fsl_esdhc.c | 12 +- drivers/net/fec_mxc.c | 78 +- drivers/power/pmic/Makefile | 2 +- drivers/power/regulator/Makefile | 2 +- include/configs/mx8mq_evk.h | 269 ++++++ include/dt-bindings/clock/imx8mq-clock.h | 612 +++++++++++++ include/dt-bindings/pinctrl/pins-imx8mq.h | 632 +++++++++++++ include/imx_sip.h | 14 + 57 files changed, 9047 insertions(+), 363 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8-ca53.dtsi create mode 100644 arch/arm/dts/fsl-imx8mq-evk.dts create mode 100644 arch/arm/dts/fsl-imx8mq.dtsi create mode 100644 arch/arm/include/asm/arch-mx8m/clock.h create mode 100644 arch/arm/include/asm/arch-mx8m/crm_regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/ddr.h create mode 100644 arch/arm/include/asm/arch-mx8m/gpio.h create mode 100644 arch/arm/include/asm/arch-mx8m/imx-regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/mx8mq_pins.h create mode 100644 arch/arm/include/asm/arch-mx8m/sys_proto.h create mode 100644 arch/arm/mach-imx/mac.c create mode 100644 arch/arm/mach-imx/mmc_env.c create mode 100644 arch/arm/mach-imx/mx8m/Kconfig create mode 100644 arch/arm/mach-imx/mx8m/Makefile create mode 100644 arch/arm/mach-imx/mx8m/clock.c create mode 100644 arch/arm/mach-imx/mx8m/clock_slice.c create mode 100644 arch/arm/mach-imx/mx8m/lowlevel_init.S create mode 100644 arch/arm/mach-imx/mx8m/soc.c create mode 100644 arch/arm/mach-imx/sip.c create mode 100644 board/freescale/mx8mq_evk/Kconfig create mode 100644 board/freescale/mx8mq_evk/Makefile create mode 100644 board/freescale/mx8mq_evk/README create mode 100644 board/freescale/mx8mq_evk/ddr/ddr_init.c create mode 100644 board/freescale/mx8mq_evk/ddr/ddrphy_train.c create mode 100644 board/freescale/mx8mq_evk/ddr/helper.c create mode 100644 board/freescale/mx8mq_evk/mx8mq_evk.c create mode 100644 board/freescale/mx8mq_evk/spl.c create mode 100644 configs/mx8mq_evk_defconfig create mode 100644 include/configs/mx8mq_evk.h create mode 100644 include/dt-bindings/clock/imx8mq-clock.h create mode 100644 include/dt-bindings/pinctrl/pins-imx8mq.h create mode 100644 include/imx_sip.h -- 2.14.1

12 91

[U-Boot] [PATCH v2] usb: dwc3: convert to livetree
by Siva Durga Prasad Paladugu 07 Sep '18

07 Sep '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> Update the DWC3 USB driver to support a live tree. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> Tested-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Fixed travis build issues with some platforms. --- drivers/usb/common/common.c | 11 +++++------ drivers/usb/dwc3/dwc3-generic.c | 17 +++++++---------- drivers/usb/host/dwc3-sti-glue.c | 7 +++---- drivers/usb/host/xhci-dwc3.c | 3 ++- drivers/usb/host/xhci-zynqmp.c | 3 +-- drivers/usb/musb-new/ti-musb.c | 11 ++++------- include/linux/usb/otg.h | 6 ++++-- 7 files changed, 26 insertions(+), 32 deletions(-) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index a55def5..3dea79b 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -10,6 +10,7 @@ #include <linux/libfdt.h> #include <linux/usb/otg.h> #include <linux/usb/ch9.h> +#include <dm.h> DECLARE_GLOBAL_DATA_PTR; @@ -20,13 +21,12 @@ static const char *const usb_dr_modes[] = { [USB_DR_MODE_OTG] = "otg", }; -enum usb_dr_mode usb_get_dr_mode(int node) +enum usb_dr_mode usb_get_dr_mode(ofnode node) { - const void *fdt = gd->fdt_blob; const char *dr_mode; int i; - dr_mode = fdt_getprop(fdt, node, "dr_mode", NULL); + dr_mode = ofnode_get_property(node, "dr_mode", NULL); if (!dr_mode) { pr_err("usb dr_mode not found\n"); return USB_DR_MODE_UNKNOWN; @@ -48,13 +48,12 @@ static const char *const speed_names[] = { [USB_SPEED_SUPER] = "super-speed", }; -enum usb_device_speed usb_get_maximum_speed(int node) +enum usb_device_speed usb_get_maximum_speed(ofnode node) { - const void *fdt = gd->fdt_blob; const char *max_speed; int i; - max_speed = fdt_getprop(fdt, node, "maximum-speed", NULL); + max_speed = ofnode_get_property(node, "maximum-speed", NULL); if (!max_speed) { pr_err("usb maximum-speed not found\n"); return USB_SPEED_UNKNOWN; diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index ca63eac..ef72c8c 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -61,18 +61,17 @@ static int dwc3_generic_peripheral_remove(struct udevice *dev) static int dwc3_generic_peripheral_ofdata_to_platdata(struct udevice *dev) { struct dwc3 *priv = dev_get_priv(dev); - int node = dev_of_offset(dev); - priv->regs = (void *)devfdt_get_addr(dev); + priv->regs = (void *)dev_read_addr(dev); priv->regs += DWC3_GLOBALS_REGS_START; - priv->maximum_speed = usb_get_maximum_speed(node); + priv->maximum_speed = usb_get_maximum_speed(dev->node); if (priv->maximum_speed == USB_SPEED_UNKNOWN) { pr_err("Invalid usb maximum speed\n"); return -ENODEV; } - priv->dr_mode = usb_get_dr_mode(node); + priv->dr_mode = usb_get_dr_mode(dev->node); if (priv->dr_mode == USB_DR_MODE_UNKNOWN) { pr_err("Invalid usb mode setup\n"); return -ENODEV; @@ -100,13 +99,11 @@ U_BOOT_DRIVER(dwc3_generic_peripheral) = { static int dwc3_generic_bind(struct udevice *parent) { - const void *fdt = gd->fdt_blob; - int node; + ofnode node; int ret; - for (node = fdt_first_subnode(fdt, dev_of_offset(parent)); node > 0; - node = fdt_next_subnode(fdt, node)) { - const char *name = fdt_get_name(fdt, node, NULL); + dev_for_each_subnode(node, parent) { + const char *name = (char *)ofnode_get_name(node); enum usb_dr_mode dr_mode; struct udevice *dev; const char *driver; @@ -133,7 +130,7 @@ static int dwc3_generic_bind(struct udevice *parent) }; ret = device_bind_driver_to_node(parent, driver, name, - offset_to_ofnode(node), &dev); + node, &dev); if (ret) { debug("%s: not able to bind usb device mode\n", __func__); diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index ad7cf6e..de423ee 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -153,18 +153,17 @@ static int sti_dwc3_glue_ofdata_to_platdata(struct udevice *dev) static int sti_dwc3_glue_bind(struct udevice *dev) { struct sti_dwc3_glue_platdata *plat = dev_get_platdata(dev); - int dwc3_node; + ofnode dwc3_node; /* check if one subnode is present */ - dwc3_node = fdt_first_subnode(gd->fdt_blob, dev_of_offset(dev)); + dwc3_node = dev_read_first_subnode(dev); if (dwc3_node <= 0) { pr_err("Can't find subnode for %s\n", dev->name); return -ENODEV; } /* check if the subnode compatible string is the dwc3 one*/ - if (fdt_node_check_compatible(gd->fdt_blob, dwc3_node, - "snps,dwc3") != 0) { + if (ofnode_device_is_compatible(dwc3_node, "snps,dwc3") != 0) { pr_err("Can't find dwc3 subnode for %s\n", dev->name); return -ENODEV; } diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 80754d7..cbab436 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -202,6 +202,7 @@ static int xhci_dwc3_probe(struct udevice *dev) struct dwc3 *dwc3_reg; enum usb_dr_mode dr_mode; int ret; + ofnode node; hccr = (struct xhci_hccr *)((uintptr_t)dev_read_addr(dev)); hcor = (struct xhci_hcor *)((uintptr_t)hccr + @@ -215,7 +216,7 @@ static int xhci_dwc3_probe(struct udevice *dev) dwc3_core_init(dwc3_reg); - dr_mode = usb_get_dr_mode(dev_of_offset(dev)); + dr_mode = usb_get_dr_mode(node); if (dr_mode == USB_DR_MODE_UNKNOWN) /* by default set dual role mode to HOST */ dr_mode = USB_DR_MODE_HOST; diff --git a/drivers/usb/host/xhci-zynqmp.c b/drivers/usb/host/xhci-zynqmp.c index e44e1ae..5a5b870 100644 --- a/drivers/usb/host/xhci-zynqmp.c +++ b/drivers/usb/host/xhci-zynqmp.c @@ -121,10 +121,9 @@ static int xhci_usb_remove(struct udevice *dev) static int xhci_usb_ofdata_to_platdata(struct udevice *dev) { struct zynqmp_xhci_platdata *plat = dev_get_platdata(dev); - const void *blob = gd->fdt_blob; /* Get the base address for XHCI controller from the device node */ - plat->hcd_base = fdtdec_get_addr(blob, dev_of_offset(dev), "reg"); + plat->hcd_base = dev_read_addr(dev); if (plat->hcd_base == FDT_ADDR_T_NONE) { debug("Can't get the XHCI register base address\n"); return -ENXIO; diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 9fbe2d6..bdb5985 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -177,7 +177,6 @@ static int ti_musb_host_ofdata_to_platdata(struct udevice *dev) { struct ti_musb_platdata *platdata = dev_get_platdata(dev); const void *fdt = gd->fdt_blob; - int node = dev_of_offset(dev); int ret; ret = ti_musb_ofdata_to_platdata(dev); @@ -204,14 +203,12 @@ U_BOOT_DRIVER(ti_musb_host) = { static int ti_musb_wrapper_bind(struct udevice *parent) { - const void *fdt = gd->fdt_blob; - int node; + ofnode node; int ret; - for (node = fdt_first_subnode(fdt, dev_of_offset(parent)); node > 0; - node = fdt_next_subnode(fdt, node)) { + dev_for_each_subnode(node, parent) { struct udevice *dev; - const char *name = fdt_get_name(fdt, node, NULL); + const char *name = (char *)ofnode_get_name(node); enum usb_dr_mode dr_mode; struct driver *drv; @@ -226,7 +223,7 @@ static int ti_musb_wrapper_bind(struct udevice *parent) case USB_DR_MODE_HOST: /* Bind MUSB host */ ret = device_bind_driver_to_node(parent, "ti-musb-host", - name, offset_to_ofnode(node), &dev); + name, node, &dev); if (ret) { pr_err("musb - not able to bind usb host node\n"); return ret; diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index d2604c5..baf4d91 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -9,6 +9,8 @@ #ifndef __LINUX_USB_OTG_H #define __LINUX_USB_OTG_H +#include <dm/ofnode.h> + enum usb_dr_mode { USB_DR_MODE_UNKNOWN, USB_DR_MODE_HOST, @@ -23,7 +25,7 @@ enum usb_dr_mode { * The function gets phy interface string from property 'dr_mode', * and returns the correspondig enum usb_dr_mode */ -enum usb_dr_mode usb_get_dr_mode(int node); +enum usb_dr_mode usb_get_dr_mode(ofnode node); /** * usb_get_maximum_speed() - Get maximum speed for given device @@ -32,6 +34,6 @@ enum usb_dr_mode usb_get_dr_mode(int node); * The function gets phy interface string from property 'maximum-speed', * and returns the correspondig enum usb_device_speed */ -enum usb_device_speed usb_get_maximum_speed(int node); +enum usb_device_speed usb_get_maximum_speed(ofnode node); #endif /* __LINUX_USB_OTG_H */ -- 2.7.4

4 5

[U-Boot] [PATCH] mtd: nand: denali_dt: Add reset support
by Marek Vasut 07 Sep '18

07 Sep '18

Add optional reset support into the Denali NAND driver. In case there is a valid reset entry in the DT, the reset gets deasserted before the NAND controller gets used. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mtd/nand/denali_dt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c index 65a7797f0f..6fcd7d3843 100644 --- a/drivers/mtd/nand/denali_dt.c +++ b/drivers/mtd/nand/denali_dt.c @@ -9,6 +9,7 @@ #include <linux/io.h> #include <linux/ioport.h> #include <linux/printk.h> +#include <reset.h> #include "denali.h" @@ -64,6 +65,7 @@ static int denali_dt_probe(struct udevice *dev) const struct denali_dt_data *data; struct clk clk; struct resource res; + struct reset_ctl reset_ctl; int ret; data = (void *)dev_get_driver_data(dev); @@ -97,6 +99,13 @@ static int denali_dt_probe(struct udevice *dev) denali->clk_x_rate = clk_get_rate(&clk); + ret = reset_get_by_index(dev, 0, &reset_ctl); + if (!ret) { + reset_assert(&reset_ctl); + udelay(2); + reset_deassert(&reset_ctl); + } + return denali_init(denali); } -- 2.17.1

3 6

[U-Boot] [PATCH 0/2] Watchdog: Add support for sunxi hardware watchdog
by Chris Blake 07 Sep '18

07 Sep '18

The following patches are needed to add support for the hardware watchdog found in most sunxi SoC's. The patches below have only been tested on a sun50i device (H5 SoC) and work as expected. The actual sunxi_wdt.c was roughly based off of the mainline linux driver, and is enabled by adding CONFIG_SUNXI_WDT to your config. It is not enabled by default. Chris Blake (2): watchdog: Fix SPL builds when watchdog is enabled watchdog: Add sunxi watchdog driver common/board_f.c | 3 +- drivers/watchdog/Kconfig | 18 ++++++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sunxi_wdt.c | 103 +++++++++++++++++++++++++++++++++++++++++++ include/watchdog.h | 4 +- 5 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 drivers/watchdog/sunxi_wdt.c -- 2.7.4

2 4

[U-Boot] [PATCH] gpio: dwapb_gpio: Change to use devm_kcalloc()
by Ley Foon Tan 07 Sep '18

07 Sep '18

Change to use managed resource function devm_kcalloc(), so it will auto free memory when driver is removed. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- drivers/gpio/dwapb_gpio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 0f6574d..1594434 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -171,8 +171,7 @@ static int gpio_dwapb_bind(struct udevice *dev) if (!fdtdec_get_bool(blob, node, "gpio-controller")) continue; - plat = NULL; - plat = calloc(1, sizeof(*plat)); + plat = devm_kcalloc(dev, 1, sizeof(*plat), GFP_KERNEL); if (!plat) return -ENOMEM; -- 2.2.2

3 2

Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board support
by Rick Chen 07 Sep '18

07 Sep '18

> > From: Auer, Lukas [mailto:lukas.auer@aisec.fraunhofer.de] > > Sent: Wednesday, September 05, 2018 5:53 AM > > To: bmeng.cn(a)gmail.com > > Cc: Rick Jian-Zhi Chen(陳建志); u-boot(a)lists.denx.de > > Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board support > > > > On Tue, 2018-09-04 at 17:31 +0800, Bin Meng wrote: > > > Hi Lukas, > > > > > > On Tue, Sep 4, 2018 at 5:39 AM Auer, Lukas > > > <lukas.auer(a)aisec.fraunhofer.de> wrote: > > > > > > > > On Thu, 2018-08-30 at 00:54 -0700, Bin Meng wrote: > > > > > This adds QEMU RISC-V 'virt' board target support, with the hope > > > > > of helping people easily test U-Boot on RISC-V. > > > > > > > > > > The QEMU virt machine models a generic RISC-V virtual machine > > > > > with support for the VirtIO standard networking and block > > > > > storage devices. > > > > > It has CLINT, PLIC, 16550A UART devices in addition to VirtIO > > > > > and it also uses device-tree to pass configuration information > > > > > to guest software. It implements RISC-V privileged architecture > > > > > spec v1.10. > > > > > > > > > > Both 32-bit and 64-bit builds are supported. Support is pretty > > > > > much preliminary, only booting to U-Boot shell with the UART > > > > > driver on a single core. Booting Linux is not supported yet. > > > > > > > > > > > > > For your information and to avoid duplicate work, I am working on > > > > a patch set that improves RISC-V support in u-boot. I am currently > > > > able to boot Linux on a multi-core setup in QEMU, but they are not > > > > quite ready to submit yet. > > > > > > > > > > This is great! My next step is to work on virtio driver support in > > > U-Boot as qemu-riscv virt machine has these devices but we don't > > > have corresponding drivers in U-Boot. Then I will try to boot Linux > > > after that. Good to hear you already boot Linux with qemu-riscv! > > > Have you already supported virtio drivers in your port? If yes, I > > > will just hold on and wait for your patch series :-) > > > > > > > Hi Bin, > > > > Support for the virtio devices would be great! I don't support them in > > my port, I can only boot a kernel image from RAM. > > I only have a driver for the clint0 (core local interrupt controller), > > which I need for software interrupts to other cores and as a timer. > > Software interrupts also work over the supervisor binary interface > > (SBI), which allows u-boot to run in supervisor mode with bbl running > > in machine mode to handle the SBI calls. > > Hi Bin and Auer I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH. It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel. Please refer to doc/README.ae350 May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ? It mean after booting bbl and riscv-linux, u-boot will still alive and handle SBI calls and somethings in S-mode. Or u-boot is going to replace the role of bbl ? Rick > > > > Thank you for your patches, it's great to see better support for > > > > RISC-V in u-boot! I will add a few comments based on what I have > > > > learned so far from working with u-boot on RISC-V. > > > > > > > > > > It's a good start. RISC-V is pretty new and needs more developers > > > :-) > > > > > > > Exactly :) > > > > Thanks, > > Lukas

3 9

[U-Boot] [PATCH v2 1/1] test/py: typo occured
by Heinrich Schuchardt 06 Sep '18

06 Sep '18

%s/occured/occurred/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: remove an obsolete correction --- test/py/tests/test_efi_selftest.py | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-) diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index de3272402e..994d2e2241 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -16,7 +16,7 @@ def test_efi_selftest(u_boot_console): u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) if m != 0: - raise Exception('Failures occured during the EFI selftest') + raise Exception('Failures occurred during the EFI selftest') u_boot_console.run_command(cmd='', wait_for_echo=False, wait_for_prompt=False); m = u_boot_console.p.expect(['resetting', 'U-Boot']) if m != 0: -- 2.18.0

1 0

[U-Boot] [PATCH 1/1] test/py: typo occured
by Heinrich Schuchardt 06 Sep '18

06 Sep '18

%s/occured/occurred/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/tests/test_efi_selftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index de3272402e..994d2e2241 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -16,7 +16,7 @@ def test_efi_selftest(u_boot_console): u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) if m != 0: - raise Exception('Failures occured during the EFI selftest') + raise Exception('Failures occurred during the EFI selftest') u_boot_console.run_command(cmd='', wait_for_echo=False, wait_for_prompt=False); m = u_boot_console.p.expect(['resetting', 'U-Boot']) if m != 0: @@ -104,5 +104,5 @@ def test_efi_selftest_text_input(u_boot_console): wait_for_prompt=False) m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) if m != 0: - raise Exception('Failures occured during the EFI selftest') + raise Exception('Failures occurred during the EFI selftest') u_boot_console.restart_uboot(); -- 2.18.0

1 0

[U-Boot] [PATCH 1/1] test/py: test EFI_SIMPLE_TEXT_INPUT_PROTOCOL
by Heinrich Schuchardt 06 Sep '18

06 Sep '18

Execute the EFI selftest for the EFI_SIMPLE_TEXT_INPUT_PROTOCOL. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/tests/test_efi_selftest.py | 58 ++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index 747d52d935..de3272402e 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -48,3 +48,61 @@ def test_efi_selftest_watchdog_reboot(u_boot_console): if m != 0: raise Exception('Reset failed in \'watchdog reboot\' test') u_boot_console.restart_uboot(); + +(a)pytest.mark.buildconfigspec('cmd_bootefi_selftest') +def test_efi_selftest_text_input(u_boot_console): + """Test the EFI_SIMPLE_TEXT_INPUT_PROTOCOL + + :param u_boot_console: U-Boot console + + This function calls the text input EFI selftest. + """ + u_boot_console.run_command(cmd='setenv efi_selftest text input') + output = u_boot_console.run_command(cmd='bootefi selftest', + wait_for_prompt=False) + m = u_boot_console.p.expect(['To terminate type \'x\'']) + if m != 0: + raise Exception('No prompt for \'text input\' test') + u_boot_console.drain_console() + u_boot_console.p.timeout = 500 + # EOT + u_boot_console.run_command(cmd=chr(4), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect(['Unicode char 4']) + if m != 0: + raise Exception('EOT failed in \'text input\' test') + u_boot_console.drain_console() + # BS + u_boot_console.run_command(cmd=chr(8), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect(['(BS)']) + if m != 0: + raise Exception('BS failed in \'text input\' test') + u_boot_console.drain_console() + # TAB + u_boot_console.run_command(cmd=chr(9), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect(['(TAB)']) + if m != 0: + raise Exception('BS failed in \'text input\' test') + u_boot_console.drain_console() + # a + u_boot_console.run_command(cmd='a', wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect(['(\'a\')']) + if m != 0: + raise Exception('\'a\' failed in \'text input\' test') + u_boot_console.drain_console() + # UP escape sequence + u_boot_console.run_command(cmd=chr(27) + '[A', wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect(['(Up)']) + if m != 0: + raise Exception('UP failed in \'text input\' test') + u_boot_console.drain_console() + u_boot_console.run_command(cmd='x', wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) + if m != 0: + raise Exception('Failures occurred during the EFI selftest') + u_boot_console.restart_uboot(); -- 2.18.0

1 0

[U-Boot] [PATCH] spi: designware_spi: Add reset ctrl to driver
by Ley Foon Tan 06 Sep '18

06 Sep '18

Add code to reset all reset signals as in SPI DT node. A reset property is an optional feature, so only print out a warning and do not fail if a reset property is not present. If a reset property is discovered, then use it to deassert, thus bringing the IP out of reset. Release reset when _remove(). Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- drivers/spi/designware_spi.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index d8b73ea..b73ec38 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -17,6 +17,7 @@ #include <malloc.h> #include <spi.h> #include <fdtdec.h> +#include <reset.h> #include <linux/compat.h> #include <linux/iopoll.h> #include <asm/io.h> @@ -111,6 +112,8 @@ struct dw_spi_priv { void *tx_end; void *rx; void *rx_end; + + struct reset_ctl_bulk resets; }; static inline u32 dw_read(struct dw_spi_priv *priv, u32 offset) @@ -231,6 +234,33 @@ err_rate: return -EINVAL; } +static int dw_spi_reset(struct udevice *bus) +{ + int ret; + struct dw_spi_priv *priv = dev_get_priv(bus); + + ret = reset_get_bulk(bus, &priv->resets); + if (ret) { + /* Return 0 if error due to !CONFIG_DM_RESET and reset + * DT property is not present. + */ + if (ret == -ENOENT || ret == -ENOTSUPP) + return 0; + + dev_warn(bus, "Can't get reset: %d\n", ret); + return ret; + } + + ret = reset_deassert_bulk(&priv->resets); + if (ret) { + reset_release_bulk(&priv->resets); + dev_err(bus, "Failed to reset: %d\n", ret); + return ret; + } + + return 0; +} + static int dw_spi_probe(struct udevice *bus) { struct dw_spi_platdata *plat = dev_get_platdata(bus); @@ -244,6 +274,10 @@ static int dw_spi_probe(struct udevice *bus) if (ret) return ret; + ret = dw_spi_reset(bus); + if (ret) + return ret; + /* Currently only bits_per_word == 8 supported */ priv->bits_per_word = 8; @@ -478,6 +512,13 @@ static int dw_spi_set_mode(struct udevice *bus, uint mode) return 0; } +static int dw_spi_remove(struct udevice *bus) +{ + struct dw_spi_priv *priv = dev_get_priv(bus); + + return reset_release_bulk(&priv->resets); +} + static const struct dm_spi_ops dw_spi_ops = { .xfer = dw_spi_xfer, .set_speed = dw_spi_set_speed, @@ -502,4 +543,5 @@ U_BOOT_DRIVER(dw_spi) = { .platdata_auto_alloc_size = sizeof(struct dw_spi_platdata), .priv_auto_alloc_size = sizeof(struct dw_spi_priv), .probe = dw_spi_probe, + .remove = dw_spi_remove, }; -- 2.2.2

3 2