X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fpsoc5lp.c;h=d8e1c15682e4d8b510657f4b753988176b33d85d;hb=7a3eec2b4d9dbb9533acfb271dbe91afa0727c8e;hp=0b21ed6494295affd09271a5d2a12867c18ec63c;hpb=548bcee30dcfec3174e563e53ffb1559104b8a97;p=openocd.git

diff --git a/src/flash/nor/psoc5lp.c b/src/flash/nor/psoc5lp.c
index 0b21ed6494..d8e1c15682 100644
--- a/src/flash/nor/psoc5lp.c
+++ b/src/flash/nor/psoc5lp.c
@@ -753,16 +753,6 @@ static int psoc5lp_nvl_write(struct flash_bank *bank,
 	return ERROR_OK;
 }
 
-static int psoc5lp_nvl_protect_check(struct flash_bank *bank)
-{
-	int i;
-
-	for (i = 0; i < bank->num_sectors; i++)
-		bank->sectors[i].is_protected = -1;
-
-	return ERROR_OK;
-}
-
 static int psoc5lp_nvl_get_info_command(struct flash_bank *bank,
 	char *buf, int buf_size)
 {
@@ -855,11 +845,11 @@ struct flash_driver psoc5lp_nvl_flash = {
 	.info = psoc5lp_nvl_get_info_command,
 	.probe = psoc5lp_nvl_probe,
 	.auto_probe = psoc5lp_nvl_auto_probe,
-	.protect_check = psoc5lp_nvl_protect_check,
 	.read = psoc5lp_nvl_read,
 	.erase = psoc5lp_nvl_erase,
 	.erase_check = psoc5lp_nvl_erase_check,
 	.write = psoc5lp_nvl_write,
+	.free_driver_priv = default_flash_free_driver_priv,
 };
 
 /*
@@ -944,16 +934,6 @@ static int psoc5lp_eeprom_write(struct flash_bank *bank,
 	return ERROR_OK;
 }
 
-static int psoc5lp_eeprom_protect_check(struct flash_bank *bank)
-{
-	int i;
-
-	for (i = 0; i < bank->num_sectors; i++)
-		bank->sectors[i].is_protected = -1;
-
-	return ERROR_OK;
-}
-
 static int psoc5lp_eeprom_get_info_command(struct flash_bank *bank, char *buf, int buf_size)
 {
 	struct psoc5lp_eeprom_flash_bank *psoc_eeprom_bank = bank->driver_priv;
@@ -1063,11 +1043,11 @@ struct flash_driver psoc5lp_eeprom_flash = {
 	.info = psoc5lp_eeprom_get_info_command,
 	.probe = psoc5lp_eeprom_probe,
 	.auto_probe = psoc5lp_eeprom_auto_probe,
-	.protect_check = psoc5lp_eeprom_protect_check,
 	.read = default_flash_read,
 	.erase = psoc5lp_eeprom_erase,
 	.erase_check = default_flash_blank_check,
 	.write = psoc5lp_eeprom_write,
+	.free_driver_priv = default_flash_free_driver_priv,
 };
 
 /*
@@ -1078,6 +1058,10 @@ struct psoc5lp_flash_bank {
 	bool probed;
 	const struct psoc5lp_device *device;
 	bool ecc_enabled;
+	/* If ecc is disabled, num_sectors counts both std and ecc sectors.
+	 * If ecc is enabled, num_sectors indicates just the number of std sectors.
+	 * However ecc sector descriptors bank->sector[num_sectors..2*num_sectors-1]
+	 * are used for driver private flash operations */
 };
 
 static int psoc5lp_erase(struct flash_bank *bank, int first, int last)
@@ -1122,21 +1106,25 @@ static int psoc5lp_erase_check(struct flash_bank *bank)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
+	int num_sectors = bank->num_sectors;
+	if (psoc_bank->ecc_enabled)
+		num_sectors *= 2;	/* count both std and ecc sector always */
+
 	struct target_memory_check_block *block_array;
-	block_array = malloc(bank->num_sectors * sizeof(struct target_memory_check_block));
+	block_array = malloc(num_sectors * sizeof(struct target_memory_check_block));
 	if (block_array == NULL)
 		return ERROR_FAIL;
 
-	for (i = 0; i < bank->num_sectors; i++) {
+	for (i = 0; i < num_sectors; i++) {
 		block_array[i].address = bank->base + bank->sectors[i].offset;
 		block_array[i].size = bank->sectors[i].size;
 		block_array[i].result = UINT32_MAX; /* erase state unknown */
 	}
 
 	bool fast_check = true;
-	for (i = 0; i < bank->num_sectors; ) {
+	for (i = 0; i < num_sectors; ) {
 		retval = armv7m_blank_check_memory(target,
-					block_array + i, bank->num_sectors - i,
+					block_array + i, num_sectors - i,
 					bank->erased_value);
 		if (retval < 1) {
 			/* Run slow fallback if the first run gives no result
@@ -1149,15 +1137,15 @@ static int psoc5lp_erase_check(struct flash_bank *bank)
 	}
 
 	if (fast_check) {
-		if (!psoc_bank->ecc_enabled) {
-			int half_sectors = bank->num_sectors / 2;
-			for (i = 0; i < half_sectors / 2; i++)
+		if (psoc_bank->ecc_enabled) {
+			for (i = 0; i < bank->num_sectors; i++)
 				bank->sectors[i].is_erased =
 					(block_array[i].result != 1)
-					? block_array[i + half_sectors].result
-					: block_array[i].result;
+					? block_array[i].result
+					: block_array[i + bank->num_sectors].result;
+				/* if std sector is erased, use status of ecc sector */
 		} else {
-			for (i = 0; i < bank->num_sectors; i++)
+			for (i = 0; i < num_sectors; i++)
 				bank->sectors[i].is_erased = block_array[i].result;
 		}
 		retval = ERROR_OK;
@@ -1572,4 +1560,5 @@ struct flash_driver psoc5lp_flash = {
 	.erase = psoc5lp_erase,
 	.erase_check = psoc5lp_erase_check,
 	.write = psoc5lp_write,
+	.free_driver_priv = default_flash_free_driver_priv,
 };