August 2018 - U-Boot

[U-Boot] Get Phy device ID for non standard phy
by Pankaj Bansal 30 Aug '18

30 Aug '18

Hi All, I have a query about phy devices that implement phy identification registers at non-standard locations. The IEEE 802.3 specifies these registers as phy ID registers: 22.2.4.3.1 PHY Identifier (Registers 2 and 3) Registers 2 and 3 provide a 32-bit value, which shall constitute a unique identifier for a particular type of PHY. A PHY may return a value of zero in each of the 32 bits of the PHY Identifier. Bit 2.15 shall be the MSB of the PHY Identifier, and bit 3.0 shall be the LSB of the PHY Identifier. But there are phys that implement this 32 bit ID in nonstandard locations. In u-boot there is a weak function get_phy_id (https://elixir.bootlin.com/u-boot/v2018.09-rc1/source/drivers/net/phy/phy.c…) This function can be overridden to get the phy id for nonstandard phys. Now If this function is overridden with our own function, then it's the job of our own function to get the phy id from all phy devices (standard or nonstandard) Till date, this function has been overridden by two files : https://elixir.bootlin.com/u-boot/v2018.09-rc1/source/drivers/net/phy/corti… https://elixir.bootlin.com/u-boot/v2018.09-rc1/source/drivers/net/phy/mv88e… Now the problem arises, when we have two or more phys in one system that implement the phy ID at two different non-standard location. Like we have in our upcoming boards LX2160AQDS/LX2160ARDB : inphi phy and cortina phy. In which file we should implement the get_phy_id function? I suggest that we should implement get_phy_id function in board file,. As the board manufacturer knows the phys in his system and the various non-standard locations these phy implement the 32 bit phy identifier. Any suggestion ? Regards, Pankaj Bansal

2 3

[U-Boot] [PATCH] x86: zimage: Remove acpi_rsdp_addr propagation to kernel boot parameters
by Bin Meng 30 Aug '18

30 Aug '18

As of today, the proposal of adding "acpi_rsdp_addr" to the kernel boot protocol does not make its way to the kernel mainline. This creates some confusion if we leave it in the U-Boot code base. Remove it for now until we have a clear picture with kernel upstream. Note this eventually does a partial revert to commit 3469bf427454 ("x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters") Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/include/asm/bootparam.h | 1 - arch/x86/lib/zimage.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 0386cbe..dfbd4b4 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h @@ -69,7 +69,6 @@ struct setup_header { __u64 pref_address; __u32 init_size; __u32 handover_offset; - __u64 acpi_rsdp_addr; } __attribute__((packed)); struct sys_desc_table { diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 0442fda..230b38e 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -287,11 +287,6 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; #endif -#ifdef CONFIG_GENERATE_ACPI_TABLE - if (bootproto >= 0x020e) - hdr->acpi_rsdp_addr = acpi_get_rsdp_addr(); -#endif - setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0)); setup_video(&setup_base->screen_info); -- 2.7.4

3 3

[U-Boot] [PATCH 1/4] x86: efi: payload: Install E820 map from EFI memory map
by Bin Meng 30 Aug '18

30 Aug '18

This implements payload-specific install_e820_map() to get E820 map from the EFI memory map descriptors. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/efi/payload.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 4649bfe..0e7c7c1 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -8,6 +8,7 @@ #include <efi.h> #include <errno.h> #include <usb.h> +#include <asm/e820.h> #include <asm/post.h> DECLARE_GLOBAL_DATA_PTR; @@ -168,3 +169,84 @@ int last_stage_init(void) return 0; } + +unsigned int install_e820_map(unsigned int max_entries, + struct e820_entry *entries) +{ + struct efi_mem_desc *desc, *end; + struct efi_entry_memmap *map; + int size, ret; + efi_physical_addr_t last_end_addr = 0; + struct e820_entry *last_entry = NULL; + __u32 e820_type; + unsigned int num_entries = 0; + + ret = efi_info_get(EFIET_MEMORY_MAP, (void **)&map, &size); + if (ret) { + printf("Cannot find EFI memory map tables, ret=%d\n", ret); + + return -ENODEV; + } + + end = (struct efi_mem_desc *)((ulong)map + size); + for (desc = map->desc; desc < end; + desc = efi_get_next_mem_desc(map, desc)) { + if (desc->num_pages == 0) + continue; + + switch (desc->type) { + case EFI_LOADER_CODE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: + case EFI_CONVENTIONAL_MEMORY: + e820_type = E820_RAM; + break; + + case EFI_RESERVED_MEMORY_TYPE: + case EFI_RUNTIME_SERVICES_CODE: + case EFI_RUNTIME_SERVICES_DATA: + case EFI_MMAP_IO: + case EFI_MMAP_IO_PORT: + case EFI_PAL_CODE: + e820_type = E820_RESERVED; + break; + + case EFI_ACPI_RECLAIM_MEMORY: + e820_type = E820_ACPI; + break; + + case EFI_ACPI_MEMORY_NVS: + e820_type = E820_NVS; + break; + + case EFI_UNUSABLE_MEMORY: + e820_type = E820_UNUSABLE; + break; + + default: + printf("Invalid EFI memory descriptor type (0x%x)!\n", + desc->type); + continue; + } + + if (last_entry != NULL && last_entry->type == e820_type && + desc->physical_start == last_end_addr) { + last_entry->size += (desc->num_pages << EFI_PAGE_SHIFT); + last_end_addr += (desc->num_pages << EFI_PAGE_SHIFT); + } else { + if (num_entries >= E820MAX) + break; + + entries[num_entries].addr = desc->physical_start; + entries[num_entries].size = desc->num_pages; + entries[num_entries].size <<= EFI_PAGE_SHIFT; + entries[num_entries].type = e820_type; + last_entry = &entries[num_entries]; + last_end_addr = last_entry->addr + last_entry->size; + num_entries++; + } + } + + return num_entries; +} -- 2.7.4

2 12

[U-Boot] Query on FAT file system
by Siva Durga Prasad Paladugu 30 Aug '18

30 Aug '18

Hi, I have below queries on FAT filesystem support in uboot. It would be really helpful if someone can provide some insight into these. 1. fatwrite command is not able to write into subdirectories, but able to perform same ops on to root directory, its treating / as part of file name while trying to write into subdirs. Is there any otherway to write into subdirectories instead of using slashes or Is it a limitation/feature not supported in u-boot for writes to subdirectories in fat filesystem? 2. Does fatwrite command support overwriting a file in root directory. For example if there is a file with name abc.bin in SD card and I perform fatwrite to SD with same filename as( fatwrite mmc 0 10000 abc.bin size). 3. The FAT16 support in uboot was broken https://lists.denx.de/pipermail/u-boot/2018-July/335292.html Is it fixed now or any update on this would really be helpful. Thanks, Siva

1 0

Re: [U-Boot] [PATCH 4/8] binman: Add support for powerpc 'bootpg + resetvec' entry
by Jagdish Gediya 30 Aug '18

30 Aug '18

Hi Simon, I tried to run 'binman -T' on top of latest u-boot without any changes to understand it. I am facing below errors, Am i missing any prerequisite? $./tools/binman/binman -T FATAL ERROR: Unrecognized check name "unit_address_vs_reg" FATAL ERROR: Unrecognized check name "unit_address_vs_reg" . . . <unittest.result.TestResult run=110 errors=86 failures=3> entry_test.TestEntry.test1EntryNoImportLib Traceback (most recent call last): Exception: Error running 'dtc -I dts -o /tmp/binman.QSE04Z/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.QSE04Z/source.dts' . . . ftest.TestFunctional.testWithoutMicrocode Traceback (most recent call last): Exception: Error running 'dtc -I dts -o /tmp/binmant.Y0yzB_/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binmant.Y0yzB_/source.dts' tearDownClass (ftest.TestFunctional) Traceback (most recent call last): OSError: [Errno 2] No such file or directory: '/tmp/binmant.Y0yzB_' tearDownClass (ftest.TestFunctional) Traceback (most recent call last): OSError: [Errno 2] No such file or directory: '/tmp/binmant.Y0yzB_' fdt_test.TestFdt.testFdtNormal Traceback (most recent call last): Exception: Error running 'dtc -I dts -o /tmp/binmant.NP9CZr/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binmant.NP9CZr/source.dts' fdt_test.TestFdt.testFdtNormalProp Traceback (most recent call last): Exception: Error running 'dtc -I dts -o /tmp/binmant.NP9CZr/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binmant.NP9CZr/source.dts' Traceback (most recent call last): File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 434, in testBrokenDt str(e.exception)) AssertionError: 'FATAL ERROR: Unable to parse input tree' not found in 'Error running \'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/01_invalid.dts\': binman: Error running \'dtc -I dts -o /tmp/binman.XumV4A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.XumV4A/source.dts\'\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\n' [(<ftest.TestFunctional testMethod=testBrokenDt>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 434, in testBrokenDt\n str(e.exception))\nAssertionError: \'FATAL ERROR: Unable to parse input tree\' not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/01_invalid.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.XumV4A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.XumV4A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testInvalidEntry>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 454, in testInvalidEntry\n "\'/binman/not-a-valid-type\'", str(e.exception))\nAssertionError: "Unknown entry type \'not-a-valid-type\' in node \'/binman/not-a-valid-type\'" not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/04_invalid_entry.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.jzQF0A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.jzQF0A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testMissingNode>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 440, in testMissingNode\n self.assertIn("does not have a \'binman\' node", str(e.exception))\nAssertionError: "does not have a \'binman\' node" not found in "Error running \'dtc -I dts -o /tmp/binman.N2Mjfy/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.N2Mjfy/source.dts\'"\n')] Traceback (most recent call last): File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 454, in testInvalidEntry "'/binman/not-a-valid-type'", str(e.exception)) AssertionError: "Unknown entry type 'not-a-valid-type' in node '/binman/not-a-valid-type'" not found in 'Error running \'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/04_invalid_entry.dts\': binman: Error running \'dtc -I dts -o /tmp/binman.jzQF0A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.jzQF0A/source.dts\'\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\n' [(<ftest.TestFunctional testMethod=testBrokenDt>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 434, in testBrokenDt\n str(e.exception))\nAssertionError: \'FATAL ERROR: Unable to parse input tree\' not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/01_invalid.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.XumV4A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.XumV4A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testInvalidEntry>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 454, in testInvalidEntry\n "\'/binman/not-a-valid-type\'", str(e.exception))\nAssertionError: "Unknown entry type \'not-a-valid-type\' in node \'/binman/not-a-valid-type\'" not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/04_invalid_entry.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.jzQF0A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.jzQF0A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testMissingNode>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 440, in testMissingNode\n self.assertIn("does not have a \'binman\' node", str(e.exception))\nAssertionError: "does not have a \'binman\' node" not found in "Error running \'dtc -I dts -o /tmp/binman.N2Mjfy/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.N2Mjfy/source.dts\'"\n')] Traceback (most recent call last): File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 440, in testMissingNode self.assertIn("does not have a 'binman' node", str(e.exception)) AssertionError: "does not have a 'binman' node" not found in "Error running 'dtc -I dts -o /tmp/binman.N2Mjfy/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.N2Mjfy/source.dts'" [(<ftest.TestFunctional testMethod=testBrokenDt>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 434, in testBrokenDt\n str(e.exception))\nAssertionError: \'FATAL ERROR: Unable to parse input tree\' not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/01_invalid.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.XumV4A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.XumV4A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testInvalidEntry>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 454, in testInvalidEntry\n "\'/binman/not-a-valid-type\'", str(e.exception))\nAssertionError: "Unknown entry type \'not-a-valid-type\' in node \'/binman/not-a-valid-type\'" not found in \'Error running \\\'-d /home/jagdish/projects/nxp/u-boot-denx/tools/binman/test/04_invalid_entry.dts\\\': binman: Error running \\\'dtc -I dts -o /tmp/binman.jzQF0A/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.jzQF0A/source.dts\\\'\\nFATAL ERROR: Unrecognized check name "unit_address_vs_reg"\\n\'\n'), (<ftest.TestFunctional testMethod=testMissingNode>, 'Traceback (most recent call last):\n File "/home/jagdish/projects/nxp/u-boot-denx/tools/binman/ftest.py", line 440, in testMissingNode\n self.assertIn("does not have a \'binman\' node", str(e.exception))\nAssertionError: "does not have a \'binman\' node" not found in "Error running \'dtc -I dts -o /tmp/binman.N2Mjfy/source.dtb -O dtb -W no-unit_address_vs_reg -i /home/jagdish/projects/nxp/u-boot-denx/include /tmp/binman.N2Mjfy/source.dts\'"\n')] binman tests FAILED 49% Name Stmts Miss Cover ------------------------------------------------------------------ tools/binman/bsection 208 141 32% tools/binman/cmdline 20 0 100% tools/binman/control 104 51 51% tools/binman/elf 67 2 97% tools/binman/entry 197 96 51% tools/binman/etype/blob 18 10 44% tools/binman/etype/blob_named_by_arg 7 2 71% tools/binman/etype/cros_ec_rw 4 1 75% tools/binman/etype/fill 11 6 45% tools/binman/etype/fmap 22 15 32% tools/binman/etype/gbb 33 24 27% tools/binman/etype/intel_cmc 5 1 80% tools/binman/etype/intel_descriptor 26 15 42% tools/binman/etype/intel_fsp 5 1 80% tools/binman/etype/intel_me 5 1 80% tools/binman/etype/intel_mrc 7 2 71% tools/binman/etype/intel_vbt 5 1 80% tools/binman/etype/intel_vga 5 1 80% tools/binman/etype/section 42 23 45% tools/binman/etype/text 11 5 55% tools/binman/etype/u_boot 7 2 71% tools/binman/etype/u_boot_dtb 7 2 71% tools/binman/etype/u_boot_dtb_with_ucode 47 38 19% tools/binman/etype/u_boot_img 7 2 71% tools/binman/etype/u_boot_nodtb 7 2 71% tools/binman/etype/u_boot_spl 11 4 64% tools/binman/etype/u_boot_spl_bss_pad 15 7 53% tools/binman/etype/u_boot_spl_dtb 7 2 71% tools/binman/etype/u_boot_spl_nodtb 7 2 71% tools/binman/etype/u_boot_spl_with_ucode_ptr 12 3 75% tools/binman/etype/u_boot_tpl 11 4 64% tools/binman/etype/u_boot_tpl_dtb 7 2 71% tools/binman/etype/u_boot_ucode 27 21 22% tools/binman/etype/u_boot_with_ucode_ptr 40 28 30% tools/binman/etype/vblock 27 19 30% tools/binman/etype/x86_start16 7 2 71% tools/binman/etype/x86_start16_spl 7 2 71% tools/binman/fmap_util 41 21 49% tools/binman/image 57 26 54% ------------------------------------------------------------------ TOTAL 1153 587 49% Type 'python-coverage html' to get a report in htmlcov/index.html Coverage error: 49%, but should be 100% ValueError: Test coverage failure Thanks, Jagdish > -----Original Message----- > From: sjg(a)google.com <sjg(a)google.com> On Behalf Of Simon Glass > Sent: Tuesday, August 21, 2018 11:02 PM > To: Jagdish Gediya <jagdish.gediya(a)nxp.com> > Cc: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com>; York Sun > <york.sun(a)nxp.com>; Poonam Aggrwal <poonam.aggrwal(a)nxp.com>; Tom > Rini <trini(a)konsulko.com>; Bin Meng <bmeng.cn(a)gmail.com> > Subject: Re: [PATCH 4/8] binman: Add support for powerpc 'bootpg + > resetvec' entry > > Hi, > > On 21 August 2018 at 12:06, Jagdish Gediya <jagdish.gediya(a)nxp.com> > wrote: > > This entry contains the powerpc boot page and resetvec sections. > > > > Signed-off-by: Jagdish Gediya <jagdish.gediya(a)nxp.com> > > --- > > tools/binman/etype/mpc85xx_bootpg_resetvec.py | 15 +++++++++++++++ > > 1 file changed, 15 insertions(+) > > create mode 100644 tools/binman/etype/mpc85xx_bootpg_resetvec.py > > Please run binman with the -E option to regenerate the entry > documentation. > > You will need to actually add some to your new module :-) > > Also please add a test. Otherwise binman -T will fail. > > > > > diff --git a/tools/binman/etype/mpc85xx_bootpg_resetvec.py > > b/tools/binman/etype/mpc85xx_bootpg_resetvec.py > > new file mode 100644 > > index 0000000..d76fe95 > > --- /dev/null > > +++ b/tools/binman/etype/mpc85xx_bootpg_resetvec.py > > @@ -0,0 +1,15 @@ > > +# SPDX-License-Identifier: GPL-2.0+ > > +# Copyright 2018 NXP > > +# > > +# Entry-type module for the mpc85xx bootpg and resetvec code for > > +U-Boot # > > + > > +from entry import Entry > > +from blob import Entry_blob > > + > > +class Entry_mpc85xx_bootpg_resetvec(Entry_blob): > > + def __init__(self, section, etype, node): > > + Entry_blob.__init__(self, section, etype, node) > > + > > + def GetDefaultFilename(self): > > + return 'u-boot-br.bin' > > -- > > 2.7.4 > > > > Regards, > Simon

