June 2019 - U-Boot

[U-Boot] [PATCH v2 00/16] arm: k3: arm64: Initial support for Texas Instrument's J721E Platform
by Lokesh Vutla 13 Jun '19

13 Jun '19

This series adds initial support for Texas Instruments' K3 architecture based J721E SoC. This series depends on the: - mmc series posted by Faiz: - sysfw loader series posted by Andreas - exclusive device series posted: https://patchwork.ozlabs.org/project/uboot/list/?series=112440 - arm64 rproc cleanup series: https://patchwork.ozlabs.org/project/uboot/list/?series=112443 Changes since v1: - Updated the DT nodes with exclusive permissions - Fixed up mmc boot mode definition - Added support for fixing up msmc sram - Added custom mmu for armv8 - Added sysfw loader support. The entire series with all the dependencies is available at: https://github.com/lokeshvutla/u-boot/tree/j721e-initial-support Andreas Dannenberg (3): armv7R: K3: j721e: Unlock all applicable control MMR registers armv7R: K3: j721e: Store boot index from ROM armv7R: K3: j721e: Load SYSFW binary and config from boot media Faiz Abbas (1): mmc: am654_sdhci: Separate J721E compatible into 8bit and 4bit versions Lokesh Vutla (10): arm: K3: j721e: Add basic support for J721E SoC definition armv7R: K3: j721e: Add support for boot device detection armv7R: K3: j721e: Shut down R5 core after ATF startup on A72 board: ti: j721e: Add board support for j721e evm dt-bindings: pinctrl: k3: Introduce pinmux definitions for J721E arm: dts: ti: Add Support for J721E SoC arm: dts: k3-j721e: Add initial support for common processor board arm: dts: k3-j721e: Add r5 specific dt support configs: j721e_evm_r5: Add initial support configs: j721e_evm_a72: Add initial support Suman Anna (2): armv8: K3: j721e: Add custom MMU support board: ti: j721e: Enable fixing up msmc sram node arch/arm/dts/Makefile | 2 + .../k3-j721e-common-proc-board-u-boot.dtsi | 75 ++++++ arch/arm/dts/k3-j721e-common-proc-board.dts | 63 +++++ arch/arm/dts/k3-j721e-main.dtsi | 231 ++++++++++++++++++ arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 72 ++++++ .../arm/dts/k3-j721e-r5-common-proc-board.dts | 141 +++++++++++ arch/arm/dts/k3-j721e-som-p0.dtsi | 29 +++ arch/arm/dts/k3-j721e.dtsi | 177 ++++++++++++++ arch/arm/mach-k3/Kconfig | 13 +- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am6_init.c | 6 - arch/arm/mach-k3/arm64-mmu.c | 55 +++++ arch/arm/mach-k3/common.c | 6 + arch/arm/mach-k3/include/mach/hardware.h | 4 + .../arm/mach-k3/include/mach/j721e_hardware.h | 52 ++++ arch/arm/mach-k3/include/mach/j721e_spl.h | 31 +++ arch/arm/mach-k3/include/mach/spl.h | 4 + arch/arm/mach-k3/j721e_init.c | 228 +++++++++++++++++ board/ti/j721e/Kconfig | 55 +++++ board/ti/j721e/Makefile | 8 + board/ti/j721e/evm.c | 82 +++++++ configs/j721e_evm_a72_defconfig | 86 +++++++ configs/j721e_evm_r5_defconfig | 95 +++++++ drivers/mmc/am654_sdhci.c | 114 +++++---- include/configs/j721e_evm.h | 103 ++++++++ include/dt-bindings/pinctrl/k3.h | 3 + 26 files changed, 1685 insertions(+), 51 deletions(-) create mode 100644 arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi create mode 100644 arch/arm/dts/k3-j721e-common-proc-board.dts create mode 100644 arch/arm/dts/k3-j721e-main.dtsi create mode 100644 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board.dts create mode 100644 arch/arm/dts/k3-j721e-som-p0.dtsi create mode 100644 arch/arm/dts/k3-j721e.dtsi create mode 100644 arch/arm/mach-k3/include/mach/j721e_hardware.h create mode 100644 arch/arm/mach-k3/include/mach/j721e_spl.h create mode 100644 arch/arm/mach-k3/j721e_init.c create mode 100644 board/ti/j721e/Kconfig create mode 100644 board/ti/j721e/Makefile create mode 100644 board/ti/j721e/evm.c create mode 100644 configs/j721e_evm_a72_defconfig create mode 100644 configs/j721e_evm_r5_defconfig create mode 100644 include/configs/j721e_evm.h -- 2.21.0

