imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash/stm32h7x: avoid using magic numbers for device ids 

Change-Id: I4d682ee828404974abd9a42f98b840d77835cfe0
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6669
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
This commit is contained in:
Tarek BOCHKATI 2021-10-20 12:10:44 +01:00 committed by Antonio Borneo
parent 3f778c7c63
commit 50f977b058
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/flash/nor/stm32h7x.c
View File

@ -100,6 +100,11 @@
#define FLASH_REG_BASE_B0 0x52002000 #define FLASH_REG_BASE_B0 0x52002000
#define FLASH_REG_BASE_B1 0x52002100 #define FLASH_REG_BASE_B1 0x52002100
/* Supported device IDs */
#define DEVID_STM32H74_H75XX 0x450
#define DEVID_STM32H7A_H7BXX 0x480
#define DEVID_STM32H72_H73XX 0x483
struct stm32h7x_rev { struct stm32h7x_rev {
uint16_t rev; uint16_t rev;
const char *str; const char *str;
@ -139,24 +144,24 @@ enum stm32h7x_opt_rdp {
OPT_RDP_L2 = 0xcc OPT_RDP_L2 = 0xcc
}; };
static const struct stm32h7x_rev stm32_450_revs[] = { static const struct stm32h7x_rev stm32h74_h75xx_revs[] = {
{ 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2001, "X" }, { 0x2003, "V" }, { 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2001, "X" }, { 0x2003, "V" },
}; };
static const struct stm32h7x_rev stm32_480_revs[] = { static const struct stm32h7x_rev stm32h7a_h7bxx_revs[] = {
{ 0x1000, "A"}, { 0x1000, "A"},
}; };
static const struct stm32h7x_rev stm32_483_revs[] = { static const struct stm32h7x_rev stm32h72_h73xx_revs[] = {
{ 0x1000, "A" }, { 0x1001, "Z" }, { 0x1000, "A" }, { 0x1001, "Z" },
}; };
static uint32_t stm32x_compute_flash_cr_450_483(uint32_t cmd, int snb) static uint32_t stm32h74_h75xx_compute_flash_cr(uint32_t cmd, int snb)
{ {
return cmd | (snb << 8); return cmd | (snb << 8);
} }
static uint32_t stm32x_compute_flash_cr_480(uint32_t cmd, int snb) static uint32_t stm32h7a_h7bxx_compute_flash_cr(uint32_t cmd, int snb)
{ {
/* save FW and START bits, to be right shifted by 2 bits later */ /* save FW and START bits, to be right shifted by 2 bits later */
const uint32_t tmp = cmd & (FLASH_FW | FLASH_START); const uint32_t tmp = cmd & (FLASH_FW | FLASH_START);
@ -169,9 +174,9 @@ static uint32_t stm32x_compute_flash_cr_480(uint32_t cmd, int snb)
static const struct stm32h7x_part_info stm32h7x_parts[] = { static const struct stm32h7x_part_info stm32h7x_parts[] = {
{ {
.id = 0x450, .id = DEVID_STM32H74_H75XX,
.revs = stm32_450_revs, .revs = stm32h74_h75xx_revs,
.num_revs = ARRAY_SIZE(stm32_450_revs), .num_revs = ARRAY_SIZE(stm32h74_h75xx_revs),
.device_str = "STM32H74x/75x", .device_str = "STM32H74x/75x",
.page_size_kb = 128, .page_size_kb = 128,
.block_size = 32, .block_size = 32,
@ -181,12 +186,12 @@ static const struct stm32h7x_part_info stm32h7x_parts[] = {
.fsize_addr = 0x1FF1E880, .fsize_addr = 0x1FF1E880,
.wps_group_size = 1, .wps_group_size = 1,
.wps_mask = 0xFF, .wps_mask = 0xFF,
.compute_flash_cr = stm32x_compute_flash_cr_450_483, .compute_flash_cr = stm32h74_h75xx_compute_flash_cr,
}, },
{ {
.id = 0x480, .id = DEVID_STM32H7A_H7BXX,
.revs = stm32_480_revs, .revs = stm32h7a_h7bxx_revs,
.num_revs = ARRAY_SIZE(stm32_480_revs), .num_revs = ARRAY_SIZE(stm32h7a_h7bxx_revs),
.device_str = "STM32H7Ax/7Bx", .device_str = "STM32H7Ax/7Bx",
.page_size_kb = 8, .page_size_kb = 8,
.block_size = 16, .block_size = 16,
@ -196,12 +201,12 @@ static const struct stm32h7x_part_info stm32h7x_parts[] = {
.fsize_addr = 0x08FFF80C, .fsize_addr = 0x08FFF80C,
.wps_group_size = 4, .wps_group_size = 4,
.wps_mask = 0xFFFFFFFF, .wps_mask = 0xFFFFFFFF,
.compute_flash_cr = stm32x_compute_flash_cr_480, .compute_flash_cr = stm32h7a_h7bxx_compute_flash_cr,
}, },
{ {
.id = 0x483, .id = DEVID_STM32H72_H73XX,
.revs = stm32_483_revs, .revs = stm32h72_h73xx_revs,
.num_revs = ARRAY_SIZE(stm32_483_revs), .num_revs = ARRAY_SIZE(stm32h72_h73xx_revs),
.device_str = "STM32H72x/73x", .device_str = "STM32H72x/73x",
.page_size_kb = 128, .page_size_kb = 128,
.block_size = 32, .block_size = 32,
@ -211,7 +216,7 @@ static const struct stm32h7x_part_info stm32h7x_parts[] = {
.fsize_addr = 0x1FF1E880, .fsize_addr = 0x1FF1E880,
.wps_group_size = 1, .wps_group_size = 1,
.wps_mask = 0xFF, .wps_mask = 0xFF,
.compute_flash_cr = stm32x_compute_flash_cr_450_483, .compute_flash_cr = stm32h74_h75xx_compute_flash_cr,
}, },
}; };
@ -808,8 +813,8 @@ static int stm32x_probe(struct flash_bank *bank)
bool has_dual_bank = stm32x_info->part_info->has_dual_bank; bool has_dual_bank = stm32x_info->part_info->has_dual_bank;
switch (device_id) { switch (device_id) {
case 0x450: case DEVID_STM32H74_H75XX:
case 0x480: case DEVID_STM32H7A_H7BXX:
/* For STM32H74x/75x and STM32H7Ax/Bx /* For STM32H74x/75x and STM32H7Ax/Bx
* - STM32H7xxxI devices contains dual bank, 1 Mbyte each * - STM32H7xxxI devices contains dual bank, 1 Mbyte each
* - STM32H7xxxG devices contains dual bank, 512 Kbyte each * - STM32H7xxxG devices contains dual bank, 512 Kbyte each
@ -822,7 +827,7 @@ static int stm32x_probe(struct flash_bank *bank)
/* flash size is 2M or 1M */ /* flash size is 2M or 1M */
flash_size_in_kb /= 2; flash_size_in_kb /= 2;
break; break;
case 0x483: case DEVID_STM32H72_H73XX:
break; break;
default: default:
LOG_ERROR("unsupported device"); LOG_ERROR("unsupported device");