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

fsp_baytrail: Remove use of BAYTRAIL_SMM Kconfig symbol 

The symbol BAYTRAIL_SMM was never valid (there's no config statment
initializing the symbol), but it was being selected and used
in the code.

Now that SMM is supported in fsp_baytrail, the code it was trying
to switch can be removed, and just set up for SMM.

Change-Id: I0fd4865a951734e728500e7baf593ff7eb556f73
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12553
Tested-by: build bot (Jenkins)
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Ben Gardner <gardner.ben@gmail.com>
This commit is contained in:
Martin Roth 2015-11-26 17:46:45 -07:00
parent 4013469c50
commit bd88fa0ef6
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/fsp_baytrail/Kconfig
View File

@ -35,7 +35,6 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_MP select PARALLEL_MP
select REG_SCRIPT select REG_SCRIPT
select SMM_TSEG select SMM_TSEG
select BAYTRAIL_SMM
select SMP select SMP
select SPI_FLASH select SPI_FLASH
select SSE2 select SSE2

11
src/soc/intel/fsp_baytrail/acpi.c
View File

@ -22,6 +22,7 @@
#include <arch/acpigen.h> #include <arch/acpigen.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/smm.h>
#include <cpu/intel/speedstep.h> #include <cpu/intel/speedstep.h>
#include <cpu/intel/turbo.h> #include <cpu/intel/turbo.h>
#include <arch/smp/mpspec.h> #include <arch/smp/mpspec.h>
@ -208,18 +209,10 @@ void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
/* System Management */ /* System Management */
fadt->sci_int = acpi_sci_irq(); fadt->sci_int = acpi_sci_irq();
#if IS_ENABLED(CONFIG_BAYTRAIL_SMM)
fadt->smi_cmd = APM_CNT; fadt->smi_cmd = APM_CNT;
fadt->acpi_enable = APM_CNT_ACPI_ENABLE; fadt->acpi_enable = APM_CNT_ACPI_ENABLE;
fadt->acpi_disable = APM_CNT_ACPI_DISABLE; fadt->acpi_disable = APM_CNT_ACPI_DISABLE;
#else
fadt->smi_cmd = 0x00; /* disable SMM */
fadt->acpi_enable = 0x00; /* unused if SMI_CMD = 0 */
fadt->acpi_disable = 0x00; /* unused if SMI_CMD = 0 */
/* Enable ACPI */
outl(inl(pmbase + 4) | 0x01, pmbase + 4);
#endif
/* Power Control */ /* Power Control */
fadt->s4bios_req = 0x00; fadt->s4bios_req = 0x00;