From c7854b064f7d245f8f25c95f8775c0cfd66f086f Mon Sep 17 00:00:00 2001 From: Tim Wawrzynczak Date: Mon, 18 May 2020 13:43:19 -0600 Subject: [PATCH] soc/intel/tigerlake: Implement soc_get_pmc_mux_device() The ChromeOS EC is adding new entries to its USBC.CONx devices (see later patch), and it needs to get access to the PMC.MUX device so that its ACPI path can be retrieved. This provides a weak function to return NULL for all Intel SoCs except for Tiger Lake, which locates the device if it is found in the devicetree. Change-Id: I3fe3ef25e9fac8748142f5b1bd870c9bc70b97ff Signed-off-by: Tim Wawrzynczak Reviewed-on: https://review.coreboot.org/c/coreboot/+/40948 Reviewed-by: Duncan Laurie Tested-by: build bot (Jenkins) --- src/drivers/intel/pmc_mux/chip.h | 2 ++ .../common/block/include/intelblocks/pmc.h | 9 +++++++++ src/soc/intel/tigerlake/pmc.c | 20 +++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/src/drivers/intel/pmc_mux/chip.h b/src/drivers/intel/pmc_mux/chip.h index dcca2a3ecc..f73a07047f 100644 --- a/src/drivers/intel/pmc_mux/chip.h +++ b/src/drivers/intel/pmc_mux/chip.h @@ -3,6 +3,8 @@ #ifndef __DRIVERS_INTEL_PMC_MUX_H__ #define __DRIVERS_INTEL_PMC_MUX_H__ +extern struct chip_operations drivers_intel_pmc_mux_ops; + struct drivers_intel_pmc_mux_config { }; diff --git a/src/soc/intel/common/block/include/intelblocks/pmc.h b/src/soc/intel/common/block/include/intelblocks/pmc.h index 329bbe9bd7..75e212740d 100644 --- a/src/soc/intel/common/block/include/intelblocks/pmc.h +++ b/src/soc/intel/common/block/include/intelblocks/pmc.h @@ -51,4 +51,13 @@ int pmc_soc_get_resources(struct pmc_resource_config *cfg); /* API to set ACPI mode */ void pmc_set_acpi_mode(void); +/* + * Returns a reference to the PMC MUX device for the given port number. + * Returns NULL if not found or SoC does not support PMC MUX. + * + * Input: Port number (0-based) + * Output: Const pointer to PMC MUX device + */ +const struct device *soc_get_pmc_mux_device(int port_number); + #endif /* SOC_INTEL_COMMON_BLOCK_PMC_H */ diff --git a/src/soc/intel/tigerlake/pmc.c b/src/soc/intel/tigerlake/pmc.c index c24898faf3..84a18e3865 100644 --- a/src/soc/intel/tigerlake/pmc.c +++ b/src/soc/intel/tigerlake/pmc.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -123,6 +124,25 @@ static void soc_pmc_fill_ssdt(const struct device *dev) dev_path(dev)); } +/* By default, TGL uses the PMC MUX for all ports, so port_number is unused */ +const struct device *soc_get_pmc_mux_device(int port_number) +{ + const struct device *pmc; + struct device *child; + + child = NULL; + pmc = pcidev_path_on_root(PCH_DEVFN_PMC); + if (!pmc || !pmc->link_list) + return NULL; + + while ((child = dev_bus_each_child(pmc->link_list, child)) != NULL) + if (child->chip_ops == &drivers_intel_pmc_mux_ops) + break; + + /* child will either be the correct device or NULL if not found */ + return child; +} + struct device_operations pmc_ops = { .read_resources = soc_pmc_read_resources, .set_resources = noop_set_resources,