GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lynxpoint: Consolidate common GNVS init 

Change-Id: Ie8e4fffcec308d1cd5e696605e78671f3ababf40
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7054
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Vladimir Serbinenko 2014-10-12 00:26:21 +02:00
parent b6200969ec
commit 1b409fd132
9 changed files with 13 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mainboard/google/bolt/acpi_tables.c
View File

@ -55,10 +55,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -79,16 +75,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
gnvs->chromeos.vbt2 = google_ec_running_ro() ? gnvs->chromeos.vbt2 = google_ec_running_ro() ?
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

10
src/mainboard/google/falco/acpi_tables.c
View File

@ -49,10 +49,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -73,16 +69,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
gnvs->chromeos.vbt2 = google_ec_running_ro() ? gnvs->chromeos.vbt2 = google_ec_running_ro() ?
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

10
src/mainboard/google/panther/acpi_tables.c
View File

@ -66,10 +66,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -90,16 +86,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
// SuperIO is always RO // SuperIO is always RO
gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

10
src/mainboard/google/peppy/acpi_tables.c
View File

@ -58,10 +58,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -82,16 +78,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
gnvs->chromeos.vbt2 = google_ec_running_ro() ? gnvs->chromeos.vbt2 = google_ec_running_ro() ?
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

10
src/mainboard/google/samus/acpi_tables.c
View File

@ -49,10 +49,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -73,16 +69,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
gnvs->chromeos.vbt2 = google_ec_running_ro() ? gnvs->chromeos.vbt2 = google_ec_running_ro() ?
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

10
src/mainboard/google/slippy/acpi_tables.c
View File

@ -55,10 +55,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -79,16 +75,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
gnvs->chromeos.vbt2 = google_ec_running_ro() ? gnvs->chromeos.vbt2 = google_ec_running_ro() ?
ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; ACTIVE_ECFW_RO : ACTIVE_ECFW_RW;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

9
src/mainboard/intel/baskingridge/acpi_tables.c
View File

@ -65,10 +65,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -92,15 +88,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
/* Emerald Lake has no EC (?) */ /* Emerald Lake has no EC (?) */
gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

9
src/mainboard/intel/wtm2/acpi_tables.c
View File

@ -65,10 +65,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs)
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;
gnvs->s3u1 = 1; gnvs->s3u1 = 1;
@ -89,15 +85,10 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
gnvs->did[4] = 0x00000005; gnvs->did[4] = 0x00000005;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
// TODO(reinauer) this could move elsewhere?
chromeos_init_vboot(&(gnvs->chromeos));
/* Emerald Lake has no EC (?) */ /* Emerald Lake has no EC (?) */
gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO;
#endif #endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_update_thermal_table(gnvs); acpi_update_thermal_table(gnvs);
} }

13
src/southbridge/intel/lynxpoint/lpc.c
View File

@ -756,7 +756,20 @@ static void southbridge_inject_dsdt(void)
if (gnvs) { if (gnvs) {
int scopelen; int scopelen;
acpi_create_gnvs(gnvs); acpi_create_gnvs(gnvs);
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
#if CONFIG_CHROMEOS
chromeos_init_vboot(&(gnvs->chromeos));
#endif
/* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
acpi_save_gnvs((unsigned long)gnvs); acpi_save_gnvs((unsigned long)gnvs);
/* And tell SMI about it */ /* And tell SMI about it */
smm_setup_structures(gnvs, NULL, NULL); smm_setup_structures(gnvs, NULL, NULL);