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

soc/intel/quark: Don't use CAR_GLOBAL

Browse Source 
This soc has NO_CAR_GLOBAL_MIGRATION and does not require CAR_GLOBAL
and car_get/set_x.

Change-Id: I4e2c1c5766e3bcdd4763b42fb925074f7ccd7002
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32998
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans
2019-05-25 09:57:27 +02:00
committed by Patrick Georgi
parent 6e11908128
commit 84e22e37e8
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/soc/intel/quark/romstage/fsp2_0.c
View File

@ -13,7 +13,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h> #include <arch/symbols.h>
#include <console/console.h> #include <console/console.h>
#include <cbmem.h> #include <cbmem.h>
#include "../chip.h" #include "../chip.h"
@ -85,20 +85,19 @@ asmlinkage void car_stage_c_entry(void)
run_postcar_phase(&pcf); run_postcar_phase(&pcf);
} }
static struct chipset_power_state power_state CAR_GLOBAL; static struct chipset_power_state power_state;
struct chipset_power_state *get_power_state(void) struct chipset_power_state *get_power_state(void)
{ {
return (struct chipset_power_state *)car_get_var_ptr(&power_state); return &power_state;
} }
int fill_power_state(void) int fill_power_state(void)
{ {
struct chipset_power_state *ps = get_power_state(); power_state.prev_sleep_state = 0;
printk(BIOS_SPEW, "prev_sleep_state %d\n",
ps->prev_sleep_state = 0; power_state.prev_sleep_state);
printk(BIOS_SPEW, "prev_sleep_state %d\n", ps->prev_sleep_state); return power_state.prev_sleep_state;
return ps->prev_sleep_state;
} }
void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version) void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version)

1
src/soc/intel/quark/romstage/romstage.c
View File

@ -14,7 +14,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h>
#include <cbfs.h> #include <cbfs.h>
#include <console/console.h> #include <console/console.h>
#include <fsp/util.h> #include <fsp/util.h>

15
src/soc/intel/quark/storage_test.c
View File

@ -13,7 +13,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <assert.h> #include <assert.h>
#include <cbmem.h> #include <cbmem.h>
@ -29,13 +28,13 @@
#include <string.h> #include <string.h>
#if CONFIG(STORAGE_LOG) #if CONFIG(STORAGE_LOG)
struct log_entry log[LOG_ENTRIES] CAR_GLOBAL; struct log_entry log[LOG_ENTRIES];
uint8_t log_index CAR_GLOBAL; uint8_t log_index;
int log_full CAR_GLOBAL; int log_full;
long log_start_time CAR_GLOBAL; long log_start_time;
#endif #endif
static uint8_t drivers_storage[256] CAR_GLOBAL; static uint8_t drivers_storage[256];
#define STORAGE_DEBUG BIOS_DEBUG #define STORAGE_DEBUG BIOS_DEBUG
#define LOG_DEBUG (CONFIG(STORAGE_LOG) ? STORAGE_DEBUG : BIOS_NEVER) #define LOG_DEBUG (CONFIG(STORAGE_LOG) ? STORAGE_DEBUG : BIOS_NEVER)
@ -175,7 +174,7 @@ void storage_test(uint32_t bar, int full_initialization)
/* Get the structure addresses */ /* Get the structure addresses */
media = NULL; media = NULL;
if (ENV_ROMSTAGE) if (ENV_ROMSTAGE)
media = car_get_var_ptr(drivers_storage); media = (struct storage_media *)drivers_storage;
else else
media = cbmem_find(CBMEM_ID_STORAGE_DATA); media = cbmem_find(CBMEM_ID_STORAGE_DATA);
sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7); sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7);
@ -255,7 +254,7 @@ static void copy_storage_structures(int is_recovery)
sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7); sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7);
/* Migrate the data into CBMEM */ /* Migrate the data into CBMEM */
memcpy(media, car_get_var_ptr(drivers_storage), size); memcpy(media, drivers_storage, size);
media->ctrlr = &sdhci_ctrlr->sd_mmc_ctrlr; media->ctrlr = &sdhci_ctrlr->sd_mmc_ctrlr;
} }