tests/pkg_nanors: use static allocation #19382

benpicco · 2023-03-13T10:53:02Z

Contribution description

reed_solomon_new() uses malloc() internally, use reed_solomon_new_static() instead to use a static work buffer.

Testing procedure

tests/pkg_nanors still works:

2023-03-14 19:43:21,130 # main(): This is RIOT! (Version: 2023.04-devel-648-g94ba33-pkg/nanors-static)
2023-03-14 19:43:21,132 # START
2023-03-14 19:43:21,135 # total: 30 shards (1920 bytes)
2023-03-14 19:43:21,150 # clear shard 25 (64 byte)
2023-03-14 19:43:21,152 # clear shard 17 (64 byte)
2023-03-14 19:43:21,154 # clear shard 18 (64 byte)
2023-03-14 19:43:21,156 # clear shard 18 (64 byte)
2023-03-14 19:43:21,159 # clear shard 28 (64 byte)
2023-03-14 19:43:21,161 # clear shard 12 (64 byte)
2023-03-14 19:43:21,163 # clear shard 11 (64 byte)
2023-03-14 19:43:21,165 # clear shard 0 (64 byte)
2023-03-14 19:43:21,168 # clear shard 12 (64 byte)
2023-03-14 19:43:21,170 # clear shard 24 (64 byte)
2023-03-14 19:43:21,171 # reconstruct…
2023-03-14 19:43:21,178 # done.
2023-03-14 19:43:21,179 # SUCCESS
2023-03-14 19:43:21,186 # { "threads": [{ "name": "main", "stack_size": 1536, "stack_used": 564 }]}

Issues/PRs references

riot-ci · 2023-03-13T11:03:45Z

Murdock results

✔️ PASSED

250c561 tests/pkg_nanors: use static allocation

Success	Failures	Total	Runtime
6882	0	6882	11m:13s

Artifacts

Documentation preview

benpicco · 2023-03-13T20:25:11Z

bors merge

19382: tests/pkg_nanors: use static allocation r=benpicco a=benpicco Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de>

benpicco · 2023-03-13T22:53:56Z

bors cancel
bors merge

bors · 2023-03-13T22:53:58Z

Canceled.

19382: tests/pkg_nanors: use static allocation r=benpicco a=benpicco 19386: usbus/dfu: do not create alt interface if NUM_SLOTS=1 r=benpicco a=dylad ### Contribution description In some cases, it is really useful to build `riotboot` with `NUM_SLOTS=1`. When use in combination with `riotboot_dfu`, there is no need to export the second slot if `riotboot` is built with `NUM_SLOTS=1`. Thus, prevent the alt interface declaration in dfu if `NUM_SLOTS=1` so that only slot0 can be used to flash. ### Testing procedure Add `NUM_SLOTS=1` to `bootloaders/riotboot_dfu/Makefile` Flash the riotboot DFU bootloader to any board supported by USBUS: `make BOARD=xxx -C bootloaders/riotboot_dfu flash` and run `dfu-util -l` With NUM_SLOTS=2 you will get: ``` dfu-util -l dfu-util 0.11 Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2021 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ Found DFU: [1209:7d02] ver=0100, devnum=11, cfg=1, intf=0, path="1-4", alt=1, name="RIOT-OS Slot 1", serial="AB88DCAE80893484" Found DFU: [1209:7d02] ver=0100, devnum=11, cfg=1, intf=0, path="1-4", alt=0, name="RIOT-OS Slot 0", serial="AB88DCAE80893484" ``` with NUM_SLOTS=1 you will get: ``` dfu-util -l dfu-util 0.11 Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. Copyright 2010-2021 Tormod Volden and Stefan Schmidt This program is Free Software and has ABSOLUTELY NO WARRANTY Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ Found DFU: [1209:7d02] ver=0100, devnum=14, cfg=1, intf=0, path="1-4", alt=0, name="RIOT-OS Slot 0", serial="AB88DCAE80893484" ``` ### Issues/PRs references Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de> Co-authored-by: Dylan Laduranty <dylan.laduranty@mesotic.com>

bors · 2023-03-14T00:37:56Z

Build failed (retrying...):

Murdock

19382: tests/pkg_nanors: use static allocation r=benpicco a=benpicco Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de>

bors · 2023-03-14T01:50:27Z

Build failed:

Murdock

benpicco · 2023-03-14T19:35:51Z

bors merge

kaspar030 · 2023-03-14T20:28:58Z

bors merge

19371: sys/usbus: check for the number of required and provided EPs in static configurations r=kaspar030 a=gschorcht ### Contribution description This PR provides a static check at compile time whether the number of EPs required in a static configuration does not exceed the number of EPs provided by the USB device. #### Background In issue #19359 the problem was reported that `usbus_cdc_ecm` didn't work together with `stdio_cdc_acm` on some STM32 boards. The reason for some of the boards was simply that the application tried to allocate more EPs than available and simply ignored this and just didn't work. #### Solution Since `auto_init_usb` uses a static configuration with exactly one USBUS stack instance and one USB device, at least in case `auto_init` is used a static check can be carried out to make sure that the number of EPs required by the application doesn't exceed the number of EPs provided by the USB device. For this purpose, each `usbus_*` module defines the number of IN and OUT EPs required by that module. Each USB device driver defines the number of EPs provided by USB device if it differs from the default of 8 EPs. During the auto initialization the total number of required IN and OUT EPs is then compared with the number of EPs provided by the USB device using a static assert. ### Testing procedure 1. Green CI 2. Compilation of ```python USEMODULE='stdio_cdc_acm' BOARD=nucleo-f439zi make -j8 -C tests/usbus_cdc_ecm ``` should lead to compilation error ```python sys/auto_init/usb/auto_init_usb.c:81:1: error: static assertion failed: "Number of required IN endpoints exceeded" _Static_assert(USBUS_EP_IN_REQUIRED_NUMOF <= USBDEV_NUM_ENDPOINTS, ^~~~~~~~~~~~~~ Makefile.base:146: recipe for target 'tests/usbus_cdc_ecm/bin/nucleo-f439zi/auto_init_usbus/auto_init_usb.o' failed ``` while compilation of ``` USEMODULE='stdio_cdc_acm' BOARD=nucleo-f767zi make -j8 -C tests/usbus_cdc_ecm ``` should work. ### Issues/PRs references Fixes issue #19359 partially. 19382: tests/pkg_nanors: use static allocation r=kaspar030 a=benpicco 19388: drivers/usbdev_synopsys_dwc2: disable DMA mode r=kaspar030 a=gschorcht ### Contribution description This PR disables the DMA mode for HS cores due to several problems found: - The STALL bit of the OUT control endpoint does not seem to be cleared automatically on the next SETUP received. At least the USB OTG HS core does not generate an interrupt on the next SETUP received. This happens, for example, when CDC ACM is used and the host sends the `SET_LINE_CODING` request which is answered with setting the STALL bit of the OUT endpoint. In this case the enumeration of further interfaces, for example CDC ECM, is stopped. This problem was described in #17085 (comment) - The Enumeration fails for CDC ECM interface which uses URB support (PR #17091) ### Testing procedure Use a STM32 board with USH OTG HS interface: ```python USEMODULE='stdio_cdc_acm periph_usbdev_hs_utmi' BOARD=stm32f723e-disco make -j8 -C tests/usbus_cdc_ecm flash USEMODULE='stdio_cdc_acm periph_usbdev_hs_ulpi' BOARD=stm32f746g-disco make -j8 -C tests/usbus_cdc_ecm flash ``` Without this PR, either the enumeration completely fails (mostly for `stm32f723e-disco`) ```python [377629.753895] usb 1-2.3: new high-speed USB device number 76 using xhci_hcd [377629.854349] usb 1-2.3: device descriptor read/all, error -71 [377629.937990] usb 1-2.3: new high-speed USB device number 77 using xhci_hcd [377630.038261] usb 1-2.3: device descriptor read/all, error -71 [377630.038711] usb 1-2-port3: attempt power cycle [377630.641970] usb 1-2.3: new high-speed USB device number 78 using xhci_hcd [377630.666066] usb 1-2.3: device descriptor read/8, error -71 [377630.794076] usb 1-2.3: device descriptor read/8, error -71 [377630.981806] usb 1-2.3: new high-speed USB device number 79 using xhci_hcd [377631.002092] usb 1-2.3: device descriptor read/8, error -71 [377631.130091] usb 1-2.3: device descriptor read/8, error -71 [377631.238344] usb 1-2-port3: unable to enumerate USB device ``` or the enumeration of the CDC ECM interface stops with error. ```python [377972.828168] usb 1-2.3: new high-speed USB device number 100 using xhci_hcd [377972.928762] usb 1-2.3: config 1 interface 0 altsetting 0 endpoint 0x81 has an invalid bInterval 255, changing to 11 [377972.928765] usb 1-2.3: config 1 interface 1 altsetting 0 bulk endpoint 0x1 has invalid maxpacket 64 [377972.928767] usb 1-2.3: config 1 interface 1 altsetting 0 bulk endpoint 0x82 has invalid maxpacket 64 [377972.929225] usb 1-2.3: New USB device found, idVendor=1209, idProduct=7d00, bcdDevice= 1.00 [377972.929228] usb 1-2.3: New USB device strings: Mfr=3, Product=2, SerialNumber=4 [377972.929230] usb 1-2.3: Product: stm32f723e-disco [377972.929232] usb 1-2.3: Manufacturer: RIOT-os.org [377972.929233] usb 1-2.3: SerialNumber: A6BAC4E1B1E0806B [377972.932399] cdc_acm 1-2.3:1.0: ttyACM1: USB ACM device [377972.933905] cdc_ether: probe of 1-2.3:1.2 failed with error -32 [377973.184377] usb 1-4.3.4: reset high-speed USB device number 32 using xhci_hcd ``` With this PR the enumeration should work as it should: ```python [378480.097974] usb 1-4.3.4: reset high-speed USB device number 32 using xhci_hcd [378484.289762] usb 1-2.3: new high-speed USB device number 16 using xhci_hcd [378484.394638] usb 1-2.3: config 1 interface 0 altsetting 0 endpoint 0x81 has an invalid bInterval 255, changing to 11 [378484.394642] usb 1-2.3: config 1 interface 1 altsetting 0 bulk endpoint 0x1 has invalid maxpacket 64 [378484.394644] usb 1-2.3: config 1 interface 1 altsetting 0 bulk endpoint 0x82 has invalid maxpacket 64 [378484.395296] usb 1-2.3: New USB device found, idVendor=1209, idProduct=7d00, bcdDevice= 1.00 [378484.395299] usb 1-2.3: New USB device strings: Mfr=3, Product=2, SerialNumber=4 [378484.395301] usb 1-2.3: Product: stm32f723e-disco [378484.395303] usb 1-2.3: Manufacturer: RIOT-os.org [378484.395304] usb 1-2.3: SerialNumber: A6BAC4E1B1E0806B [378484.398547] cdc_acm 1-2.3:1.0: ttyACM1: USB ACM device [378484.401007] cdc_ether 1-2.3:1.2 usb0: register 'cdc_ether' at usb-0000:00:14.0-2.3, CDC Ethernet Device, e6:75:97:3a:74:ba [378484.449870] cdc_ether 1-2.3:1.2 enp0s20f0u2u3i2: renamed from usb0 ``` ### Issues/PRs references Co-authored-by: Gunar Schorcht <gunar@schorcht.net> Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de>