2 18

[U-Boot] sf probe failed on Intel DNV-NS platform
by Hilbert Tu(杜睿哲_Pegatron) 13 Jun '19

13 Jun '19

Hi, I got following error message when using U-Boot as payload of Coreboot on Intel DNV-NS platform. I am checking if my dts file was incorrect configured for SPI flash device. Can anyone help? Thanks. Errors: Invalid bus 0 (err=-19) Failed to initialize SPI flash at 0:0 (error -19) ==================================== My dts dump: aliases { serial0 = &serial; spi0 = &spi0; }; config { silent_console = <0>; }; chosen { stdout-path = "/serial"; }; tsc-timer { clock-frequency = <1000000000>; }; pci { compatible = "pci-x86"; u-boot,dm-pre-reloc; pch@1f,0 { reg = <0x0000f800 0 0 0 0>; compatible = "intel,pch9"; u-boot,dm-pre-reloc; #address-cells = <1>; #size-cells = <1>; spi0: spi { #address-cells = <1>; #size-cells = <0>; compatible = "intel,ich9-spi"; intel,spi-lock-down; spi-flash@0 { reg = <0>; compatible = "winbond,w25q128bv", "spi-flash"; memory-map = <0xff800000 0x00800000>; }; }; }; }; coreboot-fb { compatible = "coreboot-fb"; }; Following is the dump of command “dm tree” => dm tree Class Probed Driver Name ---------------------------------------- root [ + ] root_drive root_driver rsa_mod_ex [ ] mod_exp_sw |-- mod_exp_sw serial [ + ] ns16550_se |-- serial keyboard [ + ] i8042_kbd |-- keyboard sysreset [ ] x86-sysres |-- reset rtc [ ] rtc_mc1468 |-- rtc timer [ + ] tsc_timer |-- tsc-timer pci [ + ] pci_x86 |-- pci pci_generi [ ] pci_generi | |-- pci_0:0.0 pci_generi [ ] pci_generi | |-- pci_0:4.0 pci_generi [ ] pci_generi | |-- pci_0:5.0 pci [ + ] pci_bridge | |-- pci_0:9.0 pci [ + ] pci_bridge | |-- pci_0:e.0 pci_generi [ ] pci_generi | | `-- pci_2:0.0 pci [ + ] pci_bridge | |-- pci_0:10.0 pci_generi [ ] pci_generi | |-- pci_0:12.0 ahci [ ] ahci_pci | |-- ahci_pci scsi [ ] ahci_scsi | | `-- ahci_scsi usb [ + ] xhci_pci | |-- xhci_pci usb_hub [ + ] usb_hub | | `-- usb_hub pci [ + ] pci_bridge | |-- pci_0:16.0 pci_generi [ ] pci_generi | | |-- pci_4:0.0 pci_generi [ ] pci_generi | | `-- pci_4:0.1 pci [ + ] pci_bridge | |-- pci_0:17.0 pci_generi [ ] pci_generi | | |-- pci_5:0.0 pci_generi [ ] pci_generi | | `-- pci_5:0.1 pci_generi [ ] pci_generi | |-- pci_0:18.0 pci_generi [ ] pci_generi | |-- pci_0:1a.0 pci_generi [ ] pci_generi | |-- pci_0:1a.1 pci_generi [ ] pci_generi | |-- pci_0:1a.2 mmc [ + ] pci_mmc | |-- pci_mmc blk [ ] mmc_blk | | `-- pci_mmc.blk pci_generi [ ] pci_generi | |-- pci_0:1f.0 pci_generi [ ] pci_generi | |-- pci_0:1f.2 pci_generi [ ] pci_generi | |-- pci_0:1f.4 pci_generi [ ] pci_generi | `-- pci_0:1f.5 video [ ] coreboot_v `-- coreboot-fb -Hilbert This e-mail and its attachment may contain information that is confidential or privileged, and are solely for the use of the individual to whom this e-mail is addressed. If you are not the intended recipient or have received it accidentally, please immediately notify the sender by reply e-mail and destroy all copies of this email and its attachment. Please be advised that any unauthorized use, disclosure, distribution or copying of this email or its attachment is strictly prohibited. 本電子郵件及其附件可能含有機密或依法受特殊管制之資訊，僅供本電子郵件之受文者使用。台端如非本電子郵件之受文者或誤收本電子郵件，請立即回覆郵件通知寄件人，並銷毀本電子郵件之所有複本及附件。任何未經授權而使用、揭露、散佈或複製本電子郵件或其附件之行為，皆嚴格禁止。

2 5

[U-Boot] [PATCH] rtc: Add DM support to ds3231
by Chuanhua Han 12 Jun '19

12 Jun '19

Add an implementation of the ds3231 driver that uses the driver model i2c APIs. Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- drivers/rtc/ds3231.c | 105 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index 9352ff87a2..56974ac5fd 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -13,6 +13,7 @@ #include <common.h> #include <command.h> +#include <dm.h> #include <rtc.h> #include <i2c.h> @@ -50,6 +51,7 @@ #define RTC_STAT_BIT_EN32KHZ 0x8 /* Enable 32KHz Output */ +#ifndef CONFIG_DM_RTC static uchar rtc_read (uchar reg); static void rtc_write (uchar reg, uchar val); @@ -164,3 +166,106 @@ static void rtc_write (uchar reg, uchar val) { i2c_reg_write (CONFIG_SYS_I2C_RTC_ADDR, reg, val); } +#else +static int ds3231_rtc_get(struct udevice *dev, struct rtc_time *tmp) +{ + int rel = 0; + uchar sec, min, hour, mday, wday, mon_cent, year, status; + + status = dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR); + sec = dm_i2c_reg_read(dev, RTC_SEC_REG_ADDR); + min = dm_i2c_reg_read(dev, RTC_MIN_REG_ADDR); + hour = dm_i2c_reg_read(dev, RTC_HR_REG_ADDR); + wday = dm_i2c_reg_read(dev, RTC_DAY_REG_ADDR); + mday = dm_i2c_reg_read(dev, RTC_DATE_REG_ADDR); + mon_cent = dm_i2c_reg_read(dev, RTC_MON_REG_ADDR); + year = dm_i2c_reg_read(dev, RTC_YR_REG_ADDR); + + if (status & RTC_STAT_BIT_OSF) { + printf("### Warning: RTC oscillator has stopped\n"); + /* clear the OSF flag */ + dm_i2c_reg_write(dev, RTC_STAT_REG_ADDR, + dm_i2c_reg_read(dev, RTC_STAT_REG_ADDR) + & ~RTC_STAT_BIT_OSF); + rel = -1; + } + + tmp->tm_sec = bcd2bin(sec & 0x7F); + tmp->tm_min = bcd2bin(min & 0x7F); + tmp->tm_hour = bcd2bin(hour & 0x3F); + tmp->tm_mday = bcd2bin(mday & 0x3F); + tmp->tm_mon = bcd2bin(mon_cent & 0x1F); + tmp->tm_year = bcd2bin(year) + ((mon_cent & 0x80) ? 2000 : 1900); + tmp->tm_wday = bcd2bin((wday - 1) & 0x07); + tmp->tm_yday = 0; + tmp->tm_isdst = 0; + + debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return rel; +} + +static int ds3231_rtc_set(struct udevice *dev, const struct rtc_time *tmp) +{ + uchar century; + + debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", + tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + dm_i2c_reg_write(dev, RTC_YR_REG_ADDR, bin2bcd(tmp->tm_year % 100)); + + century = (tmp->tm_year >= 2000) ? 0x80 : 0; + dm_i2c_reg_write(dev, RTC_MON_REG_ADDR, bin2bcd(tmp->tm_mon) | century); + + dm_i2c_reg_write(dev, RTC_DAY_REG_ADDR, bin2bcd(tmp->tm_wday + 1)); + dm_i2c_reg_write(dev, RTC_DATE_REG_ADDR, bin2bcd(tmp->tm_mday)); + dm_i2c_reg_write(dev, RTC_HR_REG_ADDR, bin2bcd(tmp->tm_hour)); + dm_i2c_reg_write(dev, RTC_MIN_REG_ADDR, bin2bcd(tmp->tm_min)); + dm_i2c_reg_write(dev, RTC_SEC_REG_ADDR, bin2bcd(tmp->tm_sec)); + + return 0; +} + +static int ds3231_rtc_reset(struct udevice *dev) +{ + int ret; + + ret = dm_i2c_reg_write(dev, RTC_CTL_REG_ADDR, + RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); + if (ret < 0) + return ret; + + return 0; +} + +static int ds3231_probe(struct udevice *dev) +{ + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | + DM_I2C_CHIP_WR_ADDRESS); + + return 0; +} + +static const struct rtc_ops ds3231_rtc_ops = { + .get = ds3231_rtc_get, + .set = ds3231_rtc_set, + .reset = ds3231_rtc_reset, +}; + +static const struct udevice_id ds3231_rtc_ids[] = { + { .compatible = "dallas,ds3231" }, + { .compatible = "dallas,ds3232" }, + { } +}; + +U_BOOT_DRIVER(rtc_ds3231) = { + .name = "rtc-ds3231", + .id = UCLASS_RTC, + .probe = ds3231_probe, + .of_match = ds3231_rtc_ids, + .ops = &ds3231_rtc_ops, +}; +#endif -- 2.17.1

2 1

[U-Boot] [PATCH 1/1] efi_loader: parameter checks SetVariable()
by Heinrich Schuchardt 12 Jun '19

12 Jun '19

Return EFI_INVALID_PARAMETER if the variable name has zero length or the variable has runtime access but not boottime access. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_variable.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index e56053194d..1d1b23b0e5 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -430,7 +430,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, data_size, data); /* TODO: implement APPEND_WRITE */ - if (!variable_name || !vendor || + if (!variable_name || !*variable_name || !vendor || + ((attributes & EFI_VARIABLE_RUNTIME_ACCESS) && + !(attributes & EFI_VARIABLE_BOOTSERVICE_ACCESS)) || (attributes & EFI_VARIABLE_APPEND_WRITE)) { ret = EFI_INVALID_PARAMETER; goto out; -- 2.20.1

1 0

[U-Boot] RFC: config_distro_bootcmd aesthetic change
by Jon Nettleton 12 Jun '19

12 Jun '19

I figured I would post this topic without the patchset I currently have, and instead just test the waters to get some input on how the community would feel about this change. What I have done is to migrate all the functions from config_distro_bootcmd.h to be .functions() so by default they are hidden from the env print commands, but are still accessible from env print -a. My reasoning for doing this is as follows. 1) It makes the more common configured environment variables the main output of env print. Especially on a console this makes custom configuration far simpler to grok. 2) With another patch we can then choose the option to not store and restore the .variables to the env instead always accepting the built in defaults. This makes it much simpler to upgrade the logic behind the common distro bootflow with binary firmware updates but without forcing a user to env default -f -a and then reset their custom variables. 3) Reduces the storage size required for an environment on the disk. With the two previous integration changes it reduces my saved environment by almost 4KB. from 4.3KB down to ~500 bytes. I am happy to upload the patches, but again wanted to see if this is even something that the community would even entertain integrating before adding unnecessary patch noise. -Jon

