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

intel/82801dx,ix: Rename SMM_ASEG functions 

Static declarations for use with SMM_ASEG conflict those
declared globally for use with SMM_TSEG.

Change-Id: I8d2984cd8fe6208417b2eda0c10da8fc7bb76cf1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35892
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-08-16 08:05:52 +03:00 committed by Patrick Georgi
parent 799184397a
commit ead8a07cee
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/southbridge/intel/i82801dx/smi.c
View File

@ -235,7 +235,7 @@ static void smi_set_eos(void)
extern uint8_t smm_relocation_start, smm_relocation_end; extern uint8_t smm_relocation_start, smm_relocation_end;
static void *default_smm_area = NULL; static void *default_smm_area = NULL;
static void smm_relocate(void) static void aseg_smm_relocate(void)
{ {
u32 smi_en; u32 smi_en;
u16 pm1_en; u16 pm1_en;
@ -318,7 +318,7 @@ static void smm_relocate(void)
outb(0x00, 0xb2); outb(0x00, 0xb2);
} }
static void smm_install(void) static void aseg_smm_install(void)
{ {
/* copy the real SMM handler */ /* copy the real SMM handler */
memcpy((void *)0xa0000, _binary_smm_start, memcpy((void *)0xa0000, _binary_smm_start,
@ -329,10 +329,10 @@ static void smm_install(void)
void smm_init(void) void smm_init(void)
{ {
/* Put SMM code to 0xa0000 */ /* Put SMM code to 0xa0000 */
smm_install(); aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ /* Put relocation code to 0x38000 and relocate SMBASE */
smm_relocate(); aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ /* We're done. Make sure SMIs can happen! */
smi_set_eos(); smi_set_eos();

8
src/southbridge/intel/i82801ix/smi.c
View File

@ -45,7 +45,7 @@ static u16 pmbase = DEFAULT_PMBASE;
extern uint8_t smm_relocation_start, smm_relocation_end; extern uint8_t smm_relocation_start, smm_relocation_end;
static void *default_smm_area = NULL; static void *default_smm_area = NULL;
static void smm_relocate(void) static void aseg_smm_relocate(void)
{ {
u32 smi_en; u32 smi_en;
u16 pm1_en; u16 pm1_en;
@ -126,7 +126,7 @@ static void smm_relocate(void)
static int smm_handler_copied = 0; static int smm_handler_copied = 0;
static void smm_install(void) static void aseg_smm_install(void)
{ {
/* The first CPU running this gets to copy the SMM handler. But not all /* The first CPU running this gets to copy the SMM handler. But not all
* of them. * of them.
@ -158,10 +158,10 @@ static void smm_install(void)
void smm_init(void) void smm_init(void)
{ {
/* Put SMM code to 0xa0000 */ /* Put SMM code to 0xa0000 */
smm_install(); aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ /* Put relocation code to 0x38000 and relocate SMBASE */
smm_relocate(); aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ /* We're done. Make sure SMIs can happen! */
smi_set_eos(); smi_set_eos();