[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: Always add PM1_TMR block to FADT

[Duncan Laurie (Code Review)]

Duncan Laurie has uploaded this change for review. ( https://review.coreboot.org/23510

Change subject: soc/intel/skylake: Always add PM1_TMR block to FADT
......................................................................

soc/intel/skylake: Always add PM1_TMR block to FADT

Provide the PM1_TMR information in the FADT even if PmTimerDisabled is
set because PM timer emulation is enabled via MSR 121h so the timer will
still work and can be used by things like Tianocore and Windows.

Change-Id: I78e435c34dd4e6241d345c4d07470621ea051fb8
Signed-off-by: Duncan Laurie 
---
M src/soc/intel/skylake/acpi.c
1 file changed, 8 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/23510/1

diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 61360da..0839927 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -247,16 +247,14 @@
    fadt->pm1a_cnt_blk = pmbase + PM1_CNT;
    fadt->pm1b_cnt_blk = 0x0;
    fadt->pm2_cnt_blk = pmbase + PM2_CNT;
-	if (config->PmTimerDisabled == 0)
-		fadt->pm_tmr_blk = pmbase + PM1_TMR;
+	fadt->pm_tmr_blk = pmbase + PM1_TMR;
    fadt->gpe0_blk = pmbase + GPE0_STS(0);
    fadt->gpe1_blk = 0;

fadt->pm1_evt_len = 4;
    fadt->pm1_cnt_len = 2;
    fadt->pm2_cnt_len = 1;
-	if (config->PmTimerDisabled == 0)
-		fadt->pm_tmr_len = 4;
+	fadt->pm_tmr_len = 4;
    /* There are 4 GPE0 STS/EN pairs each 32 bits wide. */
    fadt->gpe0_blk_len = 2 * GPE0_REG_MAX * sizeof(uint32_t);
    fadt->gpe1_blk_len = 0;
@@ -323,14 +321,12 @@
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2_CNT;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	if (config->PmTimerDisabled == 0) {
-		fadt->x_pm_tmr_blk.space_id = 1;
-		fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
-		fadt->x_pm_tmr_blk.bit_offset = 0;
-		fadt->x_pm_tmr_blk.resv = 0;
-		fadt->x_pm_tmr_blk.addrl = pmbase + PM1_TMR;
-		fadt->x_pm_tmr_blk.addrh = 0x0;
-	}
+	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
+	fadt->x_pm_tmr_blk.bit_offset = 0;
+	fadt->x_pm_tmr_blk.resv = 0;
+	fadt->x_pm_tmr_blk.addrl = pmbase + PM1_TMR;
+	fadt->x_pm_tmr_blk.addrh = 0x0;

fadt->x_gpe0_blk.space_id = 0;
    fadt->x_gpe0_blk.bit_width = 0;