Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35892 )
Change subject: intel/82801dx,ix: Rename SMM_ASEG functions ......................................................................
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 --- M src/southbridge/intel/i82801dx/smi.c M src/southbridge/intel/i82801ix/smi.c 2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/35892/1
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c index 521b98d..dc53220 100644 --- a/src/southbridge/intel/i82801dx/smi.c +++ b/src/southbridge/intel/i82801dx/smi.c @@ -235,7 +235,7 @@ extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL;
-static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -318,7 +318,7 @@ outb(0x00, 0xb2); }
-static void smm_install(void) +static void aseg_smm_install(void) { /* copy the real SMM handler */ memcpy((void *)0xa0000, _binary_smm_start, @@ -329,10 +329,10 @@ void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ smi_set_eos(); diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c index 0a80dd2..5f73f41 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -45,7 +45,7 @@ extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL;
-static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -126,7 +126,7 @@
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 * of them. @@ -158,10 +158,10 @@ void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ smi_set_eos();
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35892 )
Change subject: intel/82801dx,ix: Rename SMM_ASEG functions ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35892 )
Change subject: intel/82801dx,ix: Rename SMM_ASEG functions ......................................................................
Patch Set 2:
OT: Do we need to maintain SMM_ASEG option for QEMU? Currently, it might be blocking PARALLEL_MP?
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35892 )
Change subject: intel/82801dx,ix: Rename SMM_ASEG functions ......................................................................
Patch Set 2:
Patch Set 2:
OT: Do we need to maintain SMM_ASEG option for QEMU? Currently, it might be blocking PARALLEL_MP?
I never really looked into TSEG on qemu-Q35, but it seems to be implemented so PARALLEL_MP + SMM_TSEG should be a (desirable) option.
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35892 )
Change subject: intel/82801dx,ix: Rename SMM_ASEG functions ......................................................................
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 --- M src/southbridge/intel/i82801dx/smi.c M src/southbridge/intel/i82801ix/smi.c 2 files changed, 8 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c index 521b98d..dc53220 100644 --- a/src/southbridge/intel/i82801dx/smi.c +++ b/src/southbridge/intel/i82801dx/smi.c @@ -235,7 +235,7 @@ extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL;
-static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -318,7 +318,7 @@ outb(0x00, 0xb2); }
-static void smm_install(void) +static void aseg_smm_install(void) { /* copy the real SMM handler */ memcpy((void *)0xa0000, _binary_smm_start, @@ -329,10 +329,10 @@ void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ smi_set_eos(); diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c index 0a80dd2..5f73f41 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -45,7 +45,7 @@ extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL;
-static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -126,7 +126,7 @@
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 * of them. @@ -158,10 +158,10 @@ void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install();
/* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate();
/* We're done. Make sure SMIs can happen! */ smi_set_eos();
-
Arthur Heymans (Code Review) -
Kyösti Mälkki (Code Review)
-
Patrick Georgi (Code Review)