interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/stm32h7x: add support of dual core variant of STM32H7 

STM32H7x7 and STM32H7x5 devices contains two cores : CM7 + CM4
The second core creation is only done when
  * DUAL_CORE variable is set to true
  * non HLA interface is used

A second check for the second core existence is done in cpu1 examine-end
Once the second core is detected it gets examined.

Furthermore, the script provides a configurable CTI usage in order to halt
the cores simultaneously.

Tested on Rev X and V devices.

PS: the indentation was a mix of spaces and tabs, all changed to tabs.

Change-Id: Iad9c30826965ddb9be5dee628bc2e63f953bbcb8
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: http://openocd.zylin.com/5130
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
Tarek BOCHKATI 2019-11-27 19:10:34 +01:00 committed by Tomas Vanek
parent 80f1a92bd7
commit 678fb4f60b
5 changed files with 160 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/loaders/flash/stm32/stm32h7x.S
View File

@ -18,7 +18,7 @@
.text .text
.syntax unified .syntax unified
.cpu cortex-m7 .cpu cortex-m4
.thumb .thumb
/* /*

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

@ -136,7 +136,7 @@ enum stm32h7x_opt_rdp {
}; };
static const struct stm32h7x_rev stm32_450_revs[] = { static const struct stm32h7x_rev stm32_450_revs[] = {
{ 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2001, "X" }, { 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2001, "X" }, { 0x2003, "V" },
}; };
static const struct stm32h7x_part_info stm32h7x_parts[] = { static const struct stm32h7x_part_info stm32h7x_parts[] = {

16
tcl/board/st_nucleo_h745zi.cfg Normal file
View File

@ -0,0 +1,16 @@
# This is an ST NUCLEO-H745ZI-Q board with single STM32H745ZITx chip.
source [find interface/stlink.cfg]
transport select hla_swd
# ST-Link HLA interface do not support multi-AP debugging
# then setting DUAL_CORE and USE_CTI has no effect, because
# it will fall back to single core configuration
set DUAL_CORE 1
set USE_CTI 1
source [find target/stm32h7x_dual_bank.cfg]
# when using ST-Link HLA adapter, DBGMCU accesses are done via AP0
# unfortunately DBGMCU is not accessible when SRST is asserted
reset_config srst_only

152
tcl/target/stm32h7x.cfg
View File

@ -12,6 +12,39 @@ if { [info exists CHIPNAME] } {
set _CHIPNAME stm32h7x set _CHIPNAME stm32h7x
} }
if { [info exists DUAL_BANK] } {
set $_CHIPNAME.DUAL_BANK $DUAL_BANK
unset DUAL_BANK
} else {
set $_CHIPNAME.DUAL_BANK 0
}
if { [info exists DUAL_CORE] } {
set $_CHIPNAME.DUAL_CORE $DUAL_CORE
unset DUAL_CORE
} else {
set $_CHIPNAME.DUAL_CORE 0
}
# Issue a warning when hla is used, and fallback to single core configuration
if { [set $_CHIPNAME.DUAL_CORE] && [using_hla] } {
echo "Warning : hla does not support multicore debugging"
set $_CHIPNAME.DUAL_CORE 0
}
if { [info exists USE_CTI] } {
set $_CHIPNAME.USE_CTI $USE_CTI
unset USE_CTI
} else {
set $_CHIPNAME.USE_CTI 0
}
# Issue a warning when DUAL_CORE=0 and USE_CTI=1, and fallback to USE_CTI=0
if { ![set $_CHIPNAME.DUAL_CORE] && [set $_CHIPNAME.USE_CTI] } {
echo "Warning : could not use CTI with a single core device, CTI is disabled"
set $_CHIPNAME.USE_CTI 0
}
set _ENDIAN little set _ENDIAN little
# Work-area is a space in RAM used for flash programming # Work-area is a space in RAM used for flash programming
@ -46,13 +79,30 @@ if {![using_hla]} {
target create $_CHIPNAME.ap2 mem_ap -dap $_CHIPNAME.dap -ap-num 2 target create $_CHIPNAME.ap2 mem_ap -dap $_CHIPNAME.dap -ap-num 2
} }
set _TARGETNAME $_CHIPNAME.cpu target create $_CHIPNAME.cpu0 cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap -ap-num 0
target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap -ap-num 0
$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0 $_CHIPNAME.cpu0 configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
set _FLASHNAME $_CHIPNAME.flash flash bank $_CHIPNAME.bank1.cpu0 stm32h7x 0x08000000 0 0 0 $_CHIPNAME.cpu0
flash bank $_FLASHNAME stm32h7x 0x08000000 0 0 0 $_TARGETNAME
if {[set $_CHIPNAME.DUAL_BANK]} {
flash bank $_CHIPNAME.bank2.cpu0 stm32h7x 0x08100000 0 0 0 $_CHIPNAME.cpu0
}
if {[set $_CHIPNAME.DUAL_CORE]} {
target create $_CHIPNAME.cpu1 cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap -ap-num 3
$_CHIPNAME.cpu1 configure -work-area-phys 0x38000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
flash bank $_CHIPNAME.bank1.cpu1 stm32h7x 0x08000000 0 0 0 $_CHIPNAME.cpu1
if {[set $_CHIPNAME.DUAL_BANK]} {
flash bank $_CHIPNAME.bank2.cpu1 stm32h7x 0x08100000 0 0 0 $_CHIPNAME.cpu1
}
}
# Make sure that cpu0 is selected
targets $_CHIPNAME.cpu0
# Clock after reset is HSI at 64 MHz, no need of PLL # Clock after reset is HSI at 64 MHz, no need of PLL
adapter_khz 1800 adapter_khz 1800
@ -78,7 +128,11 @@ reset_config srst_only srst_nogate
if {![using_hla]} { if {![using_hla]} {
# if srst is not fitted use SYSRESETREQ to # if srst is not fitted use SYSRESETREQ to
# perform a soft reset # perform a soft reset
cortex_m reset_config sysresetreq $_CHIPNAME.cpu0 cortex_m reset_config sysresetreq
if {[set $_CHIPNAME.DUAL_CORE]} {
$_CHIPNAME.cpu1 cortex_m reset_config sysresetreq
}
# Set CSW[27], which according to ARM ADI v5 appendix E1.4 maps to AHB signal # Set CSW[27], which according to ARM ADI v5 appendix E1.4 maps to AHB signal
# HPROT[3], which according to AMBA AHB/ASB/APB specification chapter 3.7.3 # HPROT[3], which according to AMBA AHB/ASB/APB specification chapter 3.7.3
@ -89,34 +143,56 @@ if {![using_hla]} {
$_CHIPNAME.dap apcsw 0x08000000 0x08000000 $_CHIPNAME.dap apcsw 0x08000000 0x08000000
} }
$_TARGETNAME configure -event examine-end { $_CHIPNAME.cpu0 configure -event examine-end {
# Enable D3 and D1 DBG clocks # Enable D3 and D1 DBG clocks
# DBGMCU_CR |= D3DBGCKEN | D1DBGCKEN # DBGMCU_CR |= D3DBGCKEN | D1DBGCKEN
stm32h7x_dbgmcu_mmw 0x004 0x00600000 0 stm32h7x_dbgmcu_mmw 0x004 0x00600000 0
# Enable debug during low power modes (uses more power) # Enable debug during low power modes (uses more power)
# DBGMCU_CR |= DBG_STANDBY | DBG_STOP | DBG_SLEEP in D3 & D1 Domains # DBGMCU_CR |= DBG_STANDBY | DBG_STOP | DBG_SLEEP in D3, D2 & D1 Domains
stm32h7x_dbgmcu_mmw 0x004 0x00000187 0 stm32h7x_dbgmcu_mmw 0x004 0x000001BF 0
# Stop watchdog counters during halt # Stop watchdog counters during halt
# DBGMCU_APB3FZ1 |= WWDG1 # DBGMCU_APB3FZ1 |= WWDG1
stm32h7x_dbgmcu_mmw 0x034 0x00000040 0 stm32h7x_dbgmcu_mmw 0x034 0x00000040 0
# DBGMCU_APB4FZ1 |= WDGLSD1 # DBGMCU_APB1LFZ1 |= WWDG2
stm32h7x_dbgmcu_mmw 0x054 0x00040000 0 stm32h7x_dbgmcu_mmw 0x03C 0x00000800 0
# DBGMCU_APB4FZ1 |= WDGLSD1 | WDGLSD2
stm32h7x_dbgmcu_mmw 0x054 0x000C0000 0
} }
$_TARGETNAME configure -event trace-config { $_CHIPNAME.cpu0 configure -event trace-config {
# Set TRACECLKEN; TRACE_MODE is set to async; when using sync # Set TRACECLKEN; TRACE_MODE is set to async; when using sync
# change this value accordingly to configure trace pins # change this value accordingly to configure trace pins
# assignment # assignment
stm32h7x_dbgmcu_mmw 0x004 0x00100000 0 stm32h7x_dbgmcu_mmw 0x004 0x00100000 0
} }
$_TARGETNAME configure -event reset-init { $_CHIPNAME.cpu0 configure -event reset-init {
# Clock after reset is HSI at 64 MHz, no need of PLL # Clock after reset is HSI at 64 MHz, no need of PLL
adapter_khz 4000 adapter_khz 4000
} }
if {[set $_CHIPNAME.DUAL_CORE]} {
$_CHIPNAME.cpu1 configure -event examine-end {
# get _CHIPNAME from the current target
set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
global $_CHIPNAME.USE_CTI
# Stop watchdog counters during halt
# DBGMCU_APB3FZ2 |= WWDG1
stm32h7x_dbgmcu_mmw 0x038 0x00000040 0
# DBGMCU_APB1LFZ2 |= WWDG2
stm32h7x_dbgmcu_mmw 0x040 0x00000800 0
# DBGMCU_APB4FZ2 |= WDGLSD1 | WDGLSD2
stm32h7x_dbgmcu_mmw 0x058 0x000C0000 0
if {[set $_CHIPNAME.USE_CTI]} {
stm32h7x_cti_start
}
}
}
# like mrw, but with target selection # like mrw, but with target selection
proc stm32h7x_mrw {used_target reg} { proc stm32h7x_mrw {used_target reg} {
set value "" set value ""
@ -147,3 +223,53 @@ proc stm32h7x_dbgmcu_mmw {reg_offset setbits clearbits} {
stm32h7x_mmw $used_target $reg_addr $setbits $clearbits stm32h7x_mmw $used_target $reg_addr $setbits $clearbits
} }
if {[set $_CHIPNAME.USE_CTI]} {
# create CTI instances for both cores
cti create $_CHIPNAME.cti0 -dap $_CHIPNAME.dap -ap-num 0 -ctibase 0xE0043000
cti create $_CHIPNAME.cti1 -dap $_CHIPNAME.dap -ap-num 3 -ctibase 0xE0043000
$_CHIPNAME.cpu0 configure -event halted { stm32h7x_cti_prepare_restart_all }
$_CHIPNAME.cpu1 configure -event halted { stm32h7x_cti_prepare_restart_all }
$_CHIPNAME.cpu0 configure -event debug-halted { stm32h7x_cti_prepare_restart_all }
$_CHIPNAME.cpu1 configure -event debug-halted { stm32h7x_cti_prepare_restart_all }
proc stm32h7x_cti_start {} {
# get _CHIPNAME from the current target
set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
# Configure Cores' CTIs to halt each other
# TRIGIN0 (DBGTRIGGER) and TRIGOUT0 (EDBGRQ) at CTM_CHANNEL_0
$_CHIPNAME.cti0 write INEN0 0x1
$_CHIPNAME.cti0 write OUTEN0 0x1
$_CHIPNAME.cti1 write INEN0 0x1
$_CHIPNAME.cti1 write OUTEN0 0x1
# enable CTIs
$_CHIPNAME.cti0 enable on
$_CHIPNAME.cti1 enable on
}
proc stm32h7x_cti_stop {} {
# get _CHIPNAME from the current target
set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
$_CHIPNAME.cti0 enable off
$_CHIPNAME.cti1 enable off
}
proc stm32h7x_cti_prepare_restart_all {} {
stm32h7x_cti_prepare_restart cti0
stm32h7x_cti_prepare_restart cti1
}
proc stm32h7x_cti_prepare_restart {cti} {
# get _CHIPNAME from the current target
set _CHIPNAME [regsub ".cpu\\d$" [target current] ""]
# Acknowlodge EDBGRQ at TRIGOUT0
$_CHIPNAME.$cti write INACK 0x01
$_CHIPNAME.$cti write INACK 0x00
}
}

7
tcl/target/stm32h7x_dual_bank.cfg
View File

@ -1,7 +1,6 @@
# script for stm32h7x family (dual flash bank) # script for stm32h7x family (dual flash bank)
source [find target/stm32h7x.cfg]
# STM32H7xxxI 2Mo have a dual bank flash. # STM32H7xxxI 2Mo have a dual bank flash.
# Add the second flash bank. set DUAL_BANK 1
set _FLASHNAME $_CHIPNAME.flash1
flash bank $_FLASHNAME stm32h7x 0x08100000 0 0 0 $_TARGETNAME source [find target/stm32h7x.cfg]