When building U-Boot with clang, it notices that the i8254.h include guard does not work correctly due to a typo. Fix it.

Signed-off-by: Alistair Delva adelva@google.com Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- arch/x86/include/asm/i8254.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/i8254.h b/arch/x86/include/asm/i8254.h index d769daf85d..bb8930338b 100644 --- a/arch/x86/include/asm/i8254.h +++ b/arch/x86/include/asm/i8254.h @@ -7,7 +7,7 @@ /* i8254.h Intel 8254 PIT registers */

#ifndef _ASMI386_I8254_H_ -#define _ASMI386_I8954_H_ +#define _ASMI386_I8254_H_

#define PIT_T0 0x00 /* PIT channel 0 count/status */ #define PIT_T1 0x01 /* PIT channel 1 count/status */

When compiling U-Boot with ld.lld as the linker, the helloworld EFI app example fails to link:

LD lib/efi_loader/helloworld_efi.so ld.lld: error: section: .dynamic is not contiguous with other relro sections

LLD will always create RELRO program header regardless of target emulation, whereas BFD may automatically disable it for unsupported targets. Add -znorelro to disable it explicitly in all cases.

Signed-off-by: Alistair Delva adelva@google.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Nick Desaulniers ndesaulniers@google.com --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 07696e86bb..39f03398ed 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -403,7 +403,7 @@ $(obj)/%.efi: $(obj)/%_efi.so

quiet_cmd_efi_ld = LD $@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ - -Bsymbolic -s $^ -o $@ + -Bsymbolic -znorelro -s $^ -o $@

EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS)

Cap end of relocations by the binary size.

Linkers like to insert some auxiliary sections between .rela.dyn and .bss_start. These sections don't make their way to the final binary, but reloc_rela still tries to relocate them, resulting in attempted read past the end of file.

When linking U-Boot with ld.lld, the STATIC_RELA feature (enabled by default on arm64) breaks the build. After this patch, U-Boot can be linked successfully with and without CONFIG_STATIC_RELA.

Originally-from: Elena Petrova lenaptr@google.com Signed-off-by: Alistair Delva adelva@google.com Cc: David Brazdil dbrazdil@google.com Cc: Scott Wood scottwood@freescale.com Cc: Tom Rini trini@konsulko.com --- tools/relocate-rela.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c index 6a524014b7..f0bc548617 100644 --- a/tools/relocate-rela.c +++ b/tools/relocate-rela.c @@ -63,7 +63,7 @@ int main(int argc, char **argv) { FILE *f; int i, num; - uint64_t rela_start, rela_end, text_base; + uint64_t rela_start, rela_end, text_base, file_size;

if (argc != 5) { fprintf(stderr, "Statically apply ELF rela relocations\n"); @@ -87,8 +87,7 @@ int main(int argc, char **argv) return 3; }

- if (rela_start > rela_end || rela_start < text_base || - (rela_end - rela_start) % sizeof(Elf64_Rela)) { + if (rela_start > rela_end || rela_start < text_base) { fprintf(stderr, "%s: bad rela bounds\n", argv[0]); return 3; } @@ -96,6 +95,21 @@ int main(int argc, char **argv) rela_start -= text_base; rela_end -= text_base;

+ fseek(f, 0, SEEK_END); + file_size = ftell(f); + rewind(f); + + if (rela_end > file_size) { + // Most likely compiler inserted some section that didn't get + // objcopy-ed into the final binary + rela_end = file_size; + } + + if ((rela_end - rela_start) % sizeof(Elf64_Rela)) { + fprintf(stderr, "%s: rela size isn't a multiple of Elf64_Rela\n", argv[0]); + return 3; + } + num = (rela_end - rela_start) / sizeof(Elf64_Rela);

for (i = 0; i < num; i++) {

When booting U-Boot in crosvm, the virtual machine emulates a PCI cam device, not the PCI-E 'ecam' device normally seen on e.g. QEMU. This PCI device can be supported with only trivial changes to the ecam driver.

Instead of adding a completely new driver which is identical besides the initialization step, add support for the PCI version to the existing driver.

Signed-off-by: Alistair Delva adelva@google.com Cc: Tuomas Tynkkynen tuomas.tynkkynen@iki.fi Cc: Ram Muthiah rammuthiah@google.com --- drivers/pci/pcie_ecam_generic.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index e83e5aff20..c9b55b45a9 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -14,6 +14,8 @@

#include <asm/io.h>

+#define TYPE_PCI 0x1 + /** * struct generic_ecam_pcie - generic_ecam PCIe controller state * @cfg_base: The base address of memory mapped configuration space @@ -46,9 +48,16 @@ static int pci_generic_ecam_conf_address(const struct udevice *bus, void *addr;

addr = pcie->cfg_base; - addr += (PCI_BUS(bdf) - pcie->first_busno) << 20; - addr += PCI_DEV(bdf) << 15; - addr += PCI_FUNC(bdf) << 12; + + if (dev_get_driver_data(bus) == TYPE_PCI) { + addr += (PCI_BUS(bdf) - pcie->first_busno) << 16; + addr += PCI_DEV(bdf) << 11; + addr += PCI_FUNC(bdf) << 8; + } else { + addr += (PCI_BUS(bdf) - pcie->first_busno) << 20; + addr += PCI_DEV(bdf) << 15; + addr += PCI_FUNC(bdf) << 12; + } addr += offset; *paddress = addr;

@@ -158,7 +167,8 @@ static const struct dm_pci_ops pci_generic_ecam_ops = { };

static const struct udevice_id pci_generic_ecam_ids[] = { - { .compatible = "pci-host-ecam-generic" }, + { .compatible = "pci-host-ecam-generic" /* PCI-E */ }, + { .compatible = "pci-host-cam-generic", .data = TYPE_PCI }, { } };

On Wed, 20 Oct 2021 at 15:31, Alistair Delva adelva@google.com wrote:

Fix a warning seen when compiling this dts file.

Signed-off-by: Alistair Delva adelva@google.com Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com

---

arch/x86/dts/chromebook_coral.dts | 1 + 1 file changed, 1 insertion(+)

Reviewed-by: Simon Glass sjg@chromium.org

diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index f0caaacfee..69a1c1ce29 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -825,6 +825,7 @@ * Refer to EDS-Vol2-22.3 * [14:8] steps of delay for HS400, each 125ps * [6:0] steps of delay for SDR104/HS200, each 125ps

•    */
  
    /*
     * EMMC TX DATA Delay 2
  

-- 2.30.2