August 2016 - U-Boot

[U-Boot] [PATCH 0/2] efi_loader: Implement reset on RPi
by Alexander Graf 13 Aug '16

13 Aug '16

If Linux finds an EFI implementation it always uses the EFI reset handler to reboot or power down the system. Unfortunately we haven't implemented that one yet. In fact, while we prepared for RTS handling, we never actually implemented a single user. This is going to change today. This simple patch set enables RTS reset support for the RPi systems, allowing you to reboot and shut down the rpi if booted via EFI. It also lays the groundwork to show how to implement that functionality at all, so I expect more boards to follow. Alexander Graf (2): efi_loader: Allow boards to implement get_time and reset_system ARM: bcm283x: Implement EFI RTS reset_system arch/arm/mach-bcm283x/include/mach/wdog.h | 2 +- arch/arm/mach-bcm283x/reset.c | 59 +++++++++++++++-- cmd/bootefi.c | 4 ++ include/efi_loader.h | 18 ++++++ lib/efi_loader/efi_runtime.c | 101 ++++++++++++++++++++++++++---- 5 files changed, 166 insertions(+), 18 deletions(-) -- 1.8.5.6

3 15

[U-Boot] [PATCH v2] serial: bcm283x_mu: Detect disabled serial device
by Alexander Graf 13 Aug '16

13 Aug '16

