- gerrit-log - lists.osmocom.org

Change in osmo-bsc[2022q1]: smscb: Always start ETWS timer even in cells without ETWS support
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28017 ) Change subject: smscb: Always start ETWS timer even in cells without ETWS support ...................................................................... smscb: Always start ETWS timer even in cells without ETWS support ETWS is sent over both dedicated channels and broadcast channels. Some BTS models may not support the latter, but it is still useful to start the related timer to ensure bts->etws.active gets set to false after the emergency period has concluded. Change-Id: I448be9fd75b87c1f7333a5bfa4f6ba238569fdc3 (cherry picked from commit bcd0f63dce341878bc3e4e67dd2cb29507ba1f39) --- M src/osmo-bsc/smscb.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/28017/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index fc347eb..208c203 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -538,13 +538,15 @@ if (osmo_bts_has_feature(&bts->features, BTS_FEAT_ETWS_PN)) { rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, bes->primary, sizeof(bes->primary)); LOG_BTS(bts, DCBS, LOGL_NOTICE, "Sent ETWS Primary Notification via common channel\n"); - if (wrepl->u.emergency.warning_period != 0xffffffff) { - osmo_timer_schedule(&bts->etws.timer, wrepl->u.emergency.warning_period, 0); - } else - LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " - "normal network operation due to PCH blockage\n"); } else LOG_BTS(bts, DCBS, LOGL_ERROR, "BTS doesn't support RSL command for ETWS PN\n"); + + /* start the expiration timer, if any */ + if (wrepl->u.emergency.warning_period != 0xffffffff) { + osmo_timer_schedule(&bts->etws.timer, wrepl->u.emergency.warning_period, 0); + } else + LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " + "normal network operation due to PCH blockage\n"); } /*! Try to execute a write-replace operation; roll-back if it fails. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2022q1 Gerrit-Change-Id: I448be9fd75b87c1f7333a5bfa4f6ba238569fdc3 Gerrit-Change-Number: 28017 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[2022q1]: smscb: Store ETWS input state from CBSP
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28016 ) Change subject: smscb: Store ETWS input state from CBSP ...................................................................... smscb: Store ETWS input state from CBSP Only if we store data like the CBSP message_id and serial_number we are able to later (in a subsequent patch) match a CBSP KILL for ETWS/PWS and stop emergency broadcast. Change-Id: Ide74638880d7e3c6a7c774bf6320d3dce4b11c74 Related: OS#5540 (cherry picked from commit 484f535c5091e3ca62547f8bbb6e06844c2ce8ae) --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/smscb.h M src/osmo-bsc/bts.c M src/osmo-bsc/smscb.c 5 files changed, 73 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/28016/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index cd0f8cb..d3c2ba7 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -586,7 +586,7 @@ struct osmo_timer_list cbch_timer; struct bts_smscb_chan_state cbch_basic; struct bts_smscb_chan_state cbch_extended; - struct osmo_timer_list etws_timer; /* when to stop ETWS PN */ + struct bts_etws_state etws; struct llist_head oml_fail_rep; struct llist_head chan_rqd_queue; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4a58c2b..b69ebf4 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1106,6 +1106,27 @@ uint8_t overflow; }; +#define ETWS_PRIM_NOTIF_SIZE 56 +#define ETWS_SEC_INFO_SIZE (ETWS_PRIM_NOTIF_SIZE - sizeof(struct gsm341_etws_message)) + +/* per-BTS ETWS/PWS (Emergency) state */ +struct bts_etws_state { + /* are we actively broadcasting emergency in this cell? */ + bool active; + /* input parameters received from CBC */ + struct { + uint16_t msg_id; + uint16_t serial_nr; + uint16_t warn_type; + uint8_t *sec_info; + } input; + /* encoded ETWS primary notification */ + uint8_t primary[ETWS_PRIM_NOTIF_SIZE]; + + /* timer running for the duration of the ETWS Primary Notification (PN) */ + struct osmo_timer_list timer; +}; + struct bts_oml_fail_rep { struct llist_head list; time_t time; diff --git a/include/osmocom/bsc/smscb.h b/include/osmocom/bsc/smscb.h index f48c1a1..5b0905b 100644 --- a/include/osmocom/bsc/smscb.h +++ b/include/osmocom/bsc/smscb.h @@ -64,3 +64,5 @@ void cbc_vty_init(void); int bsc_cbc_link_restart(void); int cbsp_tx_decoded(struct bsc_cbc_link *cbc, struct osmo_cbsp_decoded *decoded); + +void bts_etws_init(struct gsm_bts *bts); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 843d711..1024cfe 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -24,6 +24,7 @@ #include <osmocom/bsc/bts.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/nm_common_fsm.h> +#include <osmocom/bsc/smscb.h> const struct value_string bts_attribute_names[] = { OSMO_VALUE_STRING(BTS_TYPE_VARIANT), @@ -393,6 +394,7 @@ bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); + bts_etws_init(bts); acc_mgr_init(&bts->acc_mgr, bts); acc_ramp_init(&bts->acc_ramp, bts); diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index c89bedb..fc347eb 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -59,8 +59,6 @@ INIT_LLIST_HEAD(old); } -#define ETWS_PRIM_NOTIF_SIZE 56 - /* Build a ETWS Primary Notification message as per TS 23.041 9.4.1.3 */ static int gen_etws_primary_notification(uint8_t *out, uint16_t serial_nr, uint16_t msg_id, uint16_t warn_type, const uint8_t *sec_info) @@ -471,24 +469,52 @@ * Per-BTS Processing of CBSP from CBC, called via cbsp_per_bts() *********************************************************************************/ +static void etws_pn_stop(struct gsm_bts *bts, bool timeout) +{ + if (osmo_bts_has_feature(&bts->features, BTS_FEAT_ETWS_PN)) { + LOG_BTS(bts, DCBS, LOGL_NOTICE, "ETWS PN broadcast via PCH disabled (cause=%s)\n", + timeout ? "timeout" : "request"); + rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, NULL, 0); + } + bts->etws.active = false; + if (!timeout) + osmo_timer_del(&bts->etws.timer); +} + /* timer call-back once ETWS warning period has expired */ static void etws_pn_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *)data; - LOG_BTS(bts, DCBS, LOGL_NOTICE, "ETWS PN Timeout; disabling broadcast via PCH\n"); - rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, NULL, 0); + etws_pn_stop(bts, true); } static void etws_primary_to_bts(struct gsm_bts *bts, const struct osmo_cbsp_write_replace *wrepl) { - uint8_t etws_primary[ETWS_PRIM_NOTIF_SIZE]; + struct bts_etws_state *bes = &bts->etws; struct gsm_bts_trx *trx; unsigned int count = 0; int i, j; - gen_etws_primary_notification(etws_primary, wrepl->new_serial_nr, wrepl->msg_id, - wrepl->u.emergency.warning_type, - wrepl->u.emergency.warning_sec_info); + if (bes->input.sec_info) { + talloc_free(bes->input.sec_info); + bes->input.sec_info = NULL; + } + + /* copy over all the data to per-BTS private state */ + bes->input.msg_id = wrepl->msg_id; + bes->input.serial_nr = wrepl->new_serial_nr; + bes->input.warn_type = wrepl->u.emergency.warning_type; + if (wrepl->u.emergency.warning_sec_info) { + bes->input.sec_info = talloc_named_const(bts, ETWS_SEC_INFO_SIZE, "etws_sec_info"); + if (bes->input.sec_info) + memcpy(bes->input.sec_info, wrepl->u.emergency.warning_sec_info, ETWS_SEC_INFO_SIZE); + } + + /* generate the encoded ETWS PN */ + gen_etws_primary_notification(bes->primary, bes->input.serial_nr, bes->input.msg_id, + bes->input.warn_type, bes->input.sec_info); + + bes->active = true; /* iterate over all lchan in each TS in each TRX of this BTS */ llist_for_each_entry(trx, &bts->trx_list, list) { @@ -498,8 +524,8 @@ struct gsm_lchan *lchan = &ts->lchan[j]; if (!lchan_may_receive_data(lchan)) continue; - gsm48_send_rr_app_info(lchan, 0x1, 0x0, etws_primary, - sizeof(etws_primary)); + gsm48_send_rr_app_info(lchan, 0x1, 0x0, bes->primary, + sizeof(bes->primary)); count++; } } @@ -510,11 +536,10 @@ /* Notify BTS of primary ETWS notification via vendor-specific Abis message */ if (osmo_bts_has_feature(&bts->features, BTS_FEAT_ETWS_PN)) { - rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, etws_primary, sizeof(etws_primary)); + rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, bes->primary, sizeof(bes->primary)); LOG_BTS(bts, DCBS, LOGL_NOTICE, "Sent ETWS Primary Notification via common channel\n"); if (wrepl->u.emergency.warning_period != 0xffffffff) { - osmo_timer_setup(&bts->etws_timer, etws_pn_cb, bts); - osmo_timer_schedule(&bts->etws_timer, wrepl->u.emergency.warning_period, 0); + osmo_timer_schedule(&bts->etws.timer, wrepl->u.emergency.warning_period, 0); } else LOG_BTS(bts, DCBS, LOGL_NOTICE, "Unlimited ETWS PN broadcast, this breaks " "normal network operation due to PCH blockage\n"); @@ -676,7 +701,7 @@ llist_for_each_entry_safe(smscb, smscb2, &chan_state->messages, list) bts_smscb_del(smscb, chan_state, "RESET"); - osmo_timer_del(&bts->etws_timer); + osmo_timer_del(&bts->etws.timer); /* Make sure that broadcast is disabled */ rsl_etws_pn_command(bts, RSL_CHAN_PCH_AGCH, NULL, 0); @@ -991,3 +1016,11 @@ { install_element_ve(&bts_show_cbs_cmd); } + + +/* initialize the ETWS state of a BTS */ +void bts_etws_init(struct gsm_bts *bts) +{ + bts->etws.active = false; + osmo_timer_setup(&bts->etws.timer, etws_pn_cb, bts); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2022q1 Gerrit-Change-Id: Ide74638880d7e3c6a7c774bf6320d3dce4b11c74 Gerrit-Change-Number: 28016 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[2022q1]: smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE
by laforge 03 May '22

