Revert "soc/intel/meteorlake: Provide access to IOE through P2SB SBI for TCSS"

This reverts commit eb80b1efa3.

Reason for revert: Results into hard hang with serial debug msg inside FSP-S.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I8e7cf804828da8939f591eb0770c8daf830c8d94
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66304
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tarun Tuli <taruntuli@google.com>
Reviewed-by: Ivy Jian <ivy.jian@quanta.corp-partner.google.com>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
This commit is contained in:
Subrata Banik 2022-08-17 14:35:31 +00:00
parent 054620dcdc
commit c6d6f60bc4
4 changed files with 4 additions and 22 deletions

View File

@ -8,20 +8,16 @@
#include <intelblocks/cfg.h> #include <intelblocks/cfg.h>
#include <intelblocks/gpio.h> #include <intelblocks/gpio.h>
#include <intelblocks/itss.h> #include <intelblocks/itss.h>
#include <intelblocks/p2sb.h>
#include <intelblocks/pcie_rp.h> #include <intelblocks/pcie_rp.h>
#include <intelblocks/systemagent.h> #include <intelblocks/systemagent.h>
#include <intelblocks/tcss.h>
#include <intelblocks/xdci.h> #include <intelblocks/xdci.h>
#include <soc/intel/common/vbt.h> #include <soc/intel/common/vbt.h>
#include <soc/iomap.h>
#include <soc/itss.h> #include <soc/itss.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pcie.h> #include <soc/pcie.h>
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/tcss.h>
#if CONFIG(HAVE_ACPI_TABLES) #if CONFIG(HAVE_ACPI_TABLES)
const char *soc_acpi_name(const struct device *dev) 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) 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. */ /* Perform silicon specific init. */
fsp_silicon_init(); fsp_silicon_init();

View File

@ -126,8 +126,6 @@ struct soc_intel_meteorlake_config {
/* Program OC pins for TCSS */ /* Program OC pins for TCSS */
struct tcss_port_config tcss_ports[MAX_TYPE_C_PORTS]; struct tcss_port_config tcss_ports[MAX_TYPE_C_PORTS];
uint8_t tbt_pcie_port_disable[4]; uint8_t tbt_pcie_port_disable[4];
/* Validate TBT firmware authenticated and loaded into IMR */
bool tbt_authentication;
/* SATA related */ /* SATA related */
uint8_t sata_mode; uint8_t sata_mode;

View File

@ -14,8 +14,8 @@
#include <intelblocks/lpss.h> #include <intelblocks/lpss.h>
#include <intelblocks/xdci.h> #include <intelblocks/xdci.h>
#include <intelpch/lockdown.h> #include <intelpch/lockdown.h>
#include <intelblocks/tcss.h>
#include <security/vboot/vboot_common.h> #include <security/vboot/vboot_common.h>
#include <soc/cpu.h>
#include <soc/gpio_soc_defs.h> #include <soc/gpio_soc_defs.h>
#include <soc/intel/common/vbt.h> #include <soc/intel/common/vbt.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
@ -23,6 +23,7 @@
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <soc/soc_chip.h> #include <soc/soc_chip.h>
#include <soc/soc_info.h> #include <soc/soc_info.h>
#include <soc/cpu.h>
#include <string.h> #include <string.h>
/* THC assignment definition */ /* THC assignment definition */

View File

@ -1,15 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <intelblocks/tcss.h> #include <intelblocks/tcss.h>
#include <soc/soc_chip.h>
const struct soc_tcss_ops tcss_ops = { const struct soc_tcss_ops tcss_ops = {
.configure_aux_bias_pads = ioe_tcss_configure_aux_bias_pads_sbi, .configure_aux_bias_pads = tcss_configure_aux_bias_pads_regbar,
.valid_tbt_auth = ioe_tcss_valid_tbt_auth, .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;
}