<p>Shelley Chen has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23457">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/fizz: Adjust PL2 and PsysPl2 values for power loss<br><br>Set PsysPl2 values to 90% of max adapter power for all types of<br>adapters (typeC and barrel jack) to account for a 10 % power loss from<br>the adapter to the soc.<br><br>BUG=b:71594855<br>BRANCH=None<br>TEST=reboot device and make sure Pl2 and PsysPl2 MSRs are properly set<br> with iotools rdmsr command on both U42 and U22 skus with both<br> typeC and barrel jack power adapters.<br><br>Change-Id: I8425c6d4d669449eccb9324ff58ff6d1662c5c43<br>Signed-off-by: Shelley Chen <shchen@chromium.org><br>---<br>M src/mainboard/google/fizz/mainboard.c<br>1 file changed, 30 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/23457/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 4e7f316..f3d2970 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> * For type-C chargers, set PL2 to 90% of max power to account for</span><br><span> * cable loss and FET Rdson loss in the path from the source.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GET_TYPEC_PL2(w) (9 * (w) / 10)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SET_PSYSPL2(w) (9 * (w) / 10)</span><br><span> </span><br><span> #define OEM_ID_COUNT 3</span><br><span> #define SKU_ID_COUNT 7</span><br><span>@@ -108,17 +108,26 @@</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 | Pmax (Prop = 48W) |</span><br><span style="color: hsl(0, 100%, 40%);">- * +-------------+-----+---------+-------------------+</span><br><span style="color: hsl(0, 100%, 40%);">- * | i7 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i5 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i3 U42 | 44 | 90 | 119 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i7 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i5 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | i3 U22 | 29 | 65 | 91 |</span><br><span style="color: hsl(0, 100%, 40%);">- * | celeron U22 | 29 | 65 | 91 |</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%);">+ * | sku_id | PL2 | PsysPL2 | 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 | 77 | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U42 | 44 | 81 | 77 | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U42 | 44 | 81 | 77 | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i7 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i5 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | i3 U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | celeron U22 | 29 | 58 | 43 | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * For USB C charger:</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----+------+------+</span><br><span style="color: hsl(120, 100%, 40%);">+ * | Max Power(W)| PL2 | PsysPL2 | 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 | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | 60 (U22) | 29 | 54 | 43 | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | X (U42) | 44 | .9X | .9X | 120 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * | X (U22) | 29 | .9X | .9X | 91 | 48 |</span><br><span style="color: hsl(120, 100%, 40%);">+ * +-------------+-----+---------+-----+------+------+</span><br><span> */</span><br><span> static void mainboard_set_power_limits(u32 *pl2_val, u32 *psyspl2_val)</span><br><span> {</span><br><span>@@ -131,25 +140,26 @@</span><br><span> (1 << FIZZ_SKU_ID_I5_U42) |</span><br><span> (1 << FIZZ_SKU_ID_I3_U42);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* PL2 value is sku-based, no matter what charger we are using */</span><br><span style="color: hsl(120, 100%, 40%);">+ pl2 = FIZZ_PL2_U22;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((1 << sku) & u42_mask)</span><br><span style="color: hsl(120, 100%, 40%);">+ pl2 = FIZZ_PL2_U42;</span><br><span style="color: hsl(120, 100%, 40%);">+</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 style="color: hsl(0, 100%, 40%);">- /* using the barrel jack, get PL2 based on sku id */</span><br><span style="color: hsl(0, 100%, 40%);">- pl2 = FIZZ_PL2_U22;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* using the barrel jack, get PsysPL2 based on sku id */</span><br><span> psyspl2 = FIZZ_PSYSPL2_U22;</span><br><span> /* Running a U42 SKU */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((1 << sku) & u42_mask) {</span><br><span style="color: hsl(0, 100%, 40%);">- pl2 = FIZZ_PL2_U42;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((1 << sku) & u42_mask)</span><br><span> psyspl2 = FIZZ_PSYSPL2_U42;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> } else {</span><br><span> /* Base on max value of adapter */</span><br><span style="color: hsl(0, 100%, 40%);">- pl2 = GET_TYPEC_PL2(watts);</span><br><span> psyspl2 = watts;</span><br><span> }</span><br><span> </span><br><span> *pl2_val = pl2;</span><br><span style="color: hsl(0, 100%, 40%);">- *psyspl2_val = psyspl2;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* set psyspl2 to 90% of max adapter power */</span><br><span style="color: hsl(120, 100%, 40%);">+ *psyspl2_val = SET_PSYSPL2(psyspl2);</span><br><span> }</span><br><span> </span><br><span> static uint8_t board_oem_id(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23457">change 23457</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/23457"/><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: I8425c6d4d669449eccb9324ff58ff6d1662c5c43 </div>
<div style="display:none"> Gerrit-Change-Number: 23457 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Shelley Chen <shchen@google.com> </div>