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

mb/google/fizz: Determine PsysPl3 and Pl4 values 

Pass in fizz-specific adapter-based PsysPl3 and Pl4 values to avoid
brownouts.  According to Intel doc #560604, page 74, the max time
window is 64ms (code=6) and the min duty cycle we can set is 4%.

BUG=b:71594855
BRANCH=None
TEST=Boot to OS and check MSRs using iotools for expected values

Change-Id: I06a4c5bc25f6ec036b79f6941f80e26058d64930
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://review.coreboot.org/23528
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Shelley Chen 2018-01-31 15:57:43 -08:00 committed by Shelley Chen
parent c4f94b1a75
commit c12dff9098
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,8 @@
#define FIZZ_PL2_U22 29 #define FIZZ_PL2_U22 29
#define FIZZ_PSYSPL2_U22 65 #define FIZZ_PSYSPL2_U22 65
#define FIZZ_PSYSPL2_U42 90 #define FIZZ_PSYSPL2_U42 90
#define FIZZ_MAX_TIME_WINDOW 6
#define FIZZ_MIN_DUTYCYCLE 4
/* /*
* For type-C chargers, set PL2 to 90% of max power to account for * For type-C chargers, set PL2 to 90% of max power to account for
* cable loss and FET Rdson loss in the path from the source. * cable loss and FET Rdson loss in the path from the source.
@ -121,28 +123,32 @@ static uint8_t board_sku_id(void)
* *
* Set Pl2 and SysPl2 values based on detected charger. * Set Pl2 and SysPl2 values based on detected charger.
* If detected barrel jack, use values below based on SKU. * If detected barrel jack, use values below based on SKU.
* +-------------+-----+---------+-----+------+------+ * definitions:
* | sku_id | PL2 | PsysPL2 | PL4 | Pmax | Prop | * x = no value entered. Use default value in parenthesis.
* +-------------+-----+---------+-----+------+------+ * will set 0 to anything that shouldn't be set.
* | i7 U42 | 44 | 81 | 71 | 120 | 48 | * n = max value of power adapter.
* | i5 U42 | 44 | 81 | 71 | 120 | 48 | * +-------------+-----+---------+-----------+-------+
* | i3 U42 | 44 | 81 | 71 | 120 | 48 | * | sku_id | PL2 | PsysPL2 | PsysPL3 | PL4 |
* | i7 U22 | 29 | 58 | 43 | 91 | 48 | * +-------------+-----+---------+-----------+-------+
* | i5 U22 | 29 | 58 | 43 | 91 | 48 | * | i7 U42 | 44 | 81 | x(.85PL4) | x(71) |
* | i3 U22 | 29 | 58 | 43 | 91 | 48 | * | i5 U42 | 44 | 81 | x(.85PL4) | x(71) |
* | celeron U22 | 29 | 58 | 43 | 91 | 48 | * | i3 U42 | 44 | 81 | x(.85PL4) | x(71) |
* +-------------+-----+---------+-----+------+------+ * | i7 U22 | 29 | 58 | x(.85PL4) | x(43) |
* | i5 U22 | 29 | 58 | x(.85PL4) | x(43) |
* | i3 U22 | 29 | 58 | x(.85PL4) | x(43) |
* | celeron U22 | 29 | 58 | x(.85PL4) | x(43) |
* +-------------+-----+---------+-----------+-------+
* For USB C charger: * For USB C charger:
* +-------------+-----+---------+-----+------+------+ * +-------------+-----+---------+---------+-------+
* | Max Power(W)| PL2 | PsysPL2 | PL4 | Pmax | Prop | * | Max Power(W)| PL2 | PsysPL2 | PsysPL3 | PL4 |
* +-------------+-----+---------+-----+------+------+ * +-------------+-----+---------+---------+-------+
* | 60 (U42) | 44 | 54 | 54 | 120 | 48 | * | 60 (U42) | 44 | 54 | 54 | 54 |
* | 60 (U22) | 29 | 54 | 43 | 91 | 48 | * | 60 (U22) | 29 | 54 | 54 | x(43) |
* | X (U42) | 44 | .9X | .9X | 120 | 48 | * | n (U42) | 44 | .9n | .9n | .9n |
* | X (U22) | 29 | .9X | .9X | 91 | 48 | * | n (U22) | 29 | .9n | .9n | x(43) |
* +-------------+-----+---------+-----+------+------+ * +-------------+-----+---------+---------+-------+
*/ */
static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val) static void mainboard_set_power_limits(config_t *conf)
{ {
enum usb_chg_type type; enum usb_chg_type type;
u32 watts; u32 watts;
@ -157,6 +163,7 @@ static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val)
pl2 = FIZZ_PL2_U22; pl2 = FIZZ_PL2_U22;
if ((1 << sku) & u42_mask) if ((1 << sku) & u42_mask)
pl2 = FIZZ_PL2_U42; pl2 = FIZZ_PL2_U42;
conf->tdp_psyspl3 = conf->tdp_pl4 = 0;
/* If we can't get charger info or not PD charger, assume barrel jack */ /* If we can't get charger info or not PD charger, assume barrel jack */
if (rv != 0 || type != USB_CHG_TYPE_PD) { if (rv != 0 || type != USB_CHG_TYPE_PD) {
@ -166,13 +173,20 @@ static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val)
if ((1 << sku) & u42_mask) if ((1 << sku) & u42_mask)
psyspl2 = FIZZ_PSYSPL2_U42; psyspl2 = FIZZ_PSYSPL2_U42;
} else { } else {
/* Base on max value of adapter */ /* Detected TypeC. Base on max value of adapter */
psyspl2 = watts; psyspl2 = watts;
conf->tdp_psyspl3 = SET_PSYSPL2(psyspl2);
/* set max possible time window */
conf->tdp_psyspl3_time = FIZZ_MAX_TIME_WINDOW;
/* set minimum duty cycle */
conf->tdp_psyspl3_dutycycle = FIZZ_MIN_DUTYCYCLE;
if ((1 << sku) & u42_mask)
conf->tdp_pl4 = SET_PSYSPL2(psyspl2);
} }
*pl2_val = pl2; conf->tdp_pl2_override = pl2;
/* set psyspl2 to 90% of max adapter power */ /* set psyspl2 to 90% of max adapter power */
*psyspl2_val = SET_PSYSPL2(psyspl2); conf->tdp_psyspl2 = SET_PSYSPL2(psyspl2);
} }
static uint8_t read_oem_id_from_gpio(void) static uint8_t read_oem_id_from_gpio(void)
@ -282,7 +296,7 @@ static void mainboard_enable(device_t dev)
device_t root = SA_DEV_ROOT; device_t root = SA_DEV_ROOT;
config_t *conf = root->chip_info; config_t *conf = root->chip_info;
mainboard_set_power_limits(&conf->tdp_pl2_override, &conf->tdp_psyspl2); mainboard_set_power_limits(conf);
set_bj_adapter_limit(); set_bj_adapter_limit();