Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34151 )
Change subject: cpu/x86: Move smm_lock() prototype ......................................................................
cpu/x86: Move smm_lock() prototype
The function implementations are in local platform scopes.
Change-Id: I7a3025398b15fe6d2c5a13cdb65f3e62a49c0bc6 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/include/arch/cpu.h M src/cpu/intel/haswell/haswell.h M src/cpu/intel/smm/gen1/smi.h M src/soc/intel/broadwell/include/soc/smm.h M src/soc/intel/cannonlake/include/soc/smm.h M src/soc/intel/fsp_broadwell_de/include/soc/smm.h M src/soc/intel/icelake/include/soc/smm.h M src/soc/intel/skylake/include/soc/smm.h M src/southbridge/intel/i82801ix/i82801ix.h 9 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/34151/1
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 38066c1..b6255ec 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -203,9 +203,10 @@ unsigned int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void);
+/* Only with !PARALLEL_MP. */ void smm_init(void); void smm_init_completion(void); -void smm_lock(void); + void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
static inline bool cpu_is_amd(void) diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index 4ebbe18..cd8d5cb 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -166,6 +166,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void); struct bus; void bsp_init_and_start_aps(struct bus *cpu_bus); /* Determine if HyperThreading is disabled. The variable is not valid until diff --git a/src/cpu/intel/smm/gen1/smi.h b/src/cpu/intel/smm/gen1/smi.h index 05c507c..3d5149a 100644 --- a/src/cpu/intel/smm/gen1/smi.h +++ b/src/cpu/intel/smm/gen1/smi.h @@ -31,3 +31,4 @@ void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase); void smm_relocate(void); +void smm_lock(void); diff --git a/src/soc/intel/broadwell/include/soc/smm.h b/src/soc/intel/broadwell/include/soc/smm.h index 75e7833..d3e1cdd 100644 --- a/src/soc/intel/broadwell/include/soc/smm.h +++ b/src/soc/intel/broadwell/include/soc/smm.h @@ -59,6 +59,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
/* These helpers are for performing SMM relocation. */ void southbridge_trigger_smi(void); diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h index e1c819b..c0ab82f 100644 --- a/src/soc/intel/cannonlake/include/soc/smm.h +++ b/src/soc/intel/cannonlake/include/soc/smm.h @@ -56,5 +56,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h index 505feaf..72aa7fa 100644 --- a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h +++ b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h @@ -60,6 +60,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
/* These helpers are for performing SMM relocation. */ void southbridge_trigger_smi(void); diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h index 3c66f57..991c593 100644 --- a/src/soc/intel/icelake/include/soc/smm.h +++ b/src/soc/intel/icelake/include/soc/smm.h @@ -55,5 +55,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h index 7114a80..0c5e976 100644 --- a/src/soc/intel/skylake/include/soc/smm.h +++ b/src/soc/intel/skylake/include/soc/smm.h @@ -54,5 +54,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h index 421a101..7824180 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.h +++ b/src/southbridge/intel/i82801ix/i82801ix.h @@ -212,6 +212,8 @@ } #define LPC_IS_MOBILE(dev) lpc_is_mobile(pci_read_config16(dev, PCI_DEVICE_ID))
+void smm_lock(void); + #if defined(__PRE_RAM__) void enable_smbus(void); int smbus_read_byte(unsigned device, unsigned address);
Hello Patrick Rudolph, Philipp Deppenwiese, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34151
to look at the new patch set (#2).
Change subject: cpu/x86: Move smm_lock() prototype ......................................................................
cpu/x86: Move smm_lock() prototype
The function implementations are in local platform scopes.
Change-Id: I7a3025398b15fe6d2c5a13cdb65f3e62a49c0bc6 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/include/arch/cpu.h M src/cpu/intel/haswell/haswell.h M src/cpu/intel/smm/gen1/smi.h M src/soc/intel/broadwell/include/soc/smm.h M src/soc/intel/cannonlake/include/soc/smm.h M src/soc/intel/fsp_broadwell_de/include/soc/smm.h M src/soc/intel/icelake/include/soc/smm.h M src/soc/intel/skylake/include/soc/smm.h 8 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/34151/2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34151 )
Change subject: cpu/x86: Move smm_lock() prototype ......................................................................
Patch Set 2: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34151 )
Change subject: cpu/x86: Move smm_lock() prototype ......................................................................
Patch Set 3: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/34151/3/src/arch/x86/include/arch/c... File src/arch/x86/include/arch/cpu.h:
https://review.coreboot.org/c/coreboot/+/34151/3/src/arch/x86/include/arch/c... PS3, Line 209: Minor: could drop empty line
Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34151 )
Change subject: cpu/x86: Move smm_lock() prototype ......................................................................
cpu/x86: Move smm_lock() prototype
The function implementations are in local platform scopes.
Change-Id: I7a3025398b15fe6d2c5a13cdb65f3e62a49c0bc6 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34151 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Furquan Shaikh furquan@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/arch/x86/include/arch/cpu.h M src/cpu/intel/haswell/haswell.h M src/cpu/intel/smm/gen1/smi.h M src/soc/intel/broadwell/include/soc/smm.h M src/soc/intel/cannonlake/include/soc/smm.h M src/soc/intel/fsp_broadwell_de/include/soc/smm.h M src/soc/intel/icelake/include/soc/smm.h M src/soc/intel/skylake/include/soc/smm.h 8 files changed, 9 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 32717ba..293ca02 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -203,9 +203,10 @@ unsigned int cpu_cpuid_extended_level(void); int cpu_have_cpuid(void);
+/* Only with !PARALLEL_MP. */ void smm_init(void); void smm_init_completion(void); -void smm_lock(void); + void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
static inline bool cpu_is_amd(void) diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h index 4ebbe18..cd8d5cb 100644 --- a/src/cpu/intel/haswell/haswell.h +++ b/src/cpu/intel/haswell/haswell.h @@ -166,6 +166,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void); struct bus; void bsp_init_and_start_aps(struct bus *cpu_bus); /* Determine if HyperThreading is disabled. The variable is not valid until diff --git a/src/cpu/intel/smm/gen1/smi.h b/src/cpu/intel/smm/gen1/smi.h index 05c507c..3d5149a 100644 --- a/src/cpu/intel/smm/gen1/smi.h +++ b/src/cpu/intel/smm/gen1/smi.h @@ -31,3 +31,4 @@ void smm_relocation_handler(int cpu, uintptr_t curr_smbase, uintptr_t staggered_smbase); void smm_relocate(void); +void smm_lock(void); diff --git a/src/soc/intel/broadwell/include/soc/smm.h b/src/soc/intel/broadwell/include/soc/smm.h index 75e7833..d3e1cdd 100644 --- a/src/soc/intel/broadwell/include/soc/smm.h +++ b/src/soc/intel/broadwell/include/soc/smm.h @@ -59,6 +59,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
/* These helpers are for performing SMM relocation. */ void southbridge_trigger_smi(void); diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h index e1c819b..c0ab82f 100644 --- a/src/soc/intel/cannonlake/include/soc/smm.h +++ b/src/soc/intel/cannonlake/include/soc/smm.h @@ -56,5 +56,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h index 505feaf..72aa7fa 100644 --- a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h +++ b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h @@ -60,6 +60,7 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
/* These helpers are for performing SMM relocation. */ void southbridge_trigger_smi(void); diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h index 3c66f57..991c593 100644 --- a/src/soc/intel/icelake/include/soc/smm.h +++ b/src/soc/intel/icelake/include/soc/smm.h @@ -55,5 +55,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h index 7114a80..0c5e976 100644 --- a/src/soc/intel/skylake/include/soc/smm.h +++ b/src/soc/intel/skylake/include/soc/smm.h @@ -54,5 +54,6 @@ size_t *smm_save_state_size); void smm_initialize(void); void smm_relocate(void); +void smm_lock(void);
#endif
-
Angel Pons (Code Review) -
Furquan Shaikh (Code Review)
-
Kyösti Mälkki (Code Review)