soc/intel/tigerlake: Hook up DPTF device to devicetree

Hook up `Device4Enable` FSP setting to devicetree state and drop its
redundant devicetree setting `Device4Enable`.

The following mainboards enable the DPTF device in the devicetree
despite `Device4Enable` is not being set.

  * google/deltaur

Thus, set it to off to keep the current state unchanged.

Change-Id: Ic7636fc4f63d4beab92e742a6882ac55af2565bc
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59886
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Felix Singer 2021-12-05 03:13:37 +01:00
parent 8474f4dc9b
commit 2aa1ff4eea
12 changed files with 8 additions and 30 deletions

View File

@ -130,7 +130,7 @@ chip soc/intel/tigerlake
device domain 0 on device domain 0 on
device pci 00.0 on end # Host Bridge device pci 00.0 on end # Host Bridge
device pci 02.0 on end # Graphics device pci 02.0 on end # Graphics
device pci 04.0 on end # DPTF device pci 04.0 off end # DPTF
device pci 05.0 off end # IPU device pci 05.0 off end # IPU
device pci 06.0 off end # PEG60 device pci 06.0 off end # PEG60
device pci 07.0 on end # TBT_PCIe0 device pci 07.0 on end # TBT_PCIe0

View File

@ -295,8 +295,6 @@ chip soc/intel/tigerlake
.tdp_pl4 = 83, .tdp_pl4 = 83,
}" }"
register "Device4Enable" = "1"
register "tcc_offset" = "10" # TCC of 90 register "tcc_offset" = "10" # TCC of 90
register "CnviBtCore" = "true" register "CnviBtCore" = "true"

View File

@ -119,9 +119,6 @@ chip soc/intel/tigerlake
# Enable DPTF # Enable DPTF
register "dptf_enable" = "1" register "dptf_enable" = "1"
# Enable Processor Thermal Control
register "Device4Enable" = "1"
# Add PL1 and PL2 values # Add PL1 and PL2 values
register "power_limits_config[POWER_LIMITS_U_2_CORE]" = "{ register "power_limits_config[POWER_LIMITS_U_2_CORE]" = "{
.tdp_pl1_override = 15, .tdp_pl1_override = 15,

View File

@ -123,9 +123,6 @@ chip soc/intel/tigerlake
# Enable DPTF # Enable DPTF
register "dptf_enable" = "1" register "dptf_enable" = "1"
# Enable Processor Thermal Control
register "Device4Enable" = "1"
# Add PL1 and PL2 values # Add PL1 and PL2 values
register "power_limits_config[POWER_LIMITS_U_2_CORE]" = "{ register "power_limits_config[POWER_LIMITS_U_2_CORE]" = "{
.tdp_pl1_override = 9, .tdp_pl1_override = 9,

View File

@ -76,9 +76,7 @@ chip soc/intel/tigerlake
device domain 0 on device domain 0 on
device pci 00.0 on end # Host Bridge device pci 00.0 on end # Host Bridge
device pci 02.0 on end # Integrated Graphics Device device pci 02.0 on end # Integrated Graphics Device
device pci 04.0 on # SA Thermal Device device pci 04.0 on end # SA Thermal Device
register "Device4Enable" = "1"
end
device pci 05.0 off end # IPU device pci 05.0 off end # IPU
device pci 06.0 off end # PEG60 device pci 06.0 off end # PEG60
device pci 07.0 on end # TBT_PCIe0 device pci 07.0 on end # TBT_PCIe0

View File

@ -105,9 +105,7 @@ chip soc/intel/tigerlake
register "gfx" = "GMA_DEFAULT_PANEL(0)" register "gfx" = "GMA_DEFAULT_PANEL(0)"
end end
device ref dptf on device ref dptf on end
register "Device4Enable" = "1"
end
device ref peg on device ref peg on
# PCIe PEG0 x4, Clock 0 (SSD1) # PCIe PEG0 x4, Clock 0 (SSD1)
register "PcieClkSrcUsage[0]" = "0x40" register "PcieClkSrcUsage[0]" = "0x40"

View File

@ -105,9 +105,7 @@ chip soc/intel/tigerlake
register "gfx" = "GMA_DEFAULT_PANEL(0)" register "gfx" = "GMA_DEFAULT_PANEL(0)"
end end
device ref dptf on device ref dptf on end
register "Device4Enable" = "1"
end
device ref peg on device ref peg on
# PCIe PEG0 x4, Clock 0 (SSD1) # PCIe PEG0 x4, Clock 0 (SSD1)
register "PcieClkSrcUsage[0]" = "0x40" register "PcieClkSrcUsage[0]" = "0x40"

View File

@ -96,9 +96,7 @@ chip soc/intel/tigerlake
register "DdiPortBHpd" = "1" register "DdiPortBHpd" = "1"
register "DdiPortBDdc" = "1" register "DdiPortBDdc" = "1"
end end
device ref dptf on device ref dptf on end
register "Device4Enable" = "1"
end
device ref gna on end device ref gna on end
device ref north_xhci on device ref north_xhci on
# TODO: No TBT, but needed for USB 2.0 on Type-C port? # TODO: No TBT, but needed for USB 2.0 on Type-C port?

View File

@ -105,9 +105,7 @@ chip soc/intel/tigerlake
register "gfx" = "GMA_DEFAULT_PANEL(0)" register "gfx" = "GMA_DEFAULT_PANEL(0)"
end end
device ref dptf on device ref dptf on end
register "Device4Enable" = "1"
end
device ref peg on device ref peg on
# PCIe PEG0 x4, Clock 3 (SSD1) # PCIe PEG0 x4, Clock 3 (SSD1)
# Despite the name, SSD2_CLKREQ# is used for SSD1 # Despite the name, SSD2_CLKREQ# is used for SSD1

View File

@ -110,9 +110,7 @@ chip soc/intel/tigerlake
register "DdiPortAHpd" = "1" register "DdiPortAHpd" = "1"
register "DdiPortADdc" = "0" register "DdiPortADdc" = "0"
end end
device ref dptf on device ref dptf on end
register "Device4Enable" = "1"
end
device ref peg0 on device ref peg0 on
# PCIe PEG0 x4, Clock 7 (SSD1) # PCIe PEG0 x4, Clock 7 (SSD1)
register "PcieClkSrcUsage[7]" = "0x40" register "PcieClkSrcUsage[7]" = "0x40"

View File

@ -274,8 +274,6 @@ struct soc_intel_tigerlake_config {
/* Gfx related */ /* Gfx related */
uint8_t SkipExtGfxScan; uint8_t SkipExtGfxScan;
uint8_t Device4Enable;
/* HeciEnabled decides the state of Heci1 at end of boot /* HeciEnabled decides the state of Heci1 at end of boot
* Setting to 0 (default) disables Heci1 and hides the device from OS */ * Setting to 0 (default) disables Heci1 and hides the device from OS */
uint8_t HeciEnabled; uint8_t HeciEnabled;

View File

@ -474,7 +474,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->SlowSlewRate[0] = config->SlowSlewRate; params->SlowSlewRate[0] = config->SlowSlewRate;
/* Enable TCPU for processor thermal control */ /* Enable TCPU for processor thermal control */
params->Device4Enable = config->Device4Enable; params->Device4Enable = is_devfn_enabled(SA_DEVFN_DPTF);
/* Set TccActivationOffset */ /* Set TccActivationOffset */
params->TccActivationOffset = config->tcc_offset; params->TccActivationOffset = config->tcc_offset;