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

Change in osmo-e1d[master]: ctl: Prevent clients from opening TS0

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29951 ) Change subject: ctl: Prevent clients from opening TS0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 Gerrit-Change-Number: 29951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 16:29:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-pcu[master]: tbf_ul: Assign DL-TBF if needed after UL-TBF has gone over contenion ...

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/29933 to look at the new patch set (#3). Change subject: tbf_ul: Assign DL-TBF if needed after UL-TBF has gone over contenion resolution ...................................................................... tbf_ul: Assign DL-TBF if needed after UL-TBF has gone over contenion resolution If data received from SGSN is waiting to be sent to the MS, we may have created a DL-TBF assignment over PCH if the MS was not in packet-active mode. If the MS instead reaches back to the PCU asking for an UL-TBF, the PCU has to wait until Content Resolution of the UL-TBF has succeeded in order to attempt now to assign the DL-TBF over PACCH. The delay was already there, but the trigger to attempt the DL-TBF assignment upon UL-TBF contention reslution success was missing. Related: OS#5700 Change-Id: Ib8f7ad2390485ce9fd76a9de6cd349a5f4037568 --- M src/tbf_ul.cpp 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/33/29933/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8f7ad2390485ce9fd76a9de6cd349a5f4037568 Gerrit-Change-Number: 29933 Gerrit-PatchSet: 3 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-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: ctl: Prevent clients from opening TS0

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29951 ) Change subject: ctl: Prevent clients from opening TS0 ...................................................................... ctl: Prevent clients from opening TS0 This doesn't work, as the mux_demux.c code doesn't pass the TS0 bitstream to users anyway. So let's reject clients attempting this. Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 --- M src/ctl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/51/29951/1 diff --git a/src/ctl.c b/src/ctl.c index b5fdee4..54d37c5 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -45,7 +45,7 @@ static struct e1_ts * _e1d_get_ts(struct e1_line *line, uint8_t ts) { - if (ts < 32) + if (ts > 0 && ts < 32) return &line->ts[ts]; else if (ts == E1DP_TS_SUPERCHAN) return &line->superchan; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Idb2d20da7de72dad38ae2fccdd7630677d0f0cc8 Gerrit-Change-Number: 29951 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1d[master]: support for e1-tracer hardware

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... support for e1-tracer hardware Recent work on the e1-tracer firmware is introducing a set of USB descriptors (as configuration 2) that are mostly compatible to how osmo-e1d talks to icE1usb. The main difference is that there's only one ISO IN endpoint per USB interface, and no ISO OUT or ISU FB endpoints. So we introduce some minor adjustments here to accommodate that. Related: OS#5733 Closes: OS#5734 Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f --- M src/usb.c 1 file changed, 45 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/50/29950/1 diff --git a/src/usb.c b/src/usb.c index c8ad97f..dc89bb0 100644 --- a/src/usb.c +++ b/src/usb.c @@ -2,6 +2,7 @@ * usb.c * * (C) 2019 by Sylvain Munaut <tnt(a)246tNt.com> + * (C) 2022 by Harald Welte <laforge(a)gnumonks.org> * * All Rights Reserved * @@ -42,6 +43,7 @@ #define USB_VID 0x1d50 #define USB_PID 0x6145 +#define USB_PID_TRACER 0x6151 libusb_context *g_usb = NULL; @@ -809,7 +811,7 @@ // --------------------------------------------------------------------------- static int -_e1_usb_open_device(struct e1_daemon *e1d, struct libusb_device *dev) +_e1_usb_open_device(struct e1_daemon *e1d, struct libusb_device *dev, bool is_tracer) { struct e1_intf *intf; struct e1_line *line; @@ -873,6 +875,10 @@ osmo_talloc_replace_string(intf, &intf->usb.serial_str, serial_str); } + /* we have prior knowledge that the e1-tracer firmware configuration 2 is the e1d compatible mode. */ + if (is_tracer) + libusb_set_configuration(devh, 2); + INIT_LLIST_HEAD(&intf_data->ctrl_inprogress); ret = libusb_get_active_config_descriptor(dev, &cd); @@ -892,8 +898,13 @@ continue; id = &cd->interface[i].altsetting[1]; - if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 3)) - continue; + if (is_tracer) { + if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 1)) + continue; + } else { + if ((id->bInterfaceClass != 0xff) || (id->bInterfaceSubClass != 0xe1) || (id->bNumEndpoints < 3)) + continue; + } line = e1_intf_find_line(intf, line_nr); if (line) { @@ -933,9 +944,16 @@ } } - if (!line_data->ep_in || !line_data->ep_out || !line_data->ep_fb || !line_data->pkt_size) { - LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); - goto next_interface; + if (is_tracer) { + if (!line_data->ep_in || !line_data->pkt_size) { + LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); + goto next_interface; + } + } else { + if (!line_data->ep_in || !line_data->ep_out || !line_data->ep_fb || !line_data->pkt_size) { + LOGP(DE1D, LOGL_ERROR, "Failed to use interface %d\n", id->bInterfaceNumber); + goto next_interface; + } } if (!line) { @@ -966,13 +984,18 @@ } /* Create data flows and start the line */ - line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); - line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); - line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); + /* all supported devices have an IN endpoint */ + line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 4, line_data->pkt_size, 4); e1uf_start(line_data->flow_in); - e1uf_start(line_data->flow_out); - e1uf_start(line_data->flow_fb); + + /* e1-tracer has no OUT or FEEDBACK endpoint */ + if (!is_tracer) { + line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 4, line_data->pkt_size, 4); + e1uf_start(line_data->flow_out); + line_data->flow_fb = e1uf_create(line, e1_usb_xfer_fb, line_data->ep_fb, 2, 3, 1); + e1uf_start(line_data->flow_fb); + } if (line_data->ep_int) resubmit_irq(line); @@ -1028,10 +1051,19 @@ if (ret) continue; - if ((desc.idVendor != USB_VID) || (desc.idProduct != USB_PID)) + if (desc.idVendor != USB_VID) continue; - _e1_usb_open_device(e1d, dev_list[i]); + switch (desc.idProduct) { + case USB_PID: + _e1_usb_open_device(e1d, dev_list[i], false); + break; + case USB_PID_TRACER: + _e1_usb_open_device(e1d, dev_list[i], true); + break; + default: + continue; + } } libusb_free_device_list(dev_list, 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I855e18c0f229bd473123f96303e60ab2de90677f Gerrit-Change-Number: 29950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

