X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fkinetis.c;h=7907b8c386ad2f81d8f6a3ce946046d038fde36a;hp=4d924ad882e114cb7444f1509a2febc024dae11a;hb=69db898b3b71eeeaa7aa6f3593467b3a61f11e88;hpb=55e338f3e8344be3efab4184873a09b08f77cd27

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 4d924ad882..7907b8c386 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -82,6 +82,8 @@
 
 /* Addressess */
 #define FLEXRAM		0x14000000
+
+#define FMC_PFB01CR	0x4001f004
 #define FTFx_FSTAT	0x40020000
 #define FTFx_FCNFG	0x40020001
 #define FTFx_FCCOB3	0x40020004
@@ -92,6 +94,13 @@
 #define SIM_FCFG1	0x4004804c
 #define SIM_FCFG2	0x40048050
 #define WDOG_STCTRH	0x40052000
+#define SMC_PMCTRL	0x4007E001
+#define SMC_PMSTAT	0x4007E003
+
+/* Values */
+#define PM_STAT_RUN		0x01
+#define PM_STAT_VLPR		0x04
+#define PM_CTRL_RUNM_RUN	0x00
 
 /* Commands */
 #define FTFx_CMD_BLOCKSTAT  0x00
@@ -216,6 +225,7 @@ struct kinetis_flash_bank {
 		FS_PROGRAM_SECTOR = 1,
 		FS_PROGRAM_LONGWORD = 2,
 		FS_PROGRAM_PHRASE = 4, /* Unsupported */
+		FS_INVALIDATE_CACHE = 8,
 	} flash_support;
 };
 
@@ -948,16 +958,69 @@ static int kinetis_ftfx_command(struct target *target, uint8_t fcmd, uint32_t fa
 }
 
 
