GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tigerlake mainboards: switch to devtree aliases for PMC MUX connectors 

Now that soc_get_pmc_mux_device() is gone, the PMC MUX connector devices
can be hooked up together via devicetree aliases.

Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Change-Id: Ib51764da5b3c029f9ac7ac60199a0aedfc7f29b1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45878
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Tim Wawrzynczak 2020-09-30 13:59:21 -06:00
parent e7881ed447
commit eafe7989ac
9 changed files with 114 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mainboard/google/volteer/mainboard.c
View File

@ -9,14 +9,65 @@
#include <fw_config.h>
#include <security/tpm/tss.h>
#include <soc/gpio.h>
#include <soc/pci_devs.h>
#include <soc/ramstage.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include <variant/gpio.h>
#include <vb2_api.h>
#include "drivers/intel/pmc_mux/conn/chip.h"
extern struct chip_operations drivers_intel_pmc_mux_conn_ops;
static bool is_port1(struct device *dev)
{
return dev->path.type == DEVICE_PATH_GENERIC && dev->path.generic.id == 1 &&
dev->chip_ops == &drivers_intel_pmc_mux_conn_ops;
}
static void typec_orientation_fixup(void)
{
/*
* TODO: This is an ugly hack, see if there's a better way to accomplish this same thing
* via fw_config + devicetree, i.e., change a register's value depending on fw_config
* probing.
*/
const struct device *pmc;
const struct device *mux;
const struct device *conn;
pmc = pcidev_path_on_root(PCH_DEVFN_PMC);
if (!pmc || !pmc->link_list->children) {
printk(BIOS_ERR, "%s: unable to find PMC device or its mux\n", __func__);
return;
}
/*
* Find port 1 underneath PMC.MUX; some variants may not have this defined, so it's okay
* to just silently return here.
*/
mux = pmc->link_list->children;
conn = dev_find_matching_device_on_bus(mux->link_list, is_port1);
if (!conn)
return;
if (fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN2)) ||
fw_config_probe(FW_CONFIG(DB_USB, USB3_ACTIVE)) ||
fw_config_probe(FW_CONFIG(DB_USB, USB4_GEN3)) ||
fw_config_probe(FW_CONFIG(DB_USB, USB3_NO_A))) {
struct drivers_intel_pmc_mux_conn_config *config = conn->chip_info;
if (config) {
printk(BIOS_INFO, "Configure Right Type-C port orientation for retimer\n");
config->sbu_orientation = TYPEC_ORIENTATION_NORMAL;
}
}
}
static void mainboard_init(struct device *dev)
{
mainboard_ec_init();
typec_orientation_fixup();
}
static void add_fw_config_oem_string(const struct fw_config *config, void *arg)

11
src/mainboard/google/volteer/variants/delbin/overridetree.cb
View File

@ -70,6 +70,13 @@ chip soc/intel/tigerlake
device i2c 15 on end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -80,14 +87,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "1"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end

11
src/mainboard/google/volteer/variants/terrador/overridetree.cb
View File

@ -172,6 +172,13 @@ chip soc/intel/tigerlake
device i2c 15 on end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -182,14 +189,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "1"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "3"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end

11
src/mainboard/google/volteer/variants/todor/overridetree.cb
View File

@ -172,6 +172,13 @@ chip soc/intel/tigerlake
device i2c 15 on end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -182,14 +189,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "1"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "3"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end

26
src/mainboard/google/volteer/variants/volteer/overridetree.cb
View File

@ -221,6 +221,13 @@ chip soc/intel/tigerlake
end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -230,27 +237,12 @@ chip soc/intel/tigerlake
register "usb2_port_number" = "9"
register "usb3_port_number" = "1"
# SBU & HSL follow CC
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on
probe DB_USB USB4_GEN2
probe DB_USB USB3_ACTIVE
probe DB_USB USB4_GEN3
probe DB_USB USB3_NO_A
end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU & HSL follow CC
device generic 1 on
probe DB_USB USB3_PASSIVE
end
device generic 1 alias conn1 on end
end
end
end

28
src/mainboard/google/volteer/variants/volteer2/overridetree.cb
View File

@ -93,7 +93,7 @@ chip soc/intel/tigerlake
TEMP_PCT(42, 36),}}}"
device generic 0 on end
end
end # DPTF 0x9A03
end
device ref ipu on end # IPU 0x9A19
device ref i2c0 on
chip drivers/i2c/generic
@ -254,6 +254,13 @@ chip soc/intel/tigerlake
end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -263,27 +270,12 @@ chip soc/intel/tigerlake
register "usb2_port_number" = "9"
register "usb3_port_number" = "1"
# SBU & HSL follow CC
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on
probe DB_USB USB4_GEN2
probe DB_USB USB3_ACTIVE
probe DB_USB USB4_GEN3
probe DB_USB USB3_NO_A
end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU & HSL follow CC
device generic 1 on
probe DB_USB USB3_PASSIVE
end
device generic 1 alias conn1 on end
end
end
end

11
src/mainboard/google/volteer/variants/voxel/overridetree.cb
View File

@ -187,6 +187,13 @@ chip soc/intel/tigerlake
device i2c 15 on end
end
end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end
device ref pmc hidden
# The pmc_mux chip driver is a placeholder for the
# PMC.MUX device in the ACPI hierarchy.
@ -197,14 +204,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "1"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "4"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end

6
src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
View File

@ -306,6 +306,8 @@ chip soc/intel/tigerlake
end # GSPI1 0xA0AB
device pci 1f.0 on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end # eSPI 0xA080 - A09F
@ -320,14 +322,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "3"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "7"
register "usb3_port_number" = "4"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end

6
src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
View File

@ -310,6 +310,8 @@ chip soc/intel/tigerlake
end # GSPI1 0xA0AB
device pci 1f.0 on
chip ec/google/chromeec
use conn0 as mux_conn[0]
use conn1 as mux_conn[1]
device pnp 0c09.0 on end
end
end # eSPI 0xA080 - A09F
@ -324,14 +326,14 @@ chip soc/intel/tigerlake
register "usb3_port_number" = "3"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 0 on end
device generic 0 alias conn0 on end
end
chip drivers/intel/pmc_mux/conn
register "usb2_port_number" = "5"
register "usb3_port_number" = "2"
# SBU is fixed, HSL follows CC
register "sbu_orientation" = "TYPEC_ORIENTATION_NORMAL"
device generic 1 on end
device generic 1 alias conn1 on end
end
end
end