<p>Marc Jones has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28123">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ec/google/chromeec: Fix ACPI FWTS error<br><br>Fix the following FWTS error:<br>FAILED [MEDIUM] AMLAsmASL_MSG_RETURN_TYPES: Test 1, Assembler warning in line<br>3038<br>Line | AML source<br>--------------------------------------------------------------------------------<br>03035| Return (One)<br>03036| }<br>03037|<br>03038| Method (_Q09, 0, NotSerialized) // _Qxx: EC Query<br> | ^<br> | Warning 3115: Not all control paths return a value (_Q09)<br>03039| {<br>03040| If (Acquire (PATM, 0x03E8))<br>03041| {<br>================================================================================<br><br>ADVICE: (for Warning #3115, ASL_MSG_RETURN_TYPES): Some of the execution paths<br>do not return a value. All control paths that return must return a value<br>otherwise unexpected behaviour may occur. This error occurs because a branch on<br>an conditional op-code returns a value and another does not, which is<br>inconsistent behaviour.<br><br>_Q09 is a reserved method and can't return a value. Change the logic<br>so that no return is used and avoid this test error.<br><br>BUG=b:112476331<br>TEST=Run FWTS.<br><br>Change-Id: Ibbda1649ec2eb9cdf9966d4ec92bfd203bb78d07<br>Signed-off-by: Marc Jones <marcj303@gmail.com><br>---<br>M src/ec/google/chromeec/acpi/ec.asl<br>1 file changed, 12 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/28123/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>index 94917dd..453a6d7 100644</span><br><span>--- a/src/ec/google/chromeec/acpi/ec.asl</span><br><span>+++ b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>@@ -467,25 +467,23 @@</span><br><span> */</span><br><span> Method (_Q09, 0, NotSerialized)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- If (Acquire (^PATM, 1000)) {</span><br><span style="color: hsl(0, 100%, 40%);">- Return ()</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ If (LNot(Acquire (^PATM, 1000))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Read sensor ID for event */</span><br><span style="color: hsl(120, 100%, 40%);">+ Store (^PATI, Local0)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Read sensor ID for event */</span><br><span style="color: hsl(0, 100%, 40%);">- Store (^PATI, Local0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* When sensor ID returns 0xFF then no more events */</span><br><span style="color: hsl(0, 100%, 40%);">- While (LNotEqual (Local0, EC_TEMP_SENSOR_NOT_PRESENT))</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* When sensor ID returns 0xFF then no more events */</span><br><span style="color: hsl(120, 100%, 40%);">+ While (LNotEqual (Local0, EC_TEMP_SENSOR_NOT_PRESENT))</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span> #ifdef HAVE_THERM_EVENT_HANDLER</span><br><span style="color: hsl(0, 100%, 40%);">- \_SB.DPTF.TEVT (Local0)</span><br><span style="color: hsl(120, 100%, 40%);">+ \_SB.DPTF.TEVT (Local0)</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Keep reaading sensor ID for event */</span><br><span style="color: hsl(0, 100%, 40%);">- Store (^PATI, Local0)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep reaading sensor ID for event */</span><br><span style="color: hsl(120, 100%, 40%);">+ Store (^PATI, Local0)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Release (^PATM)</span><br><span style="color: hsl(120, 100%, 40%);">+ Release (^PATM)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28123">change 28123</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/28123"/><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: Ibbda1649ec2eb9cdf9966d4ec92bfd203bb78d07 </div>
<div style="display:none"> Gerrit-Change-Number: 28123 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>