Skip to content

Commit 32fc31b

Browse files
committed
patches/coreboot-t480/85278-post-skylake-pr0.patch: remove xeon bits we are not interested into which are conflicting against coreboot upstream commit 2f1e4e5e8515dd350cc9d68b48d32a5b6b02ae6a
Signed-off-by: Thierry Laurion <[email protected]>
1 parent 7f673d4 commit 32fc31b

File tree

1 file changed

+0
-48
lines changed

1 file changed

+0
-48
lines changed

patches/coreboot-t480/85278-post-skylake-pr0.patch

-48
Original file line numberDiff line numberDiff line change
@@ -424,54 +424,6 @@ index cd02745a9e..158b2fb691 100644
424424
tbt_finalize();
425425
if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT))
426426
heci1_disable();
427-
diff --git a/src/soc/intel/xeon_sp/finalize.c b/src/soc/intel/xeon_sp/finalize.c
428-
index a7b3602744..f0cd8a1998 100644
429-
--- a/src/soc/intel/xeon_sp/finalize.c
430-
+++ b/src/soc/intel/xeon_sp/finalize.c
431-
@@ -59,7 +59,8 @@ static void soc_finalize(void *unused)
432-
if (!CONFIG(USE_PM_ACPI_TIMER))
433-
setbits8(pmc_mmio_regs() + PCH_PWRM_ACPI_TMR_CTL, ACPI_TIM_DIS);
434-
435-
- apm_control(APM_CNT_FINALIZE);
436-
+ if (CONFIG(INTEL_CHIPSET_LOCKDOWN) || acpi_is_wakeup_s3())
437-
+ apm_control(APM_CNT_FINALIZE);
438-
439-
if (CONFIG_MAX_SOCKET > 1) {
440-
/* This MSR is package scope but run for all cpus for code simplicity */
441-
diff --git a/src/soc/intel/xeon_sp/lockdown.c b/src/soc/intel/xeon_sp/lockdown.c
442-
index a3d17b46c3..51a5cf5431 100644
443-
--- a/src/soc/intel/xeon_sp/lockdown.c
444-
+++ b/src/soc/intel/xeon_sp/lockdown.c
445-
@@ -6,25 +6,15 @@
446-
#include <soc/lockdown.h>
447-
#include <soc/pm.h>
448-
449-
-static void lpc_lockdown_config(void)
450-
-{
451-
- /* Set BIOS Interface Lock, BIOS Lock */
452-
- lpc_set_bios_interface_lock_down();
453-
-
454-
- /* Only allow writes in SMM */
455-
- if (CONFIG(BOOTMEDIA_SMM_BWP)) {
456-
- lpc_set_eiss();
457-
- lpc_enable_wp();
458-
- }
459-
- lpc_set_lock_enable();
460-
-}
461-
-
462-
void soc_lockdown_config(int chipset_lockdown)
463-
{
464-
if (chipset_lockdown == CHIPSET_LOCKDOWN_FSP)
465-
return;
466-
467-
- lpc_lockdown_config();
468-
+ if (!CONFIG(SOC_INTEL_COMMON_SPI_LOCKDOWN_SMM))
469-
+ /* LPC/eSPI lock down configuration */
470-
+ lpc_lockdown_config(chipset_lockdown);
471-
+
472-
pmc_lockdown_config();
473-
sata_lockdown_config(chipset_lockdown);
474-
spi_lockdown_config(chipset_lockdown);
475427
--
476428
2.39.5
477429

0 commit comments

Comments
 (0)