From 39363744cc76a793ab429c039ff5c75e56c3b368 Mon Sep 17 00:00:00 2001 From: Bora Guvendik Date: Thu, 8 Mar 2018 16:21:12 -0800 Subject: commonlib/storage: Make pci sdhci code compile in romstage In romstage malloc is not available, so use CAR_GLOBAL variable instead. BUG=b:78106689 TEST=Boot to OS Change-Id: If9438d0b707c6ffaa61db80bd1d385112bc91cfc Signed-off-by: Bora Guvendik Reviewed-on: https://review.coreboot.org/25067 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/commonlib/storage/pci_sdhci.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c index 329b652abb..5ecd89b477 100644 --- a/src/commonlib/storage/pci_sdhci.c +++ b/src/commonlib/storage/pci_sdhci.c @@ -18,12 +18,13 @@ #define __SIMPLE_DEVICE__ 1 #endif +#include #include #include #include #include "sd_mmc.h" +#include #include "storage.h" -#include /* Initialize an SDHCI port */ int sdhci_controller_init(struct sdhci_ctrlr *sdhci_ctrlr, void *ioaddr) @@ -35,17 +36,22 @@ int sdhci_controller_init(struct sdhci_ctrlr *sdhci_ctrlr, void *ioaddr) struct sd_mmc_ctrlr *new_mem_sdhci_controller(void *ioaddr) { - struct sdhci_ctrlr *sdhci_ctrlr; + static bool sdhci_init_done CAR_GLOBAL; + static struct sdhci_ctrlr sdhci_ctrlr CAR_GLOBAL; - sdhci_ctrlr = malloc(sizeof(*sdhci_ctrlr)); - if (sdhci_ctrlr == NULL) + if (car_get_var(sdhci_init_done) == true) { + sdhc_error("Error: SDHCI is already initialized.\n"); return NULL; + } - if (sdhci_controller_init(sdhci_ctrlr, ioaddr)) { - free(sdhci_ctrlr); - sdhci_ctrlr = NULL; + if (sdhci_controller_init(car_get_var_ptr(&sdhci_ctrlr), ioaddr)) { + sdhc_error("Error: SDHCI initialization failed.\n"); + return NULL; } - return &sdhci_ctrlr->sd_mmc_ctrlr; + + car_set_var(sdhci_init_done, true); + + return car_get_var_ptr(&sdhci_ctrlr.sd_mmc_ctrlr); } struct sd_mmc_ctrlr *new_pci_sdhci_controller(uint32_t dev) -- cgit v1.2.3