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

Change in osmo-upf[master]: add pfcp_endpoint

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28244 ) Change subject: add pfcp_endpoint ...................................................................... Patch Set 4: (1 comment) File src/libosmo-pfcp/pfcp_endpoint.c: https://gerrit.osmocom.org/c/osmo-upf/+/28244/comment/f38ce1a3_ac80ec72 PS4, Line 268: /* Slight optimization: Add sent requests to the start of the list: we will usually receive a response shortly > I haven't done a deep review, but if there is no reason to have a shared path/queue for requests and […] indeed. i have applied this in https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic8d42e201b63064a71b40ca45a5a40e29941e8ac Gerrit-Change-Number: 28244 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 Jun 2022 21:57:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmo-pfcp[master]: separate pfcp_queue_timer_cb() in req and resp

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337 ) Change subject: separate pfcp_queue_timer_cb() in req and resp ...................................................................... separate pfcp_queue_timer_cb() in req and resp Having separate callbacks for request and response messages makes for an easier read. No functional change. This applies code review from https://gerrit.osmocom.org/c/osmo-upf/+/28244 Ic8d42e201b63064a71b40ca45a5a40e29941e8ac (osmo-upf.git) Related: SYS#5599 Change-Id: Ic8ab71f5efd4cf669689a0b075f9a52ce66bdd5d --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 30 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/37/28337/1 diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 83b7c1a..e58cc1d 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -171,27 +171,38 @@ return true; } -/* T1 for a given queue entry has expired */ -static void pfcp_queue_timer_cb(void *data) +/* T1 for a given sent_requests queue entry has expired */ +static void pfcp_queue_sent_req_timer_cb(void *data) { struct osmo_pfcp_queue_entry *qe = data; bool keep; - if (qe->m->is_response) { - /* The response has waited in the queue for any retransmissions of its initiating request. Now that time - * has passed and the response can be dropped from the queue. */ - keep = false; - } else { - /* The request is still here, which means it has not received a response from the remote side. - * Retransmit the request. */ - keep = pfcp_queue_retrans(qe); - } + /* qe->m is a request sent earlier */ + OSMO_ASSERT(!qe->m->is_response); + /* The request is still here, which means it has not received a response from the remote side. + * Retransmit the request. */ + keep = pfcp_queue_retrans(qe); if (keep) return; + + /* Retransmission has elapsed. Notify resp_cb that receiving a response has failed. */ + if (qe->m->ctx.resp_cb) + qe->m->ctx.resp_cb(qe->m, NULL, "PFCP request retransmissions elapsed, no response received"); /* Drop the queue entry. No more retransmissions. */ - if (!qe->m->is_response && qe->m->ctx.resp_cb) - qe->m->ctx.resp_cb(qe->m, NULL, "PFCP retransmissions elapsed, no response received"); + osmo_pfcp_queue_del(qe); +} + +/* T1 for a given sent_responses queue entry has expired */ +static void pfcp_queue_sent_resp_timer_cb(void *data) +{ + struct osmo_pfcp_queue_entry *qe = data; + + /* qe->m is a response sent earlier */ + OSMO_ASSERT(qe->m->is_response); + + /* The response has waited in the queue for any retransmissions of its initiating request. Now that time + * has passed and the response can be dropped from the queue. */ osmo_pfcp_queue_del(qe); } @@ -268,13 +279,15 @@ /* Slight optimization: Add sent requests to the start of the list: we will usually receive a response shortly * after sending a request, removing that entry from the queue quickly. * Add sent responses to the end of the list: they will rarely be retransmitted at all. */ - if (m->is_response) + if (m->is_response) { llist_add_tail(&qe->entry, &endpoint->sent_responses); - else - llist_add_tail(&qe->entry, &endpoint->sent_requests); + osmo_timer_setup(&qe->t1, pfcp_queue_sent_resp_timer_cb, qe); + } else { + llist_add(&qe->entry, &endpoint->sent_requests); + osmo_timer_setup(&qe->t1, pfcp_queue_sent_req_timer_cb, qe); + } talloc_set_destructor(qe, osmo_pfcp_queue_destructor); - osmo_timer_setup(&qe->t1, pfcp_queue_timer_cb, qe); osmo_timer_schedule(&qe->t1, timeout/1000, timeout%1000); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Ic8ab71f5efd4cf669689a0b075f9a52ce66bdd5d Gerrit-Change-Number: 28337 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: update git URLs (git -> https; gitea)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28336 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: I22bc1dd5c8a33fbccc8cc6d0d8daf7f558f17f44 --- M README.md M configure.ac M debian/control M debian/copyright 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/28336/1 diff --git a/README.md b/README.md index 97573bc..ed9bcd6 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,9 @@ You can clone from the official libosmocore.git repository using - git clone git://git.osmocom.org/libosmocore.git + git clone https://gitea.osmocom.org/osmocom/libosmocore -There is a cgit interface at <https://git.osmocom.org/libosmocore/> +There is a web interface at <https://gitea.osmocom.org/osmocom/libosmocore> Documentation ------------- diff --git a/configure.ac b/configure.ac index bf85c07..2467c68 100644 --- a/configure.ac +++ b/configure.ac @@ -441,7 +441,7 @@ AM_PATH_PYTHON AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then - AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.]) fi fi AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) diff --git a/debian/control b/debian/control index fdd4be8..ff11656 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ libsystemd-dev, python3:native Standards-Version: 3.9.8 -Vcs-Git: git://git.osmocom.org/libosmocore.git -Vcs-Browser: http://git.osmocom.org/libosmocore/ +Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore +Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmocore Homepage: https://projects.osmocom.org/projects/libosmocore Package: libosmocore diff --git a/debian/copyright b/debian/copyright index b119569..79c5876 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libosmocore -Source: git://git.osmocom.org/libosmocore.git +Source: https://gitea.osmocom.org/osmocom/libosmocore Files: * Copyright: 2008 Daniel Willmann <daniel(a)totalueberwachung.de> -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I22bc1dd5c8a33fbccc8cc6d0d8daf7f558f17f44 Gerrit-Change-Number: 28336 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-sccp[master]: update git URLs (git -> https; gitea)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/28335 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: Idac4924a077b5389e85efaf62081589fc3de06ad --- M README.md M configure.ac M contrib/test/test-m3ua.sh M contrib/test/test-sua.sh M debian/control 5 files changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/35/28335/1 diff --git a/README.md b/README.md index 98b3591..2ec30c8 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,9 @@ You can clone from the official git repository using - git clone git://git.osmocom.org/libosmo-sccp.git - git clone https://git.osmocom.org/libosmo-sccp.git + git clone https://gitea.osmocom.org/osmocom/libosmo-sccp -There is a cgit interface at https://git.osmocom.org/libosmo-sccp/ +There is a web interface at <https://gitea.osmocom.org/osmocom/libosmo-sccp> Documentation ------------- diff --git a/configure.ac b/configure.ac index 4367b8a..92325d7 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,7 @@ AM_PATH_PYTHON AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then - AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.]) fi fi AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) diff --git a/contrib/test/test-m3ua.sh b/contrib/test/test-m3ua.sh index 0f81fe8..927f514 100755 --- a/contrib/test/test-m3ua.sh +++ b/contrib/test/test-m3ua.sh @@ -3,7 +3,7 @@ # this script executes m3ua-testtool against osmo-stp. It assumes that # it is called from within libosmo-sccp/contrib/test and also assumes # that adjacent to the libosmo-sccp, there's a check-out of -# git://git.osmocom.org/nplab/m3ua-testtool +# https://gitea.osmocom.org/nplab/m3ua-testtool # the top of the libosmo-sccp git repository TOPDIR=../../ diff --git a/contrib/test/test-sua.sh b/contrib/test/test-sua.sh index 0cb4e35..9f97f43 100755 --- a/contrib/test/test-sua.sh +++ b/contrib/test/test-sua.sh @@ -3,7 +3,7 @@ # this script executes m3ua-testtool against osmo-stp. It assumes that # it is called from within libosmo-sccp/contrib/test and also assumes # that adjacent to the libosmo-sccp, there's a check-out of -# git://git.osmocom.org/nplab/m3ua-testtool +# https://gitea.osmocom.org/nplab/sua-testtool # the top of the libosmo-sccp git repository TOPDIR=../../ diff --git a/debian/control b/debian/control index 7955055..5885de9 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ libsctp-dev, osmo-gsm-manuals-dev (>= 1.1.0) Standards-Version: 3.9.7 -Vcs-Git: git://git.osmocom.org/libosmo-sccp.git -Vcs-Browser: http://git.osmocom.org/libosmo-sccp/ +Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-sccp +Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-sccp Homepage: https://projects.osmocom.org/projects/libosmo-sccp Package: libosmo-sccp-dev -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/28335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idac4924a077b5389e85efaf62081589fc3de06ad Gerrit-Change-Number: 28335 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-netif[master]: update git URLs (git -> https; gitea)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/28334 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: I41a70e00c98e6f70c4c952d3f88bcc22595ebed7 --- M README.md M debian/control M debian/copyright 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/34/28334/1 diff --git a/README.md b/README.md index 01267ea..02814fd 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ You can clone from the official libosmo-netif.git repository using - git clone git://git.osmocom.org/libosmo-netif.git + git clone https://gitea.osmocom.org/osmocom/libosmo-netif -There is a cgit interface at <http://git.osmocom.org/libosmo-netif/> +There is a web interface at <https://gitea.osmocom.org/osmocom/libosmo-netif> Documentation ------------- diff --git a/debian/control b/debian/control index e4d0f74..fecb627 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ libpcap0.8-dev, libsctp-dev Standards-Version: 3.9.6 -Vcs-Browser: http://git.osmocom.org/libosmo-netif/ -Vcs-Git: git://git.osmocom.org/libosmo-netif.git +Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif +Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif Homepage: https://projects.osmocom.org/projects/libosmo-netif Package: libosmonetif8 diff --git a/debian/copyright b/debian/copyright index 57fe8c0..c338bc9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libosmo-netif -Source: git://git.osmocom.org/libosmo-netif.git +Source: https://gitea.osmocom.org/osmocom/libosmo-netif Files: * Copyright: 2012-2013 On-Waves -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/28334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I41a70e00c98e6f70c4c952d3f88bcc22595ebed7 Gerrit-Change-Number: 28334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: update git URLs (git -> https; gitea)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28333 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: I9edabaefe7081493fb639760d311f02c01da0155 --- M README.md M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/33/28333/1 diff --git a/README.md b/README.md index c5df874..2622c9f 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ You can clone from the official libosmo-abis.git repository using - git clone git://git.osmocom.org/libosmo-abis.git + git clone https://gitea.osmocom.org/osmocom/libosmo-abis -There is a cgit interface at <http://git.osmocom.org/libosmo-abis/> +There is a web interface at <https://gitea.osmocom.org/osmocom/libosmo-abis> Documentation ------------- diff --git a/debian/control b/debian/control index 3601b43..0451f11 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ pkg-config, libortp-dev Standards-Version: 3.9.7 -Vcs-Git: git://git.osmocom.org/libosmo-abis.git -Vcs-Browser: http://git.osmocom.org/libosmo-abis/ +Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-abis +Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-abis Homepage: https://projects.osmocom.org/projects/libosmo-abis Package: libosmo-abis -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I9edabaefe7081493fb639760d311f02c01da0155 Gerrit-Change-Number: 28333 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in simtrace2[master]: update git URLs (git -> https; gitea)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/28332 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: Ifcc942c265edc983214e4efc0bc93ee8bd1b55f4 --- M debian/control 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/32/28332/1 diff --git a/debian/control b/debian/control index 612e2ca..02d697d 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ libusb-1.0-0-dev, gcc-arm-none-eabi Standards-Version: 3.9.8 -Vcs-Git: git://git.osmocom.org/simtrace2.git -Vcs-Browser: http://git.osmocom.org/simtrace2/ +Vcs-Git: https://gitea.osmocom.org/sim-card/simtrace2 +Vcs-Browser: https://gitea.osmocom.org/sim-card/simtrace2 Homepage: http://osmocom.org/projects/simtrace2/wiki Package: simtrace2-firmware -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ifcc942c265edc983214e4efc0bc93ee8bd1b55f4 Gerrit-Change-Number: 28332 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in simtrace2[master]: WIP: ignore STALL

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/28331 ) Change subject: WIP: ignore STALL ...................................................................... WIP: ignore STALL Change-Id: I53741f265f71797c0594a818f5a1d37534fa3774 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/31/28331/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 4820f36..581e633 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -282,6 +282,7 @@ process_usb_msg(ci, xfer->buffer, xfer->actual_length); break; case LIBUSB_TRANSFER_ERROR: + case LIBUSB_TRANSFER_STALL: LOGCI(ci, LOGL_FATAL, "USB IN transfer error, trying resubmit\n"); break; case LIBUSB_TRANSFER_NO_DEVICE: @@ -336,6 +337,7 @@ process_usb_msg_irq(ci, xfer->buffer, xfer->actual_length); break; case LIBUSB_TRANSFER_ERROR: + case LIBUSB_TRANSFER_STALL: LOGCI(ci, LOGL_FATAL, "USB INT transfer error, trying resubmit\n"); break; case LIBUSB_TRANSFER_NO_DEVICE: -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53741f265f71797c0594a818f5a1d37534fa3774 Gerrit-Change-Number: 28331 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in simtrace2[master]: HACK: cardem: Don't reset on watchdog, but panic.

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/28329 ) Change subject: HACK: cardem: Don't reset on watchdog, but panic. ...................................................................... HACK: cardem: Don't reset on watchdog, but panic. This should help debug watchdog triggers. Also reduce the timer to 1s to hopefully increase the chance of triggering it. Change-Id: Ie3f47e5612cdf501abff8cb6954600b785b3a3fa --- M firmware/apps/cardem/main.c 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/29/28329/1 diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c index 347ccbd..9e76e05 100644 --- a/firmware/apps/cardem/main.c +++ b/firmware/apps/cardem/main.c @@ -137,6 +137,12 @@ board_exec_dbg_cmd(ch); } +#include <osmocom/core/panic.h> +void WDT_IrqHandler(void) +{ + osmo_panic("WDT"); +} + /*------------------------------------------------------------------------------ * Main *------------------------------------------------------------------------------*/ @@ -152,8 +158,9 @@ led_blink(LED_GREEN, BLINK_ALWAYS_ON); /* Enable watchdog for 2000ms, with no window */ - WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | - (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000)); + WDT_Enable(WDT, WDT_MR_WDFIEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | + (WDT_GetPeriod(1000) << 16) | WDT_GetPeriod(1000)); + NVIC_EnableIRQ(WDT_IRQn); PIO_InitializeInterrupts(10); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie3f47e5612cdf501abff8cb6954600b785b3a3fa Gerrit-Change-Number: 28329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in simtrace2[master]: HACK: dump enabled interrupts and priorities during startup

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/28330 ) Change subject: HACK: dump enabled interrupts and priorities during startup ...................................................................... HACK: dump enabled interrupts and priorities during startup Change-Id: I6a19aaa8674fa510e4e346cd14a3545f7bfcc838 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/30/28330/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 7f52647..694377a 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -584,6 +584,35 @@ TRACE_ENTRY(); } +struct relevant_irq { + uint32_t irq; + uint32_t prio; + const char *name; +}; +static const struct relevant_irq relevant_irqs[] = { + { UDP_IRQn, 14, "USB" }, + { CONSOLE_IRQ, 15, "CONSOLE" }, + { FIRST_USART_IRQ, 0, "7816_0" }, +#ifdef CARDEMU_SECOND_UART + { USART0_IRQn, 0, "7816_1" }, +#endif +#ifdef DETECT_VCC_BY_ADC + { ADC_IRQn, 13, "ADC" }, +#endif + { PIOA_IRQn, 10, "PIOA" }, + { PIOB_IRQn, 10, "PIOB" }, + { PIOC_IRQn, 10, "PIOC" }, +}; +void dump_irq_prios(void) +{ + printf("Interrupt Enable Mask (ISER): %08x%08x\n\r", NVIC->ISER[1], NVIC->ISER[0]); + for (unsigned int i = 0; i < ARRAY_SIZE(relevant_irqs); i++) { + const struct relevant_irq *ri = &relevant_irqs[i]; + printf("IRQ prio %02u (%s): current=%u, expected=%u\r\n", ri->irq, ri->name, + NVIC_GetPriority(ri->irq), ri->prio); + } +} + /* called if config is activated */ void mode_cardemu_init(void) { @@ -653,6 +682,9 @@ sim_switch_use_physical(1, 1); /* TODO check RST and VCC */ #endif /* CARDEMU_SECOND_UART */ + + dump_irq_prios(); + } /* called if config is deactivated */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/28330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I6a19aaa8674fa510e4e346cd14a3545f7bfcc838 Gerrit-Change-Number: 28330 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022