boot_serial: port CBOR encoding to use cddl-gen #997

oyvindronningstad · 2021-05-07T20:48:01Z

Also update cddl-gen to newer version.
This removes the dependency on tinycbor.

oyvindronningstad · 2021-05-07T20:48:46Z

FYI @nvlsianpu @de-nordic @carlescufi

de-nordic · 2021-05-10T12:05:06Z

@oyvindronningstad Do you have test manifest PR to Zephyr that I can fetch to test this?

oyvindronningstad · 2021-05-11T09:01:58Z

@de-nordic Try this: zephyrproject-rtos/zephyr#35098

de-nordic · 2021-05-11T12:08:15Z

Is it working for you? I am building this with CONFIG_MCUBOOT_SERIAL=y, CONFIG_UART_CONSOLE=n, CONFIG_MULTITHREADING=y (to make it compile) and the mcumgr hands trying to communicate to device.
The Zephyr origin/master (977aba6d02c87f884ecc79672690befcbcfd0186) with the same options work.

oyvindronningstad · 2021-05-12T08:20:40Z

@de-nordic I'm able to transfer using the provided branch.

west build ../bootloader/mcuboot/boot/zephyr/ -p -- -DCONFIG_MCUBOOT_SERIAL=y -DCONFIG_UART_CONSOLE=n -DCONFIG_MULTITHREADING=y -DCONFIG_CONSOLE_HANDLER=n -DCONFIG_BOOT_SERIAL_DETECT_PIN_VAL=1

CONFIG_BOOT_SERIAL_DETECT_PIN_VAL is just because I'm remote and can't push the button :).

I'm on nRF9160

de-nordic · 2021-05-12T14:24:00Z

Okay, so seems that upload is ok but "image list" does not work.
When I invoke

sudo ~/go/bin/mcumgr  -t 1200 --conntype serial --connstring dev=/dev/ttyUSB0,baud=115200 image list

It waits, although when interrupted (Ctrl + C kind) you may than upload image,

When I run the command to dump debug:

sudo ~/go/bin/mcumgr  -l "debug" -t 1200 --conntype serial --connstring dev=/dev/ttyUSB0,baud=115200 image list

I got this

time="2021-05-12 14:22:15.148" level=debug msg="Using connection profile: name=unnamed type=serial connstring=dev=/dev/ttyUSB0,baud=115200"
time="2021-05-12 14:22:15.149" level=debug msg="{add-nmp-listener} [serial_sesn.go:213] seq=66"
time="2021-05-12 14:22:15.149" level=debug msg="Encoded &{NmpBase:{hdr:{Op:0 Flags:0 Len:0 Group:1 Seq:66 Id:0}}} to:
00000000  a0                                                |.|
"
time="2021-05-12 14:22:15.149" level=debug msg="Encoded:
00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
"
time="2021-05-12 14:22:15.149" level=debug msg="Tx NMP request: 00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
"
time="2021-05-12 14:22:15.149" level=debug msg="Base64 encoding request:
00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
"
time="2021-05-12 14:22:15.149" level=debug msg="Tx serial
00000000  06 09                                             |..|
"
time="2021-05-12 14:22:15.149" level=debug msg="Tx serial
00000000  41 41 73 41 41 41 41 42  41 41 46 43 41 4b 44 31  |AAsAAAABAAFCAKD1|
00000010  4d 77 3d 3d                                       |Mw==|
"
time="2021-05-12 14:22:15.149" level=debug msg="Tx serial
00000000  0a                                                |.|
"
time="2021-05-12 14:22:15.246" level=debug msg="Rx serial:
00000000  06 09 41 44 4d 42 41 41  41 70 41 41 46 43 41 47  |..ADMBAAApAAFCAG|
00000010  5a 70 62 57 46 6e 5a 58  4f 66 76 32 52 7a 62 47  |ZpbWFnZXOfv2RzbG|
00000020  39 30 41 47 64 32 5a 58  4a 7a 61 57 39 75 5a 7a  |90AGd2ZXJzaW9uZz|
00000030  41 75 4d 43 34 77 4c 6a  42 6e 4d 43 34 77 4c 6a  |AuMC4wLjBnMC4wLj|
00000040  41 75 4d 50 2f 2f 45 4c  59 3d                    |AuMP//ELY=|
"
time="2021-05-12 14:22:15.246" level=debug msg="Decoded input:
00000000  01 00 00 29 00 01 42 00  66 69 6d 61 67 65 73 9f  |...)..B.fimages.|
00000010  bf 64 73 6c 6f 74 00 67  76 65 72 73 69 6f 6e 67  |.dslot.gversiong|
00000020  30 2e 30 2e 30 2e 30 67  30 2e 30 2e 30 2e 30 ff  |0.0.0.0g0.0.0.0.|
00000030  ff                                                |.|
"
time="2021-05-12 14:22:15.246" level=debug msg="rx nmp response: 00000000  01 00 00 29 00 01 42 00  66 69 6d 61 67 65 73 9f  |...)..B.fimages.|
00000010  bf 64 73 6c 6f 74 00 67  76 65 72 73 69 6f 6e 67  |.dslot.gversiong|
00000020  30 2e 30 2e 30 2e 30 67  30 2e 30 2e 30 2e 30 ff  |0.0.0.0g0.0.0.0.|
00000030  ff                                                |.|
"
time="2021-05-12 14:22:15.246" level=debug msg="Failure decoding NMP rsp: Invalid response: cbor decode error [pos 1]: only encoded map or array can be decoded into a struct
packet=
00000000  01 00 00 29 00 01 42 00  66 69 6d 61 67 65 73 9f  |...)..B.fimages.|
00000010  bf 64 73 6c 6f 74 00 67  76 65 72 73 69 6f 6e 67  |.dslot.gversiong|
00000020  30 2e 30 2e 30 2e 30 67  30 2e 30 2e 30 2e 30 ff  |0.0.0.0g0.0.0.0.|
00000030  ff                                                |.|
"

Update and rename submodule. Regenerate code and copy updated files. Update regeneration script. Signed-off-by: Øyvind Rønningstad <[email protected]>

oyvindronningstad · 2021-05-21T08:42:32Z

@de-nordic Thanks! I think I found the error. I tested image list, and it works for me now.

de-nordic · 2021-05-21T10:42:01Z

Nearly there, the imge list works only up to first successful upload, afterwards it is this:

DEBU[2021-05-21 10:40:52.043] Using connection profile: name=unnamed type=serial connstring=dev=/dev/ttyACM0,baud=115200
DEBU[2021-05-21 10:40:52.044] {add-nmp-listener} [serial_sesn.go:213] seq=66
DEBU[2021-05-21 10:40:52.044] Encoded &{NmpBase:{hdr:{Op:0 Flags:0 Len:0 Group:1 Seq:66 Id:0}}} to:
00000000  a0                                                |.|
DEBU[2021-05-21 10:40:52.044] Encoded:
00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
DEBU[2021-05-21 10:40:52.044] Tx NMP request: 00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
DEBU[2021-05-21 10:40:52.044] Base64 encoding request:
00000000  00 00 00 01 00 01 42 00  a0                       |......B..|
DEBU[2021-05-21 10:40:52.044] Tx serial
00000000  06 09                                             |..|
DEBU[2021-05-21 10:40:52.044] Tx serial
00000000  41 41 73 41 41 41 41 42  41 41 46 43 41 4b 44 31  |AAsAAAABAAFCAKD1|
00000010  4d 77 3d 3d                                       |Mw==|
DEBU[2021-05-21 10:40:52.044] Tx serial
00000000  0a                                                |.|
DEBU[2021-05-21 10:40:52.138] Rx serial:
00000000  06 09 41 44 55 42 41 41  41 72 41 41 46 43 41 4c  |..ADUBAAArAAFCAL|
00000010  39 6d 61 57 31 68 5a 32  56 7a 6e 37 39 6b 63 32  |9maW1hZ2Vzn79kc2|
00000020  78 76 64 41 42 6e 64 6d  56 79 63 32 6c 76 62 6d  |xvdABndmVyc2lvbm|
00000030  63 77 4c 6a 41 75 4d 43  34 77 5a 7a 41 75 4d 43  |cwLjAuMC4wZzAuMC|
00000040  34 77 4c 6a 44 2f 2f 2f  39 51 59 77 3d 3d        |4wLjD///9QYw==|
DEBU[2021-05-21 10:40:52.138] Decoded input:
00000000  01 00 00 2b 00 01 42 00  bf 66 69 6d 61 67 65 73  |...+..B..fimages|
00000010  9f bf 64 73 6c 6f 74 00  67 76 65 72 73 69 6f 6e  |..dslot.gversion|
00000020  67 30 2e 30 2e 30 2e 30  67 30 2e 30 2e 30 2e 30  |g0.0.0.0g0.0.0.0|
00000030  ff ff ff                                          |...|
DEBU[2021-05-21 10:40:52.138] rx nmp response: 00000000  01 00 00 2b 00 01 42 00  bf 66 69 6d 61 67 65 73  |...+..B..fimages|
00000010  9f bf 64 73 6c 6f 74 00  67 76 65 72 73 69 6f 6e  |..dslot.gversion|
00000020  67 30 2e 30 2e 30 2e 30  67 30 2e 30 2e 30 2e 30  |g0.0.0.0g0.0.0.0|
00000030  ff ff ff                                          |...|
DEBU[2021-05-21 10:40:52.139] Failure decoding NMP rsp: Invalid response: cbor decode error [pos 41]: decodeNaked: Unrecognized d.bd: 0xff
packet=
00000000  01 00 00 2b 00 01 42 00  bf 66 69 6d 61 67 65 73  |...+..B..fimages|
00000010  9f bf 64 73 6c 6f 74 00  67 76 65 72 73 69 6f 6e  |..dslot.gversion|
00000020  67 30 2e 30 2e 30 2e 30  67 30 2e 30 2e 30 2e 30  |g0.0.0.0g0.0.0.0|
00000030  ff ff ff
``

Non-generated. Using cbor_encode directly This removes the dependence on TinyCBOR. Fixes mcu-tools#978 Signed-off-by: Øyvind Rønningstad <[email protected]>

oyvindronningstad · 2021-05-21T11:48:10Z

@de-nordic Thanks again, fixed :).

de-nordic

Tested on nrf52840dk: all features of serial recovery work correctly.

Looks OK, couldn't find anything to stick to. Thanks!

oyvindronningstad · 2021-05-21T12:38:59Z

@de-nordic @nvlsianpu I'm not allowed to add reviewers, so please add relevant people.

utzig

LGTM, works on Mynewt as well.

oyvindronningstad · 2021-05-25T07:13:45Z

Great, this is ready from my side now.

carlescufi · 2021-05-25T09:42:15Z

@nvlsianpu is this ready for merging now?

utzig · 2021-05-25T14:52:51Z

@nvlsianpu is this ready for merging now?

Hopefully it is :-)

de-nordic · 2021-05-26T11:55:20Z

Btw, mcuboot flas size got tiny reduction:

Memory region         Used Size  Region Size  %age Used
           FLASH:       43952 B        48 KB     89.42%
            SRAM:       26272 B       256 KB     10.02%
        IDT_LIST:          0 GB         2 KB      0.00%

vs the PR base:

Memory region         Used Size  Region Size  %age Used
           FLASH:       43972 B        48 KB     89.46%
            SRAM:       26272 B       256 KB     10.02%
        IDT_LIST:          0 GB         2 KB      0.00%

sjanc · 2022-06-27T15:15:24Z

Hi,

sorry for digging this out but I recently wanted to update Mynewt dependency from 1.7.2 to 1.9 and that commit broke 'newt test all'. ie mcuboot/boot/boot_serial/test/ doesn't build

