soc/intel/tgl: Replace dt HeciEnabled
by HECI1 disable
config
List of changes: 1. Drop `HeciEnabled` from dt and dt chip configuration. 2. Replace all logic that disables HECI1 based on the `HeciEnabled` chip config with `DISABLE_HECI1_AT_PRE_BOOT` config. Mainboards that choose to make HECI1 enable during boot don't override `heci1 disable` config. Signed-off-by: Subrata Banik <subratabanik@google.com> Change-Id: I4a81fd58df468e2711108a3243bf116e02986316 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60730 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
parent
a2f51f2225
commit
ad50b40eed
@ -87,9 +87,6 @@ chip soc/intel/tigerlake
|
|||||||
register "pmc_gpe0_dw1" = "GPP_D"
|
register "pmc_gpe0_dw1" = "GPP_D"
|
||||||
register "pmc_gpe0_dw2" = "GPP_E"
|
register "pmc_gpe0_dw2" = "GPP_E"
|
||||||
|
|
||||||
# Enable heci communication
|
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
|
|
||||||
# FSP configuration
|
# FSP configuration
|
||||||
register "SaGv" = "SaGv_Enabled"
|
register "SaGv" = "SaGv_Enabled"
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@ chip soc/intel/tigerlake
|
|||||||
register "pmc_gpe0_dw1" = "GPP_C"
|
register "pmc_gpe0_dw1" = "GPP_C"
|
||||||
register "pmc_gpe0_dw2" = "GPP_D"
|
register "pmc_gpe0_dw2" = "GPP_D"
|
||||||
|
|
||||||
# Enable heci1 communication
|
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
|
|
||||||
# FSP configuration
|
# FSP configuration
|
||||||
register "SaGv" = "SaGv_Enabled"
|
register "SaGv" = "SaGv_Enabled"
|
||||||
|
|
||||||
|
@ -8,9 +8,6 @@ chip soc/intel/tigerlake
|
|||||||
register "pmc_gpe0_dw1" = "GPP_C"
|
register "pmc_gpe0_dw1" = "GPP_C"
|
||||||
register "pmc_gpe0_dw2" = "GPP_D"
|
register "pmc_gpe0_dw2" = "GPP_D"
|
||||||
|
|
||||||
# Enable heci1 communication
|
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
|
|
||||||
# FSP configuration
|
# FSP configuration
|
||||||
register "SaGv" = "SaGv_Disabled"
|
register "SaGv" = "SaGv_Disabled"
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@ chip soc/intel/tigerlake
|
|||||||
register "CnviBtCore" = "true"
|
register "CnviBtCore" = "true"
|
||||||
register "CnviBtAudioOffload" = "1"
|
register "CnviBtAudioOffload" = "1"
|
||||||
register "enable_c6dram" = "1"
|
register "enable_c6dram" = "1"
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
register "SaGv" = "SaGv_Enabled"
|
register "SaGv" = "SaGv_Enabled"
|
||||||
register "TcssD3ColdDisable" = "1"
|
register "TcssD3ColdDisable" = "1"
|
||||||
|
|
||||||
|
@ -242,9 +242,7 @@ chip soc/intel/tigerlake
|
|||||||
# TODO: USB-PD?
|
# TODO: USB-PD?
|
||||||
register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
|
register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
|
||||||
end
|
end
|
||||||
device ref heci1 on
|
device ref heci1 on end
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
end
|
|
||||||
device ref uart2 on
|
device ref uart2 on
|
||||||
# Debug console
|
# Debug console
|
||||||
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
||||||
|
@ -253,9 +253,7 @@ chip soc/intel/tigerlake
|
|||||||
# TODO: Pantone ROM?
|
# TODO: Pantone ROM?
|
||||||
register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci"
|
register "SerialIoI2cMode[PchSerialIoIndexI2C2]" = "PchSerialIoPci"
|
||||||
end
|
end
|
||||||
device ref heci1 on
|
device ref heci1 on end
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
end
|
|
||||||
device ref uart2 on
|
device ref uart2 on
|
||||||
# Debug console
|
# Debug console
|
||||||
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
||||||
|
@ -123,9 +123,7 @@ chip soc/intel/tigerlake
|
|||||||
device i2c 15 on end
|
device i2c 15 on end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
device ref heci1 on
|
device ref heci1 on end
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
end
|
|
||||||
device ref uart2 on
|
device ref uart2 on
|
||||||
# Debug console
|
# Debug console
|
||||||
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
||||||
|
@ -223,9 +223,7 @@ chip soc/intel/tigerlake
|
|||||||
# TODO: USB-PD?
|
# TODO: USB-PD?
|
||||||
register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
|
register "SerialIoI2cMode[PchSerialIoIndexI2C1]" = "PchSerialIoPci"
|
||||||
end
|
end
|
||||||
device ref heci1 on
|
device ref heci1 on end
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
end
|
|
||||||
device ref uart2 on
|
device ref uart2 on
|
||||||
# Debug console
|
# Debug console
|
||||||
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
||||||
|
@ -158,9 +158,7 @@ chip soc/intel/tigerlake
|
|||||||
device i2c 2c on end
|
device i2c 2c on end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
device ref heci1 on
|
device ref heci1 on end
|
||||||
register "HeciEnabled" = "1"
|
|
||||||
end
|
|
||||||
device ref uart2 on
|
device ref uart2 on
|
||||||
# Debug console
|
# Debug console
|
||||||
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
register "SerialIoUartMode[PchSerialIoIndexUART2]" = "PchSerialIoSkipInit"
|
||||||
|
@ -276,10 +276,6 @@ struct soc_intel_tigerlake_config {
|
|||||||
/* Gfx related */
|
/* Gfx related */
|
||||||
uint8_t SkipExtGfxScan;
|
uint8_t SkipExtGfxScan;
|
||||||
|
|
||||||
/* HeciEnabled decides the state of Heci1 at end of boot
|
|
||||||
* Setting to 0 (default) disables Heci1 and hides the device from OS */
|
|
||||||
uint8_t HeciEnabled;
|
|
||||||
|
|
||||||
/* Enable/Disable EIST. 1b:Enabled, 0b:Disabled */
|
/* Enable/Disable EIST. 1b:Enabled, 0b:Disabled */
|
||||||
uint8_t eist_enable;
|
uint8_t eist_enable;
|
||||||
|
|
||||||
|
@ -16,11 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
void smihandler_soc_at_finalize(void)
|
void smihandler_soc_at_finalize(void)
|
||||||
{
|
{
|
||||||
const struct soc_intel_tigerlake_config *config;
|
if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT) && CONFIG(HECI_DISABLE_USING_SMM))
|
||||||
|
|
||||||
config = config_of_soc();
|
|
||||||
|
|
||||||
if (!config->HeciEnabled && CONFIG(HECI_DISABLE_USING_SMM))
|
|
||||||
heci_disable();
|
heci_disable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user