[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-602-gfc7a428fc

[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  fc7a428fc2a5d1e74621e56a2cbd2c31566fc63f (commit)
      from  37f9485cef8b98aaed739c8140b3674441dc5876 (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 fc7a428fc2a5d1e74621e56a2cbd2c31566fc63f
Author: Tomas Vanek <va...@fb...>
Date:   Mon Jan 22 14:17:27 2024 +0100

    flash/nor/nrf5: make flash erase little faster
    
    Enable and disable erase mode only once
    instead of toggling it for each sector.
    
    Refactor to decrease the number of call levels.
    
    Change-Id: Ie546a4fc24da0eea2753a2bebaa63d941ef7aa1d
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8111
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c
index b4a8e979e..641f3ab21 100644
--- a/src/flash/nor/nrf5.c
+++ b/src/flash/nor/nrf5.c
@@ -375,7 +375,7 @@ static int nrf5_nvmc_read_only(struct nrf5_info *chip)
 			       NRF5_NVMC_CONFIG_REN);
 
 	if (res != ERROR_OK) {
-		LOG_ERROR("Failed to enable read-only operation");
+		LOG_ERROR("Failed to disable write/erase operation");
 		return res;
 	}
 	/*
@@ -389,35 +389,6 @@ static int nrf5_nvmc_read_only(struct nrf5_info *chip)
 	return res;
 }
 
-static int nrf5_nvmc_generic_erase(struct nrf5_info *chip,
-			       uint32_t erase_register, uint32_t erase_value)
-{
-	int res;
-
-	res = nrf5_nvmc_erase_enable(chip);
-	if (res != ERROR_OK)
-		goto error;
-
-	res = nrf5_nvmc_write_u32(chip,
-			       erase_register,
-			       erase_value);
-	if (res != ERROR_OK)
-		goto set_read_only;
-
-	res = nrf5_wait_for_nvmc(chip);
-	if (res != ERROR_OK)
-		goto set_read_only;
-
-	return nrf5_nvmc_read_only(chip);
-
-set_read_only:
-	nrf5_nvmc_read_only(chip);
-error:
-	LOG_ERROR("Failed to erase reg: 0x%08"PRIx32" val: 0x%08"PRIx32,
-		  erase_register, erase_value);
-	return ERROR_FAIL;
-}
-
 /* nRF51 series only */
 static int nrf51_protect_check_clenr0(struct flash_bank *bank)
 {
@@ -900,13 +871,6 @@ static int nrf5_auto_probe(struct flash_bank *bank)
 	return nrf5_probe(bank);
 }
 
-static int nrf5_erase_all(struct nrf5_info *chip)
-{
-	LOG_DEBUG("Erasing all non-volatile memory");
-	return nrf5_nvmc_generic_erase(chip,
-					NRF5_NVMC_ERASEALL,
-					0x00000001);
-}
 
 static int nrf5_erase_page(struct flash_bank *bank,
 							struct nrf5_info *chip,
@@ -938,17 +902,18 @@ static int nrf5_erase_page(struct flash_bank *bank,
 			}
 		}
 
-		res = nrf5_nvmc_generic_erase(chip,
-					       NRF5_NVMC_ERASEUICR,
-					       0x00000001);
-
+		res = nrf5_nvmc_write_u32(chip, NRF5_NVMC_ERASEUICR, 0x00000001);
 
 	} else {
-		res = nrf5_nvmc_generic_erase(chip,
-					       NRF5_NVMC_ERASEPAGE,
-					       sector->offset);
+		res = nrf5_nvmc_write_u32(chip, NRF5_NVMC_ERASEPAGE, sector->offset);
+	}
+
+	if (res != ERROR_OK) {
+		/* caller logs the error */
+		return res;
 	}
 
+	res = nrf5_wait_for_nvmc(chip);
 	return res;
 }
 
@@ -1137,13 +1102,18 @@ static int nrf5_erase(struct flash_bank *bank, unsigned int first,
 			return res;
 	}
 
+	res = nrf5_nvmc_erase_enable(chip);
+	if (res != ERROR_OK)
+		goto error;
+
 	/* For each sector to be erased */
 	for (unsigned int s = first; s <= last; s++) {
 
 		if (chip->features & NRF5_FEATURE_SERIES_51
 				&& bank->sectors[s].is_protected == 1) {
 			LOG_ERROR("Flash sector %d is protected", s);
-			return ERROR_FLASH_PROTECTED;
+			res = ERROR_FLASH_PROTECTED;
+			break;
 		}
 
 		res = nrf5_erase_page(bank, chip, &bank->sectors[s]);
@@ -1153,7 +1123,9 @@ static int nrf5_erase(struct flash_bank *bank, unsigned int first,
 		}
 	}
 
-	return ERROR_OK;
+error:
+	nrf5_nvmc_read_only(chip);
+	return res;
 }
 
 static void nrf5_free_driver_priv(struct flash_bank *bank)
@@ -1277,14 +1249,27 @@ COMMAND_HANDLER(nrf5_handle_mass_erase_command)
 		}
 	}
 
-	res = nrf5_erase_all(chip);
+	res = nrf5_nvmc_erase_enable(chip);
+	if (res != ERROR_OK)
+		goto error;
+
+	res = nrf5_nvmc_write_u32(chip, NRF5_NVMC_ERASEALL, 0x00000001);
+	if (res != ERROR_OK) {
+		LOG_ERROR("Mass erase failed");
+		goto error;
+	}
+
+	res = nrf5_wait_for_nvmc(chip);
+	if (res != ERROR_OK)
+		LOG_ERROR("Mass erase did not complete");
+
+error:
+	nrf5_nvmc_read_only(chip);
+
 	if (res == ERROR_OK) {
 		LOG_INFO("Mass erase completed.");
 		if (chip->features & NRF5_FEATURE_SERIES_51)
 			LOG_INFO("A reset or power cycle is required if the flash was protected before.");
-
-	} else {
-		LOG_ERROR("Failed to erase the chip");
 	}
 
 	return res;

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

Summary of changes:
 src/flash/nor/nrf5.c | 85 ++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository