[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-385-gb61a28086

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b61a280860f9ceb9bc38125c48d2f0f4d35f1c11 (commit)
      from  f78f9a90a6c4f8abedbac8a4047631cbe3ea0e17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b61a280860f9ceb9bc38125c48d2f0f4d35f1c11
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Thu Sep 9 22:14:36 2021 +0100

    flash/stm32l4x: fix flash programming in 64-bit hosts
    
    stm32l4_work_area struct is shared between the loader and stm32l4x flash driver
    
    '*wp' and '*rp' pointers' size is 4 bytes each since stm32l4x devices have
    32-bit processors.
    
    however when used in openocd code, their size depends on the host
      if the host is 32-bit, then the size is 4 bytes each.
      if the host is 64-bit, then the size is 8 bytes each.
    
    to avoid this size difference, change their types depending on the
    usage (pointers for the loader, and 32-bit integers in openocd code).
    
    Change-Id: I0a3df4bb4bf872b01cdb9357eb28307868d7d469
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6556
    Tested-by: jenkins
    Reviewed-by: Yestin Sun <sun...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/contrib/loaders/flash/stm32/stm32l4x.c b/contrib/loaders/flash/stm32/stm32l4x.c
index bcad98843..54c88a335 100644
--- a/contrib/loaders/flash/stm32/stm32l4x.c
+++ b/contrib/loaders/flash/stm32/stm32l4x.c
@@ -5,6 +5,8 @@
  *   tar...@st...
  */
 
+#define OPENOCD_CONTRIB_LOADERS_FLASH_STM32_STM32L4X
+
 #include <stdint.h>
 #include "../../../../src/flash/nor/stm32l4x.h"
 
diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index f76bc45fe..0182aae66 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1405,16 +1405,19 @@ static int stm32l4_write_block(struct flash_bank *bank, const uint8_t *buffer,
 	armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
 	armv7m_info.core_mode = ARM_MODE_THREAD;
 
-	init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);	/* buffer start, status (out) */
+	/* contrib/loaders/flash/stm32/stm32l4x.c:write() arguments */
+	init_reg_param(&reg_params[0], "r0", 32, PARAM_IN_OUT);	/* stm32l4_work_area ptr , status (out) */
 	init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);	/* buffer end */
 	init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);	/* target address */
 	init_reg_param(&reg_params[3], "r3", 32, PARAM_OUT);	/* count (of stm32l4_info->data_width) */
-	init_reg_param(&reg_params[4], "sp", 32, PARAM_OUT);	/* write algo stack pointer */
 
 	buf_set_u32(reg_params[0].value, 0, 32, source->address);
 	buf_set_u32(reg_params[1].value, 0, 32, source->address + source->size);
 	buf_set_u32(reg_params[2].value, 0, 32, address);
 	buf_set_u32(reg_params[3].value, 0, 32, count);
+
+	/* write algo stack pointer */
+	init_reg_param(&reg_params[4], "sp", 32, PARAM_OUT);
 	buf_set_u32(reg_params[4].value, 0, 32, source->address +
 			offsetof(struct stm32l4_work_area, stack) + LDR_STACK_SIZE);
 
diff --git a/src/flash/nor/stm32l4x.h b/src/flash/nor/stm32l4x.h
index 4cc50a040..4458c0875 100644
--- a/src/flash/nor/stm32l4x.h
+++ b/src/flash/nor/stm32l4x.h
@@ -136,9 +136,24 @@ struct stm32l4_work_area {
 	} params;
 	uint8_t stack[LDR_STACK_SIZE];
 	struct flash_async_algorithm_circbuf {
+		/* note: stm32l4_work_area struct is shared between the loader
+		 * and stm32l4x flash driver.
+		 *
+		 * '*wp' and '*rp' pointers' size is 4 bytes each since stm32l4x
+		 * devices have 32-bit processors.
+		 * however when used in openocd code, their size depends on the host
+		 *   if the host is 32-bit, then the size is 4 bytes each.
+		 *   if the host is 64-bit, then the size is 8 bytes each.
+		 * to avoid this size difference, change their types depending on the
+		 * usage (pointers for the loader, and 32-bit integers in openocd code).
+		 */
+#ifdef OPENOCD_CONTRIB_LOADERS_FLASH_STM32_STM32L4X
 		uint8_t *wp;
 		uint8_t *rp;
-		uint8_t *buf;
+#else
+		uint32_t wp;
+		uint32_t rp;
+#endif /* OPENOCD_CONTRIB_LOADERS_FLASH_STM32_STM32L4X */
 	} fifo;
 };
 

-----------------------------------------------------------------------

Summary of changes:
 contrib/loaders/flash/stm32/stm32l4x.c |  2 ++
 src/flash/nor/stm32l4x.c               |  7 +++++--
 src/flash/nor/stm32l4x.h               | 17 ++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository