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

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

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29950 ) Change subject: support for e1-tracer hardware ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: Minor recommended change, but I'm not opposed to merging as-is. File src/usb.c: https://gerrit.osmocom.org/c/osmo-e1d/+/29950/comment/c0b18293_ed3b9adb PS1, Line 993: if (!is_tracer) { I would just test on if (line_data->ep_out) and if (line_data->ep_fb) rather than is_tracer. A bit of a nit pick but it's more consistent with the ep_int test and also in the future if e1d is tracing, it's one less things to change. -- 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-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:34:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 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

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022