diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c index f6e1d24725..5b62c069da 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/chip.c @@ -8,20 +8,16 @@ #include #include #include -#include #include #include -#include #include #include -#include #include #include #include #include #include #include -#include #if CONFIG(HAVE_ACPI_TABLES) const char *soc_acpi_name(const struct device *dev) @@ -133,12 +129,6 @@ static void soc_fill_gpio_pm_configuration(void) void soc_init_pre_device(void *chip_info) { - config_t *config = config_of_soc(); - - /* Validate TBT image authentication */ - config->tbt_authentication = ioe_p2sb_sbi_read(PID_IOM, - IOM_CSME_IMR_TBT_STATUS) & TBT_VALID_AUTHENTICATION; - /* Perform silicon specific init. */ fsp_silicon_init(); diff --git a/src/soc/intel/meteorlake/chip.h b/src/soc/intel/meteorlake/chip.h index 04b8299b2d..05d77f3d1c 100644 --- a/src/soc/intel/meteorlake/chip.h +++ b/src/soc/intel/meteorlake/chip.h @@ -126,8 +126,6 @@ struct soc_intel_meteorlake_config { /* Program OC pins for TCSS */ struct tcss_port_config tcss_ports[MAX_TYPE_C_PORTS]; uint8_t tbt_pcie_port_disable[4]; - /* Validate TBT firmware authenticated and loaded into IMR */ - bool tbt_authentication; /* SATA related */ uint8_t sata_mode; diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index ff17a35a36..3ca6c52da6 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -14,8 +14,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -23,6 +23,7 @@ #include #include #include +#include #include /* THC assignment definition */ diff --git a/src/soc/intel/meteorlake/tcss.c b/src/soc/intel/meteorlake/tcss.c index 7509504eea..c51fe6c41f 100644 --- a/src/soc/intel/meteorlake/tcss.c +++ b/src/soc/intel/meteorlake/tcss.c @@ -1,15 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include -#include const struct soc_tcss_ops tcss_ops = { - .configure_aux_bias_pads = ioe_tcss_configure_aux_bias_pads_sbi, - .valid_tbt_auth = ioe_tcss_valid_tbt_auth, + .configure_aux_bias_pads = tcss_configure_aux_bias_pads_regbar, + .valid_tbt_auth = tcss_valid_tbt_auth, }; - -bool ioe_tcss_valid_tbt_auth(void) -{ - const config_t *config = config_of_soc(); - return config->tbt_authentication; -}