diff options
| author | Tim Van Patten <timvp@google.com> | 2022-09-13 14:37:32 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-09-15 17:58:07 +0000 |
| commit | 54ce4aa98cf55f0715670be4f592a39adcf82328 (patch) | |
| tree | d4c75d9f3b7821154530021ee6d966bbac68dfc8 /src | |
| parent | 56776a1ab39333c791903e0a7e79e8fb51d3162d (diff) | |
zork: Control DPTC with only Kconfig
Moving the config value SOC_AMD_COMMON_BLOCK_ACPI_DPTC to
soc/amd/picasso/Kconfig and conditionally enabling it for only Morphius
boards makes the value dptc_tablet_mode_enable redundant.
This CL removes dptc_tablet_mode_enable so DPTC is controlled entirely
with the Kconfig value SOC_AMD_COMMON_BLOCK_ACPI_DPTC. This means DPTC
is only included for boards that actually enable it.
BRANCH=none
BUG=b:217911928
TEST=Build zork
Signed-off-by: Tim Van Patten <timvp@google.com>
Change-Id: Ic54a9bb491234088be8184bec8b09e2e31ffa298
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67635
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/zork/variants/morphius/overridetree.cb | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/chip.h | 3 | ||||
| -rw-r--r-- | src/soc/amd/picasso/root_complex.c | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb index 48747c4dfa..60634308bb 100644 --- a/src/mainboard/google/zork/variants/morphius/overridetree.cb +++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb @@ -30,7 +30,6 @@ chip soc/amd/picasso register "telemetry_vddcr_soc_offset" = "0" # Set STAPM confiuration for tablet mode - register "dptc_tablet_mode_enable" = "true" register "slow_ppt_limit_tablet_mode_mW" = "20000" register "fast_ppt_limit_tablet_mode_mW" = "24000" register "sustained_power_limit_tablet_mode_mW" = "12000" diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h index 7ff36fcde2..3320350ee1 100644 --- a/src/soc/amd/picasso/chip.h +++ b/src/soc/amd/picasso/chip.h @@ -117,9 +117,6 @@ struct soc_amd_picasso_config { uint32_t stapm_time_constant_s; uint32_t sustained_power_limit_mW; - /* Enable dptc tablet mode */ - bool dptc_tablet_mode_enable; - /* STAPM Configuration for tablet mode */ uint32_t fast_ppt_limit_tablet_mode_mW; uint32_t slow_ppt_limit_tablet_mode_mW; diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index afa8565515..2fe8a217a6 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -184,10 +184,7 @@ static void acipgen_dptci(void) { const struct soc_amd_picasso_config *config = config_of_soc(); - if (!config->dptc_tablet_mode_enable) - return; - - /* DPTC is enabled. Always fill out the default DPTC values. */ + /* Normal mode DPTC values. */ struct dptc_input default_input = DPTC_INPUTS(config->thermctl_limit_degreeC, config->sustained_power_limit_mW, config->fast_ppt_limit_mW, @@ -207,7 +204,8 @@ static void acipgen_dptci(void) static void root_complex_fill_ssdt(const struct device *device) { acpi_fill_root_complex_tom(device); - acipgen_dptci(); + if (CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC)) + acipgen_dptci(); } static const char *gnb_acpi_name(const struct device *dev) |