Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49250 )
Change subject: sb,soc/intel: Remove no-op APMC for C-state and P-state ......................................................................
sb,soc/intel: Remove no-op APMC for C-state and P-state
Change-Id: I3c1aa7f68eb03f04ddb9c1a5e960e3e2050a029c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/49250 Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/baytrail/smihandler.c M src/soc/intel/braswell/smihandler.c M src/soc/intel/broadwell/pch/smihandler.c M src/soc/intel/common/block/smm/smihandler.c M src/soc/intel/denverton_ns/smihandler.c M src/southbridge/intel/common/smihandler.c M src/southbridge/intel/i82801dx/smihandler.c M src/southbridge/intel/i82801gx/fadt.c M src/southbridge/intel/i82801ix/fadt.c M src/southbridge/intel/i82801jx/fadt.c M src/southbridge/intel/lynxpoint/smihandler.c 11 files changed, 0 insertions(+), 100 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/baytrail/smihandler.c b/src/soc/intel/baytrail/smihandler.c index 1a33444..41eeeda 100644 --- a/src/soc/intel/baytrail/smihandler.c +++ b/src/soc/intel/baytrail/smihandler.c @@ -283,20 +283,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: disable_pm1_control(SCI_EN); break; diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c index 7343d47..138dc33 100644 --- a/src/soc/intel/braswell/smihandler.c +++ b/src/soc/intel/braswell/smihandler.c @@ -262,20 +262,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: disable_pm1_control(SCI_EN); break; diff --git a/src/soc/intel/broadwell/pch/smihandler.c b/src/soc/intel/broadwell/pch/smihandler.c index 02c795e..c6632da 100644 --- a/src/soc/intel/broadwell/pch/smihandler.c +++ b/src/soc/intel/broadwell/pch/smihandler.c @@ -314,10 +314,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - break; - case APM_CNT_PST_CONTROL: - break; case APM_CNT_ACPI_DISABLE: disable_pm1_control(SCI_EN); break; diff --git a/src/soc/intel/common/block/smm/smihandler.c b/src/soc/intel/common/block/smm/smihandler.c index 4aed3f8..4625d34 100644 --- a/src/soc/intel/common/block/smm/smihandler.c +++ b/src/soc/intel/common/block/smm/smihandler.c @@ -333,20 +333,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* - * Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: pmc_disable_pm1_control(SCI_EN); break; diff --git a/src/soc/intel/denverton_ns/smihandler.c b/src/soc/intel/denverton_ns/smihandler.c index f00d921..68e8519 100644 --- a/src/soc/intel/denverton_ns/smihandler.c +++ b/src/soc/intel/denverton_ns/smihandler.c @@ -222,18 +222,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: disable_pm1_control(SCI_EN); break; diff --git a/src/southbridge/intel/common/smihandler.c b/src/southbridge/intel/common/smihandler.c index 07cd662..18f171d 100644 --- a/src/southbridge/intel/common/smihandler.c +++ b/src/southbridge/intel/common/smihandler.c @@ -277,18 +277,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: write_pmbase32(PM1_CNT, read_pmbase32(PM1_CNT) & ~SCI_EN); break; diff --git a/src/southbridge/intel/i82801dx/smihandler.c b/src/southbridge/intel/i82801dx/smihandler.c index d18f8b2..575d1ba 100644 --- a/src/southbridge/intel/i82801dx/smihandler.c +++ b/src/southbridge/intel/i82801dx/smihandler.c @@ -299,18 +299,6 @@
reg8 = apm_get_apmc(); switch (reg8) { - case APM_CNT_CST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: pmctrl = inl(pmbase + PM1_CNT); pmctrl &= ~SCI_EN; diff --git a/src/southbridge/intel/i82801gx/fadt.c b/src/southbridge/intel/i82801gx/fadt.c index 3be40b9..153ddea 100644 --- a/src/southbridge/intel/i82801gx/fadt.c +++ b/src/southbridge/intel/i82801gx/fadt.c @@ -20,8 +20,6 @@ fadt->smi_cmd = APM_CNT; fadt->acpi_enable = APM_CNT_ACPI_ENABLE; fadt->acpi_disable = APM_CNT_ACPI_DISABLE; - fadt->pstate_cnt = APM_CNT_PST_CONTROL; - fadt->cst_cnt = APM_CNT_CST_CONTROL; }
fadt->pm1a_evt_blk = pmbase; diff --git a/src/southbridge/intel/i82801ix/fadt.c b/src/southbridge/intel/i82801ix/fadt.c index b7da216..8a48f1b 100644 --- a/src/southbridge/intel/i82801ix/fadt.c +++ b/src/southbridge/intel/i82801ix/fadt.c @@ -16,8 +16,6 @@ fadt->smi_cmd = APM_CNT; fadt->acpi_enable = APM_CNT_ACPI_ENABLE; fadt->acpi_disable = APM_CNT_ACPI_DISABLE; - fadt->pstate_cnt = APM_CNT_PST_CONTROL; - fadt->cst_cnt = APM_CNT_CST_CONTROL; }
fadt->pm1a_evt_blk = pmbase; diff --git a/src/southbridge/intel/i82801jx/fadt.c b/src/southbridge/intel/i82801jx/fadt.c index fd55661..377b4d2 100644 --- a/src/southbridge/intel/i82801jx/fadt.c +++ b/src/southbridge/intel/i82801jx/fadt.c @@ -16,8 +16,6 @@ fadt->smi_cmd = APM_CNT; fadt->acpi_enable = APM_CNT_ACPI_ENABLE; fadt->acpi_disable = APM_CNT_ACPI_DISABLE; - fadt->pstate_cnt = APM_CNT_PST_CONTROL; - fadt->cst_cnt = APM_CNT_CST_CONTROL; }
fadt->pm1a_evt_blk = pmbase; diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c index 8af5356..e3b0f3c 100644 --- a/src/southbridge/intel/lynxpoint/smihandler.c +++ b/src/southbridge/intel/lynxpoint/smihandler.c @@ -277,18 +277,6 @@
chipset_finalized = 1; break; - case APM_CNT_CST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; - case APM_CNT_PST_CONTROL: - /* Calling this function seems to cause - * some kind of race condition in Linux - * and causes a kernel oops - */ - break; case APM_CNT_ACPI_DISABLE: disable_pm1_control(SCI_EN); break;
-
Kyösti Mälkki (Code Review)