Merge up to eb01c632a4bb1c07d2bddb008d6987c809f1c496 from RISC-V OpenOCD #15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Another step to drop jim_handler. Change-Id: I85cb567386a5aceb36aa273f8b66cbfd4a637c3f Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8586 Tested-by: jenkins Reviewed-by: Evgeniy Naydanov <[email protected]>
While there, use Jim_EvalObj() to execute the subcommand, so any
error will correctly report the TCL file and the line number that
have originated the error, instead of the silly:
> capture {bogus command}
command.c:703: Error: invalid command name "bogus"
at file "command.c", line 703
Change-Id: Ic75a6146d6cedf49e808d98501fa1a7d4235b58a
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8587
Tested-by: jenkins
With commit c023534 ("target: use list for target events") scan build incorrectly states that list_add() would be called with the field 'next' of the parameter 'head' (thus 'head->next') set to NULL. Then, list_add() would call linux_list_add() with the parameter 'next' set to NULL that will cause a NULL dereference. While this can really happen with broken code, it's not the case with the code from the change above. Add assert() in linux_list_add() to silent scan build on this false positive and to detect future incorrect use of the list. Change-Id: Iec7f3d70237312b646ac58f76ecaab2fa25eab41 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8824 Tested-by: jenkins
Since commit ef1cfb2 ("Duane Ellis: "target as an [tcl] object" feature.") merged in 2008, the commands: $target_name configure -chain-position ... target create ... -chain-position ... cause the allocated working area to be freed. There is no reason for this, it is probably caused by an incorrect copy/paste from the author. Drop the call to target_free_all_working_areas(). Change-Id: I61a9303afe7fee6953669218330635c0b965b20d Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8825 Reviewed-by: Tomas Vanek <[email protected]> Tested-by: jenkins
The command shares with command 'target create' the struct jim_nvp nvp_target_event[] - Convert the 'struct jim_nvp' in 'struct nvp'. - Create an alias 'struct jim_nvp' to decouple the commands 'invoke-event' and 'target create', abusing the fact that the actual layout of the two struct's type is the same. This alias will be dropped in a following change. - Rewrite the command 'invoke-event' and the helper function target_event_name(). Change-Id: I537732fe4c08042cc02bcd0f72142254d7968fa6 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8826 Tested-by: jenkins
Rewrite only the command, but still use the old jimtcl specific code shared with 'configure' and 'cget'. Change-Id: I7cf220e494f0ebbf123f8075b1feb9251fd7f569 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8827 Tested-by: jenkins
Rewrite only the command, but still use the old jimtcl specific code shared with 'target create'. Change-Id: Ie5e1c9eb237531121c2d143d1732cf281dfdc9ff Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8828 Tested-by: jenkins
The function target_configure() is used by the commands 'target create', 'configure' and 'cget', already rewritten as COMMAND_HANDLER. Rewrite the common function as COMMAND_HELPER. While there: - fix the check on arguments, even if it should be coded better; - keep jimtcl code for target_type::target_jim_configure() and for rtos_create(); these would be rewritten later on. Change-Id: I7e5699ca6d124e34d3b2199714e3ce584bfcce80 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8829 Tested-by: jenkins
The parameter Jim_Interp to the target API target_create() is not used by any target. Drop it. Change-Id: I67c492078a6c808db974505f9e297c45165f64d0 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8831 Tested-by: jenkins Reviewed-by: Tomas Vanek <[email protected]>
STM32C05/09x devices are similar to STM32C03/07x devices Change-Id: I77c803356c32f06699c14622828585609c90a136 Signed-off-by: HAOUES Ahmed <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8618 Reviewed-by: Tomas Vanek <[email protected]> Reviewed-by: Antonio Borneo <[email protected]> Tested-by: jenkins
Add support for the Real-Time CPU (RCPU) of K1, which is a 32-bit RISC-V
N308 High-Efficiency Processor Core designed by Nuclei System Technology
Co. Ltd.
The JTAG interface can be configured to connect to either X60s or RCPU
processors. To enable JTAG for RCPU, set TARGET to "rcpu".
For example:
openocd -c "set TARGET rcpu" -f interface/cmsis-dap.cfg \
-f target/spacemit-k1.cfg
Change-Id: I9cd62fac332137afac17efa52702818de8f0b6f5
Signed-off-by: Junhui Liu <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8821
Reviewed-by: liangzhen <[email protected]>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
The driver directly runs a TCL command that has been renamed with commit 4d99e77 ("jtag/hla: Restructure commands"), while the original name has been deprecated. Update the TCL command to the new syntax. Change-Id: I2fc9ef9a209bae1d78951e253d54164b2ac00cdd Signed-off-by: Antonio Borneo <[email protected]> Fixes: 4d99e77 ("jtag/hla: Restructure commands") Reviewed-on: https://review.openocd.org/c/openocd/+/8832 Reviewed-by: zapb <[email protected]> Tested-by: jenkins
TV: Extracted RP2040/2350 flash driver part only. Fixed style problems. Change-Id: I88a7d5aa0a239ae93d72bd5671686b19c6ca11ad Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: graham sanderson <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8440 Tested-by: jenkins
And add support for A1 ROM table. TV: cortex_m smp change removed. Fixed style problems. 'uint' replaced by unsigned int Change-Id: Iff2710fa0734dc7074d8d490d8fae43dc27c0c2a Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: Luke Wren <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8441 Tested-by: jenkins
TV: cortex_m.c changes removed. Change-Id: I85830f2d64f8afb86690737f9ae70dde5e6143e1 Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: graham sanderson <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8442 Tested-by: jenkins
which has 16-bit well-known pointers. Change-Id: Ia0838a0b062f73a9c5751abb48f1b4d55100bd1d Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: Luke Wren <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8443 Reviewed-by: Jonathan Bell <[email protected]> Tested-by: jenkins
…into chunks Also add keep_alive() to erase/program to avoid nasty GDB message. TV: Fixed style problems. Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: Luke Wren <[email protected]> Change-Id: Ibb18775aeed192361ae1585bfdaad03760583cf3 Reviewed-on: https://review.openocd.org/c/openocd/+/8444 Tested-by: jenkins Reviewed-by: Jonathan Bell <[email protected]>
when erase region does not start at 0 Signed-off-by: Tomas Vanek <[email protected]> Signed-off-by: Luke Wren <[email protected]> Change-Id: I2b9db61e8ac837b6c6431aacf3b73ed3a1772fbc Reviewed-on: https://review.openocd.org/c/openocd/+/8445 Tested-by: jenkins Reviewed-by: Jonathan Bell <[email protected]>
Do not enforce hard-wired size 32 MiB Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I54608f75cc13996fda38ebd5d330e3b1893c2fd9 Reviewed-on: https://review.openocd.org/c/openocd/+/8446 Tested-by: jenkins Reviewed-by: Jonathan Bell <[email protected]> Reviewed-by: Antonio Borneo <[email protected]>
The new flash command could be handy for a reboot to BOOTSEL mode and for making (Q)SPI flash content visible at 0x10xxxxxx address mapping area after a rescue reset. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I1b532afcc41a4051298313e685658e86c02c53f9 Reviewed-on: https://review.openocd.org/c/openocd/+/8447 Reviewed-by: Antonio Borneo <[email protected]> Tested-by: jenkins
RP2350 can switch either core to Cortex-M33 or RISC-V. The different architectures have to be supported as distinct targets in OpenOCD. Introduce 'rp2xxx _switch target' Tcl command to adapt flash bank to architecture changes. Keep the target and priv pointers intact until a flash operation is finished to prevent sudden change in the middle of write/erase. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I764354ab469e253042128958dfe70c09d04d6411 Reviewed-on: https://review.openocd.org/c/openocd/+/8448 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
RP2350 has 2 slots where either Cortex-M33 or RISC-V can be selected. Tcl variable USE_CORE selects what cores will be configured for debug. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I56fe1aa94304bdfd1ec98bba57cc3fa792a35f69 Reviewed-on: https://review.openocd.org/c/openocd/+/8449 Tested-by: jenkins
A0 chip: remove pad isolation A2 chip: instead of reset init fixes we will fix the flash driver with the following patch by Luke Wren: 8729: flash/nor/rp2xxx: fix flash operation after halt in RISC-V bootsel https://review.openocd.org/c/openocd/+/8729 I don't have A1 version to test. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I9e9fab04ead929fe6e0a17c6c2f32a6f02e9beb9 Reviewed-on: https://review.openocd.org/c/openocd/+/8450 Tested-by: jenkins
Also keep size override by FLASHSIZE Tcl variable possible. Partially backported from former upstream rp2040.c Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I224c3644450e8b46e35714bfc5436219ffdee563 Reviewed-on: https://review.openocd.org/c/openocd/+/8451 Tested-by: jenkins
Flash erase and write require this guard, unfortunately it is also partially needed in the flash probe. Partially backported from former upstream rp2040.c Signed-off-by: Tomas Vanek <[email protected]> Change-Id: Ie8a240e66c3ed68e08f872cbbfdd90a6d80e1f1e Reviewed-on: https://review.openocd.org/c/openocd/+/8452 Tested-by: jenkins
While on it: Define the names for the fixed flash page/sector sizes and use them instead of magic values. Fix memory leak on error return. Partially backported from former upstream rp2040.c Signed-off-by: Tomas Vanek <[email protected]> Change-Id: If51c912f4d381ee47756a70f616ecdbee1ac0da7 Reviewed-on: https://review.openocd.org/c/openocd/+/8453 Tested-by: jenkins
Invalidate cache and restore flash XIP mode after erase and also in error cleanup after write/erase. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: If7e0c2d75f50f923e6bcbf0aa7bab53fe91b6cc8 Reviewed-on: https://review.openocd.org/c/openocd/+/8454 Tested-by: jenkins
While on it use calloc() instead of malloc()/memset() Drop useless implementation of rp2040_flash_free_driver_priv() - exactly same as default_flash_free_driver_priv() Code style fixes forced by checkpatch Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I5c56c4a7d586c0dcab164a45e8f6200ea9a3bd1d Reviewed-on: https://review.openocd.org/c/openocd/+/8455 Tested-by: jenkins
Namely the driver name changed from rp2040_flash and added RP2350 support. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I2ec9e62786002d71f655dbe0edc9f2e9ac4141b7 Reviewed-on: https://review.openocd.org/c/openocd/+/8456 Tested-by: jenkins
Add error messages and proper error propagation. Type cleaning. Use saved chip id. Cosmetics: separating lines added. Signed-off-by: Tomas Vanek <[email protected]> Change-Id: I151e684e1fbfc9476ec429036caf85f4c9329547 Reviewed-on: https://review.openocd.org/c/openocd/+/8457 Tested-by: jenkins Reviewed-by: Jonathan Bell <[email protected]>
Commit 34ec553 ("stlink: deprecate HLA support") makes hard to use the still functional HLA transport with the stlink listed in board config files. Now that the prefixes 'hla_' and 'dapdirect_' has been dropped from the transport name, allow overriding the transport by using the 'stlink-hla' script in front of the board file, e.g.: openocd -f interface/stlink-hla.cfg -f board/st_nucleo_f4.cfg Revert the documentation changes of the change above. Improve the documentation to explain how to use the compatibility HLA mode. Improve the error message in stlink driver to guide the user to update the stlink firmware and to use the compatibility HLA mode. Change-Id: I5d0bc7954511692cebe024bda2aaa72767b97681 Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8679 Tested-by: jenkins
…summary Also enable this driver by default (auto). Change-Id: I7f592dd697c6ee150a81e151ff2333447cd9130d Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8835 Tested-by: jenkins Reviewed-by: zapb <[email protected]> Reviewed-by: Antonio Borneo <[email protected]>
Also enable this adapter by default (auto). Change-Id: I43b9f1a1873b381d015114da57efc1d78e6e7780 Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8834 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
Tested with NUCLEO-U083RC development board. Change-Id: I5e7ed1a9a19dbab70ee3155f92d67874c33b1ac2 Signed-off-by: Marc Schink <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8649 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
Use 'Tcl' because it is the official spelling. While at it, fix some misspellings of 'Jim Tcl'. Change-Id: I084541a1cc0276d15a263b843ba740da04efc30a Signed-off-by: Marc Schink <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8852 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
Use 'Tcl' because it is the official spelling. While at it, fix some misspellings of 'Jim Tcl'. Change-Id: I2d96f63b0dbc96ae62fe00ae41d2eb16897250fb Signed-off-by: Marc Schink <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8853 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
The goal of this guideline is to have consistent and well-structured configurations files. The focus of this patch is on filenames and directory structure. A guideline for the content of the files should be included in a subsequent patch. This patch addresses a long outstanding task listed in 'Pending and Open Tasks'. Change-Id: Ib32dd8b9ed15c3f647cd8d74cfc79edf0e79a3df Signed-off-by: Marc Schink <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8854 Tested-by: jenkins Reviewed-by: Antonio Borneo <[email protected]>
- update runner to ubuntu-latest - pass GITHUB_TOKEN to delete-tag-and-release as input Change-Id: I83d69cfd7af7c44e67b1115ac843a0b41d6f87b9 Signed-off-by: Samuel Obuch <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8756 Reviewed-by: Antonio Borneo <[email protected]> Tested-by: jenkins
Change-Id: I719167dc34a1a29ae32f8d4f27f2d3cd7a04e47b
From: Sriram Shanmuga <[email protected]> RISC-V Debug Specification v1.0 [3.14.22. System Bus Access Control and Status (`sbcs`, at 0x38)] states in `sbasize` field description: > Width of system bus addresses in bits. (0 indicates there is no bus access support.) Before the patch, the error message did not include the information about `sbcs.sbasize` being zero wich made it quite undescriptive: ``` [riscv.cpu] Turning off memory sampling because it failed. ``` Fixes #1270 Change-Id: I5402dd57dc9a81f65ee4c67d24e11c366006427c Signed-off-by: Sriram Shanmuga <[email protected]> Signed-off-by: Evgeniy Naydanov <[email protected]>
address translation don't need to care hstatus.HU
Add the necessary get_filed and add a comment to indicate this section is for VU/VS mode
In SV57 **virtual** addresses look as follows: +--------+---------+---------+---------+---------+---------+-----------+ |copy of | VPN[4] | VPN[3] | VPN[2] | VPN[1] | VPN[0] | OFFSET | | bit 56 | 9 bits | 9 bits | 9 bits | 9 bits | 9 bits | 12 bits | +--------+---------+---------+---------+---------+---------+-----------+ | 63 57 | 56 48 | 47 40 | 39 32 | 31 24 | 23 12 | 11 0 | while the structure of **physical** address is: +------------+----------+----------+---------+----------+-----------+ | PPN[4] | PPN[3] | PPN[2] | PPN[1] | PPN[0] | OFFSET | | 8 bits | 9 bits | 9 bits | 9 bits | 9 bits | 12 bits | +------------+----------+----------+---------+----------+-----------+ | 55 48 | 47 39 | 38 30 | 29 21 | 20 12 | 11 0 | So the size of effective VA is 57, while PA is 56 bits. When our translation routine constructs the final physical address, it preserves a portion of the original virtual address (to handle superpage cases). To mask out the part of the original VA that must be replaced with the PPN from the PTE, the **virt2phys_info_t::pa_ppn_mask** field is used. In our codebase pa_ppn_mask[4] was initialized incorrectly for SV57 mode, resulting in a single bit from the original VA to leak through, producing an incorrect physical address. Signed-off-by: Parshintsev Anatoly <[email protected]>
target/riscv: fix address translation in hypervisor mode
target/riscv: improve error messaging in case `sbasize` is zero
Merge up to afbd01b from upstream
target/riscv: fix SV57 translation for kernel address space
This commit fixes comparison in scratch_reserve function Change-Id: If994b333282bf706736b953227a9739e52f08139 Signed-off-by: Farid Khaydari <[email protected]>
…or alignment and bit operations This commit refactors the scratch_reserve() - Replacing hardcoded bit manipulation with BIT() macro - Using GENMASK_ULL() instead of hardcoded masks for sign extension - Applying ALIGN_UP() macro for address alignment calculations - Using DIV_ROUND_UP() instead of manual division with addition Change-Id: Ic40923ef7d9ac5ca0ffb313c9d4fc6d1457d6bbb Signed-off-by: Farid Khaydari <[email protected]>
Fix bug in scratch_reserve
fk-sc
force-pushed
the
fk-sc/from_upstream
branch
2 times, most recently
from
eb008cb to
728e90c
Compare
fk-sc
changed the title
fk-sc
force-pushed
the
fk-sc/from_upstream
branch
2 times, most recently
from
0e15f84 to
ab3f8f8
Compare
…om_upstream Change-Id: Ie93983904c75cb35272406b8a8653a543ffe8410
fk-sc
force-pushed
the
fk-sc/from_upstream
branch
from
ab3f8f8 to
8f6c9bc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.