Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge up to 1f3f635693a1ddc85f362dc324cb49c3e7b75f27 from upstream #1231

Merged
merged 30 commits into from
Feb 21, 2025
Merged

Merge up to 1f3f635693a1ddc85f362dc324cb49c3e7b75f27 from upstream #1231

merged 30 commits into from
Feb 21, 2025

Conversation

en-sc
Copy link
Collaborator

@en-sc en-sc commented Feb 17, 2025

Conflict in src/rtos/hwthread.c between commit 57dbcb1 ("Improve a couple of
user/debug messages. (#763)") and commit 7f2db80 ("rtos/hwthread: Use LOG_TARGET_xxx()"). Resolved by using LOG_TARGET_xxx() without changing the message

paulfertser and others added 30 commits January 31, 2025 03:21
@paulfertser @tom-van
rtos: chibios: replace malloc+sprintf with alloc_printf
ce38758 
This makes it safer and simpler at the same time.

Signed-off-by: Paul Fertser <[email protected]>
Change-Id: Ie294f1f6033ffc9f46b39210e2f7fc2f648e80ac
Reviewed-on: https://review.openocd.org/c/openocd/+/8598
Tested-by: jenkins
Reviewed-by: Tomas Vanek <[email protected]>
@tom-van
flash/nor: add DesignWare SPI controller driver
eb6f274 
Driver for DesignWare SPI controller, found on many SoCs (see compatible
list in Linux device tree bindings
Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml). This
implementation only supports MIPS as it was the only one available for the
tests, however, adding support for other architectures should require only
few adjustments. Driver relies on flash/nor/spi.h to find Flash chip info.
Driver internal functions support 24bit addressing mode, but due to
limitations of flash/nor/spi.h, it is not used. The reported writing speed
is about 60kb/s.
Lint, sanitizer and valgrind reported warnings were not related to the
driver.

Change-Id: Id3df5626ab88055f034f74f274823051dedefeb1
Signed-off-by: Sergey Matsievskiy <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8400
Tested-by: jenkins
Reviewed-by: Tomas Vanek <[email protected]>
@zapb-0 @tom-van
rtos/hwthread: Use LOG_TARGET_xxx()
7f2db80 
Use LOG_TARGET_xxx() to indicate which target the message belongs to.

While at it, fix some coding style issues.

Change-Id: Iac0296498557a689468a4a19d0bc64f03178a0d0
Signed-off-by: Marc Schink <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8727
Reviewed-by: Antonio Borneo <[email protected]>
Reviewed-by: Tomas Vanek <[email protected]>
Tested-by: jenkins
@tom-van
drivers/linuxspidev: fix minor memory leak
7dd8759 
free() strduped spi_path on quit.
Found by valgrind.

Change-Id: Iaa59c7258c920b5e60d615df790dfe815831b925
Signed-off-by: Tomas Vanek <[email protected]>
Fixes: 83e0293 ("Add Linux SPI device SWD adapter support")
Reviewed-on: https://review.openocd.org/c/openocd/+/8732
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
Reviewed-by: Richard Pasek <[email protected]>
@tom-van
drivers/linuxspidev: fix use of uninitialized speed variable
8227746 
Valgrind reported
== Syscall param ioctl(generic) points to uninitialised byte(s)
==    at 0x4ABF990: ioctl (ioctl.S:26)
==    by 0x19D00B: spidev_speed (linuxspidev.c:181)
==    by 0x19D00B: spidev_init (linuxspidev.c:307)

Indeed, spidev_init() uses adapter_get_speed(), it calls
adapter_khz_to_speed() and it returns early without setting
the output parameter if adapter is not initialized.
Of course the adapter initialized flag is not set until
spidev_init() returns.

Simply drop this code as the adapter infrastructure initializes
adapter speed just after spidev_init() return.

Change-Id: I26f011ae59fc942a34d9bb517f467c22f735091d
Signed-off-by: Tomas Vanek <[email protected]>
Fixes: 83e0293 ("Add Linux SPI device SWD adapter support")
Reviewed-on: https://review.openocd.org/c/openocd/+/8733
Tested-by: jenkins
Reviewed-by: Richard Pasek <[email protected]>
@tom-van
driver/linuxspidev: Clear queue on allocation
d09f53a 
SWD idle clocks are added to the queue by advancing the queue index
assuming the queue is zeroed. If the queue isn't zeroed, these idle
clocks end up being filled with junk data. Lets clear the queue and
associated buffers on queue allocation.

TEST: Connects successfully and ran the following TCL command:
  dump_image /dev/null 0x20000000 0x42000
  Host: Unnamed Qualcomm SoC with QUPv3 based SPI port
  Target: RT500

Signed-off-by: Richard Pasek <[email protected]>
Change-Id: Ie660c10c27c4d0937ab0629138935ddbf5aeb0ae
Fixes: 83e0293 ("Add Linux SPI device SWD adapter support")
Reviewed-on: https://review.openocd.org/c/openocd/+/8730
Reviewed-by: Tomas Vanek <[email protected]>
Reviewed-by: Jonathon Reinhart <[email protected]>
Tested-by: jenkins
@sobuch @borneoa
github/workflow: build jimtcl from sources
73e9b78 
JimTCL submodule was deprecated, this patch modifies
the GitHub snapshot action to build from sources instead.

Change-Id: Ie9ab20dbfd70506992d11a91489e82a9fa6e13ce
Signed-off-by: Samuel Obuch <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8751
Reviewed-by: Marc Schink <[email protected]>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
Reviewed-by: Erhan Kurubas <[email protected]>
@borneoa
rtt: drop useless typedefs
6e39af3 
There is no need to use extra typedef for the rtt functions.
Declare the type of the functions in the struct.

Change-Id: Idf2fee6e63ec3b3add38d042bbebe8d74613627c
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8698
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
openocd: drop useless typedef
3e4512d 
There is no need to use typedef for the array of functions.
Drop it.

While there, move the declaration outside the function and use the
array size to drop the error-prone sentinel to NULL.

Change-Id: I424964a6ef82ed1a7b27e78fbd19aa9f985b52c7
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8699
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@borneoa
drivers: rshim: drop useless typedef
4140fa2 
Use 'struct name' instead of typedef.

Change-Id: Ifff56811f53a260c314c8f5473d368599e0912e6
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8700
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
target: esp_algorithm: drop useless typedefs
e325b48 
There is no need to use extra typedef for the functions in struct
esp_algorithm_run_data.
Declare the type of the functions in the struct.
Split the comment lines to stay in the line limits.

Change-Id: I0afa6242e57133f8bf1b13ba541abd6b067350b0
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8701
Reviewed-by: Erhan Kurubas <[email protected]>
Tested-by: jenkins
@borneoa
nor: lpc2000: drop useless typedef lpc2000_variant
b023c4c 
No need to use a typedef for an enum.
Drop it.

Change-Id: Iec690ebf6704f346d010cad1e6c65496f7bcc218
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8702
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
target: etm: drop useless typedefs
ff5fb8f 
No need to use a typedef for an enum.
Drop etmv1_pipestat_t and etmv1_branch_reason_t.

Change-Id: I03ae4de3efe699d9635fc4f162649f6bedcef4c0
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8703
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@borneoa
target: trace: drop useless typedef trace_status_t
c50b541 
No need to use a typedef for an enum.
Drop it.

Change-Id: I31e0e3869c7277bcb14e05cfcac82c9655963ae6
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8704
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
target_request: drop useless typedef target_req_cmd_t
894a39e 
No need to use a typedef for an enum.
Drop it.

Change-Id: Ib5a872b52a6f3d7379d2662e4ff84f32c2bd2ef8
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8705
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@borneoa
jtag: remote_bitbang: drop useless typedef flush_bool_t
8a5c331 
No need to use a typedef for an enum.
Drop it.

Change-Id: I122784ddd7b81ccd86da258b08526685c3d70033
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8706
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
jtag: bitbang: drop useless typedef bb_value_t
54d07de 
No need to use a typedef for an enum.
Drop it.

Change-Id: I8800c95f97d2bafe27c699d7d451fb9b54286d99
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8707
Tested-by: jenkins
@borneoa
jtag: openjtag: drop useless typedef openjtag_tap_state_t
0d19325 
No need to use a typedef for an enum.
Drop it.

Change-Id: I31531b80eaf7f3d0ee6cd22844e60a05c6b748dc
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8708
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@borneoa
jtag: drop useless typedef tap_state_t
4895a55 
No need to use a typedef for an enum.
Drop it.

Change-Id: I9eb2dc4f926671c5bb44e61453d92880e3036848
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8709
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>
@borneoa
checkpatch: enable check for new typedefs
9ccd626 
We should strictly check for every new typedef.
Let checkpatch detect them and let developer use
	Checkpatch-ignore: NEW_TYPEDEFS
if it's really needed to add a new typedef.
With this change chackpatch will not complain for typedef on
function's type but only on enum, struct, variable's type.

Change-Id: I644a753e97de877d892af3a0219716f022fb1c59
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8710
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@cfriedt @borneoa
target/arc: add RTT commands
9bb0a45 
Since RTT is architecture agnostic, add support for using it on
the ARC architecture as well.

Change-Id: Icd0dec105177a1a224bfb1a63f0be5f03561b166
Signed-off-by: Chris Friedt <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8720
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
@danieldegrasse @borneoa
target/arc: allow reading memory while target runs
44e782d 
There is no reason that ARC can't support reading from memory over JTAG
while the target is executing, and this is in fact required for RTT
support. Remove this check from arc_mem_read and arc_mem_write

Change-Id: I2accfb4b99bf77c5473d133623e0eb0632cb45f6
Signed-off-by: Daniel DeGrasse <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8721
Tested-by: jenkins
Reviewed-by: Evgeniy Didin <[email protected]>
Reviewed-by: Antonio Borneo <[email protected]>
@borneoa
README: report dependency from libjim
a71f2b7 
The support for jimtcl submodule is deprecated.
Report libjim as a dependency for building OpenOCD.

Change-Id: Iaaeb03dc810451c0d72add281016c81b8cbf7059
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8722
Reviewed-by: zapb <[email protected]>
Tested-by: jenkins
@borneoa
options.c: option --help should yield exit code 0
4deb76f 
--help is supported and there is no reason to signal failure

Change-Id: I59fda5336df47ec0b8172541a5fbfe60014bba7e
Signed-off-by: R. Diez <[email protected]>

Reviewed-on: https://review.openocd.org/c/openocd/+/8723
Tested-by: jenkins
Reviewed-by: Antonio Borneo <[email protected]>
@borneoa
configure.ac: show vdebug in the config summary
5e4ad24 
Also enable this adapter by default (auto).

Change-Id: Id011168b93c4cdc602ab78eabfb9a64ca8d8a7df
Signed-off-by: R. Diez <[email protected]>

Reviewed-on: https://review.openocd.org/c/openocd/+/8601
Reviewed-by: Antonio Borneo <[email protected]>
Tested-by: jenkins
@borneoa
Makefile.am: DISTCHECK_CONFIGURE_FLAGS -> AM_DISTCHECK_CONFIGURE_FLAGS
dcf02f4 
The Automake manual states: "The user can still extend or override
the flags provided there by defining the DISTCHECK_CONFIGURE_FLAGS
variable". Overriding variable DISTCHECK_CONFIGURE_FLAGS in Makefile.am
makes it impossible for the user to do that. I discovered this
when trying to pass --enable-internal-jimtcl to distcheck.

Change-Id: Ibe5b1f23ccf3fbaa21c48b574a1b3f3e9f6fb916
Signed-off-by: R. Diez <[email protected]>

Reviewed-on: https://review.openocd.org/c/openocd/+/8724
Reviewed-by: Antonio Borneo <[email protected]>
Tested-by: jenkins
@tom-van @borneoa
target/cortex_m: call adapter_deassert_reset() only if srst is config…
71f92c9 
…ured

Deasserting is useless if reset was not asserted except the very corner
case: changed reset_config during reset processing.

Change-Id: I1d1ea142980d67293daa348a2869b68ffd78d0eb
Signed-off-by: Tomas Vanek <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8734
Reviewed-by: Antonio Borneo <[email protected]>
Tested-by: jenkins
@tom-van @borneoa
jtag/core: fix segfault when adapter driver has no reset method
ed4e584 
xlnx-pcie-xvc and linuxspidev adapter drivers does not implement
the reset method.
Although it is likely both adapters will implement the method in
the near future, avoid segfault and return an error instead.

Change-Id: If8ddf165dbc563cf6d64b2094968151075778ba7
Signed-off-by: Tomas Vanek <[email protected]>
Fixes: commit 8850eb8 ("swd: get rid of jtag queue to assert/deassert srst")
Reviewed-on: https://review.openocd.org/c/openocd/+/8735
Reviewed-by: Antonio Borneo <[email protected]>
Tested-by: jenkins
@borneoa
build: drop space after 'angie' folder name
1f3f635 
The makefile consider the two white spaces between the end of the
folder name and the '#' character for the beginning of the comment
as part of the folder name.
This cause 'make install' to create a folder named  'angie  ' that
is not welcome on all the OS.

Drop the comment and the space after the folder name.

Reported-by: Liviu Ionescu <[email protected]>
Change-Id: Iadd6803431edb83d0d84f4e4dc6d36b454f912ac
Signed-off-by: Antonio Borneo <[email protected]>
Fixes: 0ed03df ("amend angie build definitions to fix make dist")
Reviewed-on: https://review.openocd.org/c/openocd/+/8740
Reviewed-by: Liviu Ionescu
Tested-by: jenkins
Reviewed-by: Adrien Charruel <[email protected]>
@en-sc
Merge up to 1f3f635 from upstream
95cb368 
Conflict in `src/rtos/hwthread.c` between commit
57dbcb1 ("Improve a couple of
user/debug messages. (riscv-collab#763)") and commit
7f2db80 ("rtos/hwthread: Use
LOG_TARGET_xxx()"). Resolved by using `LOG_TARGET_xxx()` without
changing the message.

Change-Id: I1c1ab321b54f2ef8267f0dca63e16ca8ed6b4655
Signed-off-by: Evgeniy Naydanov <[email protected]>
MarekVCodasip
MarekVCodasip approved these changes Feb 18, 2025
View reviewed changes
Copy link
Collaborator

@MarekVCodasip MarekVCodasip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine, thanks for taking the work to this.

Also, I noticed the alloc_printf function and I noticed few places where we could replace snprintf in the riscv codebase with it. Just letting you know.

@en-sc en-sc merged commit f32f178 into riscv-collab:riscv Feb 21, 2025
3 of 4 checks passed
@en-sc en-sc deleted the en-sc/from_upstream branch February 21, 2025 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarekVCodasip MarekVCodasip MarekVCodasip approved these changes

@JanMatCodasip JanMatCodasip Awaiting requested review from JanMatCodasip

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@en-sc @MarekVCodasip @paulfertser @zapb-0 @tom-van @sobuch @borneoa @cfriedt @danieldegrasse