2 1

[U-Boot] [PATCH 0/3] Update RV3029 driver to DM and add DM-backed bootcount support
by Philipp Tomsich 30 Aug '18

30 Aug '18

On one of our application-specific carrier boards, a MicroCrystal RV3029 acts as an off-module battery-backed RTC for the RK3399-Q7. The RV3029 is intended both to provide RTC services (to Linux) and to store the bootcount in its battery-backed SRAM section. To support this use-case, this series adds the following: * replaces the existing RV3029 driver by a DM-based one (note that the existing driver appears unused and didn't even have a Kconfig entry) that closely mirrors its incarnation in Linux 4.17 * adds a bootcount-method interfacing back into DM devices (implementing support for the RTC uclass as of now). Philipp Tomsich (3): rtc: rv3029: add to Kconfig rtc: rv3029: update to support DM and sync with Linux 4.17 bootcount: add DM-based backing store for bootcount doc/device-tree-bindings/chosen.txt | 27 ++ drivers/bootcount/Kconfig | 12 + drivers/bootcount/Makefile | 1 + drivers/bootcount/bootcount_dm.c | 93 ++++++ drivers/rtc/Kconfig | 10 + drivers/rtc/rv3029.c | 579 +++++++++++++++++++++++++++--------- scripts/config_whitelist.txt | 1 - 7 files changed, 585 insertions(+), 138 deletions(-) create mode 100644 drivers/bootcount/bootcount_dm.c -- 2.1.4

5 12

[U-Boot] [PATCH v4 00/17] clk: Add Allwinner CLK, RESET support
by Jagan Teki 30 Aug '18

30 Aug '18

This series is refined version of Allwinner CLK, RESET support for previous version[1] which implements CLK and RESET for USB. Tested on A64, H3, H5, R40, A83T, A20. Changes for v4: - Collect Acked-by and Tested-by - Rebase on master - Fixed checkpatch warnings - Fixed SPDX licence - return 0 if reset request ops not used Changes for v3: - Added H6 CLK, RESET changes - Added fastboot mmc device patch - Added fat env mmc device patch - Update bootorder to check eMMC as per DT - Collect Tested-by Changes for v2: - Fixed few warnings and spaces in reset descriptor table - Add Ethernet CLK and RESET changes All these changes available at u-boot-sunxi/next Note: - V3S, A23, A33 still need to test [1] https://patchwork.ozlabs.org/cover/959324/ Any inputs, Jagan. Jagan Teki (17): clk: Add Allwinner A64 CLK driver reset: Return 0 if no request ops reset: Add Allwinner RESET driver clk: sunxi: Add Allwinner H3/H5 CLK driver clk: sunxi: Add Allwinner A10/A20 CLK driver clk: sunxi: Add Allwinner A10s/A13 CLK driver clk: sunxi: Add Allwinner A31 CLK driver clk: sunxi: Add Allwinner A23 CLK driver clk: sunxi: a23: Add CLK support for A33 clk: sunxi: Add Allwinner A83T CLK driver clk: sunxi: Add Allwinner R40 CLK driver clk: sunxi: Add Allwinner V3S CLK driver sunxi: Enable CLK phy: sun4i-usb: Use CLK and RESET support musb-new: sunxi: Use CLK and RESET support sunxi: usb: Switch to Generic host controllers usb: host: Drop [e-o]hci-sunxi drivers arch/arm/include/asm/arch-sunxi/ccu.h | 72 ++++++ arch/arm/mach-sunxi/Kconfig | 12 + configs/A10-OLinuXino-Lime_defconfig | 1 + configs/A10s-OLinuXino-M_defconfig | 1 + configs/A13-OLinuXinoM_defconfig | 1 + configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 + configs/A20-OLinuXino-Lime2_defconfig | 1 + configs/A20-OLinuXino-Lime_defconfig | 1 + configs/A20-Olimex-SOM204-EVB_defconfig | 2 + configs/Auxtek-T003_defconfig | 1 + configs/Auxtek-T004_defconfig | 1 + configs/Bananapi_defconfig | 1 + configs/Bananapi_m2m_defconfig | 1 + configs/Bananapro_defconfig | 1 + configs/CHIP_defconfig | 1 + configs/CHIP_pro_defconfig | 1 + configs/CSQ_CS908_defconfig | 1 + configs/Colombus_defconfig | 1 + configs/Cubieboard2_defconfig | 1 + configs/Cubieboard_defconfig | 1 + configs/Cubietruck_plus_defconfig | 1 + configs/Hummingbird_A31_defconfig | 1 + configs/Itead_Ibox_A20_defconfig | 1 + configs/Linksprite_pcDuino3_Nano_defconfig | 1 + configs/Linksprite_pcDuino3_defconfig | 1 + configs/Linksprite_pcDuino_defconfig | 1 + configs/MK808C_defconfig | 1 + configs/Marsboard_A10_defconfig | 1 + configs/Mele_A1000G_quad_defconfig | 1 + configs/Mele_A1000_defconfig | 1 + configs/Mele_I7_defconfig | 1 + configs/Mele_M3_defconfig | 1 + configs/Mele_M5_defconfig | 1 + configs/Mele_M9_defconfig | 1 + configs/Mini-X_defconfig | 1 + configs/Orangepi_defconfig | 1 + configs/Orangepi_mini_defconfig | 1 + configs/Sinlinx_SinA31s_defconfig | 1 + configs/Sinlinx_SinA33_defconfig | 1 + configs/Sinovoip_BPI_M2_Plus_defconfig | 1 + configs/Sinovoip_BPI_M2_defconfig | 1 + configs/Sinovoip_BPI_M3_defconfig | 1 + configs/Wexler_TAB7200_defconfig | 1 + configs/Wobo_i5_defconfig | 1 + configs/a64-olinuxino_defconfig | 1 + configs/ba10_tv_box_defconfig | 1 + configs/bananapi_m1_plus_defconfig | 1 + configs/bananapi_m64_defconfig | 1 + configs/ga10h_v1_1_defconfig | 1 + configs/h8_homlet_v2_defconfig | 1 + configs/i12-tvbox_defconfig | 1 + configs/icnova-a20-swac_defconfig | 1 + configs/inet1_defconfig | 1 + configs/inet_q972_defconfig | 1 + configs/jesurun_q5_defconfig | 1 + configs/libretech_all_h3_cc_h2_plus_defconfig | 1 + configs/libretech_all_h3_cc_h3_defconfig | 1 + configs/libretech_all_h3_cc_h5_defconfig | 1 + configs/mixtile_loftq_defconfig | 1 + configs/mk802_a10s_defconfig | 1 + configs/mk802_defconfig | 1 + configs/mk802ii_defconfig | 1 + configs/nanopi_a64_defconfig | 1 + configs/nanopi_m1_defconfig | 1 + configs/nanopi_m1_plus_defconfig | 1 + configs/nanopi_neo2_defconfig | 1 + configs/nanopi_neo_air_defconfig | 1 + configs/nanopi_neo_defconfig | 1 + configs/nanopi_neo_plus2_defconfig | 1 + configs/orangepi_2_defconfig | 1 + configs/orangepi_lite_defconfig | 1 + configs/orangepi_one_defconfig | 1 + configs/orangepi_pc2_defconfig | 1 + configs/orangepi_pc_defconfig | 1 + configs/orangepi_pc_plus_defconfig | 1 + configs/orangepi_plus2e_defconfig | 1 + configs/orangepi_plus_defconfig | 1 + configs/orangepi_prime_defconfig | 1 + configs/orangepi_r1_defconfig | 1 + configs/orangepi_win_defconfig | 1 + configs/orangepi_zero_defconfig | 1 + configs/orangepi_zero_plus2_defconfig | 1 + configs/orangepi_zero_plus_defconfig | 1 + configs/parrot_r16_defconfig | 1 + configs/pine64_plus_defconfig | 1 + configs/r7-tv-dongle_defconfig | 1 + configs/sopine_baseboard_defconfig | 1 + configs/sun8i_a23_evb_defconfig | 1 + configs/sunxi_Gemei_G9_defconfig | 1 + configs/tbs_a711_defconfig | 1 + drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/sunxi/Kconfig | 75 ++++++ drivers/clk/sunxi/Makefile | 17 ++ drivers/clk/sunxi/clk_a10.c | 77 ++++++ drivers/clk/sunxi/clk_a10s.c | 74 ++++++ drivers/clk/sunxi/clk_a23.c | 81 ++++++ drivers/clk/sunxi/clk_a31.c | 86 +++++++ drivers/clk/sunxi/clk_a64.c | 84 +++++++ drivers/clk/sunxi/clk_a83t.c | 81 ++++++ drivers/clk/sunxi/clk_h3.c | 97 ++++++++ drivers/clk/sunxi/clk_r40.c | 88 +++++++ drivers/clk/sunxi/clk_sunxi.c | 58 +++++ drivers/clk/sunxi/clk_v3s.c | 69 ++++++ drivers/phy/allwinner/phy-sun4i-usb.c | 77 ++++-- drivers/reset/Kconfig | 8 + drivers/reset/Makefile | 1 + drivers/reset/reset-sunxi.c | 125 ++++++++++ drivers/reset/reset-uclass.c | 3 + drivers/usb/host/Kconfig | 2 + drivers/usb/host/Makefile | 2 - drivers/usb/host/ehci-sunxi.c | 204 --------------- drivers/usb/host/ohci-sunxi.c | 233 ------------------ drivers/usb/musb-new/sunxi.c | 87 ++++--- include/configs/sun4i.h | 4 - include/configs/sun50i.h | 5 - include/configs/sun5i.h | 4 - include/configs/sun6i.h | 4 - include/configs/sun7i.h | 4 - include/configs/sun8i.h | 4 - include/configs/sunxi-common.h | 1 - scripts/config_whitelist.txt | 2 - 123 files changed, 1310 insertions(+), 523 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/ccu.h create mode 100644 drivers/clk/sunxi/Kconfig create mode 100644 drivers/clk/sunxi/Makefile create mode 100644 drivers/clk/sunxi/clk_a10.c create mode 100644 drivers/clk/sunxi/clk_a10s.c create mode 100644 drivers/clk/sunxi/clk_a23.c create mode 100644 drivers/clk/sunxi/clk_a31.c create mode 100644 drivers/clk/sunxi/clk_a64.c create mode 100644 drivers/clk/sunxi/clk_a83t.c create mode 100644 drivers/clk/sunxi/clk_h3.c create mode 100644 drivers/clk/sunxi/clk_r40.c create mode 100644 drivers/clk/sunxi/clk_sunxi.c create mode 100644 drivers/clk/sunxi/clk_v3s.c create mode 100644 drivers/reset/reset-sunxi.c delete mode 100644 drivers/usb/host/ehci-sunxi.c delete mode 100644 drivers/usb/host/ohci-sunxi.c -- 2.18.0.321.gffc6fa0e3

3 32

[U-Boot] [PATCH 1/2] ARM: tegra: reserve unmapped RAM so EFI doesn't use it
by Stephen Warren 29 Aug '18

29 Aug '18

From: Stephen Warren <swarren(a)nvidia.com> Tegra U-Boot ensures that board_get_usable_ram_top() never returns a value over 4GB, since some peripherals can't access such addresses. However, on systems with more than 2GB of RAM, RAM bank 1 does describe this extra RAM, so that Linux (or whatever OS) can use it, subject to DMA limitations. Since board_get_usable_ram_top() points at the top of RAM bank 0, the memory locations describes by RAM bank 1 are not mapped by U-Boot's MMU configuration, and so cannot be used for anything. For some completely inexplicable reason, U-Boot's EFI support ignores the value returned by board_get_usable_ram_top(), and EFI memory allocation routines will return values above U-Boot's RAM top. This causes U-Boot to crash when it accesses that RAM, since it isn't mapped by the MMU. One use-case where this happens is TFTP download of a file on Jetson TX1 (p2371-2180). This change explicitly tells the EFI code that this extra RAM should not be used, thus avoiding the crash. A previous attempt to make EFI honor board_get_usable_ram_top() was rejected. So, this patch will need to be replicated for any board that implements board_get_usable_ram_top(). Fixes: aa909462d018 ("efi_loader: efi_allocate_pages is too restrictive") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/mach-tegra/board2.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 421a71b3014d..869d5d99d2fd 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> +#include <efi_loader.h> #include <errno.h> #include <ns16550.h> #include <usb.h> @@ -210,6 +211,19 @@ int board_early_init_f(void) int board_late_init(void) { +#ifdef CONFIG_EFI_LOADER + if (gd->bd->bi_dram[1].start) { + /* + * Only bank 0 is below board_get_usable_ram_top(), so all of + * bank 1 is not mapped by the U-Boot MMU configuration, and so + * we must prevent EFI from using it. + */ + efi_add_memory_map(gd->bd->bi_dram[1].start, + gd->bd->bi_dram[1].size / 4096, + EFI_RESERVED_MEMORY_TYPE, false); + } +#endif + #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE) if (tegra_cpu_is_non_secure()) { printf("CPU is in NS mode\n"); -- 2.18.0

3 3

[U-Boot] [PATCH] rockchip: add TPL_TINY_FRAMEWORK support
by Kever Yang 29 Aug '18

29 Aug '18

Rockchip BootRom support load firmware from storage media twice, one for ddr sdram init code into sram and another time to load firmware into DDR. For ddr sdram init code(which is TPL in U-Boot project), it's OK to re-use the stack and vector table. In order to get more available sram space, we need to skip all the init code from U-Boot project including start.S, reset.S and framework. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/cpu/armv7/start.S | 2 + arch/arm/cpu/armv8/start.S | 2 + arch/arm/include/asm/arch-rockchip/boot0.h | 10 ++ arch/arm/mach-rockchip/Kconfig | 12 +++ arch/arm/mach-rockchip/Makefile | 2 + arch/arm/mach-rockchip/tiny_tpl.c | 106 +++++++++++++++++++++ 6 files changed, 134 insertions(+) create mode 100644 arch/arm/mach-rockchip/tiny_tpl.c diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 81edec01bf..548d9ff23a 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -38,7 +38,9 @@ reset: /* Allow the board to save important registers */ b save_boot_params +#if !CONFIG_IS_ENABLED(TINY_FRAMEWORK) save_boot_params_ret: +#endif #ifdef CONFIG_ARMV7_LPAE /* * check for Hypervisor support diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index d4db4d044f..e0f8fad10c 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -31,6 +31,7 @@ _start: b reset #endif +#if !CONFIG_IS_ENABLED(TINY_FRAMEWORK) .align 3 .globl _TEXT_BASE @@ -361,3 +362,4 @@ ENDPROC(c_runtime_cpu_setup) WEAK(save_boot_params) b save_boot_params_ret /* back to my caller */ ENDPROC(save_boot_params) +#endif diff --git a/arch/arm/include/asm/arch-rockchip/boot0.h b/arch/arm/include/asm/arch-rockchip/boot0.h index 9ea4708ada..7f00494513 100644 --- a/arch/arm/include/asm/arch-rockchip/boot0.h +++ b/arch/arm/include/asm/arch-rockchip/boot0.h @@ -41,8 +41,18 @@ entry_counter: #if (defined(CONFIG_SPL_BUILD) || defined(CONFIG_ARM64)) /* U-Boot proper of armv7 do not need this */ +#if CONFIG_IS_ENABLED(TINY_FRAMEWORK) + /* Allow the board to save important registers */ + b save_boot_params +.globl save_boot_params_ret +.type save_boot_params_ret, %function + +save_boot_params_ret: + b board_init_f +#else b reset #endif +#endif #if !defined(CONFIG_ARM64) /* diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 187aa14184..be23bcc37e 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -306,6 +306,18 @@ config TPL_ROCKCHIP_EARLYRETURN_TO_BROM config SPL_MMC_SUPPORT default y if !SPL_ROCKCHIP_BACK_TO_BROM +config TPL_TINY_FRAMEWORK + bool "Tiny TPL for DDR init" + depends on TPL && !TPL_FRAMEWORK + default y + help + Rockchip BootRom support load firmware from storage media twice, + one for ddr sdram init code into sram and another time to load + firmware into DDR. For ddr sdram init code(which is TPL in U-Boot + project), it's OK to re-use the stack and vector table. In order + to get more available sram space, we need to skip all the init code + from U-Boot project including start.S, reset.S and framework. + source "arch/arm/mach-rockchip/rk3036/Kconfig" source "arch/arm/mach-rockchip/rk3128/Kconfig" source "arch/arm/mach-rockchip/rk3188/Kconfig" diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index 83afdac99d..c88700f10d 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -9,6 +9,8 @@ obj-spl-$(CONFIG_ROCKCHIP_BROM_HELPER) += bootrom.o obj-tpl-$(CONFIG_ROCKCHIP_BROM_HELPER) += bootrom.o +obj-tpl-$(CONFIG_TPL_TINY_FRAMEWORK) += tiny_tpl.o + obj-tpl-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-tpl.o obj-tpl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-tpl.o obj-tpl-$(CONFIG_ROCKCHIP_RK322X) += rk322x-board-tpl.o diff --git a/arch/arm/mach-rockchip/tiny_tpl.c b/arch/arm/mach-rockchip/tiny_tpl.c new file mode 100644 index 0000000000..47f15c0af1 --- /dev/null +++ b/arch/arm/mach-rockchip/tiny_tpl.c @@ -0,0 +1,106 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018 Rockchip Electronics Co., Ltd + */ + +#include <common.h> +#include <debug_uart.h> +#include <spl.h> +#include <version.h> +#include <asm/io.h> +#include <asm/arch/bootrom.h> +#include <asm/arch-rockchip/sys_proto.h> + +#ifndef CONFIG_TPL_LIBGENERIC_SUPPORT +#ifdef CONFIG_ARM64 +/* for ARM64,it don't have define timer_init and __udelay except lib/timer.c */ +int __weak timer_init(void) +{ + return 0; +} + +void __weak __udelay(unsigned long usec) +{ + u64 i, j, count; + + asm volatile ("MRS %0, CNTPCT_EL0" : "=r"(count)); + i = count; + /* usec to count,24MHz */ + j = usec * 24; + i += j; + while (1) { + asm volatile ("MRS %0, CNTPCT_EL0" : "=r"(count)); + if (count > i) + break; + } +} +#endif /* CONFIG_ARM64 */ +void udelay(unsigned long usec) +{ + __udelay(usec); +} + +void hang(void) +{ + for (;;) + ; +} +#endif /* CONFIG_TPL_LIBGENERIC_SUPPORT */ + +u32 spl_boot_device(void) +{ + return BOOT_DEVICE_BOOTROM; +} + +__weak void rockchip_stimer_init(void) +{ +#ifndef CONFIG_ARM64 + asm volatile("mcr p15, 0, %0, c14, c0, 0" + : : "r"(COUNTER_FREQUENCY)); +#else + /* + * For ARM64,generally initialize CNTFRQ in start.S, + * but if defined CONFIG_TPL_TINY_FRAMEWORK should skip start.S. + * So initialize CNTFRQ to 24MHz here. + */ + asm volatile("msr CNTFRQ_EL0, %0" + : : "r" (COUNTER_FREQUENCY)); +#endif + writel(0, CONFIG_ROCKCHIP_STIMER_BASE + 0x10); + writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE); + writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE + 4); + writel(1, CONFIG_ROCKCHIP_STIMER_BASE + 0x10); +} + +__weak int arch_cpu_init(void) +{ + return 0; +} + +void board_init_f(ulong dummy) +{ + rockchip_stimer_init(); + arch_cpu_init(); +#define EARLY_DEBUG +#ifdef EARLY_DEBUG + /* + * Debug UART can be used from here if required: + * + * debug_uart_init(); + * printch('a'); + * printhex8(0x1234); + * printascii("string"); + */ + debug_uart_init(); + printascii("\nU-Boot Tiny TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \ + U_BOOT_TIME ")\n"); +#endif + + /* Init ARM arch timer */ + timer_init(); + + /* We are not going to use DM framework in tiny TPL */ + sdram_init(); + + back_to_bootrom(BROM_BOOT_NEXTSTAGE); +} -- 2.18.0

2 1

[U-Boot] [RESEND PATCH V2 1/3] imx: mx7: psci: improve cpu hotplug flow
by Anson Huang 29 Aug '18

29 Aug '18

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

5 9