-static int kinetis_erase(struct flash_bank *bank, int first, int last)
+static int kinetis_check_run_mode(struct target *target)
 {
 	int result, i;
-	struct kinetis_flash_bank *kinfo = bank->driver_priv;
+	uint8_t pmctrl, pmstat;
 
-	if (bank->target->state != TARGET_HALTED) {
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
+	result = target_read_u8(target, SMC_PMSTAT, &pmstat);
+	if (result != ERROR_OK)
+		return result;
+
+	if (pmstat == PM_STAT_RUN)
+		return ERROR_OK;
+
+	if (pmstat == PM_STAT_VLPR) {
+		/* It is safe to switch from VLPR to RUN mode without changing clock */
+		LOG_INFO("Switching from VLPR to RUN mode.");
+		pmctrl = PM_CTRL_RUNM_RUN;
+		result = target_write_u8(target, SMC_PMCTRL, pmctrl);
+		if (result != ERROR_OK)
+			return result;
+
+		for (i = 100; i; i--) {
+			result = target_read_u8(target, SMC_PMSTAT, &pmstat);
+			if (result != ERROR_OK)
+				return result;
+
+			if (pmstat == PM_STAT_RUN)
+				return ERROR_OK;
+		}
+	}
+
+	LOG_ERROR("Flash operation not possible in current run mode: SMC_PMSTAT: 0x%x", pmstat);
+	LOG_ERROR("Issue a 'reset init' command.");
+	return ERROR_TARGET_NOT_HALTED;
+}
+
+
+static void kinetis_invalidate_flash_cache(struct flash_bank *bank)
+{
+	struct kinetis_flash_bank *kinfo = bank->driver_priv;
+	uint8_t pfb01cr_byte2 = 0xf0;
+
+	if (!(kinfo->flash_support & FS_INVALIDATE_CACHE))
+		return;
+
+	target_write_memory(bank->target, FMC_PFB01CR + 2, 1, 1, &pfb01cr_byte2);
+	return;
+}
+
+
+static int kinetis_erase(struct flash_bank *bank, int first, int last)
+{
+	int result, i;
+	struct kinetis_flash_bank *kinfo = bank->driver_priv;
+
+	result = kinetis_check_run_mode(bank->target);
+	if (result != ERROR_OK)
+		return result;
+
 	if ((first > bank->num_sectors) || (last > bank->num_sectors))
 		return ERROR_FLASH_OPERATION_FAILED;
 
@@ -980,6 +1043,8 @@ static int kinetis_erase(struct flash_bank *bank, int first, int last)
 		bank->sectors[i].is_erased = 1;
 	}
 
+	kinetis_invalidate_flash_cache(bank);
+
 	if (first == 0) {
 		LOG_WARNING
 			("flash configuration field erased, please reset the device");
@@ -1027,10 +1092,9 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
 	struct kinetis_flash_bank *kinfo = bank->driver_priv;
 	uint8_t *new_buffer = NULL;
 
-	if (bank->target->state != TARGET_HALTED) {
-		LOG_ERROR("Target not halted");
-		return ERROR_TARGET_NOT_HALTED;
-	}
+	result = kinetis_check_run_mode(bank->target);
+	if (result != ERROR_OK)
+		return result;
 
 	if (!(kinfo->flash_support & FS_PROGRAM_SECTOR)) {
 		/* fallback to longword write */
@@ -1179,6 +1243,7 @@ static int kinetis_write(struct flash_bank *bank, const uint8_t *buffer,
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
+	kinetis_invalidate_flash_cache(bank);
 	return ERROR_OK;
 }
 
@@ -1187,7 +1252,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 	int result, i;
 	uint32_t offset = 0;
 	uint8_t fcfg1_nvmsize, fcfg1_pfsize, fcfg1_eesize, fcfg1_depart;
-	uint8_t fcfg2_pflsh;
+	uint8_t fcfg2_maxaddr0, fcfg2_pflsh, fcfg2_maxaddr1;
 	uint32_t nvm_size = 0, pf_size = 0, df_size = 0, ee_size = 0;
 	unsigned num_blocks = 0, num_pflash_blocks = 0, num_nvm_blocks = 0, first_nvm_bank = 0,
 			pflash_sector_size_bytes = 0, nvm_sector_size_bytes = 0;
@@ -1211,7 +1276,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			pflash_sector_size_bytes = 1<<10;
 			nvm_sector_size_bytes = 1<<10;
 			num_blocks = 2;
-			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
+			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 			break;
 		case KINETIS_K_SDID_K10_M72:
 		case KINETIS_K_SDID_K20_M72:
@@ -1224,7 +1289,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			pflash_sector_size_bytes = 2<<10;
 			nvm_sector_size_bytes = 1<<10;
 			num_blocks = 2;
-			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
+			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 			kinfo->max_flash_prog_size = 1<<10;
 			break;
 		case KINETIS_K_SDID_K10_M100:
@@ -1240,7 +1305,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			pflash_sector_size_bytes = 2<<10;
 			nvm_sector_size_bytes = 2<<10;
 			num_blocks = 2;
-			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR;
+			kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 			break;
 		case KINETIS_K_SDID_K21_M120:
 		case KINETIS_K_SDID_K22_M120:
@@ -1249,7 +1314,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			kinfo->max_flash_prog_size = 1<<10;
 			nvm_sector_size_bytes = 4<<10;
 			num_blocks = 2;
-			kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+			kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 			break;
 		case KINETIS_K_SDID_K10_M120:
 		case KINETIS_K_SDID_K20_M120:
@@ -1259,7 +1324,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			pflash_sector_size_bytes = 4<<10;
 			nvm_sector_size_bytes = 4<<10;
 			num_blocks = 4;
-			kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+			kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 			break;
 		default:
 			LOG_ERROR("Unsupported K-family FAMID");
@@ -1273,7 +1338,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 				/* K02FN64, K02FN128: FTFA, 2kB sectors */
 				pflash_sector_size_bytes = 2<<10;
 				num_blocks = 1;
-				kinfo->flash_support = FS_PROGRAM_LONGWORD;
+				kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE;
 				break;
 
 			case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX2: {
@@ -1288,7 +1353,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 					/* MK24FN1M */
 					pflash_sector_size_bytes = 4<<10;
 					num_blocks = 2;
-					kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+					kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 					kinfo->max_flash_prog_size = 1<<10;
 					break;
 				}
@@ -1297,8 +1362,8 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 					|| (kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K22FN512) {
 					/* K22 with new-style SDID - smaller pflash with FTFA, 2kB sectors */
 					pflash_sector_size_bytes = 2<<10;
-					num_blocks = 2;		/* 1 or 2 blocks */
-					kinfo->flash_support = FS_PROGRAM_LONGWORD;
+					/* autodetect 1 or 2 blocks */
+					kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE;
 					break;
 				}
 				LOG_ERROR("Unsupported Kinetis K22 DIEID");
@@ -1309,12 +1374,12 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 				if ((kinfo->sim_sdid & (KINETIS_SDID_DIEID_MASK)) == KINETIS_SDID_DIEID_K24FN256) {
 					/* K24FN256 - smaller pflash with FTFA */
 					num_blocks = 1;
-					kinfo->flash_support = FS_PROGRAM_LONGWORD;
+					kinfo->flash_support = FS_PROGRAM_LONGWORD | FS_INVALIDATE_CACHE;
 					break;
 				}
 				/* K24FN1M without errata 7534 */
 				num_blocks = 2;
-				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 				kinfo->max_flash_prog_size = 1<<10;
 				break;
 
@@ -1328,7 +1393,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 				nvm_sector_size_bytes = 4<<10;
 				kinfo->max_flash_prog_size = 1<<10;
 				num_blocks = 2;
-				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 				break;
 
 			case KINETIS_SDID_FAMILYID_K2X | KINETIS_SDID_SUBFAMID_KX6:
@@ -1339,7 +1404,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 				nvm_sector_size_bytes = 4<<10;
 				kinfo->max_flash_prog_size = 1<<10;
 				num_blocks = 4;
-				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR;
+				kinfo->flash_support = FS_PROGRAM_PHRASE | FS_PROGRAM_SECTOR | FS_INVALIDATE_CACHE;
 				break;
 			default:
 				LOG_ERROR("Unsupported Kinetis FAMILYID SUBFAMID");
@@ -1349,7 +1414,7 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 			/* KL-series */
 			pflash_sector_size_bytes = 1<<10;
 			nvm_sector_size_bytes = 1<<10;
-			num_blocks = 1;
+			/* autodetect 1 or 2 blocks */
 			kinfo->flash_support = FS_PROGRAM_LONGWORD;
 			break;
 		default:
@@ -1379,6 +1444,18 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 	fcfg1_depart = (uint8_t)((kinfo->sim_fcfg1 >> 8) & 0x0f);
 
 	fcfg2_pflsh = (uint8_t)((kinfo->sim_fcfg2 >> 23) & 0x01);
+	fcfg2_maxaddr0 = (uint8_t)((kinfo->sim_fcfg2 >> 24) & 0x7f);
+	fcfg2_maxaddr1 = (uint8_t)((kinfo->sim_fcfg2 >> 16) & 0x7f);
+
+	if (num_blocks == 0)
+		num_blocks = fcfg2_maxaddr1 ? 2 : 1;
+	else if (fcfg2_maxaddr1 == 0 && num_blocks >= 2) {
+		num_blocks = 1;
+		LOG_WARNING("MAXADDR1 is zero, number of flash banks adjusted to 1");
+	} else if (fcfg2_maxaddr1 != 0 && num_blocks == 1) {
+		num_blocks = 2;
+		LOG_WARNING("MAXADDR1 is non zero, number of flash banks adjusted to 2");
+	}
 
 	/* when the PFLSH bit is set, there is no FlexNVM/FlexRAM */
 	if (!fcfg2_pflsh) {
@@ -1455,12 +1532,22 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 		pf_size = 1 << (14 + (fcfg1_pfsize >> 1));
 		break;
 	case 0x0f:
-		if (pflash_sector_size_bytes >= 4<<10)
-			pf_size = 1024<<10;
-		else if (fcfg2_pflsh)
-			pf_size = 512<<10;
+		/* a peculiar case: Freescale states different sizes for 0xf
+		 * K02P64M100SFARM	128 KB ... duplicate of code 0x7
+		 * K22P121M120SF8RM	256 KB ... duplicate of code 0x9
+		 * K22P121M120SF7RM	512 KB ... duplicate of code 0xb
+		 * K22P100M120SF5RM	1024 KB ... duplicate of code 0xd
+		 * K26P169M180SF5RM	2048 KB ... the only unique value
+		 * fcfg2_maxaddr0 seems to be the only clue to pf_size
+		 * Checking fcfg2_maxaddr0 later in this routine is pointless then
+		 */
+		if (fcfg2_pflsh)
+			pf_size = ((uint32_t)fcfg2_maxaddr0 << 13) * num_blocks;
 		else
-			pf_size = 256<<10;
+			pf_size = ((uint32_t)fcfg2_maxaddr0 << 13) * num_blocks / 2;
+		if (pf_size != 2048<<10)
+			LOG_WARNING("SIM_FCFG1 PFSIZE = 0xf: please check if pflash is %u KB", pf_size>>10);
+
 		break;
 	default:
 		pf_size = 0;
@@ -1532,6 +1619,20 @@ static int kinetis_read_part_info(struct flash_bank *bank)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
+	if (bank->bank_number == 0 && ((uint32_t)fcfg2_maxaddr0 << 13) != bank->size)
+		LOG_WARNING("MAXADDR0 0x%02" PRIx8 " check failed,"
+				" please report to OpenOCD mailing list", fcfg2_maxaddr0);
+	if (fcfg2_pflsh) {
+		if (bank->bank_number == 1 && ((uint32_t)fcfg2_maxaddr1 << 13) != bank->size)
+			LOG_WARNING("MAXADDR1 0x%02" PRIx8 " check failed,"
+				" please report to OpenOCD mailing list", fcfg2_maxaddr1);
+	} else {
+		if ((unsigned)bank->bank_number == first_nvm_bank
+				&& ((uint32_t)fcfg2_maxaddr1 << 13) != df_size)
+			LOG_WARNING("FlexNVM MAXADDR1 0x%02" PRIx8 " check failed,"
+				" please report to OpenOCD mailing list", fcfg2_maxaddr1);
+	}
+
 	if (bank->sectors) {
 		free(bank->sectors);
 		bank->sectors = NULL;
@@ -1607,14 +1708,14 @@ static int kinetis_info(struct flash_bank *bank, char *buf, int buf_size)
 static int kinetis_blank_check(struct flash_bank *bank)
 {
 	struct kinetis_flash_bank *kinfo = bank->driver_priv;
+	int result;
 
-	if (bank->target->state != TARGET_HALTED) {
-		LOG_ERROR("Target not halted");
-		return ERROR_TARGET_NOT_HALTED;
-	}
+	/* suprisingly blank check does not work in VLPR and HSRUN modes */
+	result = kinetis_check_run_mode(bank->target);
+	if (result != ERROR_OK)
+		return result;
 
 	if (kinfo->flash_class == FC_PFLASH || kinfo->flash_class == FC_FLEX_NVM) {
-		int result;
 		bool block_dirty = false;
 		uint8_t ftfx_fstat;
 
@@ -1776,10 +1877,9 @@ COMMAND_HANDLER(kinetis_nvm_partition)
 	LOG_INFO("DEPART 0x%" PRIx8 ", EEPROM size code 0x%" PRIx8,
 		 flex_nvm_partition_code, ee_size_code);
 
-	if (target->state != TARGET_HALTED) {
-		LOG_ERROR("Target not halted");
-		return ERROR_TARGET_NOT_HALTED;
-	}
+	result = kinetis_check_run_mode(target);
+	if (result != ERROR_OK)
+		return result;
 
 	result = kinetis_ftfx_command(target, FTFx_CMD_PGMPART, load_flex_ram,
 				      ee_size_code, flex_nvm_partition_code, 0, 0,