- gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: Check once if remote addr is available when sending dummy packet
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29643 ) Change subject: Check once if remote addr is available when sending dummy packet ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6 Gerrit-Change-Number: 29643 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: cosmetic: Fix indentation
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29642 ) Change subject: osmux: cosmetic: Fix indentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic7087e7907c1078d134d7d9b11ed6a6bf1941308 Gerrit-Change-Number: 29642 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:40:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Drop unused role parameter
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29641 ) Change subject: osmux: Drop unused role parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I39c2852bb60aaba4f85188c55f157e4abec47a0e Gerrit-Change-Number: 29641 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:40:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Add claudators around IPv6 address to distinguish port in log ...
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29640 ) Change subject: osmux: Add claudators around IPv6 address to distinguish port in log line ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I811ac5b4386f06c224f29f44f10dce4008fa7a4f Gerrit-Change-Number: 29640 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:39:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Add claudators around IPv6 address to distinguish port in log ...
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29640 ) Change subject: osmux: Add claudators around IPv6 address to distinguish port in log line ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/29640/comment/d348ef32_f204fc0a PS2, Line 7: claudators I think this is not a word used in English. square brackets? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I811ac5b4386f06c224f29f44f10dce4008fa7a4f Gerrit-Change-Number: 29640 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:39:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Change couple log lines to OSMUX category
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29639 ) Change subject: osmux: Change couple log lines to OSMUX category ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia04d08099f0b1e81707699d872779108f22522bf Gerrit-Change-Number: 29639 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:39:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: bts: Log unexpected RSL message
by laforge 06 Oct '22

06 Oct '22

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 ) Change subject: bts: Log unexpected RSL message ...................................................................... Patch Set 2: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582/comment/2745684c_64f0… PS2, Line 786: RSL PDU > I thought you meant PDU as a generic thing so I put it here. […] the problem is the overloading of the name RSL with either "RSL Port" and "RSL protocol [message|packet|PDU". The RSL port can (AFAIR) also transport other messages, as per its port definition. I think among those are IPA up/down notifications. So the generic catch-all receive at the bottom is catching something received on the RSL test port which is not a RSL message. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6cdc53ff038858211b09c0a8eeec19603107ffe4 Gerrit-Change-Number: 29582 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 06 Oct 2022 10:38:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-e1d[master]: usb: Fix ICE1USB_INTF_SET_GPSDO_MODE request parameter
by laforge 06 Oct '22

06 Oct '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29634 ) Change subject: usb: Fix ICE1USB_INTF_SET_GPSDO_MODE request parameter ...................................................................... usb: Fix ICE1USB_INTF_SET_GPSDO_MODE request parameter This call takes its argument in wValue rather than as payload Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ibeebe3184a4744bd0cd9f5a19db84c12fab18806 --- M src/usb.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/usb.c b/src/usb.c index 97e2563..b511adb 100644 --- a/src/usb.c +++ b/src/usb.c @@ -635,8 +635,8 @@ { const uint16_t bmReqType = LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT; - return _e1_usb_intf_send_ctrl(intf, bmReqType, ICE1USB_INTF_SET_GPSDO_MODE, 0, - (uint8_t *)&gpsdo_mode, sizeof(gpsdo_mode)); + return _e1_usb_intf_send_ctrl(intf, bmReqType, ICE1USB_INTF_SET_GPSDO_MODE, gpsdo_mode, + NULL, 0); } int 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ibeebe3184a4744bd0cd9f5a19db84c12fab18806 Gerrit-Change-Number: 29634 Gerrit-PatchSet: 4 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: vty: Add option to disable GPS-DO loop and use manual tuning values
by laforge 06 Oct '22

