May 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2e1

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email ) Change subject: gateware/cores: Update no2e1 ...................................................................... gateware/cores: Update no2e1 This pulls in the support for non-crc4 framing modes and also setting the Sa bits (for osmo-v5) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 --- M gateware/cores/no2e1 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gateware/cores/no2e1 b/gateware/cores/no2e1 index 074f293..344a8e9 160000 --- a/gateware/cores/no2e1 +++ b/gateware/cores/no2e1 @@ -1 +1 @@ -Subproject commit 074f293d350a1698de16bf942fb2f5f2d61857cc +Subproject commit 344a8e9ec36dc27e9694abc7b3afd8f6b5bcbaba -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email 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: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 Gerrit-Change-Number: 36677 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email ) Change subject: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode ...................................................................... icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode There is really no need here, we can use `memcpy` just as well. Not sure if this was a problem here but newer gcc are annoying with aliasing rules and such so better safe than sorry. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I110ee4c014e8cfe058f7fc357decb7ab99e0be64 --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 19 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 328ff3f..11c7401 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -345,27 +345,25 @@ static bool _set_tx_mode_done(struct usb_xfer *xfer) { - const struct ice1usb_tx_config *cfg = (const struct ice1usb_tx_config *) xfer->data; struct usb_ctrl_req *req = xfer->cb_ctx; int port = _ifnum2port(req->wIndex); struct usb_e1_state *usb_e1 = _get_state(port); printf("set_tx_mode[%d] %02x%02x%02x%02x\r\n", port, xfer->data[0], xfer->data[1], xfer->data[2], xfer->data[3]); - usb_e1->tx_cfg = *cfg; - e1_tx_config(port, _tx_config_reg(cfg)); + memcpy(&usb_e1->tx_cfg, xfer->data, sizeof(struct ice1usb_tx_config)); + e1_tx_config(port, _tx_config_reg(&usb_e1->tx_cfg)); return true; } static bool _set_rx_mode_done(struct usb_xfer *xfer) { - const struct ice1usb_rx_config *cfg = (const struct ice1usb_rx_config *) xfer->data; struct usb_ctrl_req *req = xfer->cb_ctx; int port = _ifnum2port(req->wIndex); struct usb_e1_state *usb_e1 = _get_state(port); printf("set_rx_mode[%d] %02x\r\n", port, xfer->data[0]); - usb_e1->rx_cfg = *cfg; - e1_rx_config(port, _rx_config_reg(cfg)); + memcpy(&usb_e1->rx_cfg, xfer->data, sizeof(struct ice1usb_rx_config)); + e1_rx_config(port, _rx_config_reg(&usb_e1->rx_cfg)); return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email 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: I110ee4c014e8cfe058f7fc357decb7ab99e0be64 Gerrit-Change-Number: 36676 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix OIS -> AIS typo

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36678?usp=email ) Change subject: icE1usb fw: Fix OIS -> AIS typo ...................................................................... icE1usb fw: Fix OIS -> AIS typo Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I23f242c31483533adb9cb60b4aac9b95a7b807e8 --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 6597124..bfc042e 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -309,7 +309,7 @@ /* TX */ if (e1->tx.state == IDLE) { - /* "Off" state: We TX only OIS */ + /* "Off" state: We TX only AIS */ e1->tx.cr.val = (e1->tx.cr.cfg & ~(E1_TX_CR_MODE_MASK | E1_TX_CR_ALARM)) | E1_TX_CR_ENABLE | E1_TX_CR_MODE_TRSP; } else { /* "On state: Enabled + User config */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36678?usp=email 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: I23f242c31483533adb9cb60b4aac9b95a7b807e8 Gerrit-Change-Number: 36678 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-e1-hardware[master]: fw: Update the helpers in misc.{c,h} for the new tick measurement hw

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36680?usp=email ) Change subject: fw: Update the helpers in misc.{c,h} for the new tick measurement hw ...................................................................... fw: Update the helpers in misc.{c,h} for the new tick measurement hw Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ia881fead7a40f773969a016db05bea0a1fa1604f --- M firmware/ice40-riscv/e1-tracer/misc.c M firmware/ice40-riscv/e1-tracer/misc.h M firmware/ice40-riscv/icE1usb/misc.c M firmware/ice40-riscv/icE1usb/misc.h 4 files changed, 53 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/e1-tracer/misc.c b/firmware/ice40-riscv/e1-tracer/misc.c index c2e0763..6f5c88a 100644 --- a/firmware/ice40-riscv/e1-tracer/misc.c +++ b/firmware/ice40-riscv/e1-tracer/misc.c @@ -15,10 +15,11 @@ struct misc { uint32_t warmboot; uint32_t _rsvd0[3];; - struct { - uint16_t rx; - uint16_t _rsvd1; - } e1_tick[2]; + union { + uint32_t e1_tick_sel; + uint16_t e1_tick[2]; + }; + uint32_t _rsvd1; struct { uint32_t _rsvd2; uint32_t now; @@ -29,10 +30,15 @@ void -e1_tick_read(uint16_t *ticks) +e1_tick_sel(int type) { - ticks[0] = misc_regs->e1_tick[0].rx; - ticks[1] = misc_regs->e1_tick[1].rx; + misc_regs->e1_tick_sel = (type << 16) | type; +} + +uint16_t +e1_tick_read(int port) +{ + return misc_regs->e1_tick[port]; } diff --git a/firmware/ice40-riscv/e1-tracer/misc.h b/firmware/ice40-riscv/e1-tracer/misc.h index 42dfe51..2944743 100644 --- a/firmware/ice40-riscv/e1-tracer/misc.h +++ b/firmware/ice40-riscv/e1-tracer/misc.h @@ -10,6 +10,14 @@ #include <stdbool.h> #include <stdint.h> -void e1_tick_read(uint16_t *ticks); +enum e1_tick_type { + TICK_TX = 0, + TICK_RX_PULSE = 1, + TICK_RX_SAMPLE = 2, + TICK_RX_ONE = 3, +}; + +void e1_tick_sel(int type); +uint16_t e1_tick_read(int port); void reboot(int fw); diff --git a/firmware/ice40-riscv/icE1usb/misc.c b/firmware/ice40-riscv/icE1usb/misc.c index b8419aa..1445580 100644 --- a/firmware/ice40-riscv/icE1usb/misc.c +++ b/firmware/ice40-riscv/icE1usb/misc.c @@ -21,11 +21,12 @@ uint8_t _rsvd; } gpio; uint32_t e1_led; - uint32_t _rsvd; - struct { - uint16_t rx; - uint16_t tx; - } e1_tick[2]; + uint32_t _rsvd0; + union { + uint32_t e1_tick_sel; + uint16_t e1_tick[2]; + }; + uint32_t _rsvd1; struct { uint32_t pps; uint32_t now; @@ -116,10 +117,16 @@ } +void +e1_tick_sel(int type) +{ + misc_regs->e1_tick_sel = (type << 16) | type; +} + uint16_t e1_tick_read(int port) { - return misc_regs->e1_tick[port].tx; + return misc_regs->e1_tick[port]; } diff --git a/firmware/ice40-riscv/icE1usb/misc.h b/firmware/ice40-riscv/icE1usb/misc.h index b72793f..ca99951 100644 --- a/firmware/ice40-riscv/icE1usb/misc.h +++ b/firmware/ice40-riscv/icE1usb/misc.h @@ -34,6 +34,14 @@ void e1_led_pause(void); void e1_led_set(bool enable, uint8_t cfg); +enum e1_tick_type { + TICK_TX = 0, + TICK_RX_PULSE = 1, + TICK_RX_SAMPLE = 2, + TICK_RX_ONE = 3, +}; + +void e1_tick_sel(int type); uint16_t e1_tick_read(int port); bool time_elapsed(uint32_t ref, unsigned int tick); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36680?usp=email 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: Ia881fead7a40f773969a016db05bea0a1fa1604f Gerrit-Change-Number: 36680 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Always define NUM_E1_PORTS in Makefile

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?usp=email ) Change subject: icE1usb fw: Always define NUM_E1_PORTS in Makefile ...................................................................... icE1usb fw: Always define NUM_E1_PORTS in Makefile So that it's available without having to include the USB include ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I0b434cef7a662c19e5f48072285c013e8c02e254 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/usb_desc_ids.h 2 files changed, 14 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index f385408..5fcd1f7 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -19,6 +19,8 @@ ifeq ($(SINGLE_CHANNEL),1) CFLAGS += -DNUM_E1_PORTS=1 +else +CFLAGS += -DNUM_E1_PORTS=2 endif NO2USB_FW_VERSION=0 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index df0331e..b9a7032 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -7,10 +7,6 @@ #pragma once -#ifndef NUM_E1_PORTS -# define NUM_E1_PORTS 2 -#endif - #define USB_INTF_E1(p) (0 + (p)) #define USB_INTF_GPS_CDC_CTL (NUM_E1_PORTS + 0) #define USB_INTF_GPS_CDC_DATA (NUM_E1_PORTS + 1) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?usp=email 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: I0b434cef7a662c19e5f48072285c013e8c02e254 Gerrit-Change-Number: 36681 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Use NUM_E1_PORTS in e1.c

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?usp=email ) Change subject: icE1usb fw: Use NUM_E1_PORTS in e1.c ...................................................................... icE1usb fw: Use NUM_E1_PORTS in e1.c Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id69b4429a67ccb8834fee26b83839539a5ad8b31 --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index bfc042e..5e4fa33 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -263,13 +263,13 @@ struct e1_error_count errors; }; -static struct e1_state g_e1[2]; +static struct e1_state g_e1[NUM_E1_PORTS]; static volatile struct e1_core * _get_regs(int port) { - if ((port < 0) || (port > 1)) + if ((port < 0) || (port >= NUM_E1_PORTS)) panic("_get_regs invalid port %d", port); return &e1_regs_base[port]; } @@ -277,7 +277,7 @@ static struct e1_state * _get_state(int port) { - if ((port < 0) || (port > 1)) + if ((port < 0) || (port >= NUM_E1_PORTS)) panic("_get_state invalid port %d", port); return &g_e1[port]; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?usp=email 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: Id69b4429a67ccb8834fee26b83839539a5ad8b31 Gerrit-Change-Number: 36683 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-e1-hardware[master]: gateware: Rework the low-level line state monitoring ticks

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email ) Change subject: gateware: Rework the low-level line state monitoring ticks ...................................................................... gateware: Rework the low-level line state monitoring ticks The 'tick' system was meant to allow the firmware to monitor the low level state of the line, beyong just "not aligned", but it was never really useful in the present state. Now we have more tick source available (but only one can be measured at the same time). More specifically, the firmware can monitor the presence/absence of raw pulses (LOS condition), it can also monitor the number of '1' pulses to detect an AIS signals, or simply the rate of RX pulses (to tune the local oscillator to incoming signal rate). Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e --- M gateware/common/rtl/soc_base.v M gateware/cores/no2e1 M gateware/e1-tracer/doc/mem-map.md M gateware/e1-tracer/rtl/misc.v M gateware/e1-tracer/rtl/top.v M gateware/icE1usb-proto/doc/mem-map.md M gateware/icE1usb-proto/rtl/misc.v M gateware/icE1usb-proto/rtl/top.v M gateware/icE1usb/doc/mem-map.md M gateware/icE1usb/rtl/misc.v M gateware/icE1usb/rtl/top.v 11 files changed, 176 insertions(+), 65 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gateware/common/rtl/soc_base.v b/gateware/common/rtl/soc_base.v index 25c4af8..be7766a 100644 --- a/gateware/common/rtl/soc_base.v +++ b/gateware/common/rtl/soc_base.v @@ -72,9 +72,8 @@ input wire [ WB_N -1:0] wb_m_ack, // Ticks - output wire [E1_N-1:0] tick_e1_rx, - output wire [E1_N-1:0] tick_e1_tx, - output wire tick_usb_sof, + output wire [4*E1_N-1:0] tick_e1, + output wire tick_usb_sof, // Clock / Reset input wire clk_sys, @@ -502,8 +501,7 @@ .wb_cyc (wb_cyc[7]), .wb_ack (wb_ack[7]), .irq (), - .tick_rx (tick_e1_rx), - .tick_tx (tick_e1_tx), + .mon_tick (tick_e1), .clk (clk_sys), .rst (rst_sys) ); diff --git a/gateware/cores/no2e1 b/gateware/cores/no2e1 index 344a8e9..dac3a8b 160000 --- a/gateware/cores/no2e1 +++ b/gateware/cores/no2e1 @@ -1 +1 @@ -Subproject commit 344a8e9ec36dc27e9694abc7b3afd8f6b5bcbaba +Subproject commit dac3a8b7a5d8736d867edc48a65a41965d8b78d1 diff --git a/gateware/e1-tracer/doc/mem-map.md b/gateware/e1-tracer/doc/mem-map.md index 06cfad0..aa79948 100644 --- a/gateware/e1-tracer/doc/mem-map.md +++ b/gateware/e1-tracer/doc/mem-map.md @@ -156,21 +156,43 @@ Write to this register with bit 2 set will trigger a FPGA reload of the selected image. -#### E1 tick channel 0/1 (Read Only, addr `0x04` / `0x05`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| / | rx_tick | +| / |ts[1]| / |ts[0]| '-----------------------------------------------------------------------------------------------' - * [15:0] - rx_tick + * [17:16] - ts[1] : Tick Source for channel 1 + * [ 1: 0] - ts[0] : Tick Source for channel 0 ``` -An internal counter is incremented at every bit received by the corresponding E1 channel. That -counter value is then captured at every USB Start-of-Frame packet and the last captured value -made available here. +Selects the tick source for the counters below for each E1 channel. +Available sources are : + +* `0`: (reserved) +* `1`: (reserved) +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| chan[1] | chan[0] | +'-----------------------------------------------------------------------------------------------' + + * [31:16] - chan[1] : Tick counter for channel 1 + * [15: 0] - chan[0] : Tick counter for channel 0 +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 +channel. That counter value is then captured at every USB Start-of-Frame packet and the last +captured value made available here. #### Time (Read Only, addr `0x07`) diff --git a/gateware/e1-tracer/rtl/misc.v b/gateware/e1-tracer/rtl/misc.v index e39a787..5d1c1f4 100644 --- a/gateware/e1-tracer/rtl/misc.v +++ b/gateware/e1-tracer/rtl/misc.v @@ -16,7 +16,7 @@ input wire btn, // Ticks - input wire [1:0] tick_e1_rx, + input wire [7:0] tick_e1, input wire tick_usb_sof, // Reset request @@ -43,9 +43,13 @@ // Bus wire bus_clr; reg bus_we_boot; + reg bus_we_tick_sel; // Counters - wire [15:0] cap_e1_rx[0:1]; + reg [1:0] tick_e1_sel[0:1]; + wire [1:0] tick_e1_mux; + + wire [15:0] cap_e1[0:1]; wire [31:0] cnt_time; // Boot @@ -64,10 +68,13 @@ // Write enables always @(posedge clk) - if (bus_clr | ~wb_we) - bus_we_boot <= 1'b0; - else - bus_we_boot <= wb_addr == 4'h0; + if (bus_clr | ~wb_we) begin + bus_we_boot <= 1'b0; + bus_we_tick_sel <= 1'b0; + end else begin + bus_we_boot <= wb_addr == 4'h0; + bus_we_tick_sel <= wb_addr == 4'h4; + end // Read mux always @(posedge clk) @@ -75,8 +82,7 @@ wb_rdata <= 32'h00000000; else case (wb_addr[3:0]) - 4'h4: wb_rdata <= { 16'h000, cap_e1_rx[0] }; - 4'h5: wb_rdata <= { 16'h000, cap_e1_rx[1] }; + 4'h4: wb_rdata <= { cap_e1[1], cap_e1[0] }; 4'h7: wb_rdata <= cnt_time; default: wb_rdata <= 32'hxxxxxxxx; endcase @@ -86,12 +92,21 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) begin + tick_e1_sel[1] <= wb_wdata[17:16]; + tick_e1_sel[0] <= wb_wdata[ 1: 0]; + end + + assign tick_e1_mux[0] = tick_e1[{1'b0, tick_e1_sel[0]}]; + assign tick_e1_mux[1] = tick_e1[{1'b1, tick_e1_sel[1]}]; + capcnt #( .W(16) ) e1_cnt_I[1:0] ( .cnt_cur (), - .cnt_cap ({cap_e1_rx[1], cap_e1_rx[0] }), - .inc ({tick_e1_rx[1], tick_e1_rx[0]}), + .cnt_cap ({ cap_e1[1], cap_e1[0] }), + .inc ({ tick_e1_mux[1], tick_e1_mux[0] }), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/e1-tracer/rtl/top.v b/gateware/e1-tracer/rtl/top.v index 0e76c5a..8e1d67b 100644 --- a/gateware/e1-tracer/rtl/top.v +++ b/gateware/e1-tracer/rtl/top.v @@ -80,7 +80,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire [1:0] tick_e1_rx; + wire [7:0] tick_e1; wire tick_usb_sof; // Clocks / Reset @@ -136,7 +136,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -167,7 +167,7 @@ misc misc_I ( .btn (btn), - .tick_e1_rx (tick_e1_rx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), diff --git a/gateware/icE1usb-proto/doc/mem-map.md b/gateware/icE1usb-proto/doc/mem-map.md index d8f9cba..b326619 100644 --- a/gateware/icE1usb-proto/doc/mem-map.md +++ b/gateware/icE1usb-proto/doc/mem-map.md @@ -156,20 +156,39 @@ Write to this register with bit 2 set will trigger a FPGA reload of the selected image. -#### E1 tick channel 0 (Read Only, addr `0x04`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| tx_tick | rx_tick | +| / | tss | '-----------------------------------------------------------------------------------------------' - * [31:16] - tx_tick - * [15: 0] - rx_tick + * [ 1: 0] - tss : Tick Source Select ``` -An internal counter is incremented at every bit received/transmitted by the corresponding E1 +Selects the tick source for the counters below. +Available sources are : + +* `0`: TX tick, for every bit sent +* `1`: RX Pulse, for every detected pulse on the input +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| / | tick_cnt | +'-----------------------------------------------------------------------------------------------' + + * [15: 0] - tick_cnt : Tick counter value +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 channel. That counter value is then captured at every USB Start-of-Frame packet and the last captured value made available here. diff --git a/gateware/icE1usb-proto/rtl/misc.v b/gateware/icE1usb-proto/rtl/misc.v index 8ff14d9..68ac624 100644 --- a/gateware/icE1usb-proto/rtl/misc.v +++ b/gateware/icE1usb-proto/rtl/misc.v @@ -26,9 +26,8 @@ input wire btn, // Ticks - input wire tick_e1_rx, - input wire tick_e1_tx, - input wire tick_usb_sof, + input wire [3:0] tick_e1, + input wire tick_usb_sof, // Reset request output wire rst_req, @@ -52,12 +51,15 @@ // Bus wire bus_clr; reg bus_we_boot; + reg bus_we_tick_sel; reg [ 1:0] bus_we_pdm_clk; reg [ 2:0] bus_we_pdm_e1; // Counters - wire [15:0] cap_e1_rx; - wire [15:0] cap_e1_tx; + reg [1:0] tick_e1_sel; + wire tick_e1_mux; + + wire [15:0] cap_e1; wire [31:0] cnt_time; // PDM @@ -82,6 +84,7 @@ always @(posedge clk) if (bus_clr | ~wb_we) begin bus_we_boot <= 1'b0; + bus_we_tick_sel <= 1'b0; bus_we_pdm_clk[0] <= 1'b0; bus_we_pdm_clk[1] <= 1'b0; bus_we_pdm_e1[0] <= 1'b0; @@ -89,6 +92,7 @@ bus_we_pdm_e1[2] <= 1'b0; end else begin bus_we_boot <= wb_addr == 4'h0; + bus_we_tick_sel <= wb_addr == 4'h4; bus_we_pdm_clk[0] <= wb_addr == 4'h8; bus_we_pdm_clk[1] <= wb_addr == 4'h9; bus_we_pdm_e1[0] <= wb_addr == 4'ha; @@ -102,7 +106,7 @@ wb_rdata <= 32'h00000000; else case (wb_addr[3:0]) - 4'h4: wb_rdata <= { cap_e1_tx, cap_e1_rx }; + 4'h4: wb_rdata <= { 16'h0000, cap_e1 }; 4'h7: wb_rdata <= cnt_time; `ifdef WITH_PDM_READBACK 4'h8: wb_rdata <= { pdm_clk[0][12], 19'h00000, pdm_clk[0][11:0] }; @@ -119,12 +123,18 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) + tick_e1_sel <= wb_wdata[1:0]; + + assign tick_e1_mux = tick_e1[tick_e1_sel]; + capcnt #( .W(16) - ) e1_cnt_I[1:0] ( + ) e1_cnt_I ( .cnt_cur (), - .cnt_cap ({cap_e1_tx, cap_e1_rx }), - .inc ({tick_e1_tx, tick_e1_rx}), + .cnt_cap (cap_e1), + .inc (tick_e1_mux), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/icE1usb-proto/rtl/top.v b/gateware/icE1usb-proto/rtl/top.v index 7cefeac..40eaf5c 100644 --- a/gateware/icE1usb-proto/rtl/top.v +++ b/gateware/icE1usb-proto/rtl/top.v @@ -78,8 +78,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire tick_e1_rx; - wire tick_e1_tx; + wire [3:0] tick_e1; wire tick_usb_sof; // Clocks / Reset @@ -135,8 +134,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -172,8 +170,7 @@ .clk_tune_hi (clk_tune_hi), .clk_tune_lo (clk_tune_lo), .btn (btn), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), diff --git a/gateware/icE1usb/doc/mem-map.md b/gateware/icE1usb/doc/mem-map.md index 75d7b69..395a577 100644 --- a/gateware/icE1usb/doc/mem-map.md +++ b/gateware/icE1usb/doc/mem-map.md @@ -206,20 +206,41 @@ * `10`: Slow blink * `11`: Fast blink -#### E1 tick channel 0/1 (Read Only, addr `0x04-0x05`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| tx_tick | rx_tick | +| / |ts[1]| / |ts[0]| '-----------------------------------------------------------------------------------------------' - * [31:16] - tx_tick - * [15: 0] - rx_tick + * [17:16] - ts[1] : Tick Source for channel 1 + * [ 1: 0] - ts[0] : Tick Source for channel 0 ``` -An internal counter is incremented at every bit received/transmitted by the corresponding E1 +Selects the tick source for the counters below for each E1 channel. +Available sources are : + +* `0`: TX tick, for every bit sent +* `1`: RX Pulse, for every detected pulse on the input +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| chan[1] | chan[0] | +'-----------------------------------------------------------------------------------------------' + + * [31:16] - chan[1] : Tick counter for channel 1 + * [15: 0] - chan[0] : Tick counter for channel 0 +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 channel. That counter value is then captured at every USB Start-of-Frame packet and the last captured value made available here. diff --git a/gateware/icE1usb/rtl/misc.v b/gateware/icE1usb/rtl/misc.v index 7aaa068..347412c 100644 --- a/gateware/icE1usb/rtl/misc.v +++ b/gateware/icE1usb/rtl/misc.v @@ -37,8 +37,7 @@ input wire btn_stb, // Ticks - input wire [ 1:0] tick_e1_rx, - input wire [ 1:0] tick_e1_tx, + input wire [ 7:0] tick_e1, input wire tick_usb_sof, // Reset request @@ -67,6 +66,7 @@ reg bus_we_boot; reg bus_we_gpio; reg bus_we_led; + reg bus_we_tick_sel; reg [ 1:0] bus_we_pdm_clk; reg [ 1:0] bus_we_pdm_e1; @@ -83,8 +83,10 @@ wire gps_pps_r; // Counters - wire [15:0] cap_e1_rx[0:1]; - wire [15:0] cap_e1_tx[0:1]; + reg [1:0] tick_e1_sel[0:1]; + wire [1:0] tick_e1_mux; + + wire [15:0] cap_e1[0:1]; wire [31:0] cap_gps; wire [31:0] cnt_time; @@ -112,6 +114,7 @@ bus_we_boot <= 1'b0; bus_we_gpio <= 1'b0; bus_we_led <= 1'b0; + bus_we_tick_sel <= 1'b0; bus_we_pdm_clk[0] <= 1'b0; bus_we_pdm_clk[1] <= 1'b0; bus_we_pdm_e1[0] <= 1'b0; @@ -120,6 +123,7 @@ bus_we_boot <= wb_addr == 4'h0; bus_we_gpio <= wb_addr == 4'h1; bus_we_led <= wb_addr == 4'h2; + bus_we_tick_sel <= wb_addr == 4'h4; bus_we_pdm_clk[0] <= wb_addr == 4'h8; bus_we_pdm_clk[1] <= wb_addr == 4'h9; bus_we_pdm_e1[0] <= wb_addr == 4'ha; @@ -134,8 +138,7 @@ case (wb_addr[3:0]) 4'h1: wb_rdata <= { 12'h000, gpio_in, 4'h0, gpio_oe, 4'h0, gpio_out }; 4'h2: wb_rdata <= { 22'h000000, e1_led_active, e1_led }; - 4'h4: wb_rdata <= { cap_e1_tx[0], cap_e1_rx[0] }; - 4'h5: wb_rdata <= { cap_e1_tx[1], cap_e1_rx[1] }; + 4'h4: wb_rdata <= { cap_e1[1], cap_e1[0] }; 4'h6: wb_rdata <= cap_gps; 4'h7: wb_rdata <= cnt_time; `ifdef WITH_PDM_READBACK @@ -229,12 +232,21 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) begin + tick_e1_sel[1] <= wb_wdata[17:16]; + tick_e1_sel[0] <= wb_wdata[ 1: 0]; + end + + assign tick_e1_mux[0] = tick_e1[{1'b0, tick_e1_sel[0]}]; + assign tick_e1_mux[1] = tick_e1[{1'b1, tick_e1_sel[1]}]; + capcnt #( .W(16) - ) e1_cnt_I[3:0] ( + ) e1_cnt_I[1:0] ( .cnt_cur (), - .cnt_cap ({cap_e1_tx[1], cap_e1_rx[1], cap_e1_tx[0], cap_e1_rx[0] }), - .inc ({tick_e1_tx[1], tick_e1_rx[1], tick_e1_tx[0], tick_e1_rx[0]}), + .cnt_cap ({ cap_e1[1], cap_e1[0] }), + .inc ({ tick_e1_mux[1], tick_e1_mux[0] }), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/icE1usb/rtl/top.v b/gateware/icE1usb/rtl/top.v index a2b8979..472c1ff 100644 --- a/gateware/icE1usb/rtl/top.v +++ b/gateware/icE1usb/rtl/top.v @@ -99,8 +99,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire [1:0] tick_e1_rx; - wire [1:0] tick_e1_tx; + wire [7:0] tick_e1; wire tick_usb_sof; // I2C @@ -182,8 +181,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -255,8 +253,7 @@ .e1_led_active (e1_led_active), .btn_val (btn_val), .btn_stb (btn_stb), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email 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: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e Gerrit-Change-Number: 36679 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix some formatting (tab vs space)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?usp=email ) Change subject: icE1usb fw: Fix some formatting (tab vs space) ...................................................................... icE1usb fw: Fix some formatting (tab vs space) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id47025320e65a27fc46e9204e050c57d108dab56 --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 11c7401..18d8516 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -434,8 +434,8 @@ static struct usb_fn_drv _e1_drv = { .set_conf = _e1_set_conf, - .set_intf = _e1_set_intf, - .get_intf = _e1_get_intf, + .set_intf = _e1_set_intf, + .get_intf = _e1_get_intf, .ctrl_req = _e1_ctrl_req, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?usp=email 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: Id47025320e65a27fc46e9204e050c57d108dab56 Gerrit-Change-Number: 36682 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email ) Change subject: icE1usb fw: Avoid casting random pointer to struct in set_{rx,tx}_mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36676?usp=email 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: I110ee4c014e8cfe058f7fc357decb7ab99e0be64 Gerrit-Change-Number: 36676 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 06 May 2024 18:47:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-e1-hardware[master]: fw: Update the helpers in misc.{c,h} for the new tick measurement hw

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36680?usp=email ) Change subject: fw: Update the helpers in misc.{c,h} for the new tick measurement hw ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36680?usp=email 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: Ia881fead7a40f773969a016db05bea0a1fa1604f Gerrit-Change-Number: 36680 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 06 May 2024 18:47:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024