Compiling bin/targets/unittest/boot_boot_serial_test/generated/src/boot_boot_serial_test-sysinit-app.c
repos/mcuboot/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c: In function ‘TEST_CASE_boot_serial_upload_bigger_image’:
repos/mcuboot/boot/boot_serial/test/src/testcases/boot_serial_upload_bigger_image.c:91:42: error: ‘Value8Bit’ undeclared (first use in this function)
91 | buf[payload_off + len - 2] = Value8Bit;
| ^~~~~~~~~

So two questions:

should I simply move those tests from mcuboot into mynewt-core?
Is Mynewt target no longer tested for mcuboot releases?

sjanc · 2022-06-27T15:43:21Z

looks like it was easy to fix in mcuboot :) #1400

oyvindronningstad force-pushed the encode branch 3 times, most recently from 55a3430 to 011a96c Compare May 7, 2021 21:05

de-nordic mentioned this pull request May 10, 2021

switch cbor encoding to generated by cddl-gen #978

Closed

oyvindronningstad force-pushed the encode branch from 011a96c to c589be9 Compare May 10, 2021 10:04

nvlsianpu self-requested a review May 10, 2021 10:49

oyvindronningstad force-pushed the encode branch from c589be9 to 9f21bcd Compare May 10, 2021 11:01

oyvindronningstad mentioned this pull request May 11, 2021

Update cddl-gen zephyrproject-rtos/mcuboot#51

Closed

boot_serial: Update cddl-gen

dfd168a

Update and rename submodule. Regenerate code and copy updated files. Update regeneration script. Signed-off-by: Øyvind Rønningstad <[email protected]>

oyvindronningstad force-pushed the encode branch from 9f21bcd to a6cafae Compare May 21, 2021 08:40

de-nordic self-requested a review May 21, 2021 09:37

boot_serial: Port encoding to use cddl-gen

cae00e0

Non-generated. Using cbor_encode directly This removes the dependence on TinyCBOR. Fixes mcu-tools#978 Signed-off-by: Øyvind Rønningstad <[email protected]>

oyvindronningstad force-pushed the encode branch from a6cafae to cae00e0 Compare May 21, 2021 11:47

de-nordic approved these changes May 21, 2021

View reviewed changes

de-nordic requested a review from utzig May 21, 2021 12:39

utzig approved these changes May 23, 2021

View reviewed changes

utzig merged commit 9f4aefd into mcu-tools:main May 25, 2021

oyvindronningstad deleted the encode branch May 25, 2021 16:53

de-nordic mentioned this pull request Jun 7, 2021

RFC: Move mcumgr functionality as internal Zephyr service zephyrproject-rtos/zephyr#36017

Closed

nvlsianpu mentioned this pull request Aug 18, 2021

serial recovery: can't upload any image bigger than 64 KB #1104

Closed

boot_serial: port CBOR encoding to use cddl-gen #997

boot_serial: port CBOR encoding to use cddl-gen #997

Uh oh!

Conversation

oyvindronningstad commented May 7, 2021

Uh oh!

oyvindronningstad commented May 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

de-nordic commented May 10, 2021

Uh oh!

oyvindronningstad commented May 11, 2021

Uh oh!

de-nordic commented May 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oyvindronningstad commented May 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

de-nordic commented May 12, 2021

Uh oh!

oyvindronningstad commented May 21, 2021

Uh oh!

de-nordic commented May 21, 2021

Uh oh!

oyvindronningstad commented May 21, 2021

Uh oh!

de-nordic left a comment

Choose a reason for hiding this comment

Uh oh!

oyvindronningstad commented May 21, 2021

Uh oh!

utzig left a comment

Choose a reason for hiding this comment

Uh oh!

oyvindronningstad commented May 25, 2021

Uh oh!

carlescufi commented May 25, 2021

Uh oh!

utzig commented May 25, 2021

Uh oh!

de-nordic commented May 26, 2021

Uh oh!

sjanc commented Jun 27, 2022

Uh oh!

sjanc commented Jun 27, 2022

Uh oh!

Uh oh!

oyvindronningstad commented May 7, 2021 •

edited

Loading

de-nordic commented May 11, 2021 •

edited

Loading

oyvindronningstad commented May 12, 2021 •

edited

Loading