benpicco · 2023-03-15T08:37:21Z

bors merge

bors · 2023-03-15T10:48:33Z

Build succeeded:

pkg/nanors: bump version

e35d4e8

benpicco requested review from smlng, leandrolanzieri, aabadie, MichelRottleuthner and fjmolinas as code owners March 13, 2023 10:53

benpicco changed the title ~~reed_solomon_new_static~~ tests/pkg_nanors: use static allocation Mar 13, 2023

github-actions bot added Area: pkg Area: External package ports Area: tests Area: tests and testing framework labels Mar 13, 2023

benpicco added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 13, 2023

benpicco requested a review from maribu March 13, 2023 13:35

maribu approved these changes Mar 13, 2023

View reviewed changes

bors bot added a commit that referenced this pull request Mar 13, 2023

Merge #19382

8655437

19382: tests/pkg_nanors: use static allocation r=benpicco a=benpicco Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de>

bors bot added a commit that referenced this pull request Mar 14, 2023

Merge #19382

51efbac

19382: tests/pkg_nanors: use static allocation r=benpicco a=benpicco Co-authored-by: Benjamin Valentin <benpicco@beuth-hochschule.de>

tests/pkg_nanors: use static allocation

250c561

benpicco force-pushed the pkg/nanors-static branch from 94ba33d to 250c561 Compare March 14, 2023 18:44

bors bot merged commit fd38db6 into RIOT-OS:master Mar 15, 2023

benpicco deleted the pkg/nanors-static branch March 15, 2023 10:48

MrKevinWeiss added this to the Release 2023.04 milestone Apr 25, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests/pkg_nanors: use static allocation #19382

tests/pkg_nanors: use static allocation #19382

benpicco commented Mar 13, 2023 •

edited

Loading

riot-ci commented Mar 13, 2023 •

edited

Loading

benpicco commented Mar 13, 2023

benpicco commented Mar 13, 2023

bors bot commented Mar 13, 2023

bors bot commented Mar 14, 2023

bors bot commented Mar 14, 2023

benpicco commented Mar 14, 2023

kaspar030 commented Mar 14, 2023

benpicco commented Mar 15, 2023

bors bot commented Mar 15, 2023

tests/pkg_nanors: use static allocation #19382

tests/pkg_nanors: use static allocation #19382

Conversation

benpicco commented Mar 13, 2023 • edited Loading

Contribution description

Testing procedure

Issues/PRs references

riot-ci commented Mar 13, 2023 • edited Loading

Murdock results

Artifacts

benpicco commented Mar 13, 2023

benpicco commented Mar 13, 2023

bors bot commented Mar 13, 2023

bors bot commented Mar 14, 2023

bors bot commented Mar 14, 2023

benpicco commented Mar 14, 2023

kaspar030 commented Mar 14, 2023

benpicco commented Mar 15, 2023

bors bot commented Mar 15, 2023

benpicco commented Mar 13, 2023 •

edited

Loading

riot-ci commented Mar 13, 2023 •

edited

Loading