06 Oct '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29635 ) Change subject: vty: Add option to disable GPS-DO loop and use manual tuning values ...................................................................... vty: Add option to disable GPS-DO loop and use manual tuning values Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I8668fe42e4c399f08696e497887120e501341f5a --- M src/e1d.h M src/usb.c M src/vty.c 3 files changed, 52 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1d.h b/src/e1d.h index ff34800..82c9bb6 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -174,6 +174,11 @@ struct { char *serial_str; + struct { + bool manual; + uint16_t coarse; + uint16_t fine; + } gpsdo; } usb; bool vty_created; diff --git a/src/usb.c b/src/usb.c index b511adb..47fff14 100644 --- a/src/usb.c +++ b/src/usb.c @@ -789,6 +789,17 @@ { struct e1_usb_intf_data *id = intf->drv_data; + if (intf->usb.gpsdo.manual) { + struct e1usb_gpsdo_tune tune = { + .coarse = intf->usb.gpsdo.coarse, + .fine = intf->usb.gpsdo.fine, + }; + e1_usb_ctrl_set_gpsdo_mode(intf, ICE1USB_GPSDO_MODE_DISABLED); + e1_usb_ctrl_set_gpsdo_tune(intf, &tune); + } else { + e1_usb_ctrl_set_gpsdo_mode(intf, ICE1USB_GPSDO_MODE_AUTO); + } + osmo_timer_setup(&id->gpsdo.poll_timer, &_e1_usb_gpsdo_poll_cb, intf); osmo_timer_schedule(&id->gpsdo.poll_timer, 1, 0); } diff --git a/src/vty.c b/src/vty.c index 65eb334..d3433da 100644 --- a/src/vty.c +++ b/src/vty.c @@ -302,6 +302,38 @@ return CMD_SUCCESS; } +DEFUN(cfg_e1d_if_gpsdo_manual, cfg_e1d_if_gpsdo_manual_cmd, + "gpsdo-manual <0-4095> <0-4095>", + "Set the GPS-DO to manual mode with the provided tune values\n" + "Coarse tune value\n" + "Fine tune value\n") +{ + struct e1_intf *intf = vty->index; + + if (intf->drv != E1_DRIVER_USB) + return CMD_WARNING; + + intf->usb.gpsdo.manual = true; + intf->usb.gpsdo.coarse = atoi(argv[0]); + intf->usb.gpsdo.fine = atoi(argv[1]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_e1d_if_no_gpsdo_manual, cfg_e1d_if_no_gpsdo_manual_cmd, + "no gpsdo-manual", + NO_STR "Set the GPS-DO back to automatic mode\n") +{ + struct e1_intf *intf = vty->index; + + if (intf->drv != E1_DRIVER_USB) + return CMD_WARNING; + + intf->usb.gpsdo.manual = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_e1d_if_line, cfg_e1d_if_line_cmd, "line <0-255>", "Configure an E1 line\n" "E1 Interface Number\n") @@ -387,6 +419,8 @@ vty_out(vty, " interface %u icE1usb%s", intf->id, VTY_NEWLINE); if (intf->usb.serial_str && strlen(intf->usb.serial_str)) vty_out(vty, " usb-serial %s%s", intf->usb.serial_str, VTY_NEWLINE); + if (intf->usb.gpsdo.manual) + vty_out(vty, " gpsdo-manual %d %d%s", intf->usb.gpsdo.coarse, intf->usb.gpsdo.fine, VTY_NEWLINE); break; case E1_DRIVER_VPAIR: vty_out(vty, " interface %u vpair%s", intf->id, VTY_NEWLINE); @@ -417,6 +451,8 @@ install_element(E1D_NODE, &cfg_e1d_if_vpair_cmd); install_element(INTF_NODE, &cfg_e1d_if_line_cmd); install_element(INTF_NODE, &cfg_e1d_if_usb_serial_cmd); + install_element(INTF_NODE, &cfg_e1d_if_gpsdo_manual_cmd); + install_element(INTF_NODE, &cfg_e1d_if_no_gpsdo_manual_cmd); install_node(&line_node, NULL); install_element(LINE_NODE, &cfg_e1d_if_line_mode_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8668fe42e4c399f08696e497887120e501341f5a Gerrit-Change-Number: 29635 Gerrit-PatchSet: 4 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-e1d[master]: usb: Add support for new GPSDO status field "Accumulated error"
by laforge 06 Oct '22