03 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28015 ) Change subject: smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE ...................................................................... smscb: Don't include extraneous IEs in CBSP KILL COMPLETE / FAILURE TS 48.049 states the following rules for the KILL COMPLETE / FAILURE messages: The Number of Broadcasts Completed List IE, if present, contains for each cell the total number of broadcasts of the killed CBS message. The Cell List IE, if present, contains the cells in which the emergency message is successfully terminated. As any message can only be either emergency or CBS, this means that we can (at maximum) have only one of those two IEs in the message. As there is no explicit indication in the KILL whether it relates to CBS or Emergency, we use the "Channel Indicator" IE, which is specified as "only included if the message refers to a CBS message". Related: SYS#5906 Closes: OS#5541 Change-Id: I9a43d386da01f085663d231a555b8b5acc99faca (cherry picked from commit 5e7458cbd8d38b3a2d8f3444c79aa03e82104ade) --- M src/osmo-bsc/smscb.c 1 file changed, 20 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/15/28015/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 5fe6345..c89bedb 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -791,11 +791,16 @@ fail->channel_ind = kill->channel_ind; llist_replace_head(&fail->fail_list, &r_state->fail); - fail->cell_list.id_discr = r_state->success.id_discr; - llist_replace_head(&fail->cell_list.list, &r_state->success.list); - - fail->num_compl_list.id_discr = r_state->num_completed.id_discr; - llist_replace_head(&fail->num_compl_list.list, &r_state->num_completed.list); + /* if the KILL relates to CBS, the "Channel Indicator" IE is present */ + if (kill->channel_ind) { + /* only if it was CBS */ + fail->num_compl_list.id_discr = r_state->num_completed.id_discr; + llist_replace_head(&fail->num_compl_list.list, &r_state->num_completed.list); + } else { + /* only if it was emergency */ + fail->cell_list.id_discr = r_state->success.id_discr; + llist_replace_head(&fail->cell_list.list, &r_state->success.list); + } } else { resp = osmo_cbsp_decoded_alloc(cbc, CBSP_MSGT_KILL_COMPL); struct osmo_cbsp_kill_complete *compl = &resp->u.kill_compl; @@ -803,11 +808,16 @@ compl->old_serial_nr = kill->old_serial_nr; compl->channel_ind = kill->channel_ind; - compl->cell_list.id_discr = r_state->success.id_discr; - llist_replace_head(&compl->cell_list.list, &r_state->success.list); - - compl->num_compl_list.id_discr = r_state->num_completed.id_discr; - llist_replace_head(&compl->num_compl_list.list, &r_state->num_completed.list); + /* if the KILL relates to CBS, the "Channel Indicator" IE is present */ + if (kill->channel_ind) { + /* only if it was CBS */ + compl->num_compl_list.id_discr = r_state->num_completed.id_discr; + llist_replace_head(&compl->num_compl_list.list, &r_state->num_completed.list); + } else { + /* only if it was emergency */ + compl->cell_list.id_discr = r_state->success.id_discr; + llist_replace_head(&compl->cell_list.list, &r_state->success.list); + } } cbsp_tx_decoded(cbc, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2022q1 Gerrit-Change-Id: I9a43d386da01f085663d231a555b8b5acc99faca Gerrit-Change-Number: 28015 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: firmware: Remove a couple of questionable debug puts()
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28014 ) Change subject: firmware: Remove a couple of questionable debug puts() ...................................................................... firmware: Remove a couple of questionable debug puts() Those were low level debug meant to be temporary and somehow ended up committed. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ie1b802f347b0de9ea82edb61faaba6094b8f4dfa --- M firmware/ice40-riscv/e1-tracer/fw_app.c M firmware/ice40-riscv/icE1usb/usb_e1.c 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/14/28014/1 diff --git a/firmware/ice40-riscv/e1-tracer/fw_app.c b/firmware/ice40-riscv/e1-tracer/fw_app.c index 3ddbf50..7db941e 100644 --- a/firmware/ice40-riscv/e1-tracer/fw_app.c +++ b/firmware/ice40-riscv/e1-tracer/fw_app.c @@ -165,8 +165,6 @@ /* SPI */ spi_init(); - puts("XXX\n"); - /* Enable USB directly */ serial_no_init(); usb_init(&app_stack_desc); diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 6fdaa91..4e52408 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -200,10 +200,6 @@ /* Next BDI */ bdi ^= 1; usb_e1->out_bdi = bdi; - - static int x = 0; - if ((x++ & 0xff) == 0xff) - puts("."); } /* Feedback endpoint */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28014 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: Ie1b802f347b0de9ea82edb61faaba6094b8f4dfa Gerrit-Change-Number: 28014 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/icE1usb: Use custom I2C core by default rather than SB_I2C
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28013 ) Change subject: gateware/icE1usb: Use custom I2C core by default rather than SB_I2C ...................................................................... gateware/icE1usb: Use custom I2C core by default rather than SB_I2C SB_I2C is apparently just a pain to use and buggy and such, so use our custom one. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I1596ccbf03dd4450f519fe9b54a7fece125a7fbc --- M gateware/icE1usb/rtl/top.v 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/13/28013/1 diff --git a/gateware/icE1usb/rtl/top.v b/gateware/icE1usb/rtl/top.v index 7762fb0..a2b8979 100644 --- a/gateware/icE1usb/rtl/top.v +++ b/gateware/icE1usb/rtl/top.v @@ -12,8 +12,8 @@ `default_nettype none // `define WITH_SINGLE_CHANNEL -`define WITH_SB_I2C -// `define WITH_CUSTOM_I2C +// `define WITH_SB_I2C +`define WITH_CUSTOM_I2C module top ( // E1 PHY -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28013 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: I1596ccbf03dd4450f519fe9b54a7fece125a7fbc Gerrit-Change-Number: 28013 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/icE1usb: Set divider of I2C core to be ~ 400 kHz
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28012 ) Change subject: gateware/icE1usb: Set divider of I2C core to be ~ 400 kHz ...................................................................... gateware/icE1usb: Set divider of I2C core to be ~ 400 kHz Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I1dd4ab34da9d01b599cf9c782e721aaee9b8740d --- M gateware/icE1usb/rtl/top.v 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/12/28012/1 diff --git a/gateware/icE1usb/rtl/top.v b/gateware/icE1usb/rtl/top.v index fdf75a1..7762fb0 100644 --- a/gateware/icE1usb/rtl/top.v +++ b/gateware/icE1usb/rtl/top.v @@ -316,7 +316,7 @@ // Controller i2c_master_wb #( - .DW(3), + .DW(4), .FIFO_DEPTH(0) ) i2c_I ( .scl_oe (i2c_scl_oe), -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28012 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: I1dd4ab34da9d01b599cf9c782e721aaee9b8740d Gerrit-Change-Number: 28012 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/icE1usb: Typo in instance names
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28010 ) Change subject: gateware/icE1usb: Typo in instance names ...................................................................... gateware/icE1usb: Typo in instance names Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I7db544b4ff98fcfc382193f040550f377178aebf --- M gateware/icE1usb/rtl/misc.v 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/10/28010/1 diff --git a/gateware/icE1usb/rtl/misc.v b/gateware/icE1usb/rtl/misc.v index 1dd9f8c..7aaa068 100644 --- a/gateware/icE1usb/rtl/misc.v +++ b/gateware/icE1usb/rtl/misc.v @@ -198,7 +198,7 @@ .PIN_TYPE(6'b000000), // Reg input, no output .PULLUP(1'b0), .IO_STANDARD("SB_LVCMOS") - ) btn_iob_I ( + ) pps_iob_I ( .PACKAGE_PIN(gps_pps), .INPUT_CLK (clk), .D_IN_0 (gps_pps_iob) @@ -209,7 +209,7 @@ .L(2), .RST_VAL(1'b0), .WITH_SYNCHRONIZER(1) - ) btn_flt_I ( + ) pps_flt_I ( .in (gps_pps_iob), .val (), .rise (gps_pps_r), -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28010 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: I7db544b4ff98fcfc382193f040550f377178aebf Gerrit-Change-Number: 28010 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/icE1usb: Replace local I2C core with no2misc one
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28011 ) Change subject: gateware/icE1usb: Replace local I2C core with no2misc one ...................................................................... gateware/icE1usb: Replace local I2C core with no2misc one This core has been merged (and improved) upstream, so update the submodule, remove local copy and make the required tweaks. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I79fca561fee32bbaec94882b4f65c7ecaa44be11 --- M gateware/cores/no2misc M gateware/icE1usb/Makefile D gateware/icE1usb/rtl/i2c_master.v D gateware/icE1usb/rtl/i2c_master_wb.v M gateware/icE1usb/rtl/top.v 5 files changed, 7 insertions(+), 313 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/11/28011/1 diff --git a/gateware/cores/no2misc b/gateware/cores/no2misc index 16103ac..f9d1d47 160000 --- a/gateware/cores/no2misc +++ b/gateware/cores/no2misc @@ -1 +1 @@ -Subproject commit 16103ac61c8f11e63e043229a0a7a085bc38bde0 +Subproject commit f9d1d47620ce81e9545287c585a5e8f0873b1661 diff --git a/gateware/icE1usb/Makefile b/gateware/icE1usb/Makefile index 790a1cb..8c3f49a 100644 --- a/gateware/icE1usb/Makefile +++ b/gateware/icE1usb/Makefile @@ -3,8 +3,6 @@ PROJ_DEPS := no2e1 no2ice40 no2misc no2usb PROJ_RTL_SRCS := $(addprefix rtl/, \ - i2c_master.v \ - i2c_master_wb.v \ led_blinker.v \ misc.v \ sr_btn_if.v \ diff --git a/gateware/icE1usb/rtl/i2c_master.v b/gateware/icE1usb/rtl/i2c_master.v deleted file mode 100644 index 16e7555..0000000 --- a/gateware/icE1usb/rtl/i2c_master.v +++ /dev/null @@ -1,192 +0,0 @@ -/* - * i2c_master.v - * - * vim: ts=4 sw=4 - * - * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> - * SPDX-License-Identifier: CERN-OHL-P-2.0 - */ - -`default_nettype none - -module i2c_master #( - parameter integer DW = 3 -)( - // IOs - output reg scl_oe, - output reg sda_oe, - input wire sda_i, - - // Control - input wire [7:0] data_in, - input wire ack_in, - input wire [1:0] cmd, - input wire stb, - - output wire [7:0] data_out, - output wire ack_out, - - output wire ready, - - // Clock / Reset - input wire clk, - input wire rst -); - - // Commands - localparam [2:0] CMD_START = 3'b00; - localparam [2:0] CMD_STOP = 3'b01; - localparam [2:0] CMD_WRITE = 3'b10; - localparam [2:0] CMD_READ = 3'b11; - - // FSM states - localparam - ST_IDLE = 0, - ST_LOWER_SCL = 1, - ST_LOW_CYCLE = 2, - ST_RISE_SCL = 3, - ST_HIGH_CYCLE = 4; - - - // Signals - // ------- - - reg [2:0] state; - reg [2:0] state_nxt; - - reg [1:0] cmd_cur; - - reg [DW:0] cyc_cnt; - wire cyc_now; - - reg [3:0] bit_cnt; - wire bit_last; - - reg [8:0] data_reg; - - - // State Machine - // ------------- - - always @(posedge clk) - if (rst) - state <= ST_IDLE; - else - state <= state_nxt; - - always @(*) - begin - // Default is to stay put - state_nxt = state; - - // Act depending on current state - case (state) - ST_IDLE: - if (stb) - state_nxt = ST_LOW_CYCLE; - - ST_LOW_CYCLE: - if (cyc_now) - state_nxt = ST_RISE_SCL; - - ST_RISE_SCL: - if (cyc_now) - state_nxt = ST_HIGH_CYCLE; - - ST_HIGH_CYCLE: - if (cyc_now) - state_nxt = (cmd_cur == 2'b01) ? ST_IDLE : ST_LOWER_SCL; - - ST_LOWER_SCL: - if (cyc_now) - state_nxt = bit_last ? ST_IDLE : ST_LOW_CYCLE; - endcase - end - - // Misc control - // ------------ - - always @(posedge clk) - if (stb) - cmd_cur <= cmd; - - - // Baud Rate generator - // ------------------- - - always @(posedge clk) - if (state == ST_IDLE) - cyc_cnt <= 0; - else - cyc_cnt <= cyc_cnt[DW] ? 0 : (cyc_cnt + 1); - - assign cyc_now = cyc_cnt[DW]; - - - // Bit count - // --------- - - always @(posedge clk) - if ((state == ST_LOWER_SCL) && cyc_now) - bit_cnt <= bit_cnt + 1; - else if (stb) - case (cmd) - 2'b00: bit_cnt <= 4'h8; // START - 2'b01: bit_cnt <= 4'h8; // STOP - 2'b10: bit_cnt <= 4'h0; // Write - 2'b11: bit_cnt <= 4'h0; // Read - default: bit_cnt <= 4'hx; - endcase - - assign bit_last = bit_cnt[3]; - - - // Data register - // ------------- - - always @(posedge clk) - if ((state == ST_HIGH_CYCLE) && cyc_now) - data_reg <= { data_reg[7:0], sda_i }; - else if (stb) - // Only handle Write / Read. START & STOP is handled in IO mux - data_reg <= cmd[0] ? { 8'b11111111, ack_in } : { data_in, 1'b1 }; - - - // IO - // -- - - always @(posedge clk) - if (rst) - scl_oe <= 1'b0; - else if (cyc_now) begin - if (state == ST_LOWER_SCL) - scl_oe <= 1'b1; - else if (state == ST_RISE_SCL) - scl_oe <= 1'b0; - end - - always @(posedge clk) - if (rst) - sda_oe <= 1'b0; - else if (cyc_now) begin - if (~cmd_cur[1]) begin - if (state == ST_LOW_CYCLE) - sda_oe <= cmd_cur[0]; - else if (state == ST_HIGH_CYCLE) - sda_oe <= ~cmd_cur[0]; - end else begin - if (state == ST_LOW_CYCLE) - sda_oe <= ~data_reg[8]; - end - end - - - // User IF - // ------- - - assign data_out = data_reg[8:1]; - assign ack_out = data_reg[0]; - - assign ready = (state == ST_IDLE); - -endmodule diff --git a/gateware/icE1usb/rtl/i2c_master_wb.v b/gateware/icE1usb/rtl/i2c_master_wb.v deleted file mode 100644 index 0a54971..0000000 --- a/gateware/icE1usb/rtl/i2c_master_wb.v +++ /dev/null @@ -1,102 +0,0 @@ -/* - * i2c_master_wb.v - * - * vim: ts=4 sw=4 - * - * Wishbone wrapper with optional buffering for i2c_master core - * - * Copyright (C) 2019-2020 Sylvain Munaut <tnt(a)246tNt.com> - * SPDX-License-Identifier: CERN-OHL-P-2.0 - */ - -`default_nettype none - -module i2c_master_wb #( - parameter integer DW = 3, - parameter integer FIFO_DEPTH = 0 -)( - // IOs - output wire scl_oe, - output wire sda_oe, - input wire sda_i, - - // Wishbone - output wire [31:0] wb_rdata, - input wire [31:0] wb_wdata, - input wire wb_we, - input wire wb_cyc, - output wire wb_ack, - - output wire ready, - - // Clock / Reset - input wire clk, - input wire rst -); - - // Signals - // ------- - - wire [7:0] data_in; - wire ack_in; - wire [1:0] cmd; - wire stb; - wire [7:0] data_out; - wire ack_out; - - - // Core - // ---- - - i2c_master #( - .DW(DW) - ) core_I ( - .scl_oe (scl_oe), - .sda_oe (sda_oe), - .sda_i (sda_i), - .data_in (data_in), - .ack_in (ack_in), - .cmd (cmd), - .stb (stb), - .data_out(data_out), - .ack_out (ack_out), - .ready (ready), - .clk (clk), - .rst (rst) - ); - - - // Bus interface (no buffer) - // ------------- - - if (FIFO_DEPTH == 0) begin - // No buffer - assign wb_rdata = wb_cyc ? { ready, 22'd0, ack_out, data_out } : 32'h00000000; - - assign cmd = wb_wdata[13:12]; - assign ack_in = wb_wdata[8]; - assign data_in = wb_wdata[7:0]; - - assign stb = wb_cyc & wb_we; - - assign wb_ack = wb_cyc; - end - - - // Bus interface (FIFO) - // ------------- - - if (FIFO_DEPTH > 0) begin - - // Signals - // ------- - - - // FIFOs - // ----- - - - - end - -endmodule diff --git a/gateware/icE1usb/rtl/top.v b/gateware/icE1usb/rtl/top.v index b38f97a..fdf75a1 100644 --- a/gateware/icE1usb/rtl/top.v +++ b/gateware/icE1usb/rtl/top.v @@ -105,6 +105,7 @@ // I2C wire i2c_scl_oe; + wire i2c_scl_i; wire i2c_sda_oe; wire i2c_sda_i; @@ -319,6 +320,7 @@ .FIFO_DEPTH(0) ) i2c_I ( .scl_oe (i2c_scl_oe), + .scl_i (i2c_scl_i), .sda_oe (i2c_sda_oe), .sda_i (i2c_sda_i), .wb_rdata(wb_rdata[2]), @@ -326,34 +328,22 @@ .wb_we (wb_we), .wb_cyc (wb_cyc[2]), .wb_ack (wb_ack[2]), - .ready (), .clk (clk_sys), .rst (rst_sys) ); // IOBs SB_IO #( - .PIN_TYPE(6'b110101), - .PULLUP(1'b1), - .IO_STANDARD("SB_LVCMOS") - ) i2c_scl_iob_I ( - .PACKAGE_PIN (i2c_scl), - .OUTPUT_CLK (clk_sys), - .OUTPUT_ENABLE(i2c_scl_oe), - .D_OUT_0 (1'b0) - ); - - SB_IO #( .PIN_TYPE(6'b110100), .PULLUP(1'b1), .IO_STANDARD("SB_LVCMOS") - ) i2c_sda_iob_I ( - .PACKAGE_PIN (i2c_sda), + ) i2c_iob_I[1:0] ( + .PACKAGE_PIN ({i2c_scl, i2c_sda}), .INPUT_CLK (clk_sys), .OUTPUT_CLK (clk_sys), - .OUTPUT_ENABLE(i2c_sda_oe), + .OUTPUT_ENABLE({i2c_scl_oe, i2c_sda_oe}), .D_OUT_0 (1'b0), - .D_IN_0 (i2c_sda_i) + .D_IN_0 ({i2c_scl_i, i2c_sda_i}) ); `else -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28011 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: I79fca561fee32bbaec94882b4f65c7ecaa44be11 Gerrit-Change-Number: 28011 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/icE1usb: Don't let nextpnr promote globals
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28009 ) Change subject: gateware/icE1usb: Don't let nextpnr promote globals ...................................................................... gateware/icE1usb: Don't let nextpnr promote globals We manually use global buffers for the signals that need to be global, don't let nextpnr heuristic mess with things. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I5dc5f2f39dca933b2570cbe4e26d9d7fd2a44688 --- M gateware/icE1usb/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/09/28009/1 diff --git a/gateware/icE1usb/Makefile b/gateware/icE1usb/Makefile index 2bfd1b5..790a1cb 100644 --- a/gateware/icE1usb/Makefile +++ b/gateware/icE1usb/Makefile @@ -38,7 +38,7 @@ SEED ?= 15 YOSYS_SYNTH_ARGS := -NEXTPNR_ARGS := --pre-pack data/clocks.py --pre-pack data/opt.py --seed $(SEED) +NEXTPNR_ARGS := --pre-pack data/clocks.py --pre-pack data/opt.py --seed $(SEED) --no-promote-globals ifeq ($(IGNORE_TIMING),1) NEXTPNR_ARGS += --timing-allow-fail -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28009 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: I5dc5f2f39dca933b2570cbe4e26d9d7fd2a44688 Gerrit-Change-Number: 28009 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

Change in osmo-e1-hardware[master]: gateware/common: Unify a bit with other repo
by tnt 03 May '22

03 May '22

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28008 ) Change subject: gateware/common: Unify a bit with other repo ...................................................................... gateware/common: Unify a bit with other repo This just pulls in some small update in various files shared by several repository. It's mostly comment and formatting, nothing functionnal really. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Icb7bea1cf7243e9ace819cd567eb006fcc71c808 --- M gateware/common/fw/Makefile D gateware/common/fw/bin2hex.py M gateware/common/fw/boot.S M gateware/common/rtl/soc_picorv32_bridge.v 4 files changed, 72 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/08/28008/1 diff --git a/gateware/common/fw/Makefile b/gateware/common/fw/Makefile index 3fef9a5..52889ee 100644 --- a/gateware/common/fw/Makefile +++ b/gateware/common/fw/Makefile @@ -1,12 +1,14 @@ -CROSS = riscv-none-embed- +CROSS ?= riscv-none-embed- CC := $(CROSS)gcc OBJCOPY := $(CROSS)objcopy -CFLAGS=-Wall -Os -march=rv32i -mabi=ilp32 -ffreestanding -flto -nostartfiles -fomit-frame-pointer -Wl,--gc-section +CFLAGS=-Wall -Os -march=rv32i -mabi=ilp32 -ffreestanding -flto -nostartfiles -fomit-frame-pointer -Wl,--gc-section --specs=nano.specs + all: boot.hex + boot.elf: lnk-boot.lds boot.S $(CC) $(CFLAGS) -Wl,-Bstatic,-T,lnk-boot.lds,--strip-debug -DAPP_FLASH_ADDR=0x000a0000 -o $@ boot.S @@ -14,7 +16,7 @@ $(OBJCOPY) -O binary $< $@ %.hex: %.bin - ./bin2hex.py $< $@ + hexdump boot.bin -ve '1/4 "%08x\n"' $< > $@ clean: rm -f *.bin *.hex *.elf *.o diff --git a/gateware/common/fw/bin2hex.py b/gateware/common/fw/bin2hex.py deleted file mode 100755 index 43ba263..0000000 --- a/gateware/common/fw/bin2hex.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python3 -# -# Converts binary into something that can be used by `readmemh` -# -# Copyright (C) 2020 Sylvain Munaut <tnt(a)246tNt.com> -# SPDX-License-Identifier: MIT -# - -import struct -import sys - - -def main(argv0, in_name, out_name): - with open(in_name, 'rb') as in_fh, open(out_name, 'w') as out_fh: - while True: - b = in_fh.read(4) - if len(b) < 4: - break - out_fh.write('%08x\n' % struct.unpack('<I', b)) - -if __name__ == '__main__': - main(*sys.argv) diff --git a/gateware/common/fw/boot.S b/gateware/common/fw/boot.S index df4f41b..b01fc80 100644 --- a/gateware/common/fw/boot.S +++ b/gateware/common/fw/boot.S @@ -3,10 +3,13 @@ * * SPI boot code * - * Copyright (C) 2020 Sylvain Munaut <tnt(a)246tNt.com> + * Copyright (C) 2020-2022 Sylvain Munaut <tnt(a)246tNt.com> * SPDX-License-Identifier: MIT */ +// #define BOOT_DEBUG +// (also set UART_DIV for the board below !) + #ifndef APP_FLASH_ADDR #define APP_FLASH_ADDR 0x00100000 #endif @@ -19,18 +22,50 @@ #define APP_SIZE 0x00010000 #endif + .equ UART_BASE, 0x81000000 + .equ UART_DIV, 29 // 30.72 MHz / (29+2) ~= 1 Mbaud (icE1usb) + //.equ UART_DIV, 22 // 24 MHz / (22+2) ~= 1 Mbaud (e1-tracer) + .section .text.start .global _start _start: + // Debug +#ifdef BOOT_DEBUG + // Set UART divisor + li a0, UART_BASE + li a1, UART_DIV + sw a1, 4(a0) + + // Output 'a' + li a1, 97 + sw a1, 0(a0) +#endif + // SPI init jal spi_init + // Debug +#ifdef BOOT_DEBUG + // Output 'b' + li a0, UART_BASE + li a1, 98 + sw a1, 0(a0) +#endif + // Read from flash to SRAM li a0, APP_SRAM_ADDR li a1, APP_SIZE li a2, APP_FLASH_ADDR jal spi_flash_read + // Debug +#ifdef BOOT_DEBUG + // Output 'c' + li a0, UART_BASE + li a1, 99 + sw a1, 0(a0) +#endif + // Setup reboot code li t0, 0x0002006f sw t0, 0(zero) @@ -39,16 +74,27 @@ j APP_SRAM_ADDR - .equ SPI_BASE, 0x80000000 - .equ SPICR0, 4 * 0x08 - .equ SPICR1, 4 * 0x09 - .equ SPICR2, 4 * 0x0a - .equ SPIBR, 4 * 0x0b - .equ SPISR, 4 * 0x0c - .equ SPITXDR, 4 * 0x0d - .equ SPIRXDR, 4 * 0x0e - .equ SPICSR, 4 * 0x0f +// --------------------------------------------------------------------------- +// SB_SPI driver code +// --------------------------------------------------------------------------- +// Register definitions + + .equ SPI_BASE, 0x80000000 + + .equ SPICR0, 4 * 0x08 + .equ SPICR1, 4 * 0x09 + .equ SPICR2, 4 * 0x0a + .equ SPIBR, 4 * 0x0b + .equ SPISR, 4 * 0x0c + .equ SPITXDR, 4 * 0x0d + .equ SPIRXDR, 4 * 0x0e + .equ SPICSR, 4 * 0x0f + + +// Initializes te SPI hardware +// +// Clobbers a0, a1 spi_init: li a0, SPI_BASE @@ -71,11 +117,13 @@ ret +// Reads a block of memory from SPI flash +// // Params: // a0 - destination pointer // a1 - length (bytes) // a2 - flash offset -// +// Clobbers t0, t1, s0, s1, s2 spi_flash_read: // Save params @@ -121,9 +169,12 @@ jr s2 +// Performs a single 8 bit SPI xfer +// // Params: a0 - Data to TX // Returns: a0 - RX data // Clobbers t0, t1 + _spi_do_one: li t0, SPI_BASE li t1, 0x08 diff --git a/gateware/common/rtl/soc_picorv32_bridge.v b/gateware/common/rtl/soc_picorv32_bridge.v index c0860fe..282a950 100644 --- a/gateware/common/rtl/soc_picorv32_bridge.v +++ b/gateware/common/rtl/soc_picorv32_bridge.v @@ -10,11 +10,11 @@ `default_nettype none module soc_picorv32_bridge #( - parameter integer WB_N = 8, - parameter integer WB_DW = 32, - parameter integer WB_AW = 16, - parameter integer WB_AI = 2, - parameter integer WB_REG = 0 // [0] = cyc / [1] = addr/wdata/wstrb / [2] = ack/rdata + parameter integer WB_N = 8, + parameter integer WB_DW = 32, + parameter integer WB_AW = 16, + parameter integer WB_AI = 2, + parameter integer WB_REG = 0 // [0] = cyc / [1] = addr/wdata/wstrb / [2] = ack/rdata )( /* PicoRV32 bus */ input wire [31:0] pb_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/28008 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: Icb7bea1cf7243e9ace819cd567eb006fcc71c808 Gerrit-Change-Number: 28008 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log