<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14144">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make peer ERASE more robust<br><br>adds command 'a' to allow setting/asserting the peer SAM3S ERASE<br>line on the next command.<br>this prevents against accidental erase since only the command 'y'<br>was required, without confirmation.<br>this could happen not only through accidental user input, but<br>noise on the serial line (noise would still cause other issues,<br>but at least now it will not "brick" the device).<br>now the sequence 'ay' is required, as any other command following<br>'a' would clear the permission again.<br><br>note: since ERASE is only setting a GPIO within this command<br>parsing function, not accidental function pointer problem calling<br>'board_exec_dbg_cmd' should cause accidental ERASE since it would<br>need to be called two times with the exact sequence<br><br>Change-Id: I06bfeaef09a397bd554bec84321e0dd64ccc3aac<br>---<br>M firmware/libboard/qmod/source/board_qmod.c<br>1 file changed, 22 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/44/14144/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>index ad1f6b7..cab5271 100644</span><br><span>--- a/firmware/libboard/qmod/source/board_qmod.c</span><br><span>+++ b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /* sysmocom quad-modem sysmoQMOD application code</span><br><span> *</span><br><span> * (C) 2016-2017 by Harald Welte <hwelte@hmw-consulting.de></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018-2019, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de></span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU General Public License as published by</span><br><span>@@ -184,6 +184,11 @@</span><br><span> /* returns '1' in case we should break any endless loop */</span><br><span> void board_exec_dbg_cmd(int ch)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* this variable controls if it is allowed to assert/release the ERASE line.</span><br><span style="color: hsl(120, 100%, 40%);">+ this is done to prevent accidental ERASE on noisy serial input since only one character can trigger the ERASE.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ static bool allow_erase = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (ch) {</span><br><span> case '?':</span><br><span> printf("\t?\thelp\n\r");</span><br><span>@@ -205,6 +210,7 @@</span><br><span> printf("\tX\tRelease peer SAM3 from reset\n\r");</span><br><span> printf("\tx\tAssert peer SAM3 reset\n\r");</span><br><span> printf("\tY\tRelease peer SAM3 ERASE signal\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\ta\tAllow asserting peer SAM3 ERASE signal\n\r");</span><br><span> printf("\ty\tAssert peer SAM3 ERASE signal\n\r");</span><br><span> printf("\tU\tProceed to USB Initialization\n\r");</span><br><span> printf("\t1\tGenerate 1ms reset pulse on WWAN1\n\r");</span><br><span>@@ -243,9 +249,17 @@</span><br><span> printf("Clearing SIMTRACExx_ERASE (inactive)\n\r");</span><br><span> PIO_Clear(&pin_peer_erase);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'a':</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Asserting SIMTRACExx_ERASE allowed on next command\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ allow_erase = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'y':</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Seetting SIMTRACExx_ERASE (active)\n\r");</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Set(&pin_peer_erase);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (allow_erase) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Setting SIMTRACExx_ERASE (active)\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ PIO_Set(&pin_peer_erase);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Please first allow setting SIMTRACExx_ERASE\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case '1':</span><br><span> printf("Resetting Modem 1 (of this SAM3)\n\r");</span><br><span>@@ -268,6 +282,11 @@</span><br><span> board_exec_dbg_cmd_st12only(ch);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ // set protection back so it can only run for one command</span><br><span style="color: hsl(120, 100%, 40%);">+ if ('a' != ch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ allow_erase = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> void board_main_top(void)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14144">change 14144</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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://gerrit.osmocom.org/14144"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I06bfeaef09a397bd554bec84321e0dd64ccc3aac </div>
<div style="display:none"> Gerrit-Change-Number: 14144 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>