From c6a593bc3e7e7aa8c833bc9955ae6e637b493333 Mon Sep 17 00:00:00 2001 From: Tim Wawrzynczak Date: Tue, 14 Jul 2020 13:19:03 -0600 Subject: drivers/intel/dptf: Add missing scope operator around TSR options The previous DPTF patch train missed the proper scope operator around all of the TSR options. Without this, the optional GTSH and/or _STR Methods end up in the wrong scope. Signed-off-by: Tim Wawrzynczak Change-Id: I9298c442c047c5f7f606574d900057a7c004b47f Reviewed-on: https://review.coreboot.org/c/coreboot/+/43458 Reviewed-by: Karthik Ramasubramanian Tested-by: build bot (Jenkins) --- src/drivers/intel/dptf/dptf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/drivers/intel/dptf/dptf.c') diff --git a/src/drivers/intel/dptf/dptf.c b/src/drivers/intel/dptf/dptf.c index 4bc6b082a4..a13f6d0443 100644 --- a/src/drivers/intel/dptf/dptf.c +++ b/src/drivers/intel/dptf/dptf.c @@ -215,9 +215,12 @@ static void write_options(const struct drivers_intel_dptf_config *config) /* TSR options */ for (p = DPTF_TEMP_SENSOR_0, i = 0; p <= DPTF_TEMP_SENSOR_3; ++p, ++i) { - if (is_participant_used(config, p)) { + if (is_participant_used(config, p) && (config->options.tsr[i].hysteresis || + config->options.tsr[i].desc)) { + dptf_write_scope(p); dptf_write_tsr_hysteresis(config->options.tsr[i].hysteresis); dptf_write_STR(config->options.tsr[i].desc); + acpigen_pop_len(); /* Scope */ } } } -- cgit v1.2.3