06 Oct '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29618 ) Change subject: usb: Add support for new GPSDO status field "Accumulated error" ...................................................................... usb: Add support for new GPSDO status field "Accumulated error" Because we want to handle older firmwares too, we need to excepect we might get a smaller structure ! (We can't get a larger one since the wLength we send is limited to the structure we know) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846 --- M src/e1d.h M src/ice1usb_proto.h M src/intf_line.c M src/usb.c 4 files changed, 23 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/e1d.h b/src/e1d.h index 42be1b4..ff34800 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -67,6 +67,7 @@ LINE_GPSDO_TUNE_COARSE, LINE_GPSDO_TUNE_FINE, LINE_GPSDO_FREQ_EST, + LINE_GPSDO_ERR_ACC, }; enum e1_ts_mode { diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h index 3170d55..54b91ab 100644 --- a/src/ice1usb_proto.h +++ b/src/ice1usb_proto.h @@ -65,6 +65,7 @@ uint8_t mode; /*!< Current configured operating mode */ struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ uint32_t freq_est; /*!< Latest frequency estimate measurement */ + int16_t err_acc; /*!< Accumulated error (since fw icE1usb-fw-0.3 commit cfb8b0b7) */ } __attribute__((packed)); diff --git a/src/intf_line.c b/src/intf_line.c index a645cd3..811b8fe 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -75,6 +75,7 @@ [LINE_GPSDO_TUNE_COARSE]= { "gpsdo:tune:coarse", "GSPDO Coarse Tuning" }, [LINE_GPSDO_TUNE_FINE] = { "gpsdo:tune:fine", "GSPDO Fine Tuning" }, [LINE_GPSDO_FREQ_EST] = { "gpsdo:freq_est", "GSPDO Frequency Estimate" }, + [LINE_GPSDO_ERR_ACC] = { "gpsdo:err_acc", "GPSDO Accumulated Error" }, }; static const struct osmo_stat_item_group_desc line_stats_desc = { diff --git a/src/usb.c b/src/usb.c index fa6ddee..a60ea99 100644 --- a/src/usb.c +++ b/src/usb.c @@ -706,14 +706,29 @@ { struct e1_usb_intf_data *id = intf->drv_data; struct e1usb_gpsdo_status *last_st = &id->gpsdo.last_status; - const struct e1usb_gpsdo_status *st; + struct e1usb_gpsdo_status _st, *st = &_st; struct e1_line *line; if (len < sizeof(*st)) { - LOGPIF(intf, DE1D, LOGL_ERROR, "GPSDO status %zu < %zu!\n", len, sizeof(*st)); - return; + /* + * Because some fields can be added to the structure by newer + * firmware revisions, this means we can potentially get a shorter + * struct than what we asked for. We simply set those fields to + * zero. + * + * The opposite case (newer firmware than e1d) means the structure + * could be larger, but because we limit the wLength to the struct + * we know, we can't receive a larger one and the new fields are + * just ignored by this e1d version + */ + LOGPIF(intf, DE1D, LOGL_DEBUG, + "GPSDO status %zu < %zu ! Firmware probably outdated. " + "Some values will be zeroed\n", + len, sizeof(*st)); } - st = (const struct e1usb_gpsdo_status *) data; + + memset(st, 0x00, sizeof(*st)); + memcpy(st, data, len); if (st->state != last_st->state) { LOGPIF(intf, DE1D, LOGL_NOTICE, "GPSDO state change: %s -> %s\n", @@ -750,6 +765,7 @@ line_stat_set(line, LINE_GPSDO_TUNE_COARSE, libusb_le16_to_cpu(st->tune.coarse)); line_stat_set(line, LINE_GPSDO_TUNE_FINE, libusb_le16_to_cpu(st->tune.fine)); line_stat_set(line, LINE_GPSDO_FREQ_EST, osmo_load32le(&st->freq_est)); + line_stat_set(line, LINE_GPSDO_ERR_ACC, (int16_t)libusb_le16_to_cpu(st->err_acc)); } /* update our state */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846 Gerrit-Change-Number: 29618 Gerrit-PatchSet: 6 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log