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

Change in osmo-e1-hardware[master]: icE1usb fw: Minor doc string update

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30063 ) Change subject: icE1usb fw: Minor doc string update ...................................................................... icE1usb fw: Minor doc string update Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: If0b37021698b2d17b8412a1c05a9c7101b06a506 --- M firmware/ice40-riscv/icE1usb/ice1usb_proto.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h index 38cb23b..5b65d76 100644 --- a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h +++ b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h @@ -16,6 +16,8 @@ /*! returns a bit-mask of optional device capabilities (see enum e1usb_dev_capability) */ #define ICE1USB_DEV_GET_CAPABILITIES 0x01 + +/*! returns a string describing the firmware version */ #define ICE1USB_DEV_GET_FW_BUILD 0x02 enum e1usb_dev_capability { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30063 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: If0b37021698b2d17b8412a1c05a9c7101b06a506 Gerrit-Change-Number: 30063 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, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Process read/write device requests separately

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30064 ) Change subject: icE1usb fw: Process read/write device requests separately ...................................................................... icE1usb fw: Process read/write device requests separately Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9a8fb3d6712c83f59e5e4cba8e0bcbd4d4f95eee --- M firmware/ice40-riscv/icE1usb/usb_dev.c 1 file changed, 25 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/usb_dev.c b/firmware/ice40-riscv/icE1usb/usb_dev.c index e19d9a0..e834142 100644 --- a/firmware/ice40-riscv/icE1usb/usb_dev.c +++ b/firmware/ice40-riscv/icE1usb/usb_dev.c @@ -21,13 +21,19 @@ static enum usb_fnd_resp -_usb_dev_ctrl_req(struct usb_ctrl_req *req, struct usb_xfer *xfer) +_usb_dev_ctrl_req_write(struct usb_ctrl_req *req, struct usb_xfer *xfer) { - /* Check it's a device-wide vendor request */ - if (USB_REQ_TYPE_RCPT(req) != (USB_REQ_TYPE_VENDOR | USB_REQ_RCPT_DEV)) - return USB_FND_CONTINUE; + switch (req->bRequest) { + default: + return USB_FND_ERROR; + } - /* Dispatch / Handle */ + return USB_FND_SUCCESS; +} + +static enum usb_fnd_resp +_usb_dev_ctrl_req_read(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ switch (req->bRequest) { case ICE1USB_DEV_GET_CAPABILITIES: xfer->data[0] = (1 << ICE1USB_DEV_CAP_GPSDO); @@ -44,6 +50,20 @@ return USB_FND_SUCCESS; } +static enum usb_fnd_resp +_usb_dev_ctrl_req(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + /* Check it's a device-wide vendor request */ + if (USB_REQ_TYPE_RCPT(req) != (USB_REQ_TYPE_VENDOR | USB_REQ_RCPT_DEV)) + return USB_FND_CONTINUE; + + /* Read / Write dispatch */ + if (USB_REQ_IS_READ(req)) + return _usb_dev_ctrl_req_read(req, xfer); + else + return _usb_dev_ctrl_req_write(req, xfer); +} + static struct usb_fn_drv _dev_drv = { .ctrl_req = _usb_dev_ctrl_req, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30064 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: I9a8fb3d6712c83f59e5e4cba8e0bcbd4d4f95eee Gerrit-Change-Number: 30064 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, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Import I2C peripheral driver

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30065 ) Change subject: icE1usb fw: Import I2C peripheral driver ...................................................................... icE1usb fw: Import I2C peripheral driver Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ib729bb5f4e94eec25c86517042cdfdcb6847ba25 --- M firmware/ice40-riscv/icE1usb/Makefile A firmware/ice40-riscv/icE1usb/i2c.c A firmware/ice40-riscv/icE1usb/i2c.h 3 files changed, 149 insertions(+), 0 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 3fde2ca..f385408 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -55,6 +55,7 @@ gps.h \ gpsdo.h \ ice1usb_proto.h \ + i2c.h \ misc.h \ usb_desc_ids.h \ usb_dev.h \ @@ -69,6 +70,7 @@ fw_app.c \ gps.c \ gpsdo.c \ + i2c.c \ misc.c \ usb_desc_app.c \ usb_dev.c \ diff --git a/firmware/ice40-riscv/icE1usb/i2c.c b/firmware/ice40-riscv/icE1usb/i2c.c new file mode 100644 index 0000000..d3a9378 --- /dev/null +++ b/firmware/ice40-riscv/icE1usb/i2c.c @@ -0,0 +1,125 @@ +/* + * i2c.c + * + * Copyright (C) 2021-2022 Sylvain Munaut <tnt(a)246tNt.com> + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#include <stdint.h> +#include <stdbool.h> + +#include "console.h" + +#include "config.h" + + +struct i2c { + uint32_t csr; +} __attribute__((packed,aligned(4))); + +#define I2C_CMD_START (0 << 12) +#define I2C_CMD_STOP (1 << 12) +#define I2C_CMD_WRITE (2 << 12) +#define I2C_CMD_READ (3 << 12) + +#define I2C_GET_RESP (1 << 15) +#define I2C_ACK (0 << 8) /* ack bit value = 0 means ACK */ +#define I2C_NAK (1 << 8) /* ack bit value = 1 means NAK */ + +#define I2C_VALID (1 << 31) + + +static volatile struct i2c * const i2c_regs = (void *)(I2C_BASE); + + +static inline uint32_t +_i2c_wait(void) +{ + uint32_t v; + + do { + v = i2c_regs->csr; + } while (!(v & I2C_VALID)); + + return v & 0x1ff; +} + +bool +i2c_ready(void) +{ + return i2c_regs->csr & (1 << 31); +} + +void +i2c_start(void) +{ + i2c_regs->csr = I2C_CMD_START; +} + +void +i2c_stop(void) +{ + i2c_regs->csr = I2C_CMD_STOP; +} + +bool +i2c_write(uint8_t data) +{ + i2c_regs->csr = I2C_CMD_WRITE | data; + return (_i2c_wait() & (I2C_ACK | I2C_NAK)) == I2C_ACK; +} + +uint8_t +i2c_read(bool ack) +{ + i2c_regs->csr = I2C_CMD_READ | I2C_GET_RESP | (ack ? I2C_ACK : I2C_NAK); + return _i2c_wait() & 0xff; +} + + +bool +i2c_write_reg(uint8_t dev, uint8_t reg, uint8_t val) +{ + bool rv = true; + i2c_start(); + rv = rv && i2c_write(dev); + rv = rv && i2c_write(reg); + rv = rv && i2c_write(val); + i2c_stop(); + return rv; +} + +bool +i2c_read_reg(uint8_t dev, uint8_t reg, uint8_t *val) +{ + bool rv = true; + i2c_start(); + rv = rv && i2c_write(dev); + rv = rv && i2c_write(reg); + if (rv) + i2c_start(); + rv = rv && i2c_write(dev|1); + *val = rv ? i2c_read(false) : 0x00; // NAK + i2c_stop(); + return rv; +} + + +bool +i2c_probe(uint8_t dev) +{ + bool rv; + i2c_start(); + rv = i2c_write(dev); + i2c_stop(); + return rv; +} + +void +i2c_scan(void) +{ + for (uint8_t addr=0; addr<128; addr++) { + if (i2c_probe(addr << 1)) + printf("I2C @ %08x\n", addr << 1); + } +} diff --git a/firmware/ice40-riscv/icE1usb/i2c.h b/firmware/ice40-riscv/icE1usb/i2c.h new file mode 100644 index 0000000..da11eb5 --- /dev/null +++ b/firmware/ice40-riscv/icE1usb/i2c.h @@ -0,0 +1,22 @@ +/* + * i2c.h + * + * Copyright (C) 2021-2022 Sylvain Munaut <tnt(a)246tNt.com> + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#pragma once + +#include <stdbool.h> +#include <stdint.h> + +void i2c_start(void); +void i2c_stop(void); +bool i2c_write(uint8_t data); +uint8_t i2c_read(bool ack); + +bool i2c_write_reg(uint8_t dev, uint8_t reg, uint8_t val); +bool i2c_read_reg (uint8_t dev, uint8_t reg, uint8_t *val); + +bool i2c_probe(uint8_t dev); +void i2c_scan(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30065 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: Ib729bb5f4e94eec25c86517042cdfdcb6847ba25 Gerrit-Change-Number: 30065 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, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw/gpsdo: Only force HOLD_OVER when no PPS if not DISABLED

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30061 ) Change subject: icE1usb fw/gpsdo: Only force HOLD_OVER when no PPS if not DISABLED ...................................................................... icE1usb fw/gpsdo: Only force HOLD_OVER when no PPS if not DISABLED Bug introduced in da395cc9224f57300d8b05b8369f08d202f5c184 but since we never had anyway to use manual mode before, didn't get noticed ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I6e2b6cf5c7c0c9deaf429be000770316ec88b9d4 --- M firmware/ice40-riscv/icE1usb/gpsdo.c 1 file changed, 2 insertions(+), 1 deletion(-) 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 2481c2e..bb3801e 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -278,7 +278,8 @@ 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)) { + if ((g_gpsdo.state != STATE_DISABLED) && + 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; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30061 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: I6e2b6cf5c7c0c9deaf429be000770316ec88b9d4 Gerrit-Change-Number: 30061 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, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Fix typo in SPDX header

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30062 ) Change subject: icE1usb fw: Fix typo in SPDX header ...................................................................... icE1usb fw: Fix typo in SPDX header Those files barely even qualify for a license anyway but for consistency's sake ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9585f7f01d2dc8393828aa264ae353e2a53a37dd --- M firmware/ice40-riscv/icE1usb/config.h M firmware/ice40-riscv/icE1usb/usb_desc_ids.h 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/config.h b/firmware/ice40-riscv/icE1usb/config.h index f467b65..a27a53c 100644 --- a/firmware/ice40-riscv/icE1usb/config.h +++ b/firmware/ice40-riscv/icE1usb/config.h @@ -2,7 +2,7 @@ * config.h * * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> - * SPDX-License-Identifier: LGPL-3.0-or-later + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index ab3d156..df0331e 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -2,7 +2,7 @@ * usb_desc_ids.h * * Copyright (C) 2022 Sylvain Munaut <tnt(a)246tNt.com> - * SPDX-License-Identifier: LGPL-3.0-or-later + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30062 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: I9585f7f01d2dc8393828aa264ae353e2a53a37dd Gerrit-Change-Number: 30062 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, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Add device request to read/write I2C device registers

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30066 ) Change subject: icE1usb fw: Add device request to read/write I2C device registers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30066 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: I55a72762d535827a51e5ea1775e9abbd116bc8a8 Gerrit-Change-Number: 30066 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: Wed, 09 Nov 2022 15:46:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Import I2C peripheral driver

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30065 ) Change subject: icE1usb fw: Import I2C peripheral driver ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30065 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: Ib729bb5f4e94eec25c86517042cdfdcb6847ba25 Gerrit-Change-Number: 30065 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: Wed, 09 Nov 2022 15:46:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Process read/write device requests separately

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30064 ) Change subject: icE1usb fw: Process read/write device requests separately ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30064 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: I9a8fb3d6712c83f59e5e4cba8e0bcbd4d4f95eee Gerrit-Change-Number: 30064 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: Wed, 09 Nov 2022 15:45:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Minor doc string update

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30063 ) Change subject: icE1usb fw: Minor doc string update ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30063 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: If0b37021698b2d17b8412a1c05a9c7101b06a506 Gerrit-Change-Number: 30063 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: Wed, 09 Nov 2022 15:45:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Fix typo in SPDX header

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30062 ) Change subject: icE1usb fw: Fix typo in SPDX header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/30062 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: I9585f7f01d2dc8393828aa264ae353e2a53a37dd Gerrit-Change-Number: 30062 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: Wed, 09 Nov 2022 15:45:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022