From 50139d00bd5fdec1764c80fda846ecc1efcbfa5d Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Thu, 1 Dec 2022 15:07:51 -0700 Subject: lib: Hook up libhwbase in romstage It's hidden behind the configuration option `CONFIG_ROMSTAGE_LIBHWBASE'. This also adds some glue code to use the coreboot console for debug output and our monotonic timer framework as timer backend. Running Ada code in romstage and more particular libhwbase brings a few challenges as global initialized variables are not supported in Cache-As-Ram mode. 1. The libhwbase dynamic mmio driver implementation makes the Gnat compiler generate some global initialized variables. For this reason, when compiled for romstage or for romstage and ramstage the static mmio driver is enforced (`HWBASE_STATIC_MMIO'). 2. The Gnat compiler generates elaboration functions to initialize program data at runtime. These elaboration functions are called by the romstage_adainit() function. The data references symbols suffixed by `_E'. Even though these symbols, at compilation time, do not contain any data and are filled with zeros, the Gnat compiler installs them in the .data section. Since these symbols are actually filled with zeros, it is safe to install them in the .bss section. cf. https://docs.adacore.com/gnat_ugn-docs/html/gnat_ugn/gnat_ugn/elaboration_order_handling_in_gnat.html#elaboration-code This patch requires the libhwbase https://review.coreboot.org/c/libhwbase/+/69854 CL. BUG=b:252792591 BRANCH=firmware-brya-14505.B TEST=libhwbae compiles for romstage and loads successfully Change-Id: I670249d33506e886a683e55d1589cb2bf9b16aa3 Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/70275 Reviewed-by: Boris Mittelberg Reviewed-by: Nick Vaccaro Reviewed-by: Tarun Tuli Reviewed-by: Zhixing Ma Tested-by: build bot (Jenkins) --- src/lib/Makefile.inc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/lib/Makefile.inc') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 3e5b151b13..dcba0c61db 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -342,28 +342,34 @@ $(obj)/%.elf.rmod: $(obj)/%.elf | $(RMODTOOL) romstage-$(CONFIG_ROMSTAGE_ADA) += cb.ads ramstage-$(CONFIG_RAMSTAGE_ADA) += cb.ads -ifeq ($(CONFIG_RAMSTAGE_LIBHWBASE),y) +ifneq (,$(filter y, $(CONFIG_RAMSTAGE_LIBHWBASE) $(CONFIG_ROMSTAGE_LIBHWBASE))) to-ada-hex = $(eval $(1) := 16\\\#$(patsubst 0x%,%,$($(1)))\\\#) $(call to-ada-hex,CONFIG_HWBASE_DEFAULT_MMCONF) +libhwbase-stages = $(foreach stage, romstage ramstage, \ + $(if $(filter y,$(CONFIG_$(call toupper,$(stage))_LIBHWBASE)),$(stage))) + $(call add-special-class,hw) -hw-handler = $(eval ramstage-srcs += $$(addprefix $(1),$(2))) +hw-handler +=$(foreach stage, $(libhwbase-stages), \ + $(eval $(stage)-srcs += $$(addprefix $(1),$(2)))) $(call add-special-class,hw-gen) hw-gen-handler = \ $(eval additional-dirs += $(dir $(2))) \ - $(eval ramstage-srcs += $(2)) \ - $(eval ramstage-ads-deps += $(2)) \ - $(eval ramstage-adb-deps += $(2)) \ + $(foreach stage, $(libhwbase-stages), \ + $(eval $(stage)-srcs += $(2)) \ + $(eval $(stage)-ads-deps += $(2)) \ + $(eval $(stage)-adb-deps += $(2))) \ $(eval $(2): $(obj)/config.h) subdirs-y += ../../3rdparty/libhwbase -ramstage-$(CONFIG_HAVE_MONOTONIC_TIMER) += hw-time-timer.adb +$(foreach stage,$(libhwbase-stages), \ + $(eval $(stage)-$(CONFIG_HAVE_MONOTONIC_TIMER) += hw-time-timer.adb)) -endif # CONFIG_RAMSTAGE_LIBHWBASE +endif # CONFIG_ROMSTAGE_LIBHWBASE || CONFIG_RAMSTAGE_LIBHWBASE romstage-y += spd_bin.c -- cgit v1.2.3