[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-605-g70b362d4f

[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  70b362d4f47194eced99b448cc99b093641d1465 (commit)
      from  17be341d38bda1115b3eb8878ef7f830982fabfb (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 70b362d4f47194eced99b448cc99b093641d1465
Author: Tomas Vanek <va...@fb...>
Date:   Mon Jan 22 18:17:48 2024 +0100

    flash/nor/nrf5: show proper SoC type on newer nRF91 devices
    
    Since nRF9160 Product Specification v2.1 the new UICR SIPINFO
    fields should be preferred over UICR INFO.
    Tested on nRF9161.
    
    Signed-off-by: Tomas Vanek <va...@fb...>
    Change-Id: Ib8005b3b6292aa20fa83c1dcebd2de27df58b661
    Reviewed-on: https://review.openocd.org/c/openocd/+/8114
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index 80243ed59..cac233d47 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -285,6 +285,22 @@ static const struct nrf5_ficr_map nrf53_91_ficr_offsets = {
 	.info_flash = 0x21c,
 };
 
+/* Since nRF9160 Product Specification v2.1 there is
+ * a new UICR field SIPINFO, which should be preferred.
+ * The original INFO fields describe just a part of the chip
+ * (PARTNO=9120 at nRF9161)
+ */
+static const struct nrf5_ficr_map nrf91new_ficr_offsets = {
+	.codepagesize = 0x220,
+	.codesize = 0x224,
+	.configid = 0x200,
+	.info_part = 0x140,		/* SIPINFO.PARTNO */
+	.info_variant = 0x148,	/* SIPINFO.VARIANT */
+	.info_package = 0x214,
+	.info_ram = 0x218,
+	.info_flash = 0x21c,
+};
+
 enum {
 	NRF53APP_91_FICR_BASE = 0x00FF0000,
 	NRF53APP_91_UICR_BASE = 0x00FF8000,
@@ -614,12 +630,17 @@ static int nrf5_protect(struct flash_bank *bank, int set, unsigned int first,
 	return ERROR_FLASH_OPER_UNSUPPORTED;
 }
 
-static bool nrf5_info_variant_to_str(uint32_t variant, char *bf)
+static bool nrf5_info_variant_to_str(uint32_t variant, char *bf, bool swap)
 {
 	uint8_t b[4];
 
-	h_u32_to_be(b, variant);
-	if (isalnum(b[0]) && isalnum(b[1]) && isalnum(b[2]) && isalnum(b[3])) {
+	if (swap)
+		h_u32_to_le(b, variant);
+	else
+		h_u32_to_be(b, variant);
+
+	if (isalnum(b[0]) && isalnum(b[1]) && isalnum(b[2]) &&
+		 (isalnum(b[3]) || b[3] == 0)) {
 		memcpy(bf, b, 4);
 		bf[4] = 0;
 		return true;
@@ -646,7 +667,10 @@ static int nrf5_get_chip_type_str(const struct nrf5_info *chip, char *buf, unsig
 				chip->spec->part, chip->spec->variant, chip->spec->build_code);
 	} else if (chip->ficr_info_valid) {
 		char variant[5];
-		nrf5_info_variant_to_str(chip->ficr_info.variant, variant);
+
+		nrf5_info_variant_to_str(chip->ficr_info.variant, variant,
+								chip->features & NRF5_FEATURE_SERIES_91);
+
 		if (chip->features & (NRF5_FEATURE_SERIES_53 | NRF5_FEATURE_SERIES_91)) {
 			res = snprintf(buf, buf_size, "nRF%" PRIx32 "-%s",
 					chip->ficr_info.part, variant);
@@ -825,6 +849,16 @@ static int nrf5_probe(struct flash_bank *bank)
 	switch (bank->base) {
 	case NRF5_FLASH_BASE:
 	case NRF53APP_91_UICR_BASE:
+		res = nrf5_read_ficr_info_part(chip, &nrf53app_91_map, &nrf91new_ficr_offsets);
+		if (res == ERROR_OK) {
+			res = nrf53_91_partno_check(chip);
+			if (res == ERROR_OK) {
+				chip->map = &nrf53app_91_map;
+				chip->ficr_offsets = &nrf91new_ficr_offsets;
+				break;
+			}
+		}
+
 		res = nrf5_read_ficr_info_part(chip, &nrf53app_91_map, &nrf53_91_ficr_offsets);
 		if (res != ERROR_OK)
 			break;

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

Summary of changes:
 src/flash/nor/nrf5.c | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository