June 2023 - gerrit-log - lists.osmocom.org

Change in osmo-ccid-firmware[master]: add simple gangupdater for multiple octsim boards
by roh 15 Mar '25

15 Mar '25

roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 ) Change subject: add simple gangupdater for multiple octsim boards ...................................................................... add simple gangupdater for multiple octsim boards Change-Id: Ic10572c121ac55586ec43126b63d69529757132b --- A contrib/flash_all_octsim.sh 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/26896/1 diff --git a/contrib/flash_all_octsim.sh b/contrib/flash_all_octsim.sh new file mode 100644 index 0000000..4f4c89b --- /dev/null +++ b/contrib/flash_all_octsim.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# this script is to scan for octsim boards, sort them by usb path and call dfu-util on each to update the board +# basic flow +# - get usb path and serialno tupel from dfu-util -l +# - reformat and sort by usbpath, drop the usbpath (grep cut tr sort cut) +# - flash the boards + +# TODO: +# - error handling +# - filter dfu-util output and generate nice summary + +dfu-util -l \ + | grep "^Found" \ + | grep "\[1d50:6141\]" \ + | cut -d ' ' -f 8,13 \ + | tr -d ',' \ + | cut -d \" -f 2,4 \ + | tr \" ' ' \ + | sort \ + | cut -d ' ' -f 2 + | xargs -n 1 dfu-util -d 1d50:6141 -D sysmoOCTSIM.bin -R -p -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic10572c121ac55586ec43126b63d69529757132b Gerrit-Change-Number: 26896 Gerrit-PatchSet: 1 Gerrit-Owner: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: newchange

2 2

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 30 Jun '23

30 Jun '23

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Build verification fails because https://gerrit.osmocom.org/c/libosmocore/+/33497 is required. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 30 Jun 2023 19:43:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Remove missing functions from map file
by daniel 30 Jun '23

30 Jun '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33537 ) Change subject: osmo_io: Remove missing functions from map file ...................................................................... osmo_io: Remove missing functions from map file Change-Id: I4dbc1cf9b05521325287803f00781001b80945ef --- M src/core/libosmocore.map 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 68f7270..d31392b 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -262,8 +262,6 @@ osmo_iofd_get_priv_nr; osmo_iofd_init; osmo_iofd_ops; -osmo_iofd_read_disable; -osmo_iofd_read_enable; osmo_iofd_register; osmo_iofd_sendto_msgb; osmo_iofd_set_alloc_info; @@ -275,8 +273,6 @@ osmo_iofd_txqueue_len; osmo_iofd_unregister; osmo_iofd_uring_init; -osmo_iofd_write_disable; -osmo_iofd_write_enable; osmo_iofd_write_msgb; osmo_ip_str_type; osmo_isdnhdlc_decode; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4dbc1cf9b05521325287803f00781001b80945ef Gerrit-Change-Number: 33537 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Make the test more deterministic between backends
by daniel 30 Jun '23

30 Jun '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33496 ) Change subject: osmo_io: Make the test more deterministic between backends ...................................................................... osmo_io: Make the test more deterministic between backends Change-Id: Ibdd26a4aeadfbd6c5039c8a31cc120d3c98be727 --- M tests/osmo_io/osmo_io_test.c M tests/osmo_io/osmo_io_test.ok 2 files changed, 27 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/tests/osmo_io/osmo_io_test.c b/tests/osmo_io/osmo_io_test.c index 3683ee3..a42e6d0 100644 --- a/tests/osmo_io/osmo_io_test.c +++ b/tests/osmo_io/osmo_io_test.c @@ -38,6 +38,11 @@ #define TEST_START() printf("Running %s\n", __func__) +static uint8_t TESTDATA[] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 +}; + + static void *ctx = NULL; static void read_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg) @@ -51,7 +56,15 @@ static void write_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg) { + uint8_t *buf; printf("%s: write() returned rc=%d\n", osmo_iofd_get_name(iofd), rc); + if (rc == 0) { + msg = msgb_alloc(1024, "Test data"); + buf = msgb_put(msg, sizeof(TESTDATA)); + memcpy(buf, TESTDATA, sizeof(TESTDATA)); + + osmo_iofd_write_msgb(iofd, msg); + } } struct osmo_io_ops ioops_conn_read_write = { @@ -59,16 +72,10 @@ .write_cb = write_cb, }; -uint8_t TESTDATA[] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 -}; - static void test_connected(void) { int fds[2] = {0, 0}, rc; struct osmo_io_fd *iofd1, *iofd2; - struct msgb *msg; - uint8_t *buf; TEST_START(); @@ -80,13 +87,6 @@ iofd2 = osmo_iofd_setup(ctx, fds[1], "ep2", OSMO_IO_FD_MODE_READ_WRITE, &ioops_conn_read_write, NULL); osmo_iofd_register(iofd2, fds[1]); - msg = msgb_alloc(1024, "Test data"); - buf = msgb_put(msg, sizeof(TESTDATA)); - memcpy(buf, TESTDATA, sizeof(TESTDATA)); - - osmo_iofd_write_msgb(iofd1, msg); - - /* Allow enough cycles to handle the messages */ for (int i = 0; i < 128; i++) osmo_select_main(1); diff --git a/tests/osmo_io/osmo_io_test.ok b/tests/osmo_io/osmo_io_test.ok index 43e5464..82a6f38 100644 --- a/tests/osmo_io/osmo_io_test.ok +++ b/tests/osmo_io/osmo_io_test.ok @@ -1,6 +1,10 @@ Running test_connected -ep1: write() returned rc=16 +ep1: write() returned rc=0 ep2: write() returned rc=0 +ep1: write() returned rc=16 +ep2: write() returned rc=16 +ep1: read() msg with len=16 +01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 ep2: read() msg with len=16 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 Running test_unconnected -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibdd26a4aeadfbd6c5039c8a31cc120d3c98be727 Gerrit-Change-Number: 33496 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Fix write_enable handling in iofd_txqueue
by daniel 30 Jun '23