Attention is currently required from: laforge, tnt. Hello Jenkins Builder, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 to look at the new patch set (#2). Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" This adds a second USB configuration to the e1-tracer firmware. This configuration is closer to the USB configuration of an icE1usb and hence paves the way for using osmo-e1d with the tracer. The main conceptual difference between the existing "legacy" configuration and this new "e1d compatible" configuration is to have two USB interfaces, one for each direction of the traced E1 interface. Each interface has its own separate two altsettings, one for the disabled and one for the enabled state. Unmodified osmo-e1d will not work straight away with this, as it expects ISO OUT and ISU Feedback endpoints, which a pure rx-only tracing device of course doesn't have. Related: OS#5733 Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff --- M firmware/ice40-riscv/e1-tracer/usb_desc_app.c M firmware/ice40-riscv/e1-tracer/usb_e1.c M firmware/ice40-riscv/e1-tracer/usb_str_app.txt 3 files changed, 264 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/48/29948/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by laforge

Attention is currently required from: laforge, tnt. Hello Jenkins Builder, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 to look at the new patch set (#2). Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode Initially it was a good choice to keep the LIU driver in the host software (easier debugging/changes). However, we never really needed it to do anything but initialization of the LIU. So in order to avoid having to teach osmo-e1d or other software the details about the LIU initialization, let's do this from the firmware *if* the e1d compatible USB configuration is used. Closes: OS#5733 Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd --- M firmware/ice40-riscv/e1-tracer/Makefile A firmware/ice40-riscv/e1-tracer/idt82v2081.c A firmware/ice40-riscv/e1-tracer/idt82v2081.h A firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c A firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 6 files changed, 314 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/49/29949/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by Jenkins Builder

Attention is currently required from: tnt. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... Patch Set 1: (2 comments) File firmware/ice40-riscv/e1-tracer/usb_e1.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-646): https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948/comment/8a7156e2_f283… PS1, Line 200: else if (sel->bAlternateSetting == 1) else should follow close brace '}' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-646): https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948/comment/2a5ef29c_09bb… PS1, Line 205: else else should follow close brace '}' -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 15:45:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... Patch Set 1: (3 comments) File firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-644): https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949/comment/7851a92d_4d3e… PS1, Line 32: { .data = (void*)&cmd, .len = 1, .read = false, .write = true, }, "(foo*)" should be "(foo *)" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-644): https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949/comment/18e61d14_521f… PS1, Line 33: { .data = (void*)&rv, .len = 1, .read = true, .write = false, }, "(foo*)" should be "(foo *)" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-644): https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949/comment/d1761175_8dc0… PS1, Line 44: { .data = (void*)cmd, .len = 2, .read = false, .write = true, }, "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 01 Nov 2022 15:45:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible m...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 ) Change subject: fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" ...................................................................... fw/e1-tracer: Additional USB configuration for "osmo-e1d compatible mode" This adds a second USB configuration to the e1-tracer firmware. This configuration is closer to the USB configuration of an icE1usb and hence paves the way for using osmo-e1d with the tracer. The main conceptual difference between the existing "legacy" configuration and this new "e1d compatible" configuration is to have two USB interfaces, one for each direction of the traced E1 interface. Each interface has its own separate two altsettings, one for the disabled and one for the enabled state. Unmodified osmo-e1d will not work straight away with this, as it expects ISO OUT and ISU Feedback endpoints, which a pure rx-only tracing device of course doesn't have. Related: OS#5733 Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff --- M firmware/ice40-riscv/e1-tracer/usb_desc_app.c M firmware/ice40-riscv/e1-tracer/usb_e1.c M firmware/ice40-riscv/e1-tracer/usb_str_app.txt 3 files changed, 269 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/48/29948/1 diff --git a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c index 5109000..8178a41 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_desc_app.c +++ b/firmware/ice40-riscv/e1-tracer/usb_desc_app.c @@ -13,10 +13,9 @@ #define num_elem(a) (sizeof(a) / sizeof(a[0])) +/* Legacy Configuration */ static const struct { - /* Configuration */ struct usb_conf_desc conf; - /* E1 */ struct { struct { @@ -30,7 +29,6 @@ struct usb_ep_desc ep_data_in1; } __attribute__ ((packed)) on; } __attribute__ ((packed)) e1; - /* DFU Runtime */ struct { struct usb_intf_desc intf; @@ -130,8 +128,161 @@ }, }; +/* "icE1usb" compatible Configuration */ +static const struct { + struct usb_conf_desc conf; + /* Interface / Direction A */ + struct { + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in0; + } __attribute__ ((packed)) off; + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in0; + } __attribute__ ((packed)) on; + } __attribute__ ((packed)) a; + /* Interface / Direction B */ + struct { + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in1; + } __attribute__ ((packed)) off; + struct { + struct usb_intf_desc intf; + struct usb_ep_desc ep_data_in1; + } __attribute__ ((packed)) on; + } __attribute__ ((packed)) b; + /* DFU Runtime */ + struct { + struct usb_intf_desc intf; + struct usb_dfu_func_desc func; + } __attribute__ ((packed)) dfu; +} __attribute__ ((packed)) _app_conf_desc_e1d = { + .conf = { + .bLength = sizeof(struct usb_conf_desc), + .bDescriptorType = USB_DT_CONF, + .wTotalLength = sizeof(_app_conf_desc_e1d), + .bNumInterfaces = 3, + .bConfigurationValue = 2, + .iConfiguration = 7, + .bmAttributes = 0x80, + .bMaxPower = 0x32, /* 100 mA */ + }, + .a = { + .off = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 8, + }, + .ep_data_in0 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x81, + .bmAttributes = 0x05, + .wMaxPacketSize = 0, + .bInterval = 1, + }, + }, + .on = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 0, + .bAlternateSetting = 1, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 8, + }, + .ep_data_in0 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x81, + .bmAttributes = 0x05, + .wMaxPacketSize = 388, + .bInterval = 1, + }, + }, + }, + .b = { + .off = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 1, + .bAlternateSetting = 0, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 9, + }, + .ep_data_in1 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x82, + .bmAttributes = 0x05, + .wMaxPacketSize = 0, + .bInterval = 1, + }, + }, + .on = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 1, + .bAlternateSetting = 1, + .bNumEndpoints = 1, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0x00, + .iInterface = 9, + }, + .ep_data_in1 = { + .bLength = sizeof(struct usb_ep_desc), + .bDescriptorType = USB_DT_EP, + .bEndpointAddress = 0x82, + .bmAttributes = 0x05, + .wMaxPacketSize = 388, + .bInterval = 1, + }, + }, + }, + .dfu = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = 2, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xfe, + .bInterfaceSubClass = 0x01, + .bInterfaceProtocol = 0x01, + .iInterface = 6, + }, + .func = { + .bLength = sizeof(struct usb_dfu_func_desc), + .bDescriptorType = USB_DFU_DT_FUNC, + .bmAttributes = 0x0d, + .wDetachTimeOut = 1000, + .wTransferSize = 4096, + .bcdDFUVersion = 0x0101, + }, + }, +}; + static const struct usb_conf_desc * const _conf_desc_array[] = { &_app_conf_desc.conf, + &_app_conf_desc_e1d.conf, }; static const struct usb_dev_desc _dev_desc = { diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index 12c3906..728dc3a 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -2,6 +2,7 @@ * usb_e1.c * * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -17,7 +18,7 @@ #include "misc.h" struct { - bool running; + bool running[2]; int in_bdi[2]; } g_usb_e1; @@ -35,12 +36,12 @@ int chan; int bdi; - if (!g_usb_e1.running) - return; - /* EP[1-2] IN */ for (chan=0; chan<2; chan++) { + if (!g_usb_e1.running[chan]) + continue; + bdi = g_usb_e1.in_bdi[chan]; while ((usb_ep_regs[1+chan].in.bd[bdi].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) @@ -112,12 +113,17 @@ return NULL; } + +static const struct usb_conf_desc *last_conf; + enum usb_fnd_resp _e1_set_conf(const struct usb_conf_desc *conf) { const struct usb_intf_desc *intf; printf("e1 set_conf %08x\n", conf); + + last_conf = conf; if (!conf) return USB_FND_SUCCESS; @@ -133,81 +139,123 @@ return USB_FND_SUCCESS; } +static void +disable_chan(uint8_t chan) +{ + /* Already stopped ? */ + if (!g_usb_e1.running[chan]) + return; + + /* Update state */ + g_usb_e1.running[chan] = false; + + /* Stop E1 */ + e1_stop_one(chan); + + /* Disable end-points */ + usb_ep_regs[chan+1].in.status = 0; +} + +static void +enable_chan(uint8_t chan) +{ + /* Already running ? */ + if (g_usb_e1.running[chan]) + return; + + /* Update state */ + g_usb_e1.running[chan] = true; + + /* Reset buffer pointers */ + g_usb_e1.in_bdi[chan] = 0; + + /* Configure EP1 IN / EP2 IN */ + usb_ep_regs[chan+1].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ + + /* EP1 IN: Prepare two buffers */ + usb_ep_regs[chan+1].in.bd[0].ptr = 256 + (chan * 2 + 0) * 388; + usb_ep_regs[chan+1].in.bd[0].csr = 0; + + usb_ep_regs[chan+1].in.bd[1].ptr = 256 + (chan * 2 + 1) * 388; + usb_ep_regs[chan+1].in.bd[1].csr = 0; + + /* Start E1 */ + e1_start_one(chan); +} + enum usb_fnd_resp _e1_set_intf(const struct usb_intf_desc *base, const struct usb_intf_desc *sel) { - if (base->bInterfaceNumber != 0) - return USB_FND_CONTINUE; + if (!last_conf || last_conf->bConfigurationValue == 1) { + /* Legacy Configuration */ - if (sel->bAlternateSetting == 0) - { - /* Already stopped ? */ - if (!g_usb_e1.running) - return USB_FND_SUCCESS; + if (base->bInterfaceNumber != 0) + return USB_FND_CONTINUE; - /* Update state */ - g_usb_e1.running = false; + if (sel->bAlternateSetting == 0) + { + disable_chan(0); + disable_chan(1); + } + else if (sel->bAlternateSetting == 1) + { + enable_chan(0); + enable_chan(1); + } + else + { + /* Unknown */ + return USB_FND_ERROR; + } + } else if (last_conf && last_conf->bConfigurationValue == 2) { + /* e1d compatible configuration */ - /* Stop E1 */ - e1_stop_one(0); - e1_stop_one(1); - - /* Disable end-points */ - usb_ep_regs[1].in.status = 0; - usb_ep_regs[2].in.status = 0; - } - else if (sel->bAlternateSetting == 1) - { - /* Already running ? */ - if (g_usb_e1.running) - return USB_FND_SUCCESS; - - /* Update state */ - g_usb_e1.running = true; - - /* Reset buffer pointers */ - g_usb_e1.in_bdi[0] = 0; - g_usb_e1.in_bdi[1] = 0; - - /* Configure EP1 IN / EP2 IN */ - usb_ep_regs[1].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - usb_ep_regs[2].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - - /* EP1 IN: Prepare two buffers */ - usb_ep_regs[1].in.bd[0].ptr = 256 + 0 * 388; - usb_ep_regs[1].in.bd[0].csr = 0; - - usb_ep_regs[1].in.bd[1].ptr = 256 + 1 * 388; - usb_ep_regs[1].in.bd[1].csr = 0; - - /* EP2 IN: Prepare two buffers */ - usb_ep_regs[2].in.bd[0].ptr = 256 + 2 * 388; - usb_ep_regs[2].in.bd[0].csr = 0; - - usb_ep_regs[2].in.bd[1].ptr = 256 + 3 * 388; - usb_ep_regs[2].in.bd[1].csr = 0; - - /* Start E1 */ - e1_start_one(0); - e1_start_one(1); - } - else - { - /* Unknown */ + switch (base->bInterfaceNumber) { + case 0: + case 1: + switch (sel->bAlternateSetting) { + case 0: + disable_chan(base->bInterfaceNumber); + break; + case 1: + enable_chan(base->bInterfaceNumber); + break; + default: + /* Unknown */ + return USB_FND_ERROR; + } + break; + default: + return USB_FND_CONTINUE; + } + } else { return USB_FND_ERROR; } - return USB_FND_SUCCESS; } enum usb_fnd_resp _e1_get_intf(const struct usb_intf_desc *base, uint8_t *alt) { - if (base->bInterfaceNumber != 0) - return USB_FND_CONTINUE; + if (!last_conf || last_conf->bConfigurationValue == 1) { + /* Legacy configuration */ + if (base->bInterfaceNumber != 0) + return USB_FND_CONTINUE; - *alt = g_usb_e1.running ? 1 : 0; + *alt = g_usb_e1.running[0] && g_usb_e1.running[1] ? 1 : 0; + } else if (last_conf && last_conf->bConfigurationValue == 2) { + /* e1d compatible configuration */ + switch (base->bInterfaceNumber) { + case 0: + case 1: + *alt = g_usb_e1.running[base->bInterfaceNumber] ? 1 : 0; + break; + default: + return USB_FND_CONTINUE; + } + } else + return USB_FND_CONTINUE; return USB_FND_SUCCESS; } diff --git a/firmware/ice40-riscv/e1-tracer/usb_str_app.txt b/firmware/ice40-riscv/e1-tracer/usb_str_app.txt index 0482e91..45ac005 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_str_app.txt +++ b/firmware/ice40-riscv/e1-tracer/usb_str_app.txt @@ -1,6 +1,9 @@ 0000000000000000 osmocom e1-tracer -Main +Legacy E1 DFU runtime +osmo-e1d compatible +E1 Direction A +E1 Direction B -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I97062b9f12317b1b9b3855409c2380108cb921ff Gerrit-Change-Number: 29948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 ) Change subject: fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode ...................................................................... fw/e1-tracer: Initialize IDT82V2081 from within firmware in e1d mode Initially it was a good choice to keep the LIU driver in the host software (easier debugging/changes). However, we never really needed it to do anything but initialization of the LIU. So in order to avoid having to teach osmo-e1d or other software the details about the LIU initialization, let's do this from the firmware *if* the e1d compatible USB configuration is used. Closes: OS#5733 Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd --- M firmware/ice40-riscv/e1-tracer/Makefile A firmware/ice40-riscv/e1-tracer/idt82v2081.c A firmware/ice40-riscv/e1-tracer/idt82v2081.h A firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c A firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 6 files changed, 314 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/49/29949/1 diff --git a/firmware/ice40-riscv/e1-tracer/Makefile b/firmware/ice40-riscv/e1-tracer/Makefile index 030501e..5fa38fa 100644 --- a/firmware/ice40-riscv/e1-tracer/Makefile +++ b/firmware/ice40-riscv/e1-tracer/Makefile @@ -47,6 +47,8 @@ HEADERS_app=\ config.h \ e1.h \ + idt82v2081.h \ + idt82v2081_regs.h \ misc.h \ usb_str_app.gen.h \ $(NULL) @@ -54,6 +56,8 @@ SOURCES_app=\ e1.c \ fw_app.c \ + idt82v2081.c \ + idt82v2081_no2spi.c \ misc.c \ usb_desc_app.c \ usb_e1.c \ diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081.c b/firmware/ice40-riscv/e1-tracer/idt82v2081.c new file mode 100644 index 0000000..9233292 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081.c @@ -0,0 +1,140 @@ +/* (C) 2019 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> + +#include "idt82v2081.h" +#include "idt82v2081_regs.h" + +/*! \brief Set or clear some (masked) bits inside a register + * \param[in] e4k reference to the tuner + * \param[in] reg number of the register + * \param[in] mask bit-mask of the value + * \param[in] val data value to be written to register + * \returns 0 on success, negative in case of error + */ +static int idt82_reg_set_bit_mask(struct idt82 *idt, uint8_t reg, + uint8_t mask, uint8_t val) +{ + uint8_t tmp = idt82_reg_read(idt, reg); + + if ((tmp & mask) == val) + return 0; + + return idt82_reg_write(idt, reg, (tmp & ~mask) | (val & mask)); +} + +int idt82_termination(struct idt82 *idt, enum idt82_term term) +{ + uint8_t puls, scal; + + idt82_reg_set_bit_mask(idt, IDT_REG_TERM, term | (term << IDT_TERM_T_SHIFT), + IDT_TERM_T_MASK | IDT_TERM_R_MASK); + + switch (idt->mode) { + case IDT_MODE_E1: + if (term == IDT_TERM_INT_75) + puls = 0; + else + puls = 1; + scal = 0x21; + break; + case IDT_MODE_T1: + /* FIXME: different length! */ + puls = 2; + scal = 0x36; + break; + case IDT_MODE_J1: + puls = 7; + scal = 0x36; + break; + default: + return -1; + } + + idt82_reg_set_bit_mask(idt, IDT_REG_TCF1, puls, IDT_TCF1_PULS_MASK); + idt82_reg_set_bit_mask(idt, IDT_REG_TCF2, scal, IDT_TCF2_SCAL_MASK); + + idt->term = term; + + return 0; +} + +int idt82_mode(struct idt82 *idt, enum idt82_mode mode) +{ + switch (mode) { + case IDT_MODE_E1: + idt82_reg_set_bit_mask(idt, IDT_REG_GCF, IDT_GCF_T1E1_E1, + IDT_GCF_T1E1_MASK); + break; + case IDT_MODE_T1: + case IDT_MODE_J1: + idt82_reg_set_bit_mask(idt, IDT_REG_GCF, IDT_GCF_T1E1_T1, + IDT_GCF_T1E1_MASK); + break; + } + idt->mode = mode; + + return 0; +} + +int idt82_get_errcount(struct idt82 *idt) +{ + uint16_t ret; + int rc; + + rc = idt82_reg_read(idt, IDT_REG_CNT0); + if (rc < 0) + return rc; + + ret = rc; + + rc = idt82_reg_read(idt, IDT_REG_CNT1); + if (rc < 0) + return rc; + + ret |= (rc << 8); + + return ret; +} + +/* return in dB, range is return value ... (value + 2) */ +int idt82_get_line_att(struct idt82 *idt) +{ + int rc; + + rc = idt82_reg_read(idt, IDT_REG_STAT1); + if (rc < 0) + return rc; + + return (rc & IDT_STAT1_ATT_MASK)*2; +} + +int idt82_init(struct idt82 *idt, bool monitor) +{ + idt82_reg_write(idt, IDT_REG_RST, 0x00); /* Reset to defaults */ + + idt82_mode(idt, IDT_MODE_E1); + idt82_termination(idt, IDT_TERM_INT_120); + + idt82_reg_write(idt, IDT_REG_TCF0, 0x10); /* Disable TX */ + + if (monitor) + idt82_reg_write(idt, IDT_REG_RCF2, 0x19); /* 22 dB monitor mode */ + + return 0; +} + diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081.h b/firmware/ice40-riscv/e1-tracer/idt82v2081.h new file mode 100644 index 0000000..1c930b1 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081.h @@ -0,0 +1,35 @@ +#pragma once + +#include <stdbool.h> +#include <stdint.h> + +enum idt82_term { + IDT_TERM_INT_75 = 0, + IDT_TERM_INT_120, + IDT_TERM_INT_100, + IDT_TERM_INT_110, + IDT_TERM_EXT, +}; + +enum idt82_mode { + IDT_MODE_E1 = 0, + IDT_MODE_T1, + IDT_MODE_J1, +}; + +struct idt82 { + enum idt82_mode mode; + enum idt82_term term; + void *priv; + uint8_t cs; +}; + +int idt82_termination(struct idt82 *idt, enum idt82_term term); +int idt82_mode(struct idt82 *idt, enum idt82_mode mode); +int idt82_get_errcount(struct idt82 *idt); +int idt82_get_line_att(struct idt82 *idt); +int idt82_init(struct idt82 *idt, bool monitor); + +/* callbacks into transport */ +int idt82_reg_write(struct idt82 *idt, uint8_t reg, uint8_t val); +int idt82_reg_read(struct idt82 *idt, uint8_t reg); diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c b/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c new file mode 100644 index 0000000..66e5c5b --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081_no2spi.c @@ -0,0 +1,48 @@ +/* (C) 2019 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> +#include <stdint.h> +#include <stdlib.h> + +#include "idt82v2081.h" +#include "spi.h" + +/* Adaption layer between idt82 driver and no2fpga SPI */ + +/* backend function for core idt82 driver */ +int idt82_reg_read(struct idt82 *idt, uint8_t reg) +{ + uint8_t cmd = reg | 0x20; + uint8_t rv; + struct spi_xfer_chunk xfer[2] = { + { .data = (void*)&cmd, .len = 1, .read = false, .write = true, }, + { .data = (void*)&rv, .len = 1, .read = true, .write = false, }, + }; + spi_xfer(SPI_CS_LIU(idt->cs), xfer, 2); + return rv; +} + +/* backend function for core idt82 driver */ +int idt82_reg_write(struct idt82 *idt, uint8_t reg, uint8_t val) +{ + uint8_t cmd[2] = { reg, val }; + struct spi_xfer_chunk xfer[2] = { + { .data = (void*)cmd, .len = 2, .read = false, .write = true, }, + }; + spi_xfer(SPI_CS_LIU(idt->cs), xfer, 1); + return 0; +} diff --git a/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h b/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h new file mode 100644 index 0000000..679ed90 --- /dev/null +++ b/firmware/ice40-riscv/e1-tracer/idt82v2081_regs.h @@ -0,0 +1,81 @@ +#ifndef _IDT82_REGS_H +#define _IDT82_REGS_H + +/* Section 4.1 of Data Sheet */ +enum idt82v2081_reg { + IDT_REG_ID, /* control */ + IDT_REG_RST, + IDT_REG_GCF, + IDT_REG_TERM, + IDT_REG_JACF, + IDT_REG_TCF0, /* Tx path control */ + IDT_REG_TCF1, + IDT_REG_TCF2, + IDT_REG_TCF3, + IDT_REG_TCF4, + IDT_REG_RCF0, /* Rx path control */ + IDT_REG_RCF1, + IDT_REG_RCF2, + IDT_REG_MAINT0, /* Net Diag Ctrl */ + IDT_REG_MAINT1, + IDT_REG_MAINT2, + IDT_REG_MAINT3, + IDT_REG_MAINT4, + IDT_REG_MAINT5, + IDT_REG_MAINT6, + IDT_REG_INTM0, /* Interrupt Control */ + IDT_REG_INTM1, + IDT_REG_INTES, + IDT_REG_STAT0, /* Line Status */ + IDT_REG_STAT1, + IDT_REG_INTS0, /* Interrupt Status */ + IDT_REG_INTS1, + IDT_REG_CNT0, /* Counter */ + IDT_REG_CNT1, +}; + +#define IDT_GCF_T1E1_E1 (0 << 2) +#define IDT_GCF_T1E1_T1 (1 << 2) +#define IDT_GCF_T1E1_MASK (1 << 2) + +#define IDT_TERM_T_SHIFT 3 +#define IDT_TERM_T_MASK (7 << IDT_TERM_T_SHIFT) +#define IDT_TERM_R_SHIFT 0 +#define IDT_TERM_R_MASK (7 << IDT_TERM_R_SHIFT) + +#define IDT_TCF1_PULS_MASK 0xF + +#define IDT_TCF2_SCAL_MASK 0x3F + +#define IDT_RCF2_MG_MASK 3 +#define IDT_RCF2_UPDW_SHIFT 2 +#define IDT_RCF2_UPDW_MASK (3 << IDT_TERM_INT_75) +#define IDT_RCF2_SLICE_SHIFT 4 +#define IDT_RCF2_SLICE_MASK (3 << IDT_RCF2_SLICE_SHIFT) + +#define IDT_INTM0_EQ (1 << 7) /* equalizer out of range */ +#define IDT_INTM0_IBLBA (1 << 6) /* in-band LB act detect */ +#define IDT_INTM0_IBLBD (1 << 5) /* in-band LB deact detect */ +#define IDT_INTM0_PRBS (1 << 4) /* prbs sync signal detect */ +#define IDT_INTM0_TCLK (1 << 3) /* tclk loss */ +#define IDT_INTM0_DF (1 << 2) /* driver failure */ +#define IDT_INTM0_AIS (1 << 1) /* Alarm Indication Signal */ +#define IDT_INTM0_LOS (1 << 0) /* Loss Of Signal */ + +#define IDT_INTM1_DAC_OV (1 << 7) /* DAC arithmetic overflow */ +#define IDT_INTM1_JA_OV (1 << 6) /* JA overflow */ +#define IDT_INTM1_JA_UD (1 << 5) /* JA underflow */ +#define IDT_INTM1_ERR (1 << 4) /* PRBS/QRBS logic error detect */ +#define IDT_INTM1_EXZ (1 << 3) /* Receive excess zeros */ +#define IDT_INTM1_CV (1 << 2) /* Receive error */ +#define IDT_INTM1_TIMER (1 << 1) /* One second timer expiration */ +#define IDT_INTM1_CNT (1 << 0) /* Counter overflow */ + +/* STAT0 == INTES == INTS0 == INTM0 */ + +/* INTS1 == INTM1 */ + +#define IDT_STAT1_RLP (1 << 5) +#define IDT_STAT1_ATT_MASK 0x1F + +#endif /* _IDT82_REGS_H */ diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index 728dc3a..160d2b5 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -16,10 +16,12 @@ #include "console.h" #include "e1.h" #include "misc.h" +#include "idt82v2081.h" struct { bool running[2]; int in_bdi[2]; + struct idt82 idt82[2]; } g_usb_e1; @@ -218,6 +220,7 @@ disable_chan(base->bInterfaceNumber); break; case 1: + idt82_init(&g_usb_e1.idt82[base->bInterfaceNumber], true); enable_chan(base->bInterfaceNumber); break; default: @@ -271,6 +274,9 @@ { /* Clear state */ memset(&g_usb_e1, 0x00, sizeof(g_usb_e1)); + /* make sure we use the right SPI channel for the respective IDT82 */ + g_usb_e1.idt82[0].cs = 0; + g_usb_e1.idt82[1].cs = 1; /* Install driver */ usb_register_function_driver(&_e1_drv); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id2217ff4573c4eebd816318128f256e85fb3c3bd Gerrit-Change-Number: 29949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: e1_start/e1_stop of individual channel

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 ) Change subject: fw/e1-tracer: e1_start/e1_stop of individual channel ...................................................................... fw/e1-tracer: e1_start/e1_stop of individual channel Let's split the starting and stopping between the two channels. This is a preparation for a future e1d-compatible mode where each channel (direction) has its own USB interface and hence must be individually started/stopped. Related: OS#5733 Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 --- M firmware/ice40-riscv/e1-tracer/e1.c M firmware/ice40-riscv/e1-tracer/e1.h M firmware/ice40-riscv/e1-tracer/usb_e1.c 3 files changed, 21 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/47/29947/1 diff --git a/firmware/ice40-riscv/e1-tracer/e1.c b/firmware/ice40-riscv/e1-tracer/e1.c index dc2ae11..6b35e1d 100644 --- a/firmware/ice40-riscv/e1-tracer/e1.c +++ b/firmware/ice40-riscv/e1-tracer/e1.c @@ -2,6 +2,7 @@ * e1.c * * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -276,53 +277,36 @@ } void -e1_start(void) +e1_start_one(uint8_t chan) { /* Reset FIFOs */ #ifdef BIGBUF - e1f_reset(&g_e1.rx[0].fifo, 0, 1024); - e1f_reset(&g_e1.rx[1].fifo, 1024, 1024); + e1f_reset(&g_e1.rx[chan].fifo, 0, 1024); #else - e1f_reset(&g_e1.rx[0].fifo, 0, 128); - e1f_reset(&g_e1.rx[1].fifo, 128, 128); + e1f_reset(&g_e1.rx[chan].fifo, 0, 128); #endif - /* Enable Rx0 */ - g_e1.rx[0].cr = E1_RX_CR_OVFL_CLR | + /* Enable Rx */ + g_e1.rx[chan].cr = E1_RX_CR_OVFL_CLR | E1_RX_CR_MODE_MFA | E1_RX_CR_ENABLE; - e1_regs->rx[0].csr = g_e1.rx[0].cr; - - /* Enable Rx1 */ - g_e1.rx[1].cr = E1_RX_CR_OVFL_CLR | - E1_RX_CR_MODE_MFA | - E1_RX_CR_ENABLE; - e1_regs->rx[1].csr = g_e1.rx[1].cr; + e1_regs->rx[chan].csr = g_e1.rx[chan].cr; /* State */ - g_e1.rx[0].state = BOOT; - g_e1.rx[0].in_flight = 0; - g_e1.rx[0].flags = 0; - - g_e1.rx[1].state = BOOT; - g_e1.rx[1].in_flight = 0; - g_e1.rx[1].flags = 0; + g_e1.rx[chan].state = BOOT; + g_e1.rx[chan].in_flight = 0; + g_e1.rx[chan].flags = 0; } void -e1_stop() +e1_stop_one(uint8_t chan) { - /* Disable RX0 */ - g_e1.rx[0].cr = 0; - e1_regs->rx[0].csr = g_e1.rx[0].cr; - - /* Disable RX1 */ - g_e1.rx[1].cr = 0; - e1_regs->rx[1].csr = g_e1.rx[1].cr; + /* Disable RX */ + g_e1.rx[chan].cr = 0; + e1_regs->rx[chan].csr = g_e1.rx[0].cr; /* State */ - g_e1.rx[0].state = IDLE; - g_e1.rx[1].state = IDLE; + g_e1.rx[chan].state = IDLE; } diff --git a/firmware/ice40-riscv/e1-tracer/e1.h b/firmware/ice40-riscv/e1-tracer/e1.h index b99c682..02031aa 100644 --- a/firmware/ice40-riscv/e1-tracer/e1.h +++ b/firmware/ice40-riscv/e1-tracer/e1.h @@ -8,8 +8,8 @@ #pragma once void e1_init(); -void e1_start(); -void e1_stop(); +void e1_start_one(uint8_t chan); +void e1_stop_one(uint8_t chan); void e1_poll(void); diff --git a/firmware/ice40-riscv/e1-tracer/usb_e1.c b/firmware/ice40-riscv/e1-tracer/usb_e1.c index 3c577a4..12c3906 100644 --- a/firmware/ice40-riscv/e1-tracer/usb_e1.c +++ b/firmware/ice40-riscv/e1-tracer/usb_e1.c @@ -149,7 +149,8 @@ g_usb_e1.running = false; /* Stop E1 */ - e1_stop(); + e1_stop_one(0); + e1_stop_one(1); /* Disable end-points */ usb_ep_regs[1].in.status = 0; @@ -187,7 +188,8 @@ usb_ep_regs[2].in.bd[1].csr = 0; /* Start E1 */ - e1_start(); + e1_start_one(0); + e1_start_one(1); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7492325352222269bf0ba1346511c7dfa99c4f64 Gerrit-Change-Number: 29947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote

