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

google/chromeec: Revise parameters of EC USB PD API call 

This patch adds voltage and curent parameters in
google_chromeec_get_usb_pd_power_info and remove power parameter. Caller could
use the voltage and current information to calculate charger power rating.
The reason for this change is, some applications need the voltage information
to calculate correct system power eg PsysPmax.

BUG=b:151972149
TEST=emerge-puff coreboot; emerge-fizz coreboot

Change-Id: I11efe6f45f2f929fcb2763d192268e677d7426cb
Signed-off-by: Gaggery Tsai <gaggery.tsai@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39849
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Gaggery Tsai 2020-03-25 11:34:25 -07:00 committed by Patrick Georgi
parent 04a8cfbbc0
commit 52f18df1e3
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ec/google/chromeec/ec.c
View File

@ -1120,9 +1120,9 @@ int google_chromeec_set_usb_charge_mode(uint8_t port_id, enum usb_charge_mode mo
return google_chromeec_command(&cmd);
}
/* Get charger power info in Watts. Also returns type of charger */
/* Get charger voltage and current. Also returns type of charger */
int google_chromeec_get_usb_pd_power_info(enum usb_chg_type *type,
uint32_t *max_watts)
uint16_t *current_max, uint16_t *voltage_max)
{
struct ec_params_usb_pd_power_info params = {
.port = PD_POWER_CHARGING_PORT,
@ -1147,8 +1147,8 @@ int google_chromeec_get_usb_pd_power_info(enum usb_chg_type *type,
/* values are given in milliAmps and milliVolts */
*type = resp.type;
m = resp.meas;
*max_watts = (m.current_max * m.voltage_max) / 1000000;
*voltage_max = m.voltage_max;
*current_max = m.current_max;
return 0;
}

5
src/ec/google/chromeec/ec.h
View File

@ -102,11 +102,12 @@ int google_chromeec_set_usb_pd_role(uint8_t port, enum usb_pd_control_role role)
* Retrieve the charger type and max wattage.
*
* @param type charger type
* @param max_watts charger max wattage
* @param current_max charger max current
* @param voltage_max charger max voltage
* @return non-zero for error, otherwise 0.
*/
int google_chromeec_get_usb_pd_power_info(enum usb_chg_type *type,
uint32_t *max_watts);
uint16_t *current_max, uint16_t *voltage_max);
/*
* Set max current and voltage of a dedicated charger.

4
src/mainboard/google/fizz/mainboard.c
View File

@ -104,8 +104,9 @@ static void mainboard_set_power_limits(config_t *conf)
{
enum usb_chg_type type;
u32 watts;
u16 volts_mv, current_ma;
u32 pl2, psyspl2;
int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
int rv = google_chromeec_get_usb_pd_power_info(&type, &current_ma, &volts_mv);
uint8_t sku = board_sku_id();
const uint32_t u42_mask = (1 << FIZZ_SKU_ID_I7_U42) |
(1 << FIZZ_SKU_ID_I5_U42) |
@ -126,6 +127,7 @@ static void mainboard_set_power_limits(config_t *conf)
psyspl2 = FIZZ_PSYSPL2_U42;
} else {
/* Detected TypeC. Base on max value of adapter */
watts = ((u32)volts_mv * current_ma) / 1000000;
psyspl2 = watts;
conf->tdp_psyspl3 = SET_PSYSPL2(psyspl2);
/* set max possible time window */

4
src/mainboard/google/hatch/variants/puff/mainboard.c
View File

@ -90,8 +90,9 @@ static void mainboard_set_power_limits(config_t *conf)
{
enum usb_chg_type type;
u32 watts;
u16 volts_mv, current_ma;
u32 psyspl2 = PUFF_PSYSPL2; // default barrel jack value for U22
int rv = google_chromeec_get_usb_pd_power_info(&type, &watts);
int rv = google_chromeec_get_usb_pd_power_info(&type, &current_ma, &volts_mv);
/* use SoC default value for PsysPL3 and PL4 unless we're on USB-PD*/
conf->tdp_psyspl3 = 0;
@ -99,6 +100,7 @@ static void mainboard_set_power_limits(config_t *conf)
if (rv == 0 && type == USB_CHG_TYPE_PD) {
/* Detected USB-PD. Base on max value of adapter */
watts = ((u32)current_ma * volts_mv) / 1000000;
psyspl2 = watts;
conf->tdp_psyspl3 = SET_PSYSPL2(psyspl2);
/* set max possible time window */