30 Jun '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33536 ) Change subject: osmo_io: Fix write_enable handling in iofd_txqueue ...................................................................... osmo_io: Fix write_enable handling in iofd_txqueue Enable write on first message in both iofd_txqueue_enqueue{,_front}(), but only if the iofd is not closed. Change-Id: I75827491bb9fe0c6d1e4a195ac434f049b1a6ba6 --- M src/core/osmo_io.c 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 253dfa2..4cef142 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -171,7 +171,7 @@ llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue); iofd->tx_queue.current_length++; - if (iofd->tx_queue.current_length == 1) + if (iofd->tx_queue.current_length == 1 && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) osmo_iofd_ops.write_enable(iofd); return 0; @@ -188,6 +188,9 @@ { llist_add(&msghdr->list, &iofd->tx_queue.msg_queue); iofd->tx_queue.current_length++; + + if (iofd->tx_queue.current_length == 1 && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) + osmo_iofd_ops.write_enable(iofd); } /*! Dequeue a message from the front -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75827491bb9fe0c6d1e4a195ac434f049b1a6ba6 Gerrit-Change-Number: 33536 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Fix write_enable handling in iofd_txqueue
by daniel 30 Jun '23

30 Jun '23

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33536 ) Change subject: osmo_io: Fix write_enable handling in iofd_txqueue ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75827491bb9fe0c6d1e4a195ac434f049b1a6ba6 Gerrit-Change-Number: 33536 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 19:39:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Make the test more deterministic between backends
by daniel 30 Jun '23

30 Jun '23

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33496 ) Change subject: osmo_io: Make the test more deterministic between backends ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibdd26a4aeadfbd6c5039c8a31cc120d3c98be727 Gerrit-Change-Number: 33496 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 19:39:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 30 Jun '23

30 Jun '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... stream: Notify stream_cli on connect() Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Depends: Ieed10bc94c8aad821c0a8f7764db0e05c054c1e3 (libosmocore.git) --- M src/stream.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/42/33542/1 diff --git a/src/stream.c b/src/stream.c index f007cc4..8de6cb8 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1039,6 +1039,7 @@ if (osmo_iofd_register(cli->iofd, fd) < 0) goto error_close_socket; + osmo_iofd_notify_connected(cli->iofd); break; default: OSMO_ASSERT(false); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_iofd_notify_connected()
by fixeria 30 Jun '23

30 Jun '23

Attention is currently required from: laforge, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33497 ) Change subject: osmo_io: Add osmo_iofd_notify_connected() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieed10bc94c8aad821c0a8f7764db0e05c054c1e3 Gerrit-Change-Number: 33497 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 18:25:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Fix write_enable handling in iofd_txqueue
by fixeria 30 Jun '23

30 Jun '23

Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33536 ) Change subject: osmo_io: Fix write_enable handling in iofd_txqueue ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I75827491bb9fe0c6d1e4a195ac434f049b1a6ba6 Gerrit-Change-Number: 33536 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 18:24:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0