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

Change in osmo-mgw[master]: Get rid of separate rtp_port field

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29589 ) Change subject: Get rid of separate rtp_port field ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I294eb5d85fae79bf62d36eb9e818426e187d442c Gerrit-Change-Number: 29589 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 17:17:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Limit dfuprog to proper USB IDs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29613 ) Change subject: icE1usb fw: Limit dfuprog to proper USB IDs ...................................................................... icE1usb fw: Limit dfuprog to proper USB IDs Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Iaf96565b4068c2d6aa46d8bedac1fad618130a26 --- M firmware/ice40-riscv/icE1usb/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index b05a532..3fde2ca 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -101,7 +101,7 @@ $(ICEPROG) -o 640k $< dfuprog: $(GITVER).bin - $(DFU_UTIL) -R -a 1 -D $< + $(DFU_UTIL) -R -d 1d50:6145,1d50:6144 -a 1 -D $< clean: -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29613 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: Iaf96565b4068c2d6aa46d8bedac1fad618130a26 Gerrit-Change-Number: 29613 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Add support for building 1 channel version

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29612 ) Change subject: icE1usb fw: Add support for building 1 channel version ...................................................................... icE1usb fw: Add support for building 1 channel version Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I147bb90fca3cead8db776ecfd60c23b4b8bafe2d --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_desc_ids.h M firmware/ice40-riscv/icE1usb/usb_e1.c 4 files changed, 23 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index ed765f6..b05a532 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -17,6 +17,10 @@ CFLAGS=-Wall -Wextra -Wno-unused-parameter -Os -march=rv32i -mabi=ilp32 -ffreestanding -flto -nostartfiles -fomit-frame-pointer -Wl,--gc-section --specs=nano.specs -D$(BOARD_DEFINE) -I. -I../common CFLAGS += -DBUILD_INFO="\"$(GITVER) built $(shell date) on $(shell hostname)\"" +ifeq ($(SINGLE_CHANNEL),1) +CFLAGS += -DNUM_E1_PORTS=1 +endif + NO2USB_FW_VERSION=0 include ../../../gateware/cores/no2usb/fw/fw.mk CFLAGS += $(INC_no2usb) diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index 7dfc304..63b0b5c 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -39,7 +39,7 @@ struct usb_ep_desc ep_fb; struct usb_ep_desc ep_interrupt; } __attribute__ ((packed)) on; - } __attribute__ ((packed)) e1[2]; + } __attribute__ ((packed)) e1[NUM_E1_PORTS]; /* CDC */ struct { @@ -142,6 +142,7 @@ }, }, }, +#if NUM_E1_PORTS >= 2 .e1[1] = { .off = { .intf = { @@ -210,6 +211,7 @@ }, }, }, +#endif .cdc = { .intf_ctl = { .bLength = sizeof(struct usb_intf_desc), diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index 192092e..ab3d156 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -7,12 +7,16 @@ #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 2 -#define USB_INTF_GPS_CDC_DATA 3 -#define USB_INTF_GPSDO 4 -#define USB_INTF_DFU 5 -#define USB_INTF_NUM 6 +#define USB_INTF_GPS_CDC_CTL (NUM_E1_PORTS + 0) +#define USB_INTF_GPS_CDC_DATA (NUM_E1_PORTS + 1) +#define USB_INTF_GPSDO (NUM_E1_PORTS + 2) +#define USB_INTF_DFU (NUM_E1_PORTS + 3) +#define USB_INTF_NUM (NUM_E1_PORTS + 4) #define USB_EP_E1_IN(p) (0x82 + (3 * (p))) #define USB_EP_E1_OUT(p) (0x01 + (3 * (p))) diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 4e52408..328ff3f 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -29,7 +29,7 @@ struct e1_error_count last_err; }; -static struct usb_e1_state g_usb_e1[2]; +static struct usb_e1_state g_usb_e1[NUM_E1_PORTS]; /* default configuration at power-up */ static const struct ice1usb_tx_config tx_cfg_default = { @@ -53,7 +53,7 @@ static struct usb_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_usb_e1[port]; } @@ -63,7 +63,9 @@ { switch (bInterfaceNumber) { case USB_INTF_E1(0): return 0; +#if NUM_E1_PORTS >= 2 case USB_INTF_E1(1): return 1; +#endif default: /* Don't panic since this will be handled as USB STALL */ return -1; @@ -209,7 +211,7 @@ void usb_e1_poll(void) { - for (int i=0; i<2; i++) { + for (int i=0; i<NUM_E1_PORTS; i++) { e1_poll(i); _usb_e1_run(i); } @@ -225,7 +227,7 @@ if (!conf) return USB_FND_SUCCESS; - for (int port=0; port<2; port++) + for (int port=0; port<NUM_E1_PORTS; port++) { intf = usb_desc_find_intf(conf, USB_INTF_E1(port), 0, NULL); if (!intf) @@ -445,7 +447,7 @@ uint32_t rx_cr = _rx_config_reg(&rx_cfg_default); uint32_t tx_cr = _tx_config_reg(&tx_cfg_default); - for (int i=0; i<2; i++) { + for (int i=0; i<NUM_E1_PORTS; i++) { struct usb_e1_state *usb_e1 = _get_state(i); memset(usb_e1, 0x00, sizeof(struct usb_e1_state)); usb_e1->tx_cfg = tx_cfg_default; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29612 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: I147bb90fca3cead8db776ecfd60c23b4b8bafe2d Gerrit-Change-Number: 29612 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: If no PPS present for >= 3s, go to hold over mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29610 ) Change subject: icE1usb fw/gpsdo: If no PPS present for >= 3s, go to hold over mode ...................................................................... icE1usb fw/gpsdo: If no PPS present for >= 3s, go to hold over mode Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ia85a8bb0e146cb117ea6e2704c6a4dedf215c75a --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index 573c0bb..2481c2e 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -15,6 +15,8 @@ #include "ice1usb_proto.h" +#include "config.h" + struct { /* Configuration */ @@ -275,6 +277,14 @@ uint32_t tick_now, tick_diff; bool valid; + /* If more than 3 sec elapsed since last PPS, go to hold-over */ + if (time_elapsed(g_gpsdo.meas.tick_prev, 3 * SYS_CLK_FREQ)) { + g_gpsdo.state = STATE_HOLD_OVER; + g_gpsdo.meas.invalid = 0; + g_gpsdo.meas.skip = 0; + return; + } + /* Get current tick and check if there was a PPS and estimate frequency */ tick_now = time_pps_read(); @@ -299,6 +309,7 @@ /* No GPS fix, go to hold-over */ g_gpsdo.state = STATE_HOLD_OVER; g_gpsdo.meas.invalid = 0; + g_gpsdo.meas.skip = 0; return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29610 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: Ia85a8bb0e146cb117ea6e2704c6a4dedf215c75a Gerrit-Change-Number: 29610 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Add Notify PPS on Carrier Detect option

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29611 ) Change subject: icE1usb fw: Add Notify PPS on Carrier Detect option ...................................................................... icE1usb fw: Add Notify PPS on Carrier Detect option This is disabled by default because turns out the kernel doesn't actually support PPS on CD for USB-CDC devices :( And this also increase the interrupt traffic ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ie5d163434323a23912228003add9870fafefedf9 --- M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_gps.c 2 files changed, 66 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index 25472e0..7dfc304 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -250,7 +250,11 @@ .bmAttributes = 0x03, /* Longest notif is SERIAL_STATE with 2 data bytes */ .wMaxPacketSize = sizeof(struct usb_ctrl_req) + 2, +#ifdef GPS_PPS_ON_CD + .bInterval = 1, +#else .bInterval = 0x40, +#endif }, .intf_data = { .bLength = sizeof(struct usb_intf_desc), diff --git a/firmware/ice40-riscv/icE1usb/usb_gps.c b/firmware/ice40-riscv/icE1usb/usb_gps.c index 1c10033..7ca89fd 100644 --- a/firmware/ice40-riscv/icE1usb/usb_gps.c +++ b/firmware/ice40-riscv/icE1usb/usb_gps.c @@ -17,6 +17,7 @@ #include <no2usb/usb_cdc_proto.h> #include "console.h" +#include "misc.h" #include "usb_desc_ids.h" @@ -34,9 +35,23 @@ unsigned int rd; char data[BUF_SIZE] __attribute__((aligned(4))); } buf; + +#ifdef GPS_PPS_ON_CD + /* PPS tracking */ + struct { + uint32_t last; + bool set; + } pps; +#endif } g_usb_gps; +struct usb_cdc_notif_serial_state { + struct usb_ctrl_req hdr; + uint16_t bits; +}; + + static void _usb_gps_set_active(bool active) { @@ -120,6 +135,53 @@ else ep_regs->bd[0].csr = 0; } + +#ifdef GPS_PPS_ON_CD + /* IN EP CTL: Send PPS pulse */ + ep_regs = &usb_ep_regs[USB_EP_GPS_CDC_CTL & 0x1f].in; + + if ((ep_regs->bd[0].csr & USB_BD_STATE_MSK) != USB_BD_STATE_RDY_DATA) + { + /* Default request */ + struct usb_cdc_notif_serial_state notif = { + .hdr = { + .bmRequestType = USB_REQ_READ | USB_REQ_TYPE_CLASS | USB_REQ_RCPT_INTF, + .bRequest = USB_NOTIF_CDC_SERIAL_STATE, + .wValue = 0, + .wIndex = USB_INTF_GPS_CDC_CTL, + .wLength = 2 + }, + .bits = 0x00 + }; + + /* Check if PPS occurred */ + uint32_t pps_now = time_pps_read(); + + if (pps_now != g_usb_gps.pps.last) + { + /* Update last */ + g_usb_gps.pps.last = pps_now; + + /* Queue CD Set */ + notif.bits = 1; + usb_data_write(ep_regs->bd[0].ptr, &notif, 12); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(10); + + /* Need to clear in the future */ + g_usb_gps.pps.set = true; + } + else if (g_usb_gps.pps.set) + { + /* Queue CD Clear */ + notif.bits = 0; + usb_data_write(ep_regs->bd[0].ptr, &notif, 12); + ep_regs->bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(10); + + /* Cleared */ + g_usb_gps.pps.set = false; + } + } +#endif } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29611 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: Ie5d163434323a23912228003add9870fafefedf9 Gerrit-Change-Number: 29611 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Export accumulated error

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29607 ) Change subject: icE1usb fw/gpsdo: Export accumulated error ...................................................................... icE1usb fw/gpsdo: Export accumulated error This is a pretty usefu stat as this is what actually matters Note that structure is just extended so any call with a wLength shorter will just get the beginning of the struct (usb stack limits response to wLength) and thus is fully backward compatible. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I0aa919d4870ca7e1b653b82ac4f76ed26b5e3b08 --- M firmware/ice40-riscv/icE1usb/gpsdo.c M firmware/ice40-riscv/icE1usb/ice1usb_proto.h 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index c1df4b0..477d2e7 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -102,6 +102,7 @@ status->tune.coarse = g_gpsdo.tune.coarse; status->tune.fine = g_gpsdo.tune.fine; status->freq_est = g_gpsdo.meas.last; + status->err_acc = (g_gpsdo.state == STATE_TUNE_FINE) ? g_gpsdo.fine.acc : 0; } void diff --git a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h index 3170d55..38cb23b 100644 --- a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h +++ b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h @@ -65,6 +65,7 @@ uint8_t mode; /*!< Current configured operating mode */ struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ uint32_t freq_est; /*!< Latest frequency estimate measurement */ + int16_t err_acc; /*!< Accumulated error */ } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29607 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: I0aa919d4870ca7e1b653b82ac4f76ed26b5e3b08 Gerrit-Change-Number: 29607 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Use a struct for VCTXO dependent params

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29608 ) Change subject: icE1usb fw/gpsdo: Use a struct for VCTXO dependent params ...................................................................... icE1usb fw/gpsdo: Use a struct for VCTXO dependent params Not that useful for now, but prep for PID loop Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Iffea8992130eccd98a2952b08277e3d0d2568a1f --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 23 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index 477d2e7..5975100 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -17,6 +17,9 @@ struct { + /* Configuration */ + enum gpsdo_vctxo_model vctxo; + /* Current tuning */ struct { uint16_t coarse; @@ -41,7 +44,6 @@ /* Coarse tuning */ struct { - int vctxo_sensitivity; int step; } coarse; @@ -54,19 +56,25 @@ } g_gpsdo; -/* VCXTO sensitivity vs 'coarse' count for fast initial acquisition */ - /* - * Note that the spec if often a guaranteed minimum range and goes - * from ~0.1V to 3.2V instead of 0-3.3V so actual sensitivity is - * higher than the "theoritical value". We boost it by ~ 10% here. - */ -static const int -vctxo_sensitivity[] = { - /* +- 50 ppm pull range => ~ 0.75 Hz / hi-count (set to 0.85) */ - [VCTXO_TAITIEN_VT40] = 300, +/* + * VCXTO parameters + * + * - iKv is reciprocal sensitivity vs 'coarse' count for fast initial acquisition + * + * Note that the spec if often a guaranteed minimum range and goes + * from ~0.1V to 3.2V instead of 0-3.3V so actual sensitivity is + * higher than the "theoritical value". We boost it by ~ 10% here. + */ +static const struct { + int iKv; /* hi-count / Hz (.8 fixed point) */ +} vctxo_params[] = { + [VCTXO_TAITIEN_VT40] = { + .iKv = 300, /* +- 50 ppm pull range => ~ 0.75 Hz / hi-count (set to 0.85) */ + }, - /* +- 100 ppm pull range => ~ 1.50 Hz / hi-count (set to 1.6) */ - [VCTXO_SITIME_SIT3808_E] = 160, + [VCTXO_SITIME_SIT3808_E] = { + .iKv = 160, /* +- 100 ppm pull range => ~ 1.50 Hz / hi-count (set to 1.6) */ + }, }; /* Tuning params */ @@ -195,7 +203,7 @@ } /* Estimate correction and apply it */ - g_gpsdo.tune.coarse -= (freq_diff * g_gpsdo.coarse.vctxo_sensitivity) >> 8; + g_gpsdo.tune.coarse -= (freq_diff * vctxo_params[g_gpsdo.vctxo].iKv) >> 8; pdm_set(PDM_CLK_HI, true, g_gpsdo.tune.coarse, false); /* Skip next measurement */ @@ -357,5 +365,5 @@ /* Initial state and config */ g_gpsdo.state = STATE_HOLD_OVER; - g_gpsdo.coarse.vctxo_sensitivity = vctxo_sensitivity[vctxo]; + g_gpsdo.vctxo = vctxo; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29608 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: Iffea8992130eccd98a2952b08277e3d0d2568a1f Gerrit-Change-Number: 29608 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Use PID loop instead of ad-hoc algo

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29609 ) Change subject: icE1usb fw/gpsdo: Use PID loop instead of ad-hoc algo ...................................................................... icE1usb fw/gpsdo: Use PID loop instead of ad-hoc algo The original algo is just somehting I originally came up with on the spot and worked and I never got the time to revisit. Now after some testing, I implemented a PID loop that seems to present faster lock time and at least as good stability. Parameters were not thorougly optimized just some 'hand' tuning trying to simulate the behavior. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ie3ea7243aa4234585f1ace222632bb5580caca75 --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 22 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index 5975100..573c0bb 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -49,8 +49,8 @@ /* Fine tracking */ struct { - int acc; - int div; + int acc; /* Accumulated error */ + int integral; /* PID Integral term */ } fine; } g_gpsdo; @@ -60,6 +60,7 @@ * VCXTO parameters * * - iKv is reciprocal sensitivity vs 'coarse' count for fast initial acquisition + * - Kp, Ki, Kd are params for the fine-tracking PID loop * * Note that the spec if often a guaranteed minimum range and goes * from ~0.1V to 3.2V instead of 0-3.3V so actual sensitivity is @@ -67,13 +68,22 @@ */ static const struct { int iKv; /* hi-count / Hz (.8 fixed point) */ + int Kp; /* PID proportional term (.12 fixed point) */ + int Ki; /* PID integral term (.12 fixed point) */ + int Kd; /* PID differential term (.12 fixed point) */ } vctxo_params[] = { [VCTXO_TAITIEN_VT40] = { .iKv = 300, /* +- 50 ppm pull range => ~ 0.75 Hz / hi-count (set to 0.85) */ + .Kp = 14336, + .Ki = 410, + .Kd = -6144, }, [VCTXO_SITIME_SIT3808_E] = { .iKv = 160, /* +- 100 ppm pull range => ~ 1.50 Hz / hi-count (set to 1.6) */ + .Kp = 7168, + .Ki = 205, + .Kd = -4096, }, }; @@ -188,7 +198,7 @@ /* Reset the long term error tracking */ g_gpsdo.fine.acc = 0; - g_gpsdo.fine.div = 0; + g_gpsdo.fine.integral = 0; } static void @@ -219,7 +229,6 @@ _gpsdo_fine_track(uint32_t tick_diff) { int freq_diff = (int)tick_diff - TARGET; - uint16_t tune; /* Did we deviate too much ? */ if ((freq_diff < -2*MAX_DEV_FINE) || (freq_diff > 2*MAX_DEV_FINE)) { @@ -227,30 +236,16 @@ return; } - /* Accumulate long term error */ + /* Accumulate long term error and integrate it */ g_gpsdo.fine.acc += freq_diff; + g_gpsdo.fine.integral += g_gpsdo.fine.acc; - /* Update fine tuning value */ - if (((g_gpsdo.fine.acc >= 0) && (freq_diff > 0)) || - ((g_gpsdo.fine.acc <= 0) && (freq_diff < 0))) - { - g_gpsdo.tune.fine -= freq_diff; - } - - if (g_gpsdo.fine.acc) { - if (++g_gpsdo.fine.div > 10) { - g_gpsdo.fine.div = 0; - if (g_gpsdo.fine.acc > 0) - g_gpsdo.tune.fine--; - else if (g_gpsdo.fine.acc < 0) - g_gpsdo.tune.fine++; - } - } else { - g_gpsdo.fine.div = 0; - } - - /* Compute value with a bias from long term accumulator */ - tune = g_gpsdo.tune.fine - (g_gpsdo.fine.acc / 2); + /* PID */ + g_gpsdo.tune.fine = 2048 - (( + vctxo_params[g_gpsdo.vctxo].Kp * g_gpsdo.fine.acc + + vctxo_params[g_gpsdo.vctxo].Ki * g_gpsdo.fine.integral + + vctxo_params[g_gpsdo.vctxo].Kd * freq_diff + ) >> 12); /* If fine tune is getting close to boundary, do our * best to transfer part of it to coarse tuning */ @@ -260,13 +255,12 @@ g_gpsdo.tune.coarse += coarse_adj; g_gpsdo.tune.fine -= coarse_adj << 6; - tune -= coarse_adj << 6; pdm_set(PDM_CLK_HI, true, g_gpsdo.tune.coarse, false); } /* Apply fine */ - pdm_set(PDM_CLK_LO, true, tune, false); + pdm_set(PDM_CLK_LO, true, g_gpsdo.tune.fine, false); /* Debug */ #ifdef GPSDO_DEBUG -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29609 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: Ie3ea7243aa4234585f1ace222632bb5580caca75 Gerrit-Change-Number: 29609 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Add Notify PPS on Carrier Detect option

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29611 ) Change subject: icE1usb fw: Add Notify PPS on Carrier Detect option ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29611 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: Ie5d163434323a23912228003add9870fafefedf9 Gerrit-Change-Number: 29611 Gerrit-PatchSet: 2 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: Tue, 04 Oct 2022 17:16:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Limit dfuprog to proper USB IDs

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29613 ) Change subject: icE1usb fw: Limit dfuprog to proper USB IDs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29613 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: Iaf96565b4068c2d6aa46d8bedac1fad618130a26 Gerrit-Change-Number: 29613 Gerrit-PatchSet: 2 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: Tue, 04 Oct 2022 17:16:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022