2 1

[U-Boot] [PATCH 1/1] efi_loader: legal characters in StrToFat()
by Heinrich Schuchardt 12 Jun '19

12 Jun '19

The UEFI specification does not specify if the characters that have to be replaced by underscore in function StrToFat() of the Unicode collation protocol are those forbidden in FAT long names or those in FAT short names. EDK2 and UEFI SCT assume it is those forbidden in FAT 8.3 short names. Adjust the list of forbidden characters. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_unicode_collation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c index 4fe2362555..243c51a8db 100644 --- a/lib/efi_loader/efi_unicode_collation.c +++ b/lib/efi_loader/efi_unicode_collation.c @@ -11,8 +11,8 @@ #include <cp437.h> #include <efi_loader.h> -/* Characters that may not be used in file names */ -static const char illegal[] = "<>:\"/\\|?*\x7f"; +/* Characters that may not be used in FAT 8.3 file names */ +static const char illegal[] = "+,<=>:;\"/\\|?*[]\x7f"; /* * EDK2 assumes codepage 1250 when creating FAT 8.3 file names. -- 2.20.1

1 0

[U-Boot] Pull request for UEFI sub-system for v2019.07-rc5
by Heinrich Schuchardt 12 Jun '19

12 Jun '19

The following changes since commit 6d277fb0ed145f82dd50cc6e99d2fa553a588c3b: spl: Correct SPL_SIZE_LIMIT Kconfig option (2019-06-08 07:49:00 -0400) are available in the Git repository at: git://git.denx.de/u-boot-efi.git tags/efi-2019-07-rc5 for you to fetch changes up to 7a69e97ba42a93e33dccfe715a8522754117a715: efi_loader: implement event queue (2019-06-10 23:06:19 +0200) Travis CI showed no error except for a known issue with the TinkerBoard SPL binary being too large. Primary key fingerprint: 6DC4 F9C7 1F29 A6FA 06B7 6D33 C481 DBBC 2C05 1AC4 All related tests of the UEFI SCT are passed: Service\ProtocolName Total Failed Passed --------------------------------------------------------------------- BootServicesTest\EventTimerandPriorityServicesTest 34 0 34 BootServicesTest\MemoryAllocationServicesTest 102 0 102 BootServicesTest\ProtocolHandlerServicesTest 1214 18 1196 BootServicesTest\ImageServicesTest 123 7 116 BootServicesTest\MiscBootServicesTest 132 3 129 --------------------------------------------------------------------- Total service\Protocol 1605 28 1577 ---------------------------------------------------------------- Pull request for UEFI sub-system for v2019.07-rc5 This pull request provides fixes for event services. ---------------------------------------------------------------- Heinrich Schuchardt (5): efi_loader: RegisterProtocolNotify event signaling efi_loader: SignalEvent for event in signaled state efi_loader: event signaling in ExitBootServices efi_selftest: correct event group test efi_loader: implement event queue include/efi_loader.h | 6 +- lib/efi_loader/efi_boottime.c | 131 +++++++++++++++++++-------- lib/efi_loader/efi_console.c | 4 +- lib/efi_loader/efi_memory.c | 2 +- lib/efi_loader/efi_runtime.c | 2 +- lib/efi_selftest/efi_selftest_event_groups.c | 9 +- 6 files changed, 102 insertions(+), 52 deletions(-)