On the raspberry pi, you can disable the serial port to gain dynamic frequency scaling which can get handy at times. However, in such a configuration the serial controller gets its rx queue filled up with zero bytes which then happily get transmitted on to whoever calls getc() today. This patch adds detection logic for that case by checking whether the RX pin is mapped to GPIO15 and disables the mini uart if it is not mapped properly. That way we can leave the driver enabled in the tree and can determine during runtime whether serial is usable or not, having a single binary that allows for uart and non-uart operation. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- I'm currently on the road and verified that the non-uart case works properly with this patch and that the uart case doesn't do anything stupid, but please double check it before applying :). --- board/raspberrypi/rpi/rpi.c | 1 + drivers/serial/serial_bcm283x_mu.c | 33 ++++++++++++++++++++++++++++ include/dm/platform_data/serial_bcm283x_mu.h | 1 + 3 files changed, 35 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 4c8253d..9c52c91 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -53,6 +53,7 @@ U_BOOT_DEVICE(bcm2835_serials) = { #else static const struct bcm283x_mu_serial_platdata serial_platdata = { .base = 0x3f215040, + .gpio = 0x3f200000, .clock = 250000000, .skip_init = true, }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 7357bbf..02d5f39 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -39,6 +39,20 @@ struct bcm283x_mu_regs { u32 baud; }; +struct bcm283x_gpio_regs { + u32 gpfsel0; + u32 gpfsel1; + u32 gpfsel2; + u32 gpfsel3; + u32 gpfsel4; + u32 gpfsel5; + /* ... */ +}; + +#define BCM283X_GPIO_GPFSEL1_F15_SHIFT 15 +#define BCM283X_GPIO_ALTFUNC_MASK 0x7 +#define BCM283X_GPIO_ALTFUNC_5 0x2 + #define BCM283X_MU_LCR_DATA_SIZE_8 3 #define BCM283X_MU_LSR_TX_IDLE BIT(6) @@ -48,6 +62,7 @@ struct bcm283x_mu_regs { struct bcm283x_mu_priv { struct bcm283x_mu_regs *regs; + bool disabled; }; static int bcm283x_mu_serial_setbrg(struct udevice *dev, int baudrate) @@ -72,9 +87,18 @@ static int bcm283x_mu_serial_probe(struct udevice *dev) { struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); + struct bcm283x_gpio_regs *gpio = (struct bcm283x_gpio_regs *)plat->gpio; priv->regs = (struct bcm283x_mu_regs *)plat->base; + /* + * The RPi3 disables the mini uart by default. The easiest way to find + * out whether it is available is to check if the pin is muxed. + */ + if (((readl(&gpio->gpfsel1) >> BCM283X_GPIO_GPFSEL1_F15_SHIFT) & + BCM283X_GPIO_ALTFUNC_MASK) != BCM283X_GPIO_ALTFUNC_5) + priv->disabled = true; + return 0; } @@ -84,6 +108,9 @@ static int bcm283x_mu_serial_getc(struct udevice *dev) struct bcm283x_mu_regs *regs = priv->regs; u32 data; + if (priv->disabled) + return -EAGAIN; + /* Wait until there is data in the FIFO */ if (!(readl(&regs->lsr) & BCM283X_MU_LSR_RX_READY)) return -EAGAIN; @@ -98,6 +125,9 @@ static int bcm283x_mu_serial_putc(struct udevice *dev, const char data) struct bcm283x_mu_priv *priv = dev_get_priv(dev); struct bcm283x_mu_regs *regs = priv->regs; + if (priv->disabled) + return 0; + /* Wait until there is space in the FIFO */ if (!(readl(&regs->lsr) & BCM283X_MU_LSR_TX_EMPTY)) return -EAGAIN; @@ -114,6 +144,9 @@ static int bcm283x_mu_serial_pending(struct udevice *dev, bool input) struct bcm283x_mu_regs *regs = priv->regs; unsigned int lsr = readl(&regs->lsr); + if (priv->disabled) + return 0; + if (input) { WATCHDOG_RESET(); return (lsr & BCM283X_MU_LSR_RX_READY) ? 1 : 0; diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h index 57ae6ad..b2e32d3 100644 --- a/include/dm/platform_data/serial_bcm283x_mu.h +++ b/include/dm/platform_data/serial_bcm283x_mu.h @@ -17,6 +17,7 @@ */ struct bcm283x_mu_serial_platdata { unsigned long base; + unsigned long gpio; unsigned int clock; bool skip_init; }; -- 2.6.6

3 11

[U-Boot] [PATCH v2] kconfig: use bool instead of boolean for type definition attributes
by Masahiro Yamada 12 Aug '16

12 Aug '16

Linux stopped the use of keyword 'boolean' in Kconfig. Refer to commit 6341e62b212a2541efb0160c470e90bd226d5496 ("kconfig: use bool instead of boolean for type definition attributes") in Linux Kernel. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Fix a conflict so that it can apply to the mainline arch/arm/cpu/armv7/Kconfig | 8 ++++---- arch/arm/cpu/armv8/Kconfig | 2 +- board/sunxi/Kconfig | 16 ++++++++-------- drivers/power/Kconfig | 14 +++++++------- drivers/spmi/Kconfig | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig index bd6108e..41c6639 100644 --- a/arch/arm/cpu/armv7/Kconfig +++ b/arch/arm/cpu/armv7/Kconfig @@ -7,14 +7,14 @@ config CPU_V7_HAS_VIRT bool config ARMV7_NONSEC - boolean "Enable support for booting in non-secure mode" if EXPERT + bool "Enable support for booting in non-secure mode" if EXPERT depends on CPU_V7_HAS_NONSEC default y ---help--- Say Y here to enable support for booting in non-secure / SVC mode. config ARMV7_BOOT_SEC_DEFAULT - boolean "Boot in secure mode by default" if EXPERT + bool "Boot in secure mode by default" if EXPERT depends on ARMV7_NONSEC default y if TEGRA ---help--- @@ -25,14 +25,14 @@ config ARMV7_BOOT_SEC_DEFAULT variable to "sec" or "nonsec". config ARMV7_VIRT - boolean "Enable support for hardware virtualization" if EXPERT + bool "Enable support for hardware virtualization" if EXPERT depends on CPU_V7_HAS_VIRT && ARMV7_NONSEC default y ---help--- Say Y here to boot in hypervisor (HYP) mode when booting non-secure. config ARMV7_LPAE - boolean "Use LPAE page table format" if EXPERT + bool "Use LPAE page table format" if EXPERT depends on CPU_V7 default n ---help--- diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index acf2460..7e1fc4c 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -1,7 +1,7 @@ if ARM64 config ARMV8_MULTIENTRY - boolean "Enable multiple CPUs to enter into U-Boot" + bool "Enable multiple CPUs to enter into U-Boot" config ARMV8_SPIN_TABLE bool "Support spin-table enable method" diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 323e972..1b30669 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -249,7 +249,7 @@ config UART0_PORT_F Only enable this if you really know what you are doing. config OLD_SUNXI_KERNEL_COMPAT - boolean "Enable workarounds for booting old kernels" + bool "Enable workarounds for booting old kernels" default n ---help--- Set this to enable various workarounds for old kernels, this results in @@ -419,13 +419,13 @@ config I2C4_ENABLE endif config AXP_GPIO - boolean "Enable support for gpio-s on axp PMICs" + bool "Enable support for gpio-s on axp PMICs" default n ---help--- Say Y here to enable support for the gpio pins of the axp PMIC ICs. config VIDEO - boolean "Enable graphical uboot console on HDMI, LCD or VGA" + bool "Enable graphical uboot console on HDMI, LCD or VGA" depends on !MACH_SUN8I_A83T && !MACH_SUN8I_H3 && !MACH_SUN9I && !MACH_SUN50I_A64 default y ---help--- @@ -434,21 +434,21 @@ config VIDEO info on how to select the video output and mode. config VIDEO_HDMI - boolean "HDMI output support" + bool "HDMI output support" depends on VIDEO && !MACH_SUN8I default y ---help--- Say Y here to add support for outputting video over HDMI. config VIDEO_VGA - boolean "VGA output support" + bool "VGA output support" depends on VIDEO && (MACH_SUN4I || MACH_SUN7I) default n ---help--- Say Y here to add support for outputting video over VGA. config VIDEO_VGA_VIA_LCD - boolean "VGA via LCD controller support" + bool "VGA via LCD controller support" depends on VIDEO && (MACH_SUN5I || MACH_SUN6I || MACH_SUN8I) default n ---help--- @@ -457,7 +457,7 @@ config VIDEO_VGA_VIA_LCD Olimex A13 boards. config VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH - boolean "Force sync active high for VGA via LCD controller support" + bool "Force sync active high for VGA via LCD controller support" depends on VIDEO_VGA_VIA_LCD default n ---help--- @@ -475,7 +475,7 @@ config VIDEO_VGA_EXTERNAL_DAC_EN format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. config VIDEO_COMPOSITE - boolean "Composite video output support" + bool "Composite video output support" depends on VIDEO && (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I) default n ---help--- diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index b422703..f2c5629 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -15,12 +15,12 @@ choice default SUNXI_NO_PMIC if MACH_SUN8I_H3 || MACH_SUN50I config SUNXI_NO_PMIC - boolean "board without a pmic" + bool "board without a pmic" ---help--- Select this for boards which do not use a PMIC. config AXP152_POWER - boolean "axp152 pmic support" + bool "axp152 pmic support" depends on MACH_SUN5I select CMD_POWEROFF ---help--- @@ -28,7 +28,7 @@ config AXP152_POWER A10s boards. config AXP209_POWER - boolean "axp209 pmic support" + bool "axp209 pmic support" depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I select CMD_POWEROFF ---help--- @@ -36,7 +36,7 @@ config AXP209_POWER A10, A13 and A20 boards. config AXP221_POWER - boolean "axp221 / axp223 pmic support" + bool "axp221 / axp223 pmic support" depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 select CMD_POWEROFF ---help--- @@ -44,14 +44,14 @@ config AXP221_POWER A23 and A31 boards. config AXP809_POWER - boolean "axp809 pmic support" + bool "axp809 pmic support" depends on MACH_SUN9I select CMD_POWEROFF ---help--- Say y here to enable support for the axp809 pmic found on A80 boards. config AXP818_POWER - boolean "axp818 pmic support" + bool "axp818 pmic support" depends on MACH_SUN8I_A83T select CMD_POWEROFF ---help--- @@ -59,7 +59,7 @@ config AXP818_POWER A83T dev board. config SY8106A_POWER - boolean "SY8106A pmic support" + bool "SY8106A pmic support" depends on MACH_SUN8I_H3 ---help--- Select this to enable support for the SY8106A pmic found on some diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig index 8d25b45..ab4878e 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -9,13 +9,13 @@ config SPMI to connect PMIC devices on various SoCs. config SPMI_MSM - boolean "Support Qualcomm SPMI bus" + bool "Support Qualcomm SPMI bus" depends on SPMI ---help--- Support SPMI bus implementation found on Qualcomm Snapdragon SoCs. config SPMI_SANDBOX - boolean "Support for Sandbox SPMI bus" + bool "Support for Sandbox SPMI bus" depends on SPMI ---help--- Demo SPMI bus implementation. Emulates part of PM8916 as single -- 1.9.1

2 1

[U-Boot] [PATCH] defconfig: am43xx_evm: enable eth driver model
by Mugunthan V N 12 Aug '16

12 Aug '16

Enable eth driver model for am43xx_evm as cpsw supports driver model. This was already added with the commit bc705ea1cf12 but with commit 4c4e3b37750f to add fit support CONFIG_DM_ETH was missed. Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> --- configs/am43xx_evm_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index b3fe269..56782f1 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -56,3 +56,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_SPL_OF_LIBFDT=y CONFIG_DM_I2C=y +CONFIG_DM_ETH=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index c8ce723..1553196 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -59,3 +59,4 @@ CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_SPL_OF_LIBFDT=y CONFIG_DM_I2C=y +CONFIG_DM_ETH=y -- 2.9.2.664.ga0a1831

2 2

[U-Boot] [PATCH v3] drivers: net: cpsw: always flush cache of size aligned to PKTALIGN
by Lokesh Vutla 12 Aug '16

12 Aug '16

cpsw tries to flush dcache which is not in the range of PKTALIGN. Because of this the following warning comes while flushing: CACHE: Misaligned operation at range [dffecec0, dffed016] Fix it by flushing cache of size aligned to PKTALIGN. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- drivers/net/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 2ce4ec6..300a534 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -907,7 +907,7 @@ static int _cpsw_send(struct cpsw_priv *priv, void *packet, int length) int timeout = CPDMA_TIMEOUT; flush_dcache_range((unsigned long)packet, - (unsigned long)packet + length); + (unsigned long)packet + ALIGN(length, PKTALIGN)); /* first reap completed packets */ while (timeout-- && -- 2.9.2

3 3

[U-Boot] [PATCH] configs: dra7xx_evm: enable eth driver model
by Mugunthan V N 12 Aug '16

12 Aug '16

Enable eth driver model for dra7xx_evm as cpsw supports driver model. This was already added with the commit 641b936fa5ba but with commit bd7245849f7c to add fit support CONFIG_DM_ETH was missed. Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> --- configs/dra7xx_evm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 81d2a0e..e5f813d 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -59,3 +59,4 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_OF_LIST="dra7-evm dra72-evm" CONFIG_DM_I2C=y CONFIG_PCF8575_GPIO=y +CONFIG_DM_ETH=y -- 2.9.2.664.ga0a1831

3 3

[U-Boot] [PATCH 0/2] Enable usage of PCF GPIO line as regulator
by Vignesh R 12 Aug '16

12 Aug '16

Some IPs like MMC use PCF GPIO lines as fixed regulator, hence add support for the same. Vignesh R (2): ARM: dts: dra7xx-evm: add evm_3v3_sd regulator ARM: dra7xx_evm: Enable regulator DM support arch/arm/dts/dra7-evm.dts | 12 +++++++++++- arch/arm/dts/dra72-evm.dts | 12 +++++++++++- configs/dra7xx_evm_defconfig | 3 +++ configs/dra7xx_hs_evm_defconfig | 3 +++ 4 files changed, 28 insertions(+), 2 deletions(-) -- 2.9.2

2 6

[U-Boot] [PATCH v2] drivers/sysreset: group sysreset drivers
by Max Filippov 12 Aug '16

12 Aug '16

Create drivers/sysreset and move sysreset-uclass and all sysreset drivers there. Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- Changes v1->v2: - move RK3399 sysreset driver as well; - format patch with -M to make renames explicit. --- arch/arm/mach-rockchip/rk3036/Makefile | 1 - arch/arm/mach-rockchip/rk3288/Makefile | 1 - arch/arm/mach-rockchip/rk3399/Makefile | 1 - arch/arm/mach-snapdragon/Makefile | 1 - drivers/Kconfig | 2 ++ drivers/Makefile | 3 ++- drivers/misc/Kconfig | 9 --------- drivers/misc/Makefile | 2 -- drivers/sysreset/Kconfig | 16 ++++++++++++++++ drivers/sysreset/Makefile | 15 +++++++++++++++ drivers/{misc => sysreset}/sysreset-uclass.c | 0 .../reset_rk3036.c => drivers/sysreset/sysreset_rk3036.c | 0 .../reset_rk3288.c => drivers/sysreset/sysreset_rk3288.c | 0 .../reset_rk3399.c => drivers/sysreset/sysreset_rk3399.c | 0 drivers/{misc => sysreset}/sysreset_sandbox.c | 0 .../reset.c => drivers/sysreset/sysreset_snapdragon.c | 0 16 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 drivers/sysreset/Kconfig create mode 100644 drivers/sysreset/Makefile rename drivers/{misc => sysreset}/sysreset-uclass.c (100%) rename arch/arm/mach-rockchip/rk3036/reset_rk3036.c => drivers/sysreset/sysreset_rk3036.c (100%) rename arch/arm/mach-rockchip/rk3288/reset_rk3288.c => drivers/sysreset/sysreset_rk3288.c (100%) rename arch/arm/mach-rockchip/rk3399/reset_rk3399.c => drivers/sysreset/sysreset_rk3399.c (100%) rename drivers/{misc => sysreset}/sysreset_sandbox.c (100%) rename arch/arm/mach-snapdragon/reset.c => drivers/sysreset/sysreset_snapdragon.c (100%) diff --git a/arch/arm/mach-rockchip/rk3036/Makefile b/arch/arm/mach-rockchip/rk3036/Makefile index 6095777..916a7a4 100644 --- a/arch/arm/mach-rockchip/rk3036/Makefile +++ b/arch/arm/mach-rockchip/rk3036/Makefile @@ -5,7 +5,6 @@ # ifndef CONFIG_SPL_BUILD -obj-y += reset_rk3036.o obj-y += syscon_rk3036.o endif diff --git a/arch/arm/mach-rockchip/rk3288/Makefile b/arch/arm/mach-rockchip/rk3288/Makefile index 82b00a1..5ec3f0d 100644 --- a/arch/arm/mach-rockchip/rk3288/Makefile +++ b/arch/arm/mach-rockchip/rk3288/Makefile @@ -5,6 +5,5 @@ # obj-y += clk_rk3288.o -obj-y += reset_rk3288.o obj-y += sdram_rk3288.o obj-y += syscon_rk3288.o diff --git a/arch/arm/mach-rockchip/rk3399/Makefile b/arch/arm/mach-rockchip/rk3399/Makefile index 3ca2028..607f9c9 100644 --- a/arch/arm/mach-rockchip/rk3399/Makefile +++ b/arch/arm/mach-rockchip/rk3399/Makefile @@ -5,5 +5,4 @@ # obj-y += rk3399.o -obj-y += reset_rk3399.o obj-y += syscon_rk3399.o diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index 4735844..d82a04d 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -6,4 +6,3 @@ obj-y += clock-apq8016.o obj-y += sysmap-apq8016.o -obj-y += reset.o diff --git a/drivers/Kconfig b/drivers/Kconfig index f6003a0..4f84469 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -68,6 +68,8 @@ source "drivers/spi/Kconfig" source "drivers/spmi/Kconfig" +source "drivers/sysreset/Kconfig" + source "drivers/thermal/Kconfig" source "drivers/timer/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index ad5cbae..7861d34 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/ obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/ obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/ -obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/ +obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/ sysreset/ obj-$(CONFIG_SPL_MTD_SUPPORT) += mtd/ obj-$(CONFIG_SPL_NAND_SUPPORT) += mtd/nand/ obj-$(CONFIG_SPL_ONENAND_SUPPORT) += mtd/onenand/ @@ -59,6 +59,7 @@ obj-$(CONFIG_X86) += pch/ obj-y += rtc/ obj-y += sound/ obj-y += spmi/ +obj-y += sysreset/ obj-y += timer/ obj-y += tpm/ obj-y += twserial/ diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index b84e351..80c1558 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -121,15 +121,6 @@ config PCA9551_I2C_ADDR help The I2C address of the PCA9551 LED controller. -config SYSRESET - bool "Enable support for system reset drivers" - depends on DM - help - Enable system reset drivers which can be used to reset the CPU or - board. Each driver can provide a reset method which will be called - to effect a reset. The uclass will try all available drivers when - reset_walk() is called. - config WINBOND_W83627 bool "Enable Winbond Super I/O driver" help diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index fff6f0c..af541c6 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_MXS_OCOTP) += mxs_ocotp.o obj-$(CONFIG_NS87308) += ns87308.o obj-$(CONFIG_PDSP188x) += pdsp188x.o obj-$(CONFIG_$(SPL_)PWRSEQ) += pwrseq-uclass.o -obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o ifdef CONFIG_DM_I2C ifndef CONFIG_SPL_BUILD obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o @@ -47,7 +46,6 @@ obj-$(CONFIG_TWL4030_LED) += twl4030_led.o obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o obj-$(CONFIG_PCA9551_LED) += pca9551_led.o -obj-$(CONFIG_SYSRESET) += sysreset-uclass.o obj-$(CONFIG_FSL_DEVICE_DISABLE) += fsl_devdis.o obj-$(CONFIG_WINBOND_W83627) += winbond_w83627.o obj-$(CONFIG_QFW) += qfw.o diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig new file mode 100644 index 0000000..05a37b9 --- /dev/null +++ b/drivers/sysreset/Kconfig @@ -0,0 +1,16 @@ +# +# System reset devices +# + +menu "System reset device drivers" + +config SYSRESET + bool "Enable support for system reset drivers" + depends on DM + help + Enable system reset drivers which can be used to reset the CPU or + board. Each driver can provide a reset method which will be called + to effect a reset. The uclass will try all available drivers when + reset_walk() is called. + +endmenu diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile new file mode 100644 index 0000000..7db1b69 --- /dev/null +++ b/drivers/sysreset/Makefile @@ -0,0 +1,15 @@ +# +# (C) Copyright 2016 Cadence Design Systems Inc. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-$(CONFIG_SYSRESET) += sysreset-uclass.o + +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o +endif +obj-$(CONFIG_ROCKCHIP_RK3288) += sysreset_rk3288.o +obj-$(CONFIG_ROCKCHIP_RK3399) += sysreset_rk3399.o +obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o +obj-$(CONFIG_ARCH_SNAPDRAGON) += sysreset_snapdragon.o diff --git a/drivers/misc/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c similarity index 100% rename from drivers/misc/sysreset-uclass.c rename to drivers/sysreset/sysreset-uclass.c diff --git a/arch/arm/mach-rockchip/rk3036/reset_rk3036.c b/drivers/sysreset/sysreset_rk3036.c similarity index 100% rename from arch/arm/mach-rockchip/rk3036/reset_rk3036.c rename to drivers/sysreset/sysreset_rk3036.c diff --git a/arch/arm/mach-rockchip/rk3288/reset_rk3288.c b/drivers/sysreset/sysreset_rk3288.c similarity index 100% rename from arch/arm/mach-rockchip/rk3288/reset_rk3288.c rename to drivers/sysreset/sysreset_rk3288.c diff --git a/arch/arm/mach-rockchip/rk3399/reset_rk3399.c b/drivers/sysreset/sysreset_rk3399.c similarity index 100% rename from arch/arm/mach-rockchip/rk3399/reset_rk3399.c rename to drivers/sysreset/sysreset_rk3399.c diff --git a/drivers/misc/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c similarity index 100% rename from drivers/misc/sysreset_sandbox.c rename to drivers/sysreset/sysreset_sandbox.c diff --git a/arch/arm/mach-snapdragon/reset.c b/drivers/sysreset/sysreset_snapdragon.c similarity index 100% rename from arch/arm/mach-snapdragon/reset.c rename to drivers/sysreset/sysreset_snapdragon.c -- 2.1.4

3 2

[U-Boot] [PATCH] ARM: non-sec: flush code cacheline aligned
by Stefan Agner 12 Aug '16

12 Aug '16

From: Stefan Agner <stefan.agner(a)toradex.com> Flush operations need to be cacheline aligned to take effect, make sure to flush always complete cachelines. This avoids messages such as: CACHE: Misaligned operation at range [00900000, 009004d9] Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- arch/arm/cpu/armv7/virt-v7.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 9c53306..d33e5c6 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -54,10 +54,12 @@ static void relocate_secure_section(void) { #ifdef CONFIG_ARMV7_SECURE_BASE size_t sz = __secure_end - __secure_start; + unsigned long szflush = ALIGN(sz + 1, CONFIG_SYS_CACHELINE_SIZE); memcpy((void *)CONFIG_ARMV7_SECURE_BASE, __secure_start, sz); + flush_dcache_range(CONFIG_ARMV7_SECURE_BASE, - CONFIG_ARMV7_SECURE_BASE + sz + 1); + CONFIG_ARMV7_SECURE_BASE + szflush); protect_secure_section(); invalidate_icache_all(); #endif -- 2.9.0

3 2

[U-Boot] [PATCH] common: image: Add support for post-processing of images
by Andreas Dannenberg 12 Aug '16

12 Aug '16

This commit allows injecting a board/platform/device-specific post- processing function into the FIT image data loading process, which can include modifying the size and altering the starting source address of an image data artifact. This might be desired to do things like strip headers or footers attached to the images before they were packaged into the FIT, or to perform operations such as decryption or authentication. Introduce new configuration option CONFIG_FIT_IMAGE_POST_PROCESS to allow controlling this feature. If enabled, a platform-specific post- process function must be provided. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> --- While not limited to this use case this commit allows for example on TI high-security (HS) device variants to extend the secure boot chain to Kernel, DTB, and initramfs (and anything else really that can be bundled into a FIT image) by injecting calls to a TI-specific ROM API to perform authentication (and optionally decryption) of blobs. At this stage of the boot process one is also free to use the FIT/ RSA/SHA-based verified boot scheme already built-into U-Boot to perform authentication on TI HS devices, providing a choice between a completely open solution or continuing to perform ROM-based calls (which would have the added benefit of supporting decryption, amongst other reasons such as faster performance due to inherent crypto accelerator usage). This commit works in analogy to da74d1f "spl: fit: add support for post-processing of images" which introduced the CONFIG_SPL_FIT_IMAGE_POST_PROCESS option. On a related note Andrew (on copy) will be taking over the work on this patch to address any feedback there might be since my last day at TI will be 07/29. I will still be monitoring the mailing list but might not be able to respond in the current capacity. Thanks and Regards, Andreas Kconfig | 14 ++++++++++++++ common/image-fit.c | 26 +++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index ef12f9f..c5489dc 100644 --- a/Kconfig +++ b/Kconfig @@ -336,6 +336,20 @@ config SPL_FIT_IMAGE_POST_PROCESS injected into the FIT creation (i.e. the blobs would have been pre- processed before being added to the FIT image). +config FIT_IMAGE_POST_PROCESS + bool "Enable post-processing of FIT artifacts after loading by U-Boot" + depends on FIT && TI_SECURE_DEVICE + help + Allows doing any sort of manipulation to blobs after they got extracted + from FIT images like stripping off headers or modifying the size of the + blob, verification, authentication, decryption etc. in a platform or + board specific way. In order to use this feature a platform or board- + specific implementation of board_fit_image_post_process() must be + provided. Also, anything done during this post-processing step would + need to be comprehended in how the images were prepared before being + injected into the FIT creation (i.e. the blobs would have been pre- + processed before being added to the FIT image). + config SYS_CLK_FREQ depends on ARC || ARCH_SUNXI int "CPU clock frequency" diff --git a/common/image-fit.c b/common/image-fit.c index 73ad34e..d8d4e95 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -11,9 +11,9 @@ #ifdef USE_HOSTCC #include "mkimage.h" -#include <image.h> #include <time.h> #else +#include <linux/compiler.h> #include <common.h> #include <errno.h> #include <mapmem.h> @@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR; #endif /* !USE_HOSTCC*/ +#include <image.h> #include <bootstage.h> #include <u-boot/crc.h> #include <u-boot/md5.h> @@ -1507,6 +1508,12 @@ void fit_conf_print(const void *fit, int noffset, const char *p) static int fit_image_select(const void *fit, int rd_noffset, int verify) { +#if !defined(USE_HOSTCC) && defined(CONFIG_FIT_IMAGE_POST_PROCESS) + const void *data; + size_t size; + int ret; +#endif + fit_image_print(fit, rd_noffset, " "); if (verify) { @@ -1518,6 +1525,23 @@ static int fit_image_select(const void *fit, int rd_noffset, int verify) puts("OK\n"); } +#if !defined(USE_HOSTCC) && defined(CONFIG_FIT_IMAGE_POST_PROCESS) + ret = fit_image_get_data(fit, rd_noffset, &data, &size); + if (ret) + return ret; + + /* perform any post-processing on the image data */ + board_fit_image_post_process((void **)&data, &size); + + /* + * update U-Boot's understanding of the "data" property start address + * and size according to the performed post-processing + */ + ret = fdt_setprop((void *)fit, rd_noffset, FIT_DATA_PROP, data, size); + if (ret) + return ret; +#endif + return 0; } -- 2.7.2

3 4