<p>Shelley Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23528">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/fizz: Determine PsysPl3 and Pl4 values<br><br>Pass in fizz-specific adapter-based PsysPl3 and Pl4 values to avoid<br>brownouts.<br><br>BUG=b:71594855<br>BRANCH=None<br>TEST=Boot and check MSRs for appropriate values<br><br>Change-Id: I06a4c5bc25f6ec036b79f6941f80e26058d64930<br>Signed-off-by: Shelley Chen <shchen@chromium.org><br>---<br>M src/mainboard/google/fizz/mainboard.c<br>1 file changed, 32 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/23528/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c</span><br><span>index 3a8aa54..93cd8e5 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -108,28 +108,33 @@</span><br><span> *</span><br><span> * Set Pl2 and SysPl2 values based on detected charger.</span><br><span> * If detected barrel jack, use values below based on SKU.</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(0, 100%, 40%);">- * | sku_id | PL2 | PsysPL2 | PL4 | Pmax | Prop |</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(0, 100%, 40%);">- * | i7 U42 | 44 | 81 | 71 | 120 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i5 U42 | 44 | 81 | 71 | 120 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i3 U42 | 44 | 81 | 71 | 120 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i7 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i5 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i3 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | celeron U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * definitions:</span><br><span style="color: hsl(120, 100%, 40%);">+ * x = no value entered. Use default value in parenthesis.</span><br><span style="color: hsl(120, 100%, 40%);">+ * will set 0 to anything that shouldn't be set.</span><br><span style="color: hsl(120, 100%, 40%);">+ * n = max value of power adapter.</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----------+-------+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | sku_id | PL2 | PsysPL2 | PsysPL3 | PL4 | Pmax | Prop |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----------+-------+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i7 U42 | 44 | 81 | x(.85PL4) | x(77) | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U42 | 44 | 81 | x(.85PL4) | x(77) | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U42 | 44 | 81 | x(.85PL4) | x(77) | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i7 U22 | 29 | 58 | x(.85PL4) | x(43) | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U22 | 29 | 58 | x(.85PL4) | x(43) | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U22 | 29 | 58 | x(.85PL4) | x(43) | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | celeron U22 | 29 | 58 | x(.85PL4) | x(43) | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----------+-------+------+------+</span><br><span> * For USB C charger:</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(0, 100%, 40%);">- * | Max Power(W)| PL2 | PsysPL2 | PL4 | Pmax | Prop |</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(0, 100%, 40%);">- * | 60 (U42) | 44 | 54 | 54 | 120 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | 60 (U22) | 29 | 54 | 43 | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | X (U42) | 44 | .9X | .9X | 120 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | X (U22) | 29 | .9X | .9X | 91 | 48 |</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+---------+-------+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | Max Power(W)| PL2 | PsysPL2 | PsysPL3 | PL4 | Pmax | Prop |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+---------+-------+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 60 (U42) | 44 | 54 | 54 | 54 | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 60 (U22) | 29 | 54 | 54 | x(43) | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | n (U42) | 44 | .9n | .9n | .9n | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | n (U22) | 29 | .9n | .9n | .9n | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+---------+-------+------+------+</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val,</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 *psyspl3_val, u32 *pl4_val)</span><br><span> {</span><br><span> enum usb_chg_type type;</span><br><span> u32 watts;</span><br><span>@@ -144,6 +149,7 @@</span><br><span> pl2 = FIZZ_PL2_U22;</span><br><span> if ((1 << sku) & u42_mask)</span><br><span> pl2 = FIZZ_PL2_U42;</span><br><span style="color: hsl(120, 100%, 40%);">+ *psyspl3_val = *pl4_val = 0;</span><br><span> </span><br><span> /* If we can't get charger info or not PD charger, assume barrel jack */</span><br><span> if (rv != 0 || type != USB_CHG_TYPE_PD) {</span><br><span>@@ -153,8 +159,11 @@</span><br><span> if ((1 << sku) & u42_mask)</span><br><span> psyspl2 = FIZZ_PSYSPL2_U42;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Base on max value of adapter */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Detected TypeC. Base on max value of adapter */</span><br><span> psyspl2 = watts;</span><br><span style="color: hsl(120, 100%, 40%);">+ *psyspl3_val = SET_PSYSPL2(psyspl2);</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((1 << sku) & u42_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+ *pl4_val = SET_PSYSPL2(psyspl2);</span><br><span> }</span><br><span> </span><br><span> *pl2_val = pl2;</span><br><span>@@ -250,7 +259,8 @@</span><br><span> device_t root = SA_DEV_ROOT;</span><br><span> config_t *conf = root->chip_info;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mainboard_set_power_limits(&conf->tdp_pl2_override, &conf->tdp_psyspl2);</span><br><span style="color: hsl(120, 100%, 40%);">+ mainboard_set_power_limits(&conf->tdp_pl2_override, &conf->tdp_psyspl2,</span><br><span style="color: hsl(120, 100%, 40%);">+ &conf->tdp_psyspl3, &conf->tdp_pl4);</span><br><span> </span><br><span> set_bj_adapter_limit();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23528">change 23528</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23528"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I06a4c5bc25f6ec036b79f6941f80e26058d64930 </div>
<div style="display:none"> Gerrit-Change-Number: 23528 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Shelley Chen <shchen@google.com> </div>