2 1

[U-Boot] [PATCH 1/1] efi_loader: MetaiMatch() must be cases insensitive
by Heinrich Schuchardt 12 Jun '19

12 Jun '19

The MetaiMatch() service of the UnicodeCollationProtocol2 must be case insensitive. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_unicode_collation.c | 65 ++++++++++++++++---------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c index f293b42397..c5e5b55d07 100644 --- a/lib/efi_loader/efi_unicode_collation.c +++ b/lib/efi_loader/efi_unicode_collation.c @@ -73,11 +73,22 @@ out: return ret; } +/** + * next_lower() - get next codepoint converted to lower case + * + * @string: pointer to u16 string, on return advanced by one codepoint + * Return: first codepoint of string converted to lower case + */ +static s32 next_lower(const u16 **string) +{ + return utf_to_lower(utf16_get(string)); +} + /** * metai_match() - compare utf-16 string with a pattern string case-insenitively * - * @s: string to compare - * @p: pattern string + * @string: string to compare + * @pattern: pattern string * * The pattern string may use these: * - * matches >= 0 characters @@ -93,61 +104,67 @@ out: * * Return: true if the string is matched. */ -static bool metai_match(const u16 *s, const u16 *p) +static bool metai_match(const u16 *string, const u16 *pattern) { - u16 first; + s32 first, s, p; + + for (; *string && *pattern;) { + const u16 *string_old = string; + + s = next_lower(&string); + p = next_lower(&pattern); - for (; *s && *p; ++s, ++p) { - switch (*p) { + switch (p) { case '*': /* Match 0 or more characters */ - ++p; - for (;; ++s) { - if (metai_match(s, p)) + for (;; s = next_lower(&string)) { + if (metai_match(string_old, pattern)) return true; - if (!*s) + if (!s) return false; + string_old = string; } case '?': /* Match any one character */ break; case '[': /* Match any character in the set */ - ++p; - first = *p; + p = next_lower(&pattern); + first = p; if (first == ']') /* Empty set */ return false; - ++p; - if (*p == '-') { + p = next_lower(&pattern); + if (p == '-') { /* Range */ - ++p; - if (*s < first || *s > *p) + p = next_lower(&pattern); + if (s < first || s > p) return false; - ++p; - if (*p != ']') + p = next_lower(&pattern); + if (p != ']') return false; } else { /* Set */ bool hit = false; - if (*s == first) + if (s == first) hit = true; - for (; *p && *p != ']'; ++p) { - if (*p == *s) + for (; p && p != ']'; + p = next_lower(&pattern)) { + if (p == s) hit = true; } - if (!hit || *p != ']') + if (!hit || p != ']') return false; } break; default: /* Match one character */ - if (*p != *s) + if (p != s) return false; } } - if (!*p && !*s) + if (!*pattern && !*string) return true; return false; } -- 2.20.1

1 0

[U-Boot] [PATCH 1/1] efi_loader: AllocatePages() must accept addr == 0
by Heinrich Schuchardt 12 Jun '19

12 Jun '19

It must be possible to allocate memory at address 0 with AllocatePages(). Move a NULL pointer check. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 8d76851234..27379381e8 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -334,7 +334,6 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, * * Check that the address is within allocated memory: * - * * The address cannot be NULL. * * The address must be in a range of the memory map. * * The address may not point to EFI_CONVENTIONAL_MEMORY. * @@ -349,8 +348,6 @@ static efi_status_t efi_check_allocated(u64 addr, bool must_be_allocated) { struct efi_mem_list *item; - if (!addr) - return EFI_INVALID_PARAMETER; list_for_each_entry(item, &efi_mem, link) { u64 start = item->desc.physical_start; u64 end = start + (item->desc.num_pages << EFI_PAGE_SHIFT); @@ -560,6 +557,9 @@ efi_status_t efi_free_pool(void *buffer) efi_status_t ret; struct efi_pool_allocation *alloc; + if (!buffer) + return EFI_INVALID_PARAMETER; + ret = efi_check_allocated((uintptr_t)buffer, true); if (ret != EFI_SUCCESS) return ret; -- 2.20.1

1 0

[U-Boot] [PATCH v1] wachdog: tangier: Convert to use WDT class
by Andy Shevchenko 12 Jun '19

12 Jun '19

Convert legacy driver to use watchdog class. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/cpu/tangier/Kconfig | 1 - arch/x86/dts/edison.dts | 4 ++ configs/edison_defconfig | 2 + drivers/watchdog/Kconfig | 17 ++++---- drivers/watchdog/Makefile | 2 +- drivers/watchdog/tangier_wdt.c | 72 +++++++++++++++++++++------------- 6 files changed, 60 insertions(+), 38 deletions(-) diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index a3bd16799d..d2b7edecd6 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -10,7 +10,6 @@ config INTEL_TANGIER imply MMC_SDHCI imply MMC_SDHCI_SDMA imply MMC_SDHCI_TANGIER - imply TANGIER_WATCHDOG imply USB imply USB_DWC3 diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index ea336eac19..df24aa0d26 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -99,6 +99,10 @@ reg = <0xff009000 0x1000>; }; + watchdog: wdt@0 { + compatible = "intel,tangier-wdt"; + }; + reset { compatible = "intel,reset-tangier"; u-boot,dm-pre-reloc; diff --git a/configs/edison_defconfig b/configs/edison_defconfig index d85a897d20..0196db65cf 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -40,5 +40,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x8087 CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99 CONFIG_USB_GADGET_DOWNLOAD=y # CONFIG_USB_HOST_ETHER is not set +CONFIG_WDT=y +CONFIG_WDT_TANGIER=y CONFIG_FAT_WRITE=y CONFIG_SHA1=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b01dbc446d..2270ed2e39 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -34,15 +34,6 @@ config OMAP_WATCHDOG help Say Y here to enable the OMAP3+ watchdog driver. -config TANGIER_WATCHDOG - bool "Intel Tangier watchdog" - depends on INTEL_MID - select HW_WATCHDOG - help - This enables support for watchdog controller available on - Intel Tangier SoC. If you're using a board with Intel Tangier - SoC, say Y here. - config ULP_WATCHDOG bool "i.MX7ULP watchdog" help @@ -161,4 +152,12 @@ config WDT_MPC8xx help Select this to enable mpc8xx watchdog timer +config WDT_TANGIER + bool "Intel Tangier watchdog timer support" + depends on WDT && INTEL_MID + help + This enables support for watchdog controller available on + Intel Tangier SoC. If you're using a board with Intel Tangier + SoC, say Y here. + endmenu diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 6f20e73810..2dfc8a37b0 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o -obj-$(CONFIG_TANGIER_WATCHDOG) += tangier_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o @@ -28,3 +27,4 @@ obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MTK) += mtk_wdt.o obj-$(CONFIG_WDT_SP805) += sp805_wdt.o +obj-$(CONFIG_WDT_TANGIER) += tangier_wdt.o diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c index be4a8f467a..cd03cf10c5 100644 --- a/drivers/watchdog/tangier_wdt.c +++ b/drivers/watchdog/tangier_wdt.c @@ -3,7 +3,9 @@ * Copyright (c) 2017 Intel Corporation */ #include <common.h> -#include <watchdog.h> +#include <dm.h> +#include <wdt.h> +#include <div64.h> #include <asm/scu.h> /* Hardware timeout in seconds */ @@ -12,12 +14,6 @@ #define WDT_TIMEOUT_MAX 170 #define WDT_DEFAULT_TIMEOUT 90 -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define WATCHDOG_HEARTBEAT 60000 -#else -#define WATCHDOG_HEARTBEAT CONFIG_WATCHDOG_TIMEOUT_MSECS -#endif - enum { SCU_WATCHDOG_START = 0, SCU_WATCHDOG_STOP = 1, @@ -25,40 +21,35 @@ enum { SCU_WATCHDOG_SET_ACTION_ON_TIMEOUT = 3, }; -void hw_watchdog_reset(void) +static int tangier_wdt_reset(struct udevice *dev) { - static unsigned long last; - unsigned long now; - - if (gd->timer) - now = timer_get_us(); - else - now = rdtsc() / 1000; - - /* Do not flood SCU */ - if (last > now) - last = 0; - - if (unlikely((now - last) > (WDT_PRETIMEOUT / 2) * 1000000)) { - last = now; - scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); - } + scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); + return 0; } -int hw_watchdog_disable(void) +static int tangier_wdt_stop(struct udevice *dev) { return scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_STOP); } -void hw_watchdog_init(void) +static int tangier_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { - u32 timeout = WATCHDOG_HEARTBEAT / 1000; + u32 timeout = WDT_DEFAULT_TIMEOUT; int in_size; struct ipc_wd_start { u32 pretimeout; u32 timeout; } ipc_wd_start = { timeout - WDT_PRETIMEOUT, timeout }; + /* Calculate timeout in seconds and restrict to min and max value */ + do_div(timeout_ms, 1000); + timeout = max_t(u32, timeout_ms, WDT_TIMEOUT_MIN); + timeout = min_t(u32, timeout_ms, WDT_TIMEOUT_MAX); + + /* Update values in the IPC request */ + ipc_wd_start.pretimeout = timeout - WDT_PRETIMEOUT; + ipc_wd_start.timeout = timeout; + /* * SCU expects the input size for watchdog IPC * to be based on 4 bytes @@ -67,4 +58,31 @@ void hw_watchdog_init(void) scu_ipc_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_START, (u32 *)&ipc_wd_start, in_size, NULL, 0); + + return 0; +} + +static const struct wdt_ops tangier_wdt_ops = { + .reset = tangier_wdt_reset, + .start = tangier_wdt_start, + .stop = tangier_wdt_stop, +}; + +static const struct udevice_id tangier_wdt_ids[] = { + { .compatible = "intel,tangier-wdt" }, + { /* sentinel */ } +}; + +static int tangier_wdt_probe(struct udevice *dev) +{ + debug("%s: Probing wdt%u\n", __func__, dev->seq); + return 0; } + +U_BOOT_DRIVER(wdt_tangier) = { + .name = "wdt_tangier", + .id = UCLASS_WDT, + .of_match = tangier_wdt_ids, + .ops = &tangier_wdt_ops, + .probe = tangier_wdt_probe, +}; -- 2.20.1

2 1