sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commonlib/storage: Make pci sdhci code compile in romstage

Browse Source 
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 <bora.guvendik@intel.com>
Reviewed-on: https://review.coreboot.org/25067
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Bora Guvendik
2018-03-08 16:21:12 -08:00
committed by Patrick Georgi
parent 4356e09235
commit 39363744cc
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/commonlib/storage/pci_sdhci.c
View File

@ -18,12 +18,13 @@
#define __SIMPLE_DEVICE__ 1 #define __SIMPLE_DEVICE__ 1
#endif #endif
#include <arch/early_variables.h>
#include <assert.h> #include <assert.h>
#include <commonlib/sdhci.h> #include <commonlib/sdhci.h>
#include <device/pci.h> #include <device/pci.h>
#include "sd_mmc.h" #include "sd_mmc.h"
#include <stdint.h>
#include "storage.h" #include "storage.h"
#include <string.h>
/* Initialize an SDHCI port */ /* Initialize an SDHCI port */
int sdhci_controller_init(struct sdhci_ctrlr *sdhci_ctrlr, void *ioaddr) 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 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 (car_get_var(sdhci_init_done) == true) {
if (sdhci_ctrlr == NULL) sdhc_error("Error: SDHCI is already initialized.\n");
return NULL; return NULL;
if (sdhci_controller_init(sdhci_ctrlr, ioaddr)) {
free(sdhci_ctrlr);
sdhci_ctrlr = NULL;
} }
return &sdhci_ctrlr->sd_mmc_ctrlr;
if (sdhci_controller_init(car_get_var_ptr(&sdhci_ctrlr), ioaddr)) {
sdhc_error("Error: SDHCI initialization failed.\n");
return NULL;
}
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) struct sd_mmc_ctrlr *new_pci_sdhci_controller(uint32_t dev)