by arehbein

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote ...................................................................... gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote Related: OS#5085 Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 --- M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_vc_fsm.c M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 4 files changed, 27 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve arehbein: Looks good to me, approved diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 0959d2b..93aaa99 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -271,6 +271,9 @@ /*! recursive anchor */ bool freed; + /*! if blocked by O&M/vty */ + bool om_blocked; + /*! when the NSVC became alive or dead */ struct timespec ts_alive_change; }; diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 1db2a8e..9cd83c4 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -58,8 +58,6 @@ bool initiator; bool initiate_block; bool initiate_reset; - /* if blocked by O&M/vty */ - bool om_blocked; /* if unitdata is forwarded to the user */ bool accept_unitdata; @@ -268,7 +266,7 @@ struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi; priv->initiate_reset = priv->initiate_block = priv->initiator; - priv->om_blocked = false; + priv->nsvc->om_blocked = false; switch (event) { case GPRS_NS2_EV_REQ_START: @@ -345,7 +343,7 @@ } ns2_nse_notify_unblocked(priv->nsvc, false); - if (priv->om_blocked) { + if (priv->nsvc->om_blocked) { /* we are already blocked after a RESET */ if (old_state == GPRS_NS2_ST_RESET) { osmo_timer_del(&fi->timer); @@ -363,7 +361,7 @@ { struct gprs_ns2_vc_priv *priv = fi->priv; - if (priv->om_blocked) { + if (priv->nsvc->om_blocked) { switch (event) { case GPRS_NS2_EV_RX_BLOCK_ACK: priv->accept_unitdata = false; @@ -563,7 +561,7 @@ case GPRS_NS2_ST_BLOCKED: if (priv->initiate_block) { priv->N++; - if (priv->om_blocked) { + if (priv->nsvc->om_blocked) { if (priv->N <= nsi->timeout[NS_TOUT_TNS_BLOCK_RETRIES]) { osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); } else { @@ -717,14 +715,14 @@ case GPRS_NS2_EV_REQ_OM_BLOCK: /* vty cmd: block */ priv->initiate_block = true; - priv->om_blocked = true; + priv->nsvc->om_blocked = true; osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); break; case GPRS_NS2_EV_REQ_OM_UNBLOCK: /* vty cmd: unblock*/ - if (!priv->om_blocked) + if (!priv->nsvc->om_blocked) return; - priv->om_blocked = false; + priv->nsvc->om_blocked = false; if (fi->state == GPRS_NS2_ST_BLOCKED) osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); break; @@ -834,7 +832,7 @@ int ns2_vc_block(struct gprs_ns2_vc *nsvc) { struct gprs_ns2_vc_priv *priv = nsvc->fi->priv; - if (priv->om_blocked) + if (priv->nsvc->om_blocked) return -EALREADY; return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_BLOCK, NULL); @@ -846,7 +844,7 @@ int ns2_vc_unblock(struct gprs_ns2_vc *nsvc) { struct gprs_ns2_vc_priv *priv = nsvc->fi->priv; - if (!priv->om_blocked) + if (!priv->nsvc->om_blocked) return -EALREADY; return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_UNBLOCK, NULL); diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 016199d..3046fff 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1875,18 +1875,21 @@ void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) { if (nsvc->nsvci_is_valid) - vty_out(vty, " NSVCI %05u: %s %s %s %s since ", nsvc->nsvci, + vty_out(vty, " NSVCI %05u: %s %s %s %s %ssince ", nsvc->nsvci, osmo_fsm_inst_state_name(nsvc->fi), nsvc->persistent ? "PERSIST" : "DYNAMIC", gprs_ns2_ll_str(nsvc), - ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD"); + ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD", + nsvc->om_blocked ? "(blocked by O&M/vty) " : + !ns2_vc_is_unblocked(nsvc) ? "(cause: remote) " : ""); else - vty_out(vty, " %s %s sig_weight=%u data_weight=%u %s %s since ", + vty_out(vty, " %s %s sig_weight=%u data_weight=%u %s %s %ssince ", osmo_fsm_inst_state_name(nsvc->fi), nsvc->persistent ? "PERSIST" : "DYNAMIC", nsvc->sig_weight, nsvc->data_weight, gprs_ns2_ll_str(nsvc), - ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD"); + ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD", + !ns2_vc_is_unblocked(nsvc) ? "(cause: remote) " : ""); vty_out_uptime(vty, &nsvc->ts_alive_change); vty_out_newline(vty); diff --git a/tests/gb/gprs_ns2_vty.vty b/tests/gb/gprs_ns2_vty.vty index 4be10d5..8db5fb5 100644 --- a/tests/gb/gprs_ns2_vty.vty +++ b/tests/gb/gprs_ns2_vty.vty @@ -40,11 +40,11 @@ OsmoNSdummy# show ns NSEI 01234: UDP, DEAD since 0d 0h 0m 0s 1 NS-VC: - RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD (cause: remote) since 0d 0h 0m 0s UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0 IP-SNS signalling weight: 1 data weight: 1 1 NS-VC: - RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD (cause: remote) since 0d 0h 0m 0s OsmoNSdummy# configure terminal OsmoNSdummy(config)# ns OsmoNSdummy(config-ns)# nse 1234 @@ -54,15 +54,15 @@ OsmoNSdummy# show ns NSEI 01234: UDP, DEAD since 0d 0h 0m 0s 3 NS-VC: - RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD since 0d 0h 0m 0s - RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 DEAD since 0d 0h 0m 0s - RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 DEAD since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD (cause: remote) since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 DEAD (cause: remote) since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 DEAD (cause: remote) since 0d 0h 0m 0s UDP bind: 127.0.0.14:42999 DSCP: 0 Priority: 0 IP-SNS signalling weight: 1 data weight: 1 3 NS-VC: - RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD since 0d 0h 0m 0s - RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 DEAD since 0d 0h 0m 0s - RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 DEAD since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=1 data_weight=1 udp)[127.0.0.14]:42999<>[127.0.0.15]:9496 DEAD (cause: remote) since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=0 data_weight=9 udp)[127.0.0.14]:42999<>[127.0.0.16]:9496 DEAD (cause: remote) since 0d 0h 0m 0s + RECOVERING PERSIST sig_weight=0 data_weight=0 udp)[127.0.0.14]:42999<>[127.0.0.17]:9496 DEAD (cause: remote) since 0d 0h 0m 0s OsmoNSdummy# configure terminal OsmoNSdummy(config)# ns OsmoNSdummy(config-ns)# nse 1234 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote

by arehbein

Attention is currently required from: lynxis lazus, dexter. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: Two CR+1's -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 14:37:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote

by neels

Attention is currently required from: arehbein, lynxis lazus, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: I tend to ignore the gerrit "Done" stuff as much as i can. it is possible to vote and merge a patch without clicking "Done" on all comments. I guess it is intended as a helpful feature but i'm not feeling it. (Particularly, i find the UI to check-mark a number of N separate comments as "Done" really annoying. Not all comments mean that something needs to be done. The magic that implicitly marks things as done / undone is sometimes leading to wrong markings. Or a patch owner marks things as Done without actually having addressed the comment. So i do not let that tick mark UI hog my attention.) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 13:08:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote

by arehbein

Attention is currently required from: lynxis lazus, dexter. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if NSVC is blocked locally by O&M/vty or by remote ...................................................................... Patch Set 4: (3 comments) Patchset: PS4: > Its important to click "done" when an a comment is resolved. Hmm I thought I had done that. Did I not? Edit: Ah I see now... I had, but it was stuck in draft mode. File include/osmocom/core/fsm.h: https://gerrit.osmocom.org/c/libosmocore/+/29903/comment/35e0e969_921f4cc8 PS3, Line 103: bool om_blocked; > From my understanding, this is an NSVC related variable. […] Done File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/29903/comment/a2c9fae8_bb1b3774 PS3, Line 341: > ws Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 11:13:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Fix typo

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 ) Change subject: doc/icE1usb: Fix typo ...................................................................... doc/icE1usb: Fix typo Change-Id: I78fa7a69eed2d0112628396156174a83195f0238 --- M doc/manuals/chapters/hardware.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 4549cf4..bc27616 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -15,7 +15,7 @@ As icE1usb is an OSHW (Open Source Hardware) project, the full schematics and design files are publicly available. -The design files in KiCAD formwa are available at https://git.osmocom.org/osmo-e1-hardware/tree/hardware/icE1usb +The design files in KiCAD format are available at https://git.osmocom.org/osmo-e1-hardware/tree/hardware/icE1usb PDF rendered schematics are available at https://git.osmocom.org/osmo-e1-hardware/plain/hardware/icE1usb/r1.0/icE1us… -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I78fa7a69eed2d0112628396156174a83195f0238 Gerrit-Change-Number: 29945 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc: Prepare for more than one user manual

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 ) Change subject: doc: Prepare for more than one user manual ...................................................................... doc: Prepare for more than one user manual Move icE1usb specific chapters to chapters/icE1usb/ to prepare for the upcoming e1-tracer user manual. Change-Id: I4c6cdd4036051469640b86860ea19736aa04364a --- M doc/manuals/Makefile R doc/manuals/chapters/icE1usb/firmware.adoc R doc/manuals/chapters/icE1usb/gateware.adoc R doc/manuals/chapters/icE1usb/hardware.adoc R doc/manuals/chapters/icE1usb/host-software.adoc M doc/manuals/icE1usb-usermanual.adoc 6 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile index 2f87b57..63bd422 100644 --- a/doc/manuals/Makefile +++ b/doc/manuals/Makefile @@ -4,6 +4,6 @@ ASCIIDOC = icE1usb-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -icE1usb-usermanual.pdf: chapters/*.adoc +icE1usb-usermanual.pdf: chapters/icE1usb/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/icE1usb/firmware.adoc similarity index 100% rename from doc/manuals/chapters/firmware.adoc rename to doc/manuals/chapters/icE1usb/firmware.adoc diff --git a/doc/manuals/chapters/gateware.adoc b/doc/manuals/chapters/icE1usb/gateware.adoc similarity index 100% rename from doc/manuals/chapters/gateware.adoc rename to doc/manuals/chapters/icE1usb/gateware.adoc diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/icE1usb/hardware.adoc similarity index 100% rename from doc/manuals/chapters/hardware.adoc rename to doc/manuals/chapters/icE1usb/hardware.adoc diff --git a/doc/manuals/chapters/host-software.adoc b/doc/manuals/chapters/icE1usb/host-software.adoc similarity index 100% rename from doc/manuals/chapters/host-software.adoc rename to doc/manuals/chapters/icE1usb/host-software.adoc diff --git a/doc/manuals/icE1usb-usermanual.adoc b/doc/manuals/icE1usb-usermanual.adoc index 5cfeef6..6069e07 100644 --- a/doc/manuals/icE1usb-usermanual.adoc +++ b/doc/manuals/icE1usb-usermanual.adoc @@ -6,12 +6,12 @@ include::./common/chapters/preface.adoc[] -include::./chapters/hardware.adoc[] +include::./chapters/icE1usb/hardware.adoc[] -include::./chapters/gateware.adoc[] +include::./chapters/icE1usb/gateware.adoc[] -include::./chapters/firmware.adoc[] +include::./chapters/icE1usb/firmware.adoc[] -include::./chapters/host-software.adoc[] +include::./chapters/icE1usb/host-software.adoc[] include::./common/chapters/gfdl.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4c6cdd4036051469640b86860ea19736aa04364a Gerrit-Change-Number: 29946 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: fix warning about two list items '1'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 ) Change subject: doc/icE1usb: fix warning about two list items '1' ...................................................................... doc/icE1usb: fix warning about two list items '1' asciidoc: WARNING: firmware.adoc: line 25: list item index: expected 2 got 1 Change-Id: I7312538c6aa723e25176a6a5288ccab6c03e5f08 --- M doc/manuals/chapters/firmware.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 5e4a11c..069a2ba 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -22,7 +22,7 @@ (obviously that requires a [still] working firmware present on the device). To do so, please use `dfu-util -e` -1. by pushing the push-button (see <<hw-pushbutton>>) during power-up. +2. by pushing the push-button (see <<hw-pushbutton>>) during power-up. Simply disconnect the USB cable, then push that button and keep it pushed while re-attaching the USB cable. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7312538c6aa723e25176a6a5288ccab6c03e5f08 Gerrit-Change-Number: 29942 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Add link to older firmware builds

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 ) Change subject: doc/icE1usb: Add link to older firmware builds ...................................................................... doc/icE1usb: Add link to older firmware builds Change-Id: I8b97efbe4a644e5b9bbdec0bc764d55f7b59d2d2 --- M doc/manuals/chapters/firmware.adoc 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 069a2ba..3b47206 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -47,6 +47,8 @@ The latest firmware can be found at https://ftp.osmocom.org/binaries/icE1usb/firmware/latest/ +a backlog of earlier builds can be found at +https://ftp.osmocom.org/binaries/icE1usb/firmware/all/ The latest gateware can currently only be found at the personal developer directory of tnt at https://people.osmocom.org/tnt/ice1usb/icE1usb-202010-bd399e96.bin -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8b97efbe4a644e5b9bbdec0bc764d55f7b59d2d2 Gerrit-Change-Number: 29943 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: gateware is stored in flash and can be upgraded

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 ) Change subject: doc/icE1usb: gateware is stored in flash and can be upgraded ...................................................................... doc/icE1usb: gateware is stored in flash and can be upgraded Change-Id: I319ff4e75ba76543e562822b6b6d5968bccef237 --- M doc/manuals/chapters/gateware.adoc 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved diff --git a/doc/manuals/chapters/gateware.adoc b/doc/manuals/chapters/gateware.adoc index 03487e1..a515cb1 100644 --- a/doc/manuals/chapters/gateware.adoc +++ b/doc/manuals/chapters/gateware.adoc @@ -6,6 +6,9 @@ picoRISCV soft-core running the [[firmware]] as well as the USB device peripheral talking to the host PC. +The gateware is stored in binary form on the device-internal +non-volatile memory (SPI flash). It is field-upgradeable via USB. + As an OSHW project, all of it is available in source code format at https://git.osmocom.org/osmo-e1-hardware/tree/gateware/icE1usb -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I319ff4e75ba76543e562822b6b6d5968bccef237 Gerrit-Change-Number: 29944 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: restrict dfu programming to e1-tracer devices

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 ) Change subject: fw/e1-tracer: restrict dfu programming to e1-tracer devices ...................................................................... fw/e1-tracer: restrict dfu programming to e1-tracer devices Let's explicitly specify the VID/PID of the e1-tracer in the dfu-util invocation 'make dfuprog' to avoid accidentially programming other attached dfu capable devices. Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 --- M firmware/ice40-riscv/e1-tracer/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved diff --git a/firmware/ice40-riscv/e1-tracer/Makefile b/firmware/ice40-riscv/e1-tracer/Makefile index 8161066..030501e 100644 --- a/firmware/ice40-riscv/e1-tracer/Makefile +++ b/firmware/ice40-riscv/e1-tracer/Makefile @@ -84,7 +84,7 @@ $(ICEPROG) -o 640k $< dfuprog: $(GITVER).bin - $(DFU_UTIL) -R -a 1 -D $< + $(DFU_UTIL) -R -d 1d50:6151,1d50:6150 -a 1 -D $< clean: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 Gerrit-Change-Number: 29941 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc: Prepare for more than one user manual

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 ) Change subject: doc: Prepare for more than one user manual ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4c6cdd4036051469640b86860ea19736aa04364a Gerrit-Change-Number: 29946 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 10:18:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: gateware is stored in flash and can be upgraded

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 ) Change subject: doc/icE1usb: gateware is stored in flash and can be upgraded ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I319ff4e75ba76543e562822b6b6d5968bccef237 Gerrit-Change-Number: 29944 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 10:16:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Add link to older firmware builds

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 ) Change subject: doc/icE1usb: Add link to older firmware builds ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8b97efbe4a644e5b9bbdec0bc764d55f7b59d2d2 Gerrit-Change-Number: 29943 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 10:16:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: fix warning about two list items '1'

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 ) Change subject: doc/icE1usb: fix warning about two list items '1' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7312538c6aa723e25176a6a5288ccab6c03e5f08 Gerrit-Change-Number: 29942 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 10:16:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 89s] [394/507] installing lmodern-2.005-1 [ 90s] [395/507] installing sgml-data-2.0.11+nmu1 [ 91s] [396/507] installing libstdc++-12-dev-12.2.0-7 [ 92s] [397/507] installing libatk-bridge2.0-0-2.46.0-3 [ 92s] [398/507] installing libfontconfig1-2.13.1-4.5 [ 92s] Processing triggers for sgml-base (1.31) ... [ 92s] [399/507] installing libtool-2.4.7-4 [ 92s] [400/507] installing libenchant-2-2-2.3.3-1 [ 92s] [401/507] installing libpam-modules-1.5.2-5 [ 92s] [402/507] installing systemd-252-1 [ 93s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 93s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 93s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 93s] Initializing machine ID from D-Bus machine ID. [ 93s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 93s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 93s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 93s] dpkg: error processing package systemd (--install): [ 93s] installed systemd package post-installation script subprocess returned error exit status 65 [ 93s] Errors were encountered while processing: [ 93s] systemd [ 93s] exit ... [ 93s] ### VM INTERACTION START ### [ 93s] [ 66.704024][ T1] sysrq: Power Off [ 93s] [ 66.713203][ T254] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] cloud117 failed "build osmo-iuh_1.3.0.dsc" at Tue Nov 1 10:00:25 UTC 2022. [ 93s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 80s] [394/507] installing lmodern-2.005-1 [ 81s] [395/507] installing sgml-data-2.0.11+nmu1 [ 82s] [396/507] installing libstdc++-12-dev-12.2.0-7 [ 82s] [397/507] installing libatk-bridge2.0-0-2.46.0-3 [ 82s] [398/507] installing libfontconfig1-2.13.1-4.5 [ 82s] Processing triggers for sgml-base (1.31) ... [ 82s] [399/507] installing libtool-2.4.7-4 [ 82s] [400/507] installing libenchant-2-2-2.3.3-1 [ 82s] [401/507] installing libpam-modules-1.5.2-5 [ 83s] [402/507] installing systemd-252-1 [ 83s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 83s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 83s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 83s] Initializing machine ID from D-Bus machine ID. [ 83s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 83s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 83s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 83s] dpkg: error processing package systemd (--install): [ 83s] installed systemd package post-installation script subprocess returned error exit status 65 [ 83s] Errors were encountered while processing: [ 83s] systemd [ 83s] exit ... [ 83s] ### VM INTERACTION START ### [ 83s] [ 64.045635][ T1] sysrq: Power Off [ 83s] [ 64.048699][ T16] reboot: Power down [ 83s] ### VM INTERACTION END ### [ 83s] [ 83s] old-cirrus4 failed "build osmo-iuh_1.3.0.2.a9c38.202211010053.dsc" at Tue Nov 1 10:00:30 UTC 2022. [ 83s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/li… Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 70s] [398/510] installing lmodern-2.005-1 [ 72s] [399/510] installing sgml-data-2.0.11+nmu1 [ 72s] [400/510] installing libstdc++-12-dev-12.2.0-7 [ 73s] [401/510] installing libatk-bridge2.0-0-2.46.0-3 [ 73s] [402/510] installing libfontconfig1-2.13.1-4.5 [ 73s] Processing triggers for sgml-base (1.31) ... [ 73s] [403/510] installing libtool-2.4.7-4 [ 73s] [404/510] installing libenchant-2-2-2.3.3-1 [ 73s] [405/510] installing libpam-modules-1.5.2-5 [ 73s] [406/510] installing systemd-252-1 [ 73s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 73s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 73s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 74s] Initializing machine ID from D-Bus machine ID. [ 74s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 74s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 74s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 74s] dpkg: error processing package systemd (--install): [ 74s] installed systemd package post-installation script subprocess returned error exit status 65 [ 74s] Errors were encountered while processing: [ 74s] systemd [ 74s] exit ... [ 74s] ### VM INTERACTION START ### [ 74s] [ 58.629064][ T1] sysrq: Power Off [ 74s] [ 58.631864][ T16] reboot: Power down [ 74s] ### VM INTERACTION END ### [ 74s] [ 74s] wildcard2 failed "build libosmo-sccp_1.6.0.dsc" at Tue Nov 1 09:58:22 UTC 2022. [ 74s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 85s] [398/510] installing lmodern-2.005-1 [ 87s] [399/510] installing sgml-data-2.0.11+nmu1 [ 87s] [400/510] installing libstdc++-12-dev-12.2.0-7 [ 88s] [401/510] installing libatk-bridge2.0-0-2.46.0-3 [ 88s] [402/510] installing libfontconfig1-2.13.1-4.5 [ 88s] Processing triggers for sgml-base (1.31) ... [ 88s] [403/510] installing libtool-2.4.7-4 [ 88s] [404/510] installing libenchant-2-2-2.3.3-1 [ 88s] [405/510] installing libpam-modules-1.5.2-5 [ 88s] [406/510] installing systemd-252-1 [ 89s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 89s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 89s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 89s] Initializing machine ID from D-Bus machine ID. [ 89s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 89s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 89s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 89s] dpkg: error processing package systemd (--install): [ 89s] installed systemd package post-installation script subprocess returned error exit status 65 [ 89s] Errors were encountered while processing: [ 89s] systemd [ 89s] exit ... [ 89s] ### VM INTERACTION START ### [ 89s] [ 69.511180][ T1] sysrq: Power Off [ 89s] [ 69.514318][ T16] reboot: Power down [ 89s] ### VM INTERACTION END ### [ 89s] [ 89s] hurricane3 failed "build libosmo-sccp_1.6.0.14.71fc.202211010053.dsc" at Tue Nov 1 09:58:27 UTC 2022. [ 89s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 66s] [393/504] installing lmodern-2.005-1 [ 67s] [394/504] installing sgml-data-2.0.11+nmu1 [ 67s] [395/504] installing libstdc++-12-dev-12.2.0-7 [ 68s] [396/504] installing libatk-bridge2.0-0-2.46.0-3 [ 68s] [397/504] installing libfontconfig1-2.13.1-4.5 [ 68s] Processing triggers for sgml-base (1.31) ... [ 68s] [398/504] installing libtool-2.4.7-4 [ 68s] [399/504] installing libenchant-2-2-2.3.3-1 [ 68s] [400/504] installing libpam-modules-1.5.2-5 [ 68s] [401/504] installing systemd-252-1 [ 69s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 69s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 69s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 69s] Initializing machine ID from D-Bus machine ID. [ 69s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 69s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 69s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 69s] dpkg: error processing package systemd (--install): [ 69s] installed systemd package post-installation script subprocess returned error exit status 65 [ 69s] Errors were encountered while processing: [ 69s] systemd [ 69s] exit ... [ 69s] ### VM INTERACTION START ### [ 69s] [ 55.526564][ T1] sysrq: Power Off [ 69s] [ 55.529682][ T7] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] sheep83 failed "build osmo-ggsn_1.9.0.2.3ed2.202211010053.dsc" at Tue Nov 1 09:56:24 UTC 2022. [ 69s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 80s] [393/504] installing lmodern-2.005-1 [ 81s] [394/504] installing sgml-data-2.0.11+nmu1 [ 82s] [395/504] installing libstdc++-12-dev-12.2.0-7 [ 83s] [396/504] installing libatk-bridge2.0-0-2.46.0-3 [ 83s] [397/504] installing libfontconfig1-2.13.1-4.5 [ 83s] Processing triggers for sgml-base (1.31) ... [ 83s] [398/504] installing libtool-2.4.7-4 [ 83s] [399/504] installing libenchant-2-2-2.3.3-1 [ 83s] [400/504] installing libpam-modules-1.5.2-5 [ 83s] [401/504] installing systemd-252-1 [ 84s] Created symlink /etc/systemd/system/getty.target.wants/getty(a)tty1.service -> /lib/systemd/system/getty@.service. [ 84s] Created symlink /etc/systemd/system/multi-user.target.wants/remote-fs.target -> /lib/systemd/system/remote-fs.target. [ 84s] Created symlink /etc/systemd/system/sysinit.target.wants/systemd-pstore.service -> /lib/systemd/system/systemd-pstore.service. [ 84s] Initializing machine ID from D-Bus machine ID. [ 84s] /usr/lib/tmpfiles.d/systemd.conf:28: Failed to resolve group 'systemd-journal'. [ 84s] /usr/lib/tmpfiles.d/systemd.conf:29: Failed to resolve group 'systemd-journal'. [ 84s] /usr/lib/tmpfiles.d/systemd.conf:30: Failed to resolve group 'systemd-journal'. [ 84s] dpkg: error processing package systemd (--install): [ 84s] installed systemd package post-installation script subprocess returned error exit status 65 [ 84s] Errors were encountered while processing: [ 84s] systemd [ 84s] exit ... [ 84s] ### VM INTERACTION START ### [ 84s] [ 65.413383][ T1] sysrq: Power Off [ 84s] [ 65.416439][ T16] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] lamb51 failed "build osmo-ggsn_1.9.0.dsc" at Tue Nov 1 09:56:21 UTC 2022. [ 84s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: restrict dfu programming to e1-tracer devices

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 ) Change subject: fw/e1-tracer: restrict dfu programming to e1-tracer devices ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 Gerrit-Change-Number: 29941 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 09:06:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: restrict dfu programming to e1-tracer devices

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 ) Change subject: fw/e1-tracer: restrict dfu programming to e1-tracer devices ...................................................................... Patch Set 3: (1 comment) File firmware/ice40-riscv/e1-tracer/Makefile: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941/comment/89a386c8_254c… PS2, Line 87: $(DFU_UTIL) -R -d 1d50:6150,1d50:6151 -a 1 -D $< > dfu util doc says : […] nice catch! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 Gerrit-Change-Number: 29941 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 01 Nov 2022 09:00:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Fix typo

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 ) Change subject: doc/icE1usb: Fix typo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I78fa7a69eed2d0112628396156174a83195f0238 Gerrit-Change-Number: 29945 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:59:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29935 ) Change subject: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink ...................................................................... osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink Change-Id: I75ecf5369f31c8b8e9519d2b580355fa80c24196 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 30 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index bf6703a..6a6331f 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -61,6 +61,15 @@ [24] = 1, /* TCH/F: a=17 / h=24 */ }; +/* TDMA frame number of burst 'a' should be used as the table index. */ +static const uint8_t sched_tchf_dl_amr_cmi_map[26] = { + [4] = 1, /* TCH/F: a=4 */ + [13] = 1, /* TCH/F: a=13 */ + [21] = 1, /* TCH/F: a=21 */ +}; + +extern const uint8_t sched_tchh_dl_amr_cmi_map[26]; + /*! \brief a single TCH/F burst was received by the PHY, process it */ int rx_tchf_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { @@ -392,7 +401,7 @@ enum osmo_amr_type ft_codec; enum osmo_amr_quality bfi; int8_t sti, cmi; - bool amr_is_cmr = !dl_amr_fn_is_cmi(br->fn); + bool amr_is_cmr; if (rsl_cmode != RSL_CMOD_SPD_SPEECH) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Dropping speech frame, " @@ -430,6 +439,10 @@ "Codec (FT = %d) of RTP frame not in list\n", ft_codec); goto free_bad_msg; } + if (br->chan == TRXC_TCHF) + amr_is_cmr = !sched_tchf_dl_amr_cmi_map[br->fn % 26]; + else /* TRXC_TCHH_0 or TRXC_TCHH_1 */ + amr_is_cmr = !sched_tchh_dl_amr_cmi_map[br->fn % 26]; if (amr_is_cmr && chan_state->dl_ft != ft) { LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Codec (FT = %d) " " of RTP cannot be changed now, but in next frame\n", ft_codec); @@ -514,7 +527,8 @@ * the first FN 0,8,17 defines that CMR is included in frame. */ gsm0503_tch_afs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), - msgb_l2len(msg) - sizeof(struct amr_hdr), !dl_amr_fn_is_cmi(br->fn), + msgb_l2len(msg) - sizeof(struct amr_hdr), + !sched_tchf_dl_amr_cmi_map[br->fn % 26], chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 17073e0..37fd59d 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -66,6 +66,18 @@ [3] = 1, /* TCH/H(1): a=18 / d=24 / f=3 */ }; +/* TDMA frame number of burst 'a' should be used as the table index. + * This mapping is valid for both FACCH/H(0) and FACCH/H(1). */ +const uint8_t sched_tchh_dl_amr_cmi_map[26] = { + [4] = 1, /* TCH/H(0): a=4 */ + [13] = 1, /* TCH/H(0): a=13 */ + [21] = 1, /* TCH/H(0): a=21 */ + + [5] = 1, /* TCH/H(1): a=5 */ + [14] = 1, /* TCH/H(1): a=14 */ + [22] = 1, /* TCH/H(1): a=22 */ +}; + /* 3GPP TS 45.002, table 1 in clause 7: Mapping tables. * TDMA frame number of burst 'f' is always used as the table index. */ static const uint8_t sched_tchh_ul_facch_map[26] = { @@ -439,7 +451,8 @@ * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + sizeof(struct amr_hdr), - msgb_l2len(msg) - sizeof(struct amr_hdr), !dl_amr_fn_is_cmi(br->fn), + msgb_l2len(msg) - sizeof(struct amr_hdr), + !sched_tchh_dl_amr_cmi_map[br->fn % 26], chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I75ecf5369f31c8b8e9519d2b580355fa80c24196 Gerrit-Change-Number: 29935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29936 ) Change subject: osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi() ...................................................................... osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi() The scheduler is now using the lookup tables instead of these functions. The only part using them is the AMR unit test. Change-Id: I1a9c80dd12252e7befe9c9bc8e8f7ee8648b5465 --- M src/osmo-bts-trx/sched_utils.h M tests/amr/amr_test.c M tests/amr/amr_test.ok 3 files changed, 1 insertion(+), 350 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_utils.h b/src/osmo-bts-trx/sched_utils.h index f76e49b..95f4a77 100644 --- a/src/osmo-bts-trx/sched_utils.h +++ b/src/osmo-bts-trx/sched_utils.h @@ -22,9 +22,6 @@ #pragma once #include <stdint.h> -#include <errno.h> -#include <stdbool.h> -#include <osmo-bts/scheduler.h> extern void *tall_bts_ctx; @@ -36,77 +33,3 @@ else return 10000 * n_errors / n_bits_total; } - -/*! determine whether an uplink AMR block is CMI according to 3GPP TS 45.009. - * \param[in] fn_begin frame number of the beginning of the block. - * \returns true in case of CMI; false otherwise. */ -static inline bool ul_amr_fn_is_cmi(uint32_t fn_begin) -{ - switch (fn_begin % 26) { - /*! See also: 3GPP TS 45.009, section 3.2.1.3 Transmitter/Receiver Synchronisation */ - /* valid for AHS subslot 0 and AFS: */ - case 0: - case 8: - case 17: - /* valid for AHS subslot 1: */ - case 1: - case 9: - case 18: - return true; - break; - /* Complementary values for sanity check */ - /* valid for AHS subslot 0 and AFS: */ - case 4: - case 13: - case 21: - /* valid for AHS subslot 1: */ - case 5: - case 14: - case 22: - return false; - break; - default: - LOGP(DL1P, LOGL_DEBUG, - "uplink frame number fn_begin=%u does not mark the beginning of a voice block!\n", fn_begin); - OSMO_ASSERT(false); - return false; - break; - } -} - -/*! determine the whether a downlink AMR block is CMI according to 3GPP TS 45.009. - * \param[in] fn_begin frame number of the beginning of the block. - * \returns true in case of CMI; false otherwise. */ -static inline bool dl_amr_fn_is_cmi(uint32_t fn_begin) -{ - switch (fn_begin % 26) { - /*! See also: 3GPP TS 45.009, section 3.2.1.3 Transmitter/Receiver Synchronisation */ - /* valid for AHS subslot 0 and AFS: */ - case 4: - case 13: - case 21: - /* valid for AHS subslot 1: */ - case 5: - case 14: - case 22: - return true; - break; - /* Complementary values for sanity check */ - /* valid for AHS subslot 0 and AFS: */ - case 0: - case 8: - case 17: - /* valid for AHS subslot 1: */ - case 1: - case 9: - case 18: - return false; - break; - default: - LOGP(DL1P, LOGL_DEBUG, - "downlink frame number fn_begin=%u does not mark the beginning of a voice block!\n", fn_begin); - OSMO_ASSERT(false); - return false; - break; - } -} diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 480ff73..0fc58e7 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -27,126 +27,7 @@ #include <stdlib.h> #include <stdio.h> -#include "../../src/osmo-bts-trx/sched_utils.h" - -struct amr_cmi_test_data { - /* Frame number that marks the beginning of the voice block */ - uint32_t gsm_fn; - /* In uplink: True, when the voice block is a CMI block, false otherwise. */ - /* In downlink: False, when the voice block is a CMI block, true otherwise. */ - bool is_cmi; -}; - -/* The behavior of AHS in subslot 0 and AFS is the same */ -static const struct amr_cmi_test_data testvec_ahs_h0_and_afs[] = { - { 0, true }, - { 4, false }, - { 8, true }, - { 13, false }, - { 17, true }, - { 21, false }, - { 26, true }, - { 30, false }, - { 34, true }, - { 39, false }, - { 43, true }, - { 47, false }, - { 52, true }, - { 56, false }, - { 60, true }, - { 65, false }, - { 69, true }, - { 73, false }, - { 78, true }, - { 82, false }, - { 86, true }, - { 91, false }, - { 95, true }, - { 99, false }, -}; - -static const struct amr_cmi_test_data testvec_ahs_h1[] = { - { 1, true }, - { 5, false }, - { 9, true }, - { 14, false }, - { 18, true }, - { 22, false }, - { 27, true }, - { 31, false }, - { 35, true }, - { 40, false }, - { 44, true }, - { 48, false }, - { 53, true }, - { 57, false }, - { 61, true }, - { 66, false }, - { 70, true }, - { 74, false }, - { 79, true }, - { 83, false }, - { 87, true }, - { 92, false }, - { 96, true }, - { 100, false }, -}; - -static void test_amr_cmi_sched(void) -{ - unsigned int i; - bool res; - - printf("AMR transmission phase (CMI) in relation to GSM FN:\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h0_and_afs); i++) { - res = ul_amr_fn_is_cmi(testvec_ahs_h0_and_afs[i].gsm_fn); - printf("Uplink, AMR AHS on HR subslot 0: fn_begin=%u, CMI=%u\n", testvec_ahs_h0_and_afs[i].gsm_fn, res); - OSMO_ASSERT(res == testvec_ahs_h0_and_afs[i].is_cmi); - } - - printf("\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h0_and_afs); i++) { - res = dl_amr_fn_is_cmi(testvec_ahs_h0_and_afs[i].gsm_fn); - printf("Downlink, AMR AHS on HR subslot 0: fn_begin=%u, CMI=%u\n", testvec_ahs_h0_and_afs[i].gsm_fn, res); - OSMO_ASSERT(res == !testvec_ahs_h0_and_afs[i].is_cmi); - } - - printf("\n"); - printf("\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h1); i++) { - res = ul_amr_fn_is_cmi(testvec_ahs_h1[i].gsm_fn); - printf("Uplink, AMR AHS on HR subslot 1: fn_begin=%u, CMI=%u\n", testvec_ahs_h1[i].gsm_fn, res); - OSMO_ASSERT(res == testvec_ahs_h1[i].is_cmi); - } - - printf("\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h1); i++) { - res = dl_amr_fn_is_cmi(testvec_ahs_h1[i].gsm_fn); - printf("Downlink, AMR AHS on HR subslot 1: fn_begin=%u, CMI=%u\n", testvec_ahs_h1[i].gsm_fn, res); - OSMO_ASSERT(res == !testvec_ahs_h1[i].is_cmi); - } - - printf("\n"); - printf("\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h0_and_afs); i++) { - res = ul_amr_fn_is_cmi(testvec_ahs_h0_and_afs[i].gsm_fn); - printf("Uplink, AMR AFS: fn_begin=%u, CMI=%u\n", testvec_ahs_h0_and_afs[i].gsm_fn, res); - OSMO_ASSERT(res == testvec_ahs_h0_and_afs[i].is_cmi); - } - - printf("\n"); - - for (i = 0; i < ARRAY_SIZE(testvec_ahs_h0_and_afs); i++) { - res = dl_amr_fn_is_cmi(testvec_ahs_h0_and_afs[i].gsm_fn); - printf("Downlink, AMR AFS: fn_begin=%u, CMI=%u\n", testvec_ahs_h0_and_afs[i].gsm_fn, res); - OSMO_ASSERT(res == !testvec_ahs_h0_and_afs[i].is_cmi); - } -} +#include <errno.h> static void test_amr_parse_mr_conf(void) { @@ -185,7 +66,6 @@ log_set_print_level(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - test_amr_cmi_sched(); test_amr_parse_mr_conf(); return EXIT_SUCCESS; } diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index f0d1830..921e8b9 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -1,155 +1,3 @@ -AMR transmission phase (CMI) in relation to GSM FN: -Uplink, AMR AHS on HR subslot 0: fn_begin=0, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=4, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=8, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=13, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=17, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=21, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=26, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=30, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=34, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=39, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=43, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=47, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=52, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=56, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=60, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=65, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=69, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=73, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=78, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=82, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=86, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=91, CMI=0 -Uplink, AMR AHS on HR subslot 0: fn_begin=95, CMI=1 -Uplink, AMR AHS on HR subslot 0: fn_begin=99, CMI=0 - -Downlink, AMR AHS on HR subslot 0: fn_begin=0, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=4, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=8, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=13, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=17, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=21, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=26, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=30, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=34, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=39, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=43, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=47, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=52, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=56, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=60, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=65, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=69, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=73, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=78, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=82, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=86, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=91, CMI=1 -Downlink, AMR AHS on HR subslot 0: fn_begin=95, CMI=0 -Downlink, AMR AHS on HR subslot 0: fn_begin=99, CMI=1 - - -Uplink, AMR AHS on HR subslot 1: fn_begin=1, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=5, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=9, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=14, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=18, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=22, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=27, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=31, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=35, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=40, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=44, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=48, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=53, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=57, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=61, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=66, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=70, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=74, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=79, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=83, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=87, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=92, CMI=0 -Uplink, AMR AHS on HR subslot 1: fn_begin=96, CMI=1 -Uplink, AMR AHS on HR subslot 1: fn_begin=100, CMI=0 - -Downlink, AMR AHS on HR subslot 1: fn_begin=1, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=5, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=9, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=14, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=18, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=22, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=27, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=31, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=35, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=40, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=44, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=48, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=53, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=57, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=61, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=66, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=70, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=74, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=79, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=83, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=87, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=92, CMI=1 -Downlink, AMR AHS on HR subslot 1: fn_begin=96, CMI=0 -Downlink, AMR AHS on HR subslot 1: fn_begin=100, CMI=1 - - -Uplink, AMR AFS: fn_begin=0, CMI=1 -Uplink, AMR AFS: fn_begin=4, CMI=0 -Uplink, AMR AFS: fn_begin=8, CMI=1 -Uplink, AMR AFS: fn_begin=13, CMI=0 -Uplink, AMR AFS: fn_begin=17, CMI=1 -Uplink, AMR AFS: fn_begin=21, CMI=0 -Uplink, AMR AFS: fn_begin=26, CMI=1 -Uplink, AMR AFS: fn_begin=30, CMI=0 -Uplink, AMR AFS: fn_begin=34, CMI=1 -Uplink, AMR AFS: fn_begin=39, CMI=0 -Uplink, AMR AFS: fn_begin=43, CMI=1 -Uplink, AMR AFS: fn_begin=47, CMI=0 -Uplink, AMR AFS: fn_begin=52, CMI=1 -Uplink, AMR AFS: fn_begin=56, CMI=0 -Uplink, AMR AFS: fn_begin=60, CMI=1 -Uplink, AMR AFS: fn_begin=65, CMI=0 -Uplink, AMR AFS: fn_begin=69, CMI=1 -Uplink, AMR AFS: fn_begin=73, CMI=0 -Uplink, AMR AFS: fn_begin=78, CMI=1 -Uplink, AMR AFS: fn_begin=82, CMI=0 -Uplink, AMR AFS: fn_begin=86, CMI=1 -Uplink, AMR AFS: fn_begin=91, CMI=0 -Uplink, AMR AFS: fn_begin=95, CMI=1 -Uplink, AMR AFS: fn_begin=99, CMI=0 - -Downlink, AMR AFS: fn_begin=0, CMI=0 -Downlink, AMR AFS: fn_begin=4, CMI=1 -Downlink, AMR AFS: fn_begin=8, CMI=0 -Downlink, AMR AFS: fn_begin=13, CMI=1 -Downlink, AMR AFS: fn_begin=17, CMI=0 -Downlink, AMR AFS: fn_begin=21, CMI=1 -Downlink, AMR AFS: fn_begin=26, CMI=0 -Downlink, AMR AFS: fn_begin=30, CMI=1 -Downlink, AMR AFS: fn_begin=34, CMI=0 -Downlink, AMR AFS: fn_begin=39, CMI=1 -Downlink, AMR AFS: fn_begin=43, CMI=0 -Downlink, AMR AFS: fn_begin=47, CMI=1 -Downlink, AMR AFS: fn_begin=52, CMI=0 -Downlink, AMR AFS: fn_begin=56, CMI=1 -Downlink, AMR AFS: fn_begin=60, CMI=0 -Downlink, AMR AFS: fn_begin=65, CMI=1 -Downlink, AMR AFS: fn_begin=69, CMI=0 -Downlink, AMR AFS: fn_begin=73, CMI=1 -Downlink, AMR AFS: fn_begin=78, CMI=0 -Downlink, AMR AFS: fn_begin=82, CMI=1 -Downlink, AMR AFS: fn_begin=86, CMI=0 -Downlink, AMR AFS: fn_begin=91, CMI=1 -Downlink, AMR AFS: fn_begin=95, CMI=0 -Downlink, AMR AFS: fn_begin=99, CMI=1 amr_parse_mr_conf() <- 20 a5 0d 46 52 54 amr_parse_mr_conf() -> num_modes=4 Mode[0] = 0/13/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a9c80dd12252e7befe9c9bc8e8f7ee8648b5465 Gerrit-Change-Number: 29936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29935 ) Change subject: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > what happens to the old dl_amr_fn_is_cmi() function? can't it be dropped now? I am dropping it in a separate patch (next), because we also want to drop ul_amr_fn_is_cmi() and the related testcase. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I75ecf5369f31c8b8e9519d2b580355fa80c24196 Gerrit-Change-Number: 29935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:46:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29935 ) Change subject: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I75ecf5369f31c8b8e9519d2b580355fa80c24196 Gerrit-Change-Number: 29935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:44:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29936 ) Change subject: osmo-bts-trx: drop ul_amr_fn_is_cmi() / dl_amr_fn_is_cmi() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a9c80dd12252e7befe9c9bc8e8f7ee8648b5465 Gerrit-Change-Number: 29936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:44:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29935 ) Change subject: osmo-bts-trx: use lookup tables for checking AMR CMI/CMR on Downlink ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: what happens to the old dl_amr_fn_is_cmi() function? can't it be dropped now? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I75ecf5369f31c8b8e9519d2b580355fa80c24196 Gerrit-Change-Number: 29935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:43:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: contrib/jenkins.sh: Build e1-tracer host software

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 ) Change subject: contrib/jenkins.sh: Build e1-tracer host software ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: @osmith: So this fails as we don't have the software dependencies installed in the "hardware/firmware" docker container. I guess the safest/sanest thing to do is to expand the jenkins job to have two separate steps: One related to the hardware/firmware (executed in the existing container) and one for the host software (executed in a normal osmocom software container)? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I26e839de419c6eb86bf2a6250a1adf06b761d1fa Gerrit-Change-Number: 29921 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:41:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_conn_fail_crit: tune the MS back to BCCH

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29937 ) Change subject: BTS_Tests: fix TC_conn_fail_crit: tune the MS back to BCCH ...................................................................... BTS_Tests: fix TC_conn_fail_crit: tune the MS back to BCCH osmo-bts-trx declares a connection failure when the radio link counter S reaches 0. This counter is decreased every time the Viterbi decoder yields a decoding error on the Uplink SACCH. For more details, see 3GPP TS 45.008, section 5.2. The scheduler in osmo-bts-trx expects NOPE indications to be sent by the transceiver in the absence of valid Uplink bursts. However, due to the asynchronous nature of TRXD link, our virtual Um interface implementation, fake_trx.py, does not generate NOPE indications on it's own. Instead, trxcon is sending empty TRXDv0 PDUs (BURST.req), which are then translated to proper TRXDv1 NOPE.ind by fake_trx.py. The TC_conn_fail_crit currently sends L1CTL_DM_REL_REQ in order to simulate connection loss, what makes trxcon disable all active timeslots and thus stop sending NOPE.req to fake_trx.py. Let's tune trxcon back to BCCH, in order to ensure that NOPE.req messages are still being sent, so that osmo-bts-trx will be able to declare a connection failure over the RSL as expected. Change-Id: I34aee95111eafea90eeeea861682f1b4547d7b03 Related: Ic292d180ba64206fb4d88adb284f9f9d058b4587 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cecdda1..9baee40 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3945,6 +3945,7 @@ f_est_dchan(); f_sleep(2.0); L1CTL.send(ts_L1CTL_DM_REL_REQ(g_chan_nr)); + f_l1_tune(L1CTL); /* tune back to BCCH */ timer T := 40.0; T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29937 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: I34aee95111eafea90eeeea861682f1b4547d7b03 Gerrit-Change-Number: 29937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_conn_fail_crit: tune the MS back to BCCH

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29937 ) Change subject: BTS_Tests: fix TC_conn_fail_crit: tune the MS back to BCCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29937 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: I34aee95111eafea90eeeea861682f1b4547d7b03 Gerrit-Change-Number: 29937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:39:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: restrict dfu programming to e1-tracer devices

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 to look at the new patch set (#3). Change subject: fw/e1-tracer: restrict dfu programming to e1-tracer devices ...................................................................... fw/e1-tracer: restrict dfu programming to e1-tracer devices Let's explicitly specify the VID/PID of the e1-tracer in the dfu-util invocation 'make dfuprog' to avoid accidentially programming other attached dfu capable devices. Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 --- M firmware/ice40-riscv/e1-tracer/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/41/29941/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 Gerrit-Change-Number: 29941 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: gateware is stored in flash and can be upgraded

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 ) Change subject: doc/icE1usb: gateware is stored in flash and can be upgraded ...................................................................... doc/icE1usb: gateware is stored in flash and can be upgraded Change-Id: I319ff4e75ba76543e562822b6b6d5968bccef237 --- M doc/manuals/chapters/gateware.adoc 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/44/29944/1 diff --git a/doc/manuals/chapters/gateware.adoc b/doc/manuals/chapters/gateware.adoc index 03487e1..a515cb1 100644 --- a/doc/manuals/chapters/gateware.adoc +++ b/doc/manuals/chapters/gateware.adoc @@ -6,6 +6,9 @@ picoRISCV soft-core running the [[firmware]] as well as the USB device peripheral talking to the host PC. +The gateware is stored in binary form on the device-internal +non-volatile memory (SPI flash). It is field-upgradeable via USB. + As an OSHW project, all of it is available in source code format at https://git.osmocom.org/osmo-e1-hardware/tree/gateware/icE1usb -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I319ff4e75ba76543e562822b6b6d5968bccef237 Gerrit-Change-Number: 29944 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Fix typo

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 ) Change subject: doc/icE1usb: Fix typo ...................................................................... doc/icE1usb: Fix typo Change-Id: I78fa7a69eed2d0112628396156174a83195f0238 --- M doc/manuals/chapters/hardware.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/45/29945/1 diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 4549cf4..bc27616 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -15,7 +15,7 @@ As icE1usb is an OSHW (Open Source Hardware) project, the full schematics and design files are publicly available. -The design files in KiCAD formwa are available at https://git.osmocom.org/osmo-e1-hardware/tree/hardware/icE1usb +The design files in KiCAD format are available at https://git.osmocom.org/osmo-e1-hardware/tree/hardware/icE1usb PDF rendered schematics are available at https://git.osmocom.org/osmo-e1-hardware/plain/hardware/icE1usb/r1.0/icE1us… -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I78fa7a69eed2d0112628396156174a83195f0238 Gerrit-Change-Number: 29945 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc: Prepare for more than one user manual

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 ) Change subject: doc: Prepare for more than one user manual ...................................................................... doc: Prepare for more than one user manual Move icE1usb specific chapters to chapters/icE1usb/ to prepare for the upcoming e1-tracer user manual. Change-Id: I4c6cdd4036051469640b86860ea19736aa04364a --- M doc/manuals/Makefile R doc/manuals/chapters/icE1usb/firmware.adoc R doc/manuals/chapters/icE1usb/gateware.adoc R doc/manuals/chapters/icE1usb/hardware.adoc R doc/manuals/chapters/icE1usb/host-software.adoc M doc/manuals/icE1usb-usermanual.adoc 6 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/46/29946/1 diff --git a/doc/manuals/Makefile b/doc/manuals/Makefile index 2f87b57..63bd422 100644 --- a/doc/manuals/Makefile +++ b/doc/manuals/Makefile @@ -4,6 +4,6 @@ ASCIIDOC = icE1usb-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -icE1usb-usermanual.pdf: chapters/*.adoc +icE1usb-usermanual.pdf: chapters/icE1usb/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/icE1usb/firmware.adoc similarity index 100% rename from doc/manuals/chapters/firmware.adoc rename to doc/manuals/chapters/icE1usb/firmware.adoc diff --git a/doc/manuals/chapters/gateware.adoc b/doc/manuals/chapters/icE1usb/gateware.adoc similarity index 100% rename from doc/manuals/chapters/gateware.adoc rename to doc/manuals/chapters/icE1usb/gateware.adoc diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/icE1usb/hardware.adoc similarity index 100% rename from doc/manuals/chapters/hardware.adoc rename to doc/manuals/chapters/icE1usb/hardware.adoc diff --git a/doc/manuals/chapters/host-software.adoc b/doc/manuals/chapters/icE1usb/host-software.adoc similarity index 100% rename from doc/manuals/chapters/host-software.adoc rename to doc/manuals/chapters/icE1usb/host-software.adoc diff --git a/doc/manuals/icE1usb-usermanual.adoc b/doc/manuals/icE1usb-usermanual.adoc index 5cfeef6..6069e07 100644 --- a/doc/manuals/icE1usb-usermanual.adoc +++ b/doc/manuals/icE1usb-usermanual.adoc @@ -6,12 +6,12 @@ include::./common/chapters/preface.adoc[] -include::./chapters/hardware.adoc[] +include::./chapters/icE1usb/hardware.adoc[] -include::./chapters/gateware.adoc[] +include::./chapters/icE1usb/gateware.adoc[] -include::./chapters/firmware.adoc[] +include::./chapters/icE1usb/firmware.adoc[] -include::./chapters/host-software.adoc[] +include::./chapters/icE1usb/host-software.adoc[] include::./common/chapters/gfdl.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4c6cdd4036051469640b86860ea19736aa04364a Gerrit-Change-Number: 29946 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: fix warning about two list items '1'

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 ) Change subject: doc/icE1usb: fix warning about two list items '1' ...................................................................... doc/icE1usb: fix warning about two list items '1' asciidoc: WARNING: firmware.adoc: line 25: list item index: expected 2 got 1 Change-Id: I7312538c6aa723e25176a6a5288ccab6c03e5f08 --- M doc/manuals/chapters/firmware.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/42/29942/1 diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 5e4a11c..069a2ba 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -22,7 +22,7 @@ (obviously that requires a [still] working firmware present on the device). To do so, please use `dfu-util -e` -1. by pushing the push-button (see <<hw-pushbutton>>) during power-up. +2. by pushing the push-button (see <<hw-pushbutton>>) during power-up. Simply disconnect the USB cable, then push that button and keep it pushed while re-attaching the USB cable. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7312538c6aa723e25176a6a5288ccab6c03e5f08 Gerrit-Change-Number: 29942 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: doc/icE1usb: Add link to older firmware builds

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 ) Change subject: doc/icE1usb: Add link to older firmware builds ...................................................................... doc/icE1usb: Add link to older firmware builds Change-Id: I8b97efbe4a644e5b9bbdec0bc764d55f7b59d2d2 --- M doc/manuals/chapters/firmware.adoc 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/43/29943/1 diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 069a2ba..3b47206 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -47,6 +47,8 @@ The latest firmware can be found at https://ftp.osmocom.org/binaries/icE1usb/firmware/latest/ +a backlog of earlier builds can be found at +https://ftp.osmocom.org/binaries/icE1usb/firmware/all/ The latest gateware can currently only be found at the personal developer directory of tnt at https://people.osmocom.org/tnt/ice1usb/icE1usb-202010-bd399e96.bin -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8b97efbe4a644e5b9bbdec0bc764d55f7b59d2d2 Gerrit-Change-Number: 29943 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

Change in osmo-e1-hardware[master]: fw/e1-tracer: restrict dfu programming to e1-tracer devices

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 ) Change subject: fw/e1-tracer: restrict dfu programming to e1-tracer devices ...................................................................... Patch Set 2: (1 comment) File firmware/ice40-riscv/e1-tracer/Makefile: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941/comment/1ea53bd0_615a… PS2, Line 87: $(DFU_UTIL) -R -d 1d50:6150,1d50:6151 -a 1 -D $< dfu util doc says : --device [Run-Time VENDOR]:[Run-Time PRODUCT][,[DFU Mode VENDOR]:[DFU Mode PRODUCT]] and https://github.com/openmoko/openmoko-usb-oui/blob/master/usb_product_ids.psv has : 0x1d50 | 0x6150 | [https://osmocom.org/projects/e1-t1-adapter/wiki/E1_tracer Osmocom E1 tracer (DFU)] 0x1d50 | 0x6151 | [https://osmocom.org/projects/e1-t1-adapter/wiki/E1_tracer Osmocom E1 tracer] So it should be `-d 1d50:6151,1d50:6150` I think. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I6a17f01a621cd4af6827167427fafd2f9f277755 Gerrit-Change-Number: 29941 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Nov 2022 08:27:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2024

2023

2022

gerrit-log November 2022