<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9913">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">DFU: use central DFU override check<br><br>TRACE_INFO will also provide the DFU start reason, but TRACE_INFO<br>(TRACE_LEVEL >= 4) should only be used for debugging.<br>WARNING: With TRACE_LEVEL >= 4 the DFU binary is over the maximum of<br>16 kiB allocated for the DFU bootloader.<br>Thus make combined will not boot the main application because its<br>start if after the expecte 16 kiB address; and flashing using DFU<br>will overwrite the DFU bootloader itself.<br><br>Change-Id: I82323e0f76c03f67df7dc8f2b6783166cc25f3aa<br>---<br>M firmware/apps/dfu/main.c<br>M firmware/libboard/common/source/board_cstartup_gnu.c<br>2 files changed, 49 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/13/9913/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c</span><br><span>index 26cbb8c..796a13f 100644</span><br><span>--- a/firmware/apps/dfu/main.c</span><br><span>+++ b/firmware/apps/dfu/main.c</span><br><span>@@ -159,22 +159,32 @@</span><br><span> int USBDFU_OverrideEnterDFU(void)</span><br><span> {</span><br><span> uint32_t *app_part = (uint32_t *)FLASH_ADDR(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* at the first call we are before the text segment has been relocated,</span><br><span style="color: hsl(120, 100%, 40%);">+ * so g_dfu is not initialized yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_dfu = &_g_dfu;</span><br><span style="color: hsl(120, 100%, 40%);">+ static bool dfu_magic = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dfu_magic || (!dfu_magic && USB_DFU_MAGIC == g_dfu->magic)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ dfu_magic = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* If the loopback jumper is set, we enter DFU mode */</span><br><span style="color: hsl(0, 100%, 40%);">- if (board_override_enter_dfu())</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (board_override_enter_dfu()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* if the first word of the application partition doesn't look</span><br><span> * like a stack pointer (i.e. point to RAM), enter DFU mode */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((app_part[0] < IRAM_ADDR) ||</span><br><span style="color: hsl(0, 100%, 40%);">- ((uint8_t *)app_part[0] > IRAM_END))</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((app_part[0] < IRAM_ADDR) || ((uint8_t *)app_part[0] > IRAM_END)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* if the second word of the application partition doesn't look</span><br><span> * like a function from flash (reset vector), enter DFU mode */</span><br><span> if (((uint32_t *)app_part[1] < app_part) ||</span><br><span style="color: hsl(0, 100%, 40%);">- ((uint8_t *)app_part[1] > IFLASH_END))</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ((uint8_t *)app_part[1] > IFLASH_END)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -218,7 +228,7 @@</span><br><span> </span><br><span> EEFC_ReadUniqueID(g_unique_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n\r\n\r"</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n\r\n\r"</span><br><span> "=============================================================================\n\r"</span><br><span> "DFU bootloader %s for board %s (C) 2010-2017 by Harald Welte\n\r"</span><br><span> "=============================================================================\n\r",</span><br><span>@@ -230,6 +240,31 @@</span><br><span> g_unique_id[2], g_unique_id[3]);</span><br><span> TRACE_INFO("Reset Cause: 0x%x\n\r", reset_cause);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if (TRACE_LEVEL >= TRACE_LEVEL_INFO)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Find out why we are in the DFU bootloader, and not the main application */</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("DFU bootloader start reason: ");</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (USBDFU_OverrideEnterDFU()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("none\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("DFU switch requested by main application\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("bootloader forced (button pressed or jumper set)\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 3:</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("stack pointer (first application word) does no point in RAM\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 4: // the is no reason</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("reset vector (second application word) does no point in flash\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("unknown\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* clear g_dfu on power-up reset */</span><br><span> if (reset_cause == 0)</span><br><span> memset(g_dfu, 0, sizeof(*g_dfu));</span><br><span>diff --git a/firmware/libboard/common/source/board_cstartup_gnu.c b/firmware/libboard/common/source/board_cstartup_gnu.c</span><br><span>index 42231fb..bfe59ad 100644</span><br><span>--- a/firmware/libboard/common/source/board_cstartup_gnu.c</span><br><span>+++ b/firmware/libboard/common/source/board_cstartup_gnu.c</span><br><span>@@ -159,26 +159,12 @@</span><br><span> </span><br><span> </span><br><span> #if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
</span><br><span style="color: hsl(0, 100%, 40%);">- /* we are before the text segment has been relocated, so g_dfu is
</span><br><span style="color: hsl(0, 100%, 40%);">- * not initialized yet */
</span><br><span style="color: hsl(0, 100%, 40%);">- g_dfu = &_g_dfu;
</span><br><span style="color: hsl(0, 100%, 40%);">- if ((g_dfu->magic != USB_DFU_MAGIC) && !USBDFU_OverrideEnterDFU()) {
</span><br><span style="color: hsl(0, 100%, 40%);">- /* start application if valid
</span><br><span style="color: hsl(0, 100%, 40%);">- * the application starts with the vector table
</span><br><span style="color: hsl(0, 100%, 40%);">- * the first entry in the vector table is the initial stack pointer (SP) address
</span><br><span style="color: hsl(0, 100%, 40%);">- * the stack will be placed in RAM, which begins at 0x2000 0000
</span><br><span style="color: hsl(0, 100%, 40%);">- * there is up to 48 KB of RAM (0xc000)
</span><br><span style="color: hsl(0, 100%, 40%);">- * since the stack grown "downwards" it should start at the end of the RAM: max 0x2000 c000
</span><br><span style="color: hsl(0, 100%, 40%);">- * if the SP is not in this range (e.g. flash has been erased) there is no valid application
</span><br><span style="color: hsl(0, 100%, 40%);">- * the second entry in the vector table is the reset address, corresponding to the application start
</span><br><span style="color: hsl(0, 100%, 40%);">- */
</span><br><span style="color: hsl(0, 100%, 40%);">- if (((*((uint32_t*)(IFLASH_ADDR+BOARD_DFU_BOOT_SIZE)))&0xFFFF0000)==0x20000000) {
</span><br><span style="color: hsl(0, 100%, 40%);">- UART_Exit();
</span><br><span style="color: hsl(0, 100%, 40%);">- __disable_irq();
</span><br><span style="color: hsl(0, 100%, 40%);">- BootIntoApp();
</span><br><span style="color: hsl(0, 100%, 40%);">- /* Infinite loop */
</span><br><span style="color: hsl(0, 100%, 40%);">- while ( 1 ) ;
</span><br><span style="color: hsl(0, 100%, 40%);">- }
</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!USBDFU_OverrideEnterDFU()) {
</span><br><span style="color: hsl(120, 100%, 40%);">+ UART_Exit();
</span><br><span style="color: hsl(120, 100%, 40%);">+ __disable_irq();
</span><br><span style="color: hsl(120, 100%, 40%);">+ BootIntoApp();
</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Infinite loop */
</span><br><span style="color: hsl(120, 100%, 40%);">+ while ( 1 ) ;
</span><br><span> }
</span><br><span> #endif
</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9913">change 9913</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/9913"/><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: I82323e0f76c03f67df7dc8f2b6783166cc25f3aa </div>
<div style="display:none"> Gerrit-Change-Number: 9913 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>