Skip to content

Commit

Permalink
Minor fixes & additions
Browse files Browse the repository at this point in the history 
- G49x_G4Ax & WLEx: Added dualbank support
- G49x_G4Ax: Added option byte support
- Minor formatting improvements
- Replaced leftovers for non-fixed length types
  • Loading branch information
@Nightwalker-87
Nightwalker-87 committed Jun 7, 2023
1 parent 5e85fd0 commit 92ad99f
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 86 deletions.
2 changes: 1 addition & 1 deletion config/chips/G49x_G4Ax.chip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ bootrom_base 0x1fff0000
bootrom_size 0x7000 // 28 KB
option_base 0x1ffff800 // STM32_G4_OPTION_BYTES_BASE
option_size 0x4 // 4 B
flags swo
flags swo dualbank
2 changes: 1 addition & 1 deletion config/chips/WLx5.chip → config/chips/WLEx.chip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ bootrom_base 0x1fff0000
bootrom_size 0x7000 // 28 KB
option_base 0x1fff7800
option_size 0x10 // 16 B
flags swo
flags swo dualbank
11 changes: 6 additions & 5 deletions src/stlink-lib/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ struct stlink_fread_ihex_worker_arg {
typedef bool (*save_block_fn)(void *arg, uint8_t *block, ssize_t len);

static void stop_wdg_in_debug(stlink_t *);
int32_t stlink_jtag_reset(stlink_t *, int);
int32_t stlink_soft_reset(stlink_t *, int);
int32_t stlink_jtag_reset(stlink_t *, int32_t);
int32_t stlink_soft_reset(stlink_t *, int32_t);
void _parse_version(stlink_t *, stlink_version_t *);
static uint8_t stlink_parse_hex(const char *);
static int32_t stlink_read(stlink_t *, stm32_addr_t, size_t, save_block_fn, void *);
Expand Down Expand Up @@ -253,8 +253,8 @@ int32_t stlink_load_device_params(stlink_t *sl) {
flash_size = flash_size & 0xffff;

if ((sl->chip_id == STM32_CHIPID_L1_MD ||
sl->chip_id == STM32_CHIPID_F1_VL_MD_LD ||
sl->chip_id == STM32_CHIPID_L1_MD_PLUS) &&
sl->chip_id == STM32_CHIPID_F1_VL_MD_LD ||
sl->chip_id == STM32_CHIPID_L1_MD_PLUS) &&
(flash_size == 0)) {
sl->flash_size = 128 * 1024;
} else if (sl->chip_id == STM32_CHIPID_L1_CAT2) {
Expand Down Expand Up @@ -285,7 +285,8 @@ int32_t stlink_load_device_params(stlink_t *sl) {
sl->sram_size = 0x1000;
}

if (sl->chip_id == STM32_CHIPID_G4_CAT3) {
if (sl->chip_id == STM32_CHIPID_G4_CAT3 ||
sl->chip_id == STM32_CHIPID_G4_CAT4) {
uint32_t flash_optr;
stlink_read_debug32(sl, FLASH_Gx_OPTR, &flash_optr);

Expand Down
3 changes: 1 addition & 2 deletions src/stlink-lib/common_flash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1348,8 +1348,7 @@ int32_t stlink_fcheck_flash(stlink_t *sl, const char *path, stm32_addr_t addr) {
* @param length how much
* @return 0 for success, -ve for failure
*/
int32_t stlink_verify_write_flash(stlink_t *sl, stm32_addr_t address, uint8_t *data,
uint32_t length) {
int32_t stlink_verify_write_flash(stlink_t *sl, stm32_addr_t address, uint8_t *data, uint32_t length) {
size_t off;
size_t cmp_size = (sl->flash_pgsz > 0x1800) ? 0x1800 : sl->flash_pgsz;
ILOG("Starting verification of write complete\n");
Expand Down
141 changes: 68 additions & 73 deletions src/stlink-lib/flash_loader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* flash loaders must be aligned by 4 (it's written by stlink_write_mem32)
*/

/* flashloaders/stm32f0.s -- compiled with thumb2 */
// flashloaders/stm32f0.s -- compiled with thumb2
static const uint8_t loader_code_stm32vl[] = {
0x00, 0xbf, 0x00, 0xbf,
0x09, 0x4f, 0x1f, 0x44,
Expand All @@ -41,7 +41,7 @@ static const uint8_t loader_code_stm32vl[] = {
0x0c, 0x00, 0x00, 0x00
};

/* flashloaders/stm32f0.s -- thumb1 only, same sequence as for STM32VL, bank ignored */
// flashloaders/stm32f0.s -- thumb1 only, same sequence as for STM32VL, bank ignored
static const uint8_t loader_code_stm32f0[] = {
0xc0, 0x46, 0xc0, 0x46,
0x08, 0x4f, 0x1f, 0x44,
Expand All @@ -59,17 +59,17 @@ static const uint8_t loader_code_stm32f0[] = {
0x14, 0x00, 0x00, 0x00
};

// flashloaders/stm32lx.s
static const uint8_t loader_code_stm32lx[] = {
// flashloaders/stm32lx.s
0x04, 0x68, 0x0c, 0x60,
0x00, 0xf1, 0x04, 0x00,
0x01, 0xf1, 0x04, 0x01,
0x04, 0x3a, 0xf7, 0xdc,
0x00, 0xbe, 0x00, 0x00
};

// flashloaders/stm32f4.s
static const uint8_t loader_code_stm32f4[] = {
// flashloaders/stm32f4.s
0xdf, 0xf8, 0x24, 0xc0,
0xdf, 0xf8, 0x24, 0xa0,
0xe2, 0x44, 0x04, 0x68,
Expand All @@ -84,8 +84,8 @@ static const uint8_t loader_code_stm32f4[] = {
0x0e, 0x00, 0x00, 0x00
};

// flashloaders/stm32f4lv.s
static const uint8_t loader_code_stm32f4_lv[] = {
// flashloaders/stm32f4lv.s
0xdf, 0xf8, 0x24, 0xc0,
0xdf, 0xf8, 0x24, 0xa0,
0xe2, 0x44, 0x04, 0x78,
Expand All @@ -100,8 +100,8 @@ static const uint8_t loader_code_stm32f4_lv[] = {
0x0e, 0x00, 0x00, 0x00
};

// flashloaders/stm32l4.s
static const uint8_t loader_code_stm32l4[] = {
// flashloaders/stm32l4.s
0xdf, 0xf8, 0x28, 0xc0,
0xdf, 0xf8, 0x28, 0xa0,
0xe2, 0x44, 0x05, 0x68,
Expand All @@ -117,8 +117,8 @@ static const uint8_t loader_code_stm32l4[] = {
0x10, 0x00, 0x00, 0x00
};

// flashloaders/stm32f7.s
static const uint8_t loader_code_stm32f7[] = {
// flashloaders/stm32f7.s
0xdf, 0xf8, 0x28, 0xc0,
0xdf, 0xf8, 0x28, 0xa0,
0xe2, 0x44, 0x04, 0x68,
Expand All @@ -134,8 +134,8 @@ static const uint8_t loader_code_stm32f7[] = {
0x0e, 0x00, 0x00, 0x00
};

// flashloaders/stm32f7lv.s
static const uint8_t loader_code_stm32f7_lv[] = {
// flashloaders/stm32f7lv.s
0xdf, 0xf8, 0x28, 0xc0,
0xdf, 0xf8, 0x28, 0xa0,
0xe2, 0x44, 0x04, 0x78,
Expand Down Expand Up @@ -201,9 +201,9 @@ int32_t stlink_flash_loader_init(stlink_t *sl, flash_loader_t *fl) {
}

static int32_t loader_v_dependent_assignment(stlink_t *sl,
const uint8_t **loader_code, size_t *loader_size,
const uint8_t *high_v_loader, size_t high_v_loader_size,
const uint8_t *low_v_loader, size_t low_v_loader_size) {
const uint8_t **loader_code, size_t *loader_size,
const uint8_t *high_v_loader, size_t high_v_loader_size,
const uint8_t *low_v_loader, size_t low_v_loader_size) {
int32_t retval = 0;

if ( sl->version.stlink_v == 1) {
Expand Down Expand Up @@ -338,21 +338,21 @@ int32_t stlink_flash_loader_run(stlink_t *sl, flash_loader_t* fl, stm32_addr_t t
flash_base = FLASH_REGS_BANK2_OFS;
}

/* Setup core */
stlink_write_reg(sl, fl->buf_addr, 0); // source
stlink_write_reg(sl, target, 1); // target
stlink_write_reg(sl, (uint32_t)size, 2); // count
stlink_write_reg(sl, flash_base, 3); // flash register base
// only used on VL/F1_XL, but harmless for others
stlink_write_reg(sl, fl->loader_addr, 15); // pc register
/* Setup core */
stlink_write_reg(sl, fl->buf_addr, 0); // source
stlink_write_reg(sl, target, 1); // target
stlink_write_reg(sl, (uint32_t)size, 2); // count
stlink_write_reg(sl, flash_base, 3); // flash register base
// only used on VL/F1_XL, but harmless for others
stlink_write_reg(sl, fl->loader_addr, 15); // pc register

/* Reset IWDG */
if (fl->iwdg_kr) {
stlink_write_debug32(sl, fl->iwdg_kr, STM32F0_WDG_KR_KEY_RELOAD);
}
/* Reset IWDG */
if (fl->iwdg_kr) {
stlink_write_debug32(sl, fl->iwdg_kr, STM32F0_WDG_KR_KEY_RELOAD);
}

/* Run loader */
stlink_run(sl, RUN_FLASH_LOADER);
/* Run loader */
stlink_run(sl, RUN_FLASH_LOADER);

/*
* This piece of code used to try to spin for .1 second by waiting doing 10000 rounds of 10 µs.
Expand All @@ -365,67 +365,63 @@ int32_t stlink_flash_loader_run(stlink_t *sl, flash_loader_t* fl, stm32_addr_t t
* as what was intended. -- REW.
*/

// wait until done (reaches breakpoint)
timeout = time_ms() + 500;
while (time_ms() < timeout) {
usleep(10000);

if (stlink_is_core_halted(sl)) {
timeout = 0;
break;
}
}
// wait until done (reaches breakpoint)
timeout = time_ms() + 500;
while (time_ms() < timeout) {
usleep(10000);

if (timeout) {
ELOG("Flash loader run error\n");
goto error;
}
if (stlink_is_core_halted(sl)) {
timeout = 0;
break;
}
}

// check written byte count
stlink_read_reg(sl, 2, &rr);
if (timeout) {
ELOG("Flash loader run error\n");
goto error;
}

/*
* The chunk size for loading is not rounded. The flash loader
* subtracts the size of the written block (1-8 bytes) from
* the remaining size each time. A negative value may mean that
* several bytes garbage have been written due to the unaligned
* firmware size.
*/
if ((int32_t)rr.r[2] > 0 || (int32_t)rr.r[2] < -7) {
ELOG("Flash loader write error\n");
goto error;
}
// check written byte count
stlink_read_reg(sl, 2, &rr);

/*
* The chunk size for loading is not rounded. The flash loader
* subtracts the size of the written block (1-8 bytes) from
* the remaining size each time. A negative value may mean that
* several bytes garbage have been written due to the unaligned
* firmware size.
*/
if ((int32_t)rr.r[2] > 0 || (int32_t)rr.r[2] < -7) {
ELOG("Flash loader write error\n");
goto error;
}

return(0);
return(0);

error:
dhcsr = dfsr = cfsr = hfsr = 0;
stlink_read_debug32(sl, STLINK_REG_DHCSR, &dhcsr);
stlink_read_debug32(sl, STLINK_REG_DFSR, &dfsr);
stlink_read_debug32(sl, STLINK_REG_CFSR, &cfsr);
stlink_read_debug32(sl, STLINK_REG_HFSR, &hfsr);
stlink_read_all_regs(sl, &rr);
error:
dhcsr = dfsr = cfsr = hfsr = 0;
stlink_read_debug32(sl, STLINK_REG_DHCSR, &dhcsr);
stlink_read_debug32(sl, STLINK_REG_DFSR, &dfsr);
stlink_read_debug32(sl, STLINK_REG_CFSR, &cfsr);
stlink_read_debug32(sl, STLINK_REG_HFSR, &hfsr);
stlink_read_all_regs(sl, &rr);

WLOG("Loader state: R2 0x%X R15 0x%X\n", rr.r[2], rr.r[15]);
if (dhcsr != 0x3000B || dfsr || cfsr || hfsr) {
WLOG("MCU state: DHCSR 0x%X DFSR 0x%X CFSR 0x%X HFSR 0x%X\n",
dhcsr, dfsr, cfsr, hfsr);
}
WLOG("Loader state: R2 0x%X R15 0x%X\n", rr.r[2], rr.r[15]);
if (dhcsr != 0x3000B || dfsr || cfsr || hfsr) {
WLOG("MCU state: DHCSR 0x%X DFSR 0x%X CFSR 0x%X HFSR 0x%X\n",
dhcsr, dfsr, cfsr, hfsr);
}

return(-1);
return(-1);
}


/* ==================================================
* === Content from old source file flashloader.c ===
* ==================================================
*/
/* === Content from old source file flashloader.c === */

#define L1_WRITE_BLOCK_SIZE 0x80
#define L0_WRITE_BLOCK_SIZE 0x40

int32_t stm32l1_write_half_pages(stlink_t *sl, stm32_addr_t addr, uint8_t *base,
uint32_t len, uint32_t pagesize) {
int32_t stm32l1_write_half_pages(stlink_t *sl, stm32_addr_t addr, uint8_t *base, uint32_t len, uint32_t pagesize) {
uint32_t count, off;
uint32_t num_half_pages = len / pagesize;
uint32_t val;
Expand Down Expand Up @@ -722,8 +718,7 @@ int32_t stlink_flashloader_start(stlink_t *sl, flash_loader_t *fl) {
return (0);
}

int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl,
stm32_addr_t addr, uint8_t *base, uint32_t len) {
int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl, stm32_addr_t addr, uint8_t *base, uint32_t len) {
size_t off;
if ((sl->flash_type == STM32_FLASH_TYPE_F2_F4) ||
(sl->flash_type == STM32_FLASH_TYPE_F7) ||
Expand Down
12 changes: 11 additions & 1 deletion src/stlink-lib/flash_loader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,21 @@
#include <stlink.h>

int32_t stlink_flash_loader_init(stlink_t *sl, flash_loader_t* fl);
static int32_t loader_v_dependent_assignment(stlink_t *sl,
const uint8_t **loader_code, size_t *loader_size,
const uint8_t *high_v_loader, size_t high_v_loader_size,
const uint8_t *low_v_loader, size_t low_v_loader_size);
int32_t stlink_flash_loader_write_to_sram(stlink_t *sl, stm32_addr_t* addr, size_t* size);
int32_t stlink_flash_loader_run(stlink_t *sl, flash_loader_t* fl, stm32_addr_t target, const uint8_t* buf, size_t size);


/* === Functions from old header file flashloader.h === */

int32_t stm32l1_write_half_pages(stlink_t *sl, stm32_addr_t addr, uint8_t *base, uint32_t len, uint32_t pagesize);
static void set_flash_cr_pg(stlink_t *sl, uint32_t bank);
static void set_dma_state(stlink_t *sl, flash_loader_t *fl, int32_t bckpRstr);
int32_t stlink_flashloader_start(stlink_t *sl, flash_loader_t *fl);
int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl, stm32_addr_t addr, uint8_t* base, uint32_t len);
int32_t stlink_flashloader_write(stlink_t *sl, flash_loader_t *fl, stm32_addr_t addr, uint8_t *base, uint32_t len);
int32_t stlink_flashloader_stop(stlink_t *sl, flash_loader_t *fl);

#endif // FLASH_LOADER_H
1 change: 1 addition & 0 deletions src/stlink-lib/option_bytes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,7 @@ int32_t stlink_read_option_bytes32(stlink_t *sl, uint32_t *option_byte) {
case STM32_CHIPID_G0_CAT2:
case STM32_CHIPID_G4_CAT2:
case STM32_CHIPID_G4_CAT3:
case STM32_CHIPID_G4_CAT4:
return stlink_read_option_bytes_gx(sl, option_byte);
default:
return stlink_read_option_bytes_generic(sl, option_byte);
Expand Down
6 changes: 3 additions & 3 deletions src/win32/win32_socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ struct pollfd {
/* Winsock uses int32_t instead of the usual socklen_t */
typedef int32_t socklen_t;

int32_t win32_poll(struct pollfd *, uint32_t, int);
SOCKET win32_socket(int32_t, int32_t, int);
int32_t win32_poll(struct pollfd *, uint32_t, int32_t);
SOCKET win32_socket(int32_t, int32_t, int32_t);
int32_t win32_connect(SOCKET, struct sockaddr*, socklen_t);
SOCKET win32_accept(SOCKET, struct sockaddr*, socklen_t *);
int32_t win32_shutdown(SOCKET, int);
int32_t win32_shutdown(SOCKET, int32_t);
int32_t win32_close_socket(SOCKET fd);

#define strtok_r(x, y, z) win32_strtok_r(x, y, z)
Expand Down

0 comments on commit 92ad99f

Please sign in to comment.