summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Huang <alan-huang@quanta.corp-partner.google.com>2021-10-12 16:34:52 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2021-12-02 21:00:00 +0000
commitb974dd96b6bcefb21435c0afe19f8184aff2c74f (patch)
treedba3bad51507e58598324465475101f8f87ef77d
parent44577683008010b4470c42bf7c10ba9d92780f30 (diff)
mb/google/brya/var/baseboard/brask: Add power limits functions
Copy function variant_update_power_limits from brya to set power limits. Add function variant_update_psys_power_limits and copy the algorithm from puff. Add structure system_power_limits and psys_config to define and configure the psys power limits. BUG=b:193864533 BRANCH=none TEST=Build pass Signed-off-by: Alan Huang <alan-huang@quanta.corp-partner.google.com> Change-Id: I183017068e9c78acb9fa7073c53593d304ba9248 Reviewed-on: https://review.coreboot.org/c/coreboot/+/58241 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc1
-rw-r--r--src/mainboard/google/brya/variants/baseboard/brask/ramstage.c158
-rw-r--r--src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h32
3 files changed, 191 insertions, 0 deletions
diff --git a/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc
index 1693d2e263..8a4b2acfaa 100644
--- a/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc
+++ b/src/mainboard/google/brya/variants/baseboard/brask/Makefile.inc
@@ -4,3 +4,4 @@ romstage-y += memory.c
romstage-y += gpio.c
ramstage-y += gpio.c
+ramstage-y += ramstage.c
diff --git a/src/mainboard/google/brya/variants/baseboard/brask/ramstage.c b/src/mainboard/google/brya/variants/baseboard/brask/ramstage.c
new file mode 100644
index 0000000000..9628b447b0
--- /dev/null
+++ b/src/mainboard/google/brya/variants/baseboard/brask/ramstage.c
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <acpi/acpi_device.h>
+#include <baseboard/variants.h>
+#include <console/console.h>
+#include <device/pci_ops.h>
+#include <ec/google/chromeec/ec.h>
+#include <soc/pci_devs.h>
+
+#include <drivers/intel/dptf/chip.h>
+#include <intelblocks/power_limit.h>
+
+WEAK_DEV_PTR(dptf_policy);
+
+#define SET_PSYSPL2(e, w) ((e) * (w) / 100)
+
+static bool get_sku_index(const struct cpu_power_limits *limits, size_t num_entries,
+ size_t *intel_idx, size_t *brask_idx)
+{
+ uint16_t mchid = pci_s_read_config16(PCI_DEV(0, 0, 0), PCI_DEVICE_ID);
+ u8 tdp = get_cpu_tdp();
+ size_t i = 0;
+
+ for (i = 0; i < ARRAY_SIZE(cpuid_to_adl); i++) {
+ if (mchid == cpuid_to_adl[i].cpu_id && tdp == cpuid_to_adl[i].cpu_tdp) {
+ *intel_idx = cpuid_to_adl[i].limits;
+ break;
+ }
+ }
+
+ if (i == ARRAY_SIZE(cpuid_to_adl)) {
+ printk(BIOS_ERR, "Cannot find correct intel sku index.\n");
+ return false;
+ }
+
+ for (i = 0; i < num_entries; i++) {
+ if (mchid == limits[i].mchid && tdp == limits[i].cpu_tdp) {
+ *brask_idx = i;
+ break;
+ }
+ }
+
+ if (i == num_entries) {
+ printk(BIOS_ERR, "Cannot find correct brask sku index.\n");
+ return false;
+ }
+
+ return true;
+}
+
+void variant_update_power_limits(const struct cpu_power_limits *limits, size_t num_entries)
+{
+ const struct device *policy_dev;
+ size_t intel_idx, brask_idx;
+ struct drivers_intel_dptf_config *config;
+ struct dptf_power_limits *settings;
+ config_t *conf;
+ struct soc_power_limits_config *soc_config;
+
+ if (!num_entries)
+ return;
+
+ policy_dev = DEV_PTR(dptf_policy);
+ if (!policy_dev)
+ return;
+
+ if (!get_sku_index(limits, num_entries, &intel_idx, &brask_idx))
+ return;
+
+ config = policy_dev->chip_info;
+ settings = &config->controls.power_limits;
+ conf = config_of_soc();
+ soc_config = &conf->power_limits_config[intel_idx];
+ settings->pl1.min_power = limits[brask_idx].pl1_min_power;
+ settings->pl1.max_power = limits[brask_idx].pl1_max_power;
+ settings->pl2.min_power = limits[brask_idx].pl2_min_power;
+ settings->pl2.max_power = limits[brask_idx].pl2_max_power;
+
+ if (soc_config->tdp_pl2_override != 0) {
+ settings->pl2.max_power = soc_config->tdp_pl2_override * 1000;
+ settings->pl2.min_power = settings->pl2.max_power;
+ }
+
+ if (soc_config->tdp_pl4 == 0)
+ soc_config->tdp_pl4 = DIV_ROUND_UP(limits[brask_idx].pl4_power,
+ MILLIWATTS_TO_WATTS);
+
+ printk(BIOS_INFO, "Overriding power limits PL1(mW) (%u, %u) PL2(mW) (%u, %u) PL4 (%u)\n",
+ settings->pl1.min_power,
+ settings->pl1.max_power,
+ settings->pl2.min_power,
+ settings->pl2.max_power,
+ soc_config->tdp_pl4);
+}
+
+void variant_update_psys_power_limits(const struct cpu_power_limits *limits,
+ const struct system_power_limits *sys_limits,
+ size_t num_entries,
+ const struct psys_config *config_psys)
+{
+ struct soc_power_limits_config *soc_config;
+ const struct device *policy_dev;
+ size_t intel_idx, brask_idx;
+ u16 volts_mv, current_ma;
+ enum usb_chg_type type;
+ u32 psyspl2, pl2;
+ u32 pl2_default;
+ config_t *conf;
+ u32 watts;
+ int rv;
+
+ if (!num_entries)
+ return;
+
+ policy_dev = DEV_PTR(dptf_policy);
+ if (!policy_dev)
+ return;
+
+ if (!get_sku_index(limits, num_entries, &intel_idx, &brask_idx))
+ return;
+
+ conf = config_of_soc();
+ soc_config = &conf->power_limits_config[intel_idx];
+ soc_config->tdp_pl4 = 0;
+
+ pl2_default = DIV_ROUND_UP(limits[brask_idx].pl2_max_power, MILLIWATTS_TO_WATTS);
+ rv = google_chromeec_get_usb_pd_power_info(&type, &current_ma, &volts_mv);
+
+ if (rv == 0 && type == USB_CHG_TYPE_PD) {
+ /* Detected USB-PD. Base on max value of adapter */
+ watts = ((u32)current_ma * volts_mv) / 1000000;
+
+ /* set psyspl2 to 97% of adapter rating */
+ psyspl2 = SET_PSYSPL2(config_psys->efficiency, watts);
+
+ /* Limit PL2 if the adapter is with lower capability */
+ pl2 = (psyspl2 > pl2_default) ? pl2_default : psyspl2;
+
+ soc_config->tdp_pl4 = psyspl2;
+ } else {
+ /* Input type is barrel jack */
+ volts_mv = config_psys->bj_volts_mv;
+ psyspl2 = sys_limits[brask_idx].psys_pl2_power;
+ pl2 = pl2_default;
+ }
+
+ /* voltage unit is milliVolts and current is in milliAmps */
+ soc_config->psys_pmax = (u16)(((u32)config_psys->psys_imax_ma * volts_mv) / 1000000);
+ conf->PsysPmax = soc_config->psys_pmax;
+
+ soc_config->tdp_pl2_override = pl2;
+ soc_config->tdp_psyspl2 = psyspl2;
+
+ printk(BIOS_INFO, "Overriding PL2 (%u) PsysPL2 (%u) Psys_Pmax (%u)\n",
+ soc_config->tdp_pl2_override,
+ soc_config->tdp_psyspl2,
+ soc_config->psys_pmax);
+}
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
index 3e0fd05105..b3a10e0a64 100644
--- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
@@ -37,8 +37,40 @@ struct cpu_power_limits {
unsigned int pl4_power;
};
+struct system_power_limits {
+ uint16_t mchid;
+ u8 cpu_tdp;
+ /* PsysPL2 in Watts */
+ unsigned int psys_pl2_power;
+};
+
+struct psys_config {
+ /*
+ * The efficiency of type-c chargers
+ * For example, 'efficiency = 97' means setting 97% of max power to account for
+ * cable loss and FET Rdson loss in the path from the source.
+ */
+ unsigned int efficiency;
+
+ /* The maximum current maps to the Psys signal */
+ unsigned int psys_imax_ma;
+
+ /* The voltage of barrel jack */
+ unsigned int bj_volts_mv;
+};
+
/* Modify Power Limit devictree settings during ramstage */
void variant_update_power_limits(const struct cpu_power_limits *limits,
size_t num_entries);
+
+/*
+ * Modify Power Limit and PsysPL devictree settings during ramstage.
+ * Note, this function must be called in front of calling variant_update_power_limits.
+ */
+void variant_update_psys_power_limits(const struct cpu_power_limits *limits,
+ const struct system_power_limits *sys_limits,
+ size_t num_entries,
+ const struct psys_config *config);
+
#endif /*__BASEBOARD_VARIANTS_H__ */