September 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmocom-bb[master]: firmware: board: add support for TR-800 target
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34297?usp=email ) Change subject: firmware: board: add support for TR-800 target ...................................................................... firmware: board: add support for TR-800 target iWOW TR-800 is a packaged GSM modem module based on Calypso+Iota+Rita chipset; it is fully quadband, and reverse engineering of its PCB confirms that this module is nothing but a mass-produced version of the core of TI's legendary Leonardo+ reference platform. The same module is also known as FreeCalypso Tango - a rebranded version of the same hardware module with different firmware and a different Responsible Party for official support. FreeCalypso HQ is contributing OsmocomBB support for this Calypso modem module for two reasons: 1) Harm reduction - sooner or later someone in Osmocom universe is going to run OBB firmware on TR-800 once they lay their hands on this hardware, and the resulting operation will be less harmful / closer to correct if we provide the basic board support patch. 2) There exists a large surplus of FreeCalypso Caramel2 development boards that are based around FC Tango modules. Having this hw supported by both firmwares will hopefully increase the chances that these boards will find loving homes, as opposed to continuing to gather dust in a cardboard box. Legal and ethical disclaimer: OsmocomBB firmware running on ANY Calypso+Iota+Rita target is *known*, through confirmed observations with a measuring instrument (R&S CMU200), to put out radio transmissions that are *severely out of spec*, and this defect does NOT go away with the present patch which merely adds support for a different C+I+R board target. The present patch has been produced as a harm reduction measure, to reduce (but not to zero) the harm that will be caused by parties who run OsmocomBB firmware on C+I+R hardware despite having been advised not to. As the party seeking to reduce rather than cause that harm, Mother Mychaela and her related business entities explicitly disclaim all liability for damage that will be caused by parties who continue running OsmocomBB firmware despite having been repeatedly advised to switch to manufacturer-approved published-source firmware instead. Change-Id: I84d564f052f12a25ea3bfb9c78860e9dc6262be8 --- M src/target/firmware/Makefile A src/target/firmware/board/tr800/afcparams.c A src/target/firmware/board/tr800/init.c A src/target/firmware/board/tr800/keymap.h A src/target/firmware/board/tr800/rffe_leo_quadband.c 5 files changed, 645 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 18450ac..2a376bc 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -24,7 +24,8 @@ # # List of all supported boards (meant to be overridden on command line) -BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2x0 gta0x gtm900b fcdev3b pirelli_dpl10 +BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2x0 gta0x gtm900b fcdev3b \ + pirelli_dpl10 tr800 # Framebuffer support, board specific drivers FB_OBJS=fb/framebuffer.o fb/font.o fb/helvR08.o fb/helvB14.o fb/c64.o \ @@ -63,6 +64,13 @@ board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS) BOARD_fcdev3b_ENVIRONMENTS=highram +# iWOW TR-800 aka FreeCalypso Tango +BOARD_tr800_OBJS=$(calypso_COMMON_OBJS) board/tr800/init.o \ + board/tr800/rffe_leo_quadband.o board/gta0x/rf_tables.o \ + board/tr800/afcparams.o \ + board/common/readcal_tiffs.o battery/dummy.o $(FB_dummy_OBJS) +BOARD_tr800_ENVIRONMENTS=highram + # Pirelli DP-L10 BOARD_pirelli_dpl10_OBJS=$(calypso_COMMON_OBJS) board/pirelli_dpl10/init.o \ board/pirelli_dpl10/rffe_dpl10_triband.o \ diff --git a/src/target/firmware/board/tr800/afcparams.c b/src/target/firmware/board/tr800/afcparams.c new file mode 100644 index 0000000..ccbb360 --- /dev/null +++ b/src/target/firmware/board/tr800/afcparams.c @@ -0,0 +1,52 @@ +/* + * This code was written by Mychaela Falconia <falcon(a)freecalypso.org> + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <rf/vcxocal.h> + +/* + * Here is a representative set of AFC Psi parameters that has been + * calibrated by iWOW's factory on a TR-800 module, as recorded + * in the /gsm/rf/afcparams file: + * + * Psi_sta_inv: 4387 + * Psi_st: 12 + * Psi_st_32: 783154 + * Psi_st_inv: 5484 + * + * The following AFC slope number is the closest OsmocomBB-style afc_slope + * integer corresponding to these Psi numbers; the true value is somewhere + * between 358 and 359. + * + * Please note that all AFC parameters (both Psi and linear) have been + * calibrated per unit by iWOW's factory, and they do differ from unit + * to unit. Both iWOW and FreeCalypso firmwares make direct use of + * per-unit calibrated numbers, but OsmocomBB architecture cannot make + * use of them - hence AFC performance with OBB may be significantly + * poorer than with either iWOW or FC firmware. The present code has + * been contributed by Mother Mychaela solely as a harm reduction measure, + * and does NOT constitute any kind of approved production solution - + * you've been warned! + */ +int16_t afc_slope = 358; + +/* + * The compiled-in AFC initial DAC value below is the same as was used by + * the old OsmocomBB code written for Mot C1xx phones, but it will normally + * be overridden by the per-unit factory calibration value read from the + * /gsm/rf/afcdac file in FFS. + */ +int16_t afc_initial_dac_value = -700; diff --git a/src/target/firmware/board/tr800/init.c b/src/target/firmware/board/tr800/init.c new file mode 100644 index 0000000..a8f3253 --- /dev/null +++ b/src/target/firmware/board/tr800/init.c @@ -0,0 +1,257 @@ +/* Initialization for the iWOW TR-800 modem */ + +/* + * This code was written by Mychaela Falconia <falcon(a)freecalypso.org> + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <debug.h> +#include <ctors.h> +#include <memory.h> +#include <board.h> +#include <keypad.h> +#include <console.h> +#include <flash/cfi_flash.h> +#include <tiffs.h> + +#include <calypso/irq.h> +#include <calypso/clock.h> +#include <calypso/dma.h> +#include <calypso/rtc.h> +#include <calypso/timer.h> +#include <uart.h> + +#include <comm/sercomm.h> +#include <comm/timer.h> + +#include <abb/twl3025.h> +#include <rf/trf6151.h> +#include "keymap.h" + +#define ARMIO_LATCH_OUT 0xfffe4802 +#define IO_CNTL_REG 0xfffe4804 +#define ARM_CONF_REG 0xfffef006 +#define ASIC_CONF_REG 0xfffef008 +#define IO_CONF_REG 0xfffef00a + +static void board_io_init(void) +{ + uint16_t reg; + + reg = readw(ASIC_CONF_REG); + /* DSR_MODEM/LPG pin is unconnected - make it LPG dummy output */ + reg |= (1 << 6); + /* TWL3025: Set SPI+RIF RX clock to rising edge */ + reg |= (1 << 13) | (1 << 14); + writew(reg, ASIC_CONF_REG); + + /* + * Calypso signals GPIO0, TSPDI/GPIO4, BCLKX/GPIO6, MCUEN1/GPIO8 and + * MCUEN2/GPIO13 are unused and unconnected inside the TR-800 module. + * Configure them as dummy outputs in order to prevent floating inputs. + */ + writew(0x0215, IO_CONF_REG); + writew(0xDC0E, IO_CNTL_REG); + writew(0x0000, ARMIO_LATCH_OUT); + + /* configure ADD(22), needed for second half of flash */ + reg = readw(ARM_CONF_REG); + reg |= (1 << 3); + writew(reg, ARM_CONF_REG); +} + +/* + * A total of 8 Calypso GPIO/multifunction pins (3 pure GPIO, 5 multifunction) + * are brought out on the TR-800 module, with module users (application board + * designers) explicitly allowed to wire them in whichever way is needed for + * the custom application at hand. 6 of these pins power up as inputs. + * Should the firmware leave them as inputs, or switch them to dummy outputs + * to prevent floating inputs? The answer in FreeCalypso (for TR-800 modules + * rebranded as FC Tango) is a special file written into FFS: /etc/tango-pinmux. + * This board wiring config file tells the firmware what it should do with each + * of the 8 GPIO/multifunction pins in question; the format is defined here: + * + * https://www.freecalypso.org/hg/freecalypso-docs/file/tip/Tango-pinmux + * + * The following function reads /etc/tango-pinmux from FFS and applies the pin + * multiplexing configuration encoded therein. If this file is missing, all + * pins in question are left in their default power-up state. + */ +static void board_pinmux_init(void) +{ + uint8_t pinmux[4]; + int rc; + uint16_t conf_reg, cntl_reg, out_reg; + + rc = tiffs_read_file_fixedlen("/etc/tango-pinmux", pinmux, 4); + if (rc < 0) + return; /* error msg already printed */ + if (rc == 0) { + puts("Warning: /etc/tango-pinmux not found, pins left in default power-up state\n"); + return; + } + /* read-modify-write registers */ + conf_reg = readw(IO_CONF_REG); + cntl_reg = readw(IO_CNTL_REG); + out_reg = readw(ARMIO_LATCH_OUT); + /* GPIO1 */ + if (pinmux[0] & 0x80) { + cntl_reg &= ~(1 << 1); + if (pinmux[0] & 0x01) + out_reg |= (1 << 1); + else + out_reg &= ~(1 << 1); + } + /* GPIO2 */ + if (pinmux[1] & 0x08) { + /* pinmux says it's DCD output - set it high */ + cntl_reg &= ~(1 << 2); + out_reg |= (1 << 2); + } else if (pinmux[1] & 0x02) { + /* generic output */ + cntl_reg &= ~(1 << 2); + if (pinmux[1] & 0x01) + out_reg |= (1 << 2); + else + out_reg &= ~(1 << 2); + } + /* GPIO3 */ + if (pinmux[1] & 0x20) { + /* generic output */ + cntl_reg &= ~(1 << 3); + if (pinmux[1] & 0x10) + out_reg |= (1 << 3); + else + out_reg &= ~(1 << 3); + } + /* MCSI or GPIO? */ + if (pinmux[2] & 0x80) { + /* MCSI pins switch to GPIO */ + conf_reg |= 0x1E0; + writew(conf_reg, IO_CONF_REG); + /* GPIO9 */ + if (pinmux[3] & 0x10) { + cntl_reg &= ~(1 << 9); + if (pinmux[3] & 0x01) + out_reg |= (1 << 9); + else + out_reg &= ~(1 << 9); + } else + cntl_reg |= (1 << 9); + /* GPIO10 */ + if (pinmux[3] & 0x20) { + cntl_reg &= ~(1 << 10); + if (pinmux[3] & 0x02) + out_reg |= (1 << 10); + else + out_reg &= ~(1 << 10); + } + /* GPIO11 */ + if (pinmux[3] & 0x40) { + cntl_reg &= ~(1 << 11); + if (pinmux[3] & 0x04) + out_reg |= (1 << 11); + else + out_reg &= ~(1 << 11); + } + /* GPIO12 */ + if (pinmux[3] & 0x80) { + cntl_reg &= ~(1 << 12); + if (pinmux[3] & 0x08) + out_reg |= (1 << 12); + else + out_reg &= ~(1 << 12); + } + } + writew(out_reg, ARMIO_LATCH_OUT); + writew(cntl_reg, IO_CNTL_REG); +} + +void board_init(int with_irq) +{ + /* + * Configure the memory interface. + * nCS0 and nCS1 are internal flash and RAM - please refer to + * this technical article for an explanation of timing parameters: +https://www.freecalypso.org/hg/freecalypso-docs/file/tip/MEMIF-wait-states + */ + calypso_mem_cfg(CALYPSO_nCS0, 4, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS1, 4, CALYPSO_MEM_16bit, 1); + /* nCS2 and nCS3 are brought out for user-added custom hw */ + calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1); + calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1); + /* Calypso nCS4 is not brought out on TR-800, hence a dummy */ + calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1); + calypso_mem_cfg(CALYPSO_nCS6, 0, CALYPSO_MEM_32bit, 1); + calypso_mem_cfg(CALYPSO_nCS7, 0, CALYPSO_MEM_32bit, 0); + + /* Set VTCXO_DIV2 = 1, configure PLL for 104 MHz and give ARM half of that */ + calypso_clock_set(2, CALYPSO_PLL13_104_MHZ, ARM_MCLK_DIV_2); + + /* Configure the RHEA bridge with some sane default values */ + calypso_rhea_cfg(0, 0, 0xff, 0, 1, 0, 0); + + /* Initialize board-specific GPIO */ + board_io_init(); + + /* Enable bootrom mapping to route exception vectors to RAM */ + calypso_bootrom(with_irq); + calypso_exceptions_install(); + + /* Initialize interrupt controller */ + if (with_irq) + irq_init(); + + /* + * The choice of which UART should be used for what is arbitrary - + * change to taste! + */ + sercomm_bind_uart(UART_MODEM); + cons_bind_uart(UART_IRDA); + + /* initialize MODEM UART to be used for sercomm */ + uart_init(UART_MODEM, with_irq); + uart_baudrate(UART_MODEM, UART_115200); + + /* Initialize IRDA UART to be used for old-school console code. */ + uart_init(UART_IRDA, with_irq); + uart_baudrate(UART_IRDA, UART_115200); + + /* Initialize hardware timers */ + hwtimer_init(); + + /* Initialize DMA controller */ + dma_init(); + + /* Initialize real time clock */ + rtc_init(); + + /* Initialize system timers (uses hwtimer 2) */ + timer_init(); + + /* Initialize keypad driver */ + keypad_init(keymap, with_irq); + + /* Initialize ABB driver (uses SPI) */ + twl3025_init(); + + /* Initialize TIFFS reader (15 sectors of 64 KiB each) */ + tiffs_init(0x700000, 0x10000, 15); + + /* Initialize configurable pin multiplexing */ + board_pinmux_init(); +} diff --git a/src/target/firmware/board/tr800/keymap.h b/src/target/firmware/board/tr800/keymap.h new file mode 100644 index 0000000..8e77ce2 --- /dev/null +++ b/src/target/firmware/board/tr800/keymap.h @@ -0,0 +1,87 @@ +/* + * This code was written by Mychaela Falconia <falcon(a)freecalypso.org> + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * The TR-800 module itself does not prescribe any particular keypad + * layout - instead all 5 KBC lines and all 5 KBR lines are simply + * brought out, allowing user applications to implement any desired + * keypad up to 5x5 buttons. When designing keypads for development + * boards (whether TR800-based or "raw" Calypso), Mother Mychaela's + * preference is to follow TI's original D-Sample key layout: + + Main keypad (21 buttons): + + L. Soft R. Soft + 5-way nav + Green Red + 1 2 3 + 4 5 6 + 7 8 9 + * 0 # + + Left side buttons: VOL+ / VOL- + Right side button: generic + + Row/column matrix connections: + + KBC0 KBC1 KBC2 KBC3 KBC4 + KBR0 Green VOL- VOL+ L_Soft Nav_left + KBR1 1 2 3 R_Side Nav_right + KBR2 4 5 6 R_Soft Nav_up + KBR3 7 8 9 unused Nav_down + KBR4 * 0 # unused Nav_center + + The red button is out-of-matrix PWON. + + * If anyone has an original iWOW DSK board, the connection of + * "CALL" and "1" buttons on that board also matches the present + * D-Sample keymap. + */ + +static const uint8_t keymap[] = { + [KEY_0] = 9, + [KEY_1] = 1, + [KEY_2] = 6, + [KEY_3] = 11, + [KEY_4] = 2, + [KEY_5] = 7, + [KEY_6] = 12, + [KEY_7] = 3, + [KEY_8] = 8, + [KEY_9] = 13, + [KEY_STAR] = 4, + [KEY_HASH] = 14, + [KEY_MENU] = 24, + [KEY_LEFT_SB] = 15, + [KEY_RIGHT_SB] = 17, + [KEY_UP] = 22, + [KEY_DOWN] = 23, + [KEY_LEFT] = 20, + [KEY_RIGHT] = 21, + [KEY_OK] = 0, +/* power button is not connected to keypad scan matrix but to TWL3025 */ + [KEY_POWER] = 31, +/* D-Sample left side buttons for volume up/down control */ + [KEY_MINUS] = 5, + [KEY_PLUS] = 10, +/* + * D-Sample right side button can be seen as equivalent to + * Pirelli DP-L10 camera button, except for reversed history: + * D-Sample existed first and was used by the designers of the + * Pirelli DP-L10 phone as their starting point. + */ + [KEY_CAMERA] = 16, +}; diff --git a/src/target/firmware/board/tr800/rffe_leo_quadband.c b/src/target/firmware/board/tr800/rffe_leo_quadband.c new file mode 100644 index 0000000..b1989a6 --- /dev/null +++ b/src/target/firmware/board/tr800/rffe_leo_quadband.c @@ -0,0 +1,194 @@ +/* + * This code was written by Mychaela Falconia <falcon(a)freecalypso.org> + * who refuses to claim copyright on it and has released it as public domain + * instead. NO rights reserved, all rights relinquished. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* + * This module implements RFFE control for TI's original Leonardo+ + * quadband RFFE, depicted on page 4 of this 2011-find schematic drawing: + * + * https://www.freecalypso.org/pub/GSM/Calypso/Leonardo_plus_quadband_schem.pdf + * + * This TI-original quadband RFFE is reproduced verbatim on the TR-800 + * packaged module by iWOW. + * + * The present C code is based on ../gta0x/rffe_gta0x_triband.c, + * controlling Openmoko's triband RFFE which is very closely based on + * Leonardo, with only a few control signal permutations. + * + * The present code addition by Mother Mychaela merely brings the TR-800 hw + * target to the same level of support that already existed in OBB since + * forever for Compal/Motorola and Openmoko GTA01/02 targets, and more + * recently GTM900 and FCDEV3B - it does NOT fix the problem of overly + * simplistic RFFE control timing and other oversimplifications which OBB + * exhibits in comparison to the official firmware maintained by the + * custodians of the Calypso+Iota+RF chipset (formerly TI, now FreeCalypso). + * These massive oversimplifications which OBB exhibits in comparison to + * officially approved production firmwares result in OBB's radio transmissions + * being SEVERELY out of compliance (as observed with even the simplest tests + * with a CMU200 RF test instrument), thus anyone who runs the present code + * with Tx enabled outside of a Faraday cage will very likely cause + * interference and disruption to public communication networks! Furthermore, + * if you go on with running OBB with Tx enabled after having read this + * warning, the resulting interference and disruption to public communication + * networks can be considered intentional on your part, which is likely to be + * seen as a more severe offense. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <debug.h> +#include <memory.h> +#include <rffe.h> +#include <calypso/tsp.h> +#include <rf/trf6151.h> + +/* + * OsmocomBB's definition of system inherent gain is similar to what is + * called "magic gain" (GMagic) in TI's architecture, except that TI's + * GMagic includes TRF6151 LNA gain whereas OBB's definition of system + * inherent gain does not. TI's GMagic is also reckoned in half-dB units + * instead of integral dB. + * + * The canonical GMagic number for Leonardo/TR-800 RFFE is 200, both in + * iWOW's original calibration and as confirmed with CMU200 measurements + * at FreeCalypso HQ. GMagic=200 in TI's universe is equivalent to + * OsmocomBB's "system inherent gain" of 73 dB. + */ +#define SYSTEM_INHERENT_GAIN 73 + +/* describe how the RF frontend is wired on Leonardo and TR-800 */ + +#define RITA_RESET TSPACT(0) /* Reset of the Rita TRF6151 */ +#define PA_ENABLE TSPACT(9) /* Enable the Power Amplifier */ +#define PA_BAND_SEL TSPACT(3) /* PA band select, 1=DCS/PCS */ + +/* All FEM controls are low-active */ +#define FEM_7 TSPACT(2) /* FEM pin 7 */ +#define FEM_8 TSPACT(1) /* FEM pin 8 */ +#define FEM_9 TSPACT(4) /* FEM pin 9 */ + +#define IOTA_STROBE TSPEN(0) /* Strobe for the Iota TSP */ +#define RITA_STROBE TSPEN(2) /* Strobe for the Rita TSP */ + +/* switch RF Frontend Mode */ +void rffe_mode(enum gsm_band band, int tx) +{ + uint16_t tspact = tsp_act_state(); + + /* First we mask off all bits from the state cache */ + tspact &= ~PA_ENABLE; + tspact &= ~PA_BAND_SEL; + tspact |= FEM_7 | FEM_8 | FEM_9; /* low-active */ + + switch (band) { + case GSM_BAND_850: + tspact &= ~FEM_9; + break; + case GSM_BAND_900: + case GSM_BAND_1800: + case GSM_BAND_1900: + break; + default: + /* TODO return/signal error here */ + break; + } + +#ifdef CONFIG_TX_ENABLE + /* Then we selectively set the bits on, if required */ + if (tx) { + switch (band) { + case GSM_BAND_850: + case GSM_BAND_900: + tspact |= FEM_9; + tspact &= ~FEM_7; + break; + case GSM_BAND_1800: + case GSM_BAND_1900: + tspact &= ~FEM_8; + tspact |= PA_BAND_SEL; + break; + default: + break; + } + tspact |= PA_ENABLE; + } +#endif /* TRANSMIT_SUPPORT */ + + tsp_act_update(tspact); +} + +/* Returns RF wiring */ +uint32_t rffe_get_rx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_DCS1800) | (1 << PORT_PCS1900); +} + +uint32_t rffe_get_tx_ports(void) +{ + return (1 << PORT_LO) | (1 << PORT_HI); +} + +/* Returns need for IQ swap */ +int rffe_iq_swapped(uint16_t band_arfcn, int tx) +{ + return trf6151_iq_swapped(band_arfcn, tx); +} + + +#define MCU_SW_TRACE 0xfffef00e +#define ARM_CONF_REG 0xfffef006 + +void rffe_init(void) +{ + uint16_t reg; + + reg = readw(ARM_CONF_REG); + reg &= ~(1 << 7); /* TSPACT4 I/O function, not nRDYMEM */ + writew(reg, ARM_CONF_REG); + + reg = readw(MCU_SW_TRACE); + reg &= ~(1 << 1); /* TSPACT9 I/O function, not MAS(1) */ + writew(reg, MCU_SW_TRACE); + + /* Configure the TSPEN which is connected to the TWL3025 */ + tsp_setup(IOTA_STROBE, 1, 0, 0); + + trf6151_init(RITA_STROBE, RITA_RESET); +} + +uint8_t rffe_get_gain(void) +{ + return trf6151_get_gain(); +} + +void rffe_set_gain(uint8_t dbm) +{ + trf6151_set_gain(dbm); +} + +const uint8_t system_inherent_gain = SYSTEM_INHERENT_GAIN; + +/* Given the expected input level of exp_inp dBm/8 and the target of target_bb + * dBm8, configure the RF Frontend with the respective gain */ +void rffe_compute_gain(int16_t exp_inp, int16_t target_bb) +{ + trf6151_compute_gain(exp_inp, target_bb); +} + +void rffe_rx_win_ctrl(int16_t exp_inp, int16_t target_bb) +{ + /* FIXME */ +} -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34297?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I84d564f052f12a25ea3bfb9c78860e9dc6262be8 Gerrit-Change-Number: 34297 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: steve-m <steve(a)steve-m.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

[L] Change in osmocom-bb[master]: firmware: board: add support for TR-800 target
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: falconia, steve-m, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34297?usp=email ) Change subject: firmware: board: add support for TR-800 target ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34297?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I84d564f052f12a25ea3bfb9c78860e9dc6262be8 Gerrit-Change-Number: 34297 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: steve-m <steve(a)steve-m.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: steve-m <steve(a)steve-m.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:19:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: Introduce new error scenario tests
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: daniel, fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255?usp=email ) Change subject: dia2gsup: Introduce new error scenario tests ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File dia2gsup/DIA2GSUP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255/comment/b3dd1a5b_da2a… PS1, Line 345: TC_authinfo_gsup_err_imsi_unknown > Given that what this app does is basically translating stuff, I think it makes sense to check specif […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic870a2c1de74bee3f7d8e26874635d58469ccbea Gerrit-Change-Number: 34255 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:17:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: .gitignore: add include/osmocom/core/socket_compat.h
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email ) Change subject: .gitignore: add include/osmocom/core/socket_compat.h ...................................................................... .gitignore: add include/osmocom/core/socket_compat.h Ensure that this auto-generated file does not show up in `git status`. Change-Id: Id7c245579f5a3288a9ea62589ca802e427e54720 --- M .gitignore 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index d900138..264e739 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,7 @@ src/gsm/*_gen.c include/osmocom/core/crc*gen.h include/osmocom/core/bit*gen.h +include/osmocom/core/socket_compat.h include/osmocom/gsm/gsm0503.h tests/conv/gsm0503_test_vectors.c -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7c245579f5a3288a9ea62589ca802e427e54720 Gerrit-Change-Number: 34306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: tests/{v110,gsm44021}: change naming: 'test_' -> '_test'
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email ) Change subject: tests/{v110,gsm44021}: change naming: 'test_' -> '_test' ...................................................................... tests/{v110,gsm44021}: change naming: 'test_' -> '_test' Ensure that the test binaries do not show up in `git status`: tests/gsm44021/test_frame_csd tests/v110/test_frame tests/v110/test_ra1 The new naming complies to the 'tests/*/*_test' pattern in .gitignore. Change-Id: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce --- M tests/Makefile.am R tests/gsm44021/frame_csd_test.c R tests/gsm44021/frame_csd_test.ok M tests/testsuite.at R tests/v110/frame_test.c R tests/v110/frame_test.ok R tests/v110/ra1_test.c R tests/v110/ra1_test.ok 8 files changed, 47 insertions(+), 30 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index 8df9d56..5f4914e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -51,9 +51,9 @@ smscb/gsm0341_test \ smscb/cbsp_test \ auth/xor2g_test \ - v110/test_frame \ - v110/test_ra1 \ - gsm44021/test_frame_csd \ + v110/frame_test \ + v110/ra1_test \ + gsm44021/frame_csd_test \ osmo_io/osmo_io_test \ $(NULL) @@ -362,14 +362,14 @@ iuup_iuup_test_SOURCES = iuup/iuup_test.c iuup_iuup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) -v110_test_frame_SOURCES = v110/test_frame.c -v110_test_frame_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) +v110_frame_test_SOURCES = v110/frame_test.c +v110_frame_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) -v110_test_ra1_SOURCES = v110/test_ra1.c -v110_test_ra1_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) +v110_ra1_test_SOURCES = v110/ra1_test.c +v110_ra1_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) -gsm44021_test_frame_csd_SOURCES = gsm44021/test_frame_csd.c -gsm44021_test_frame_csd_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \ +gsm44021_frame_csd_test_SOURCES = gsm44021/frame_csd_test.c +gsm44021_frame_csd_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(LDADD) @@ -475,9 +475,9 @@ smscb/smscb_test.ok \ smscb/gsm0341_test.ok \ smscb/cbsp_test.ok \ - v110/test_frame.ok \ - v110/test_ra1.ok \ - gsm44021/test_frame_csd.ok \ + v110/frame_test.ok \ + v110/ra1_test.ok \ + gsm44021/frame_csd_test.ok \ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ $(NULL) @@ -684,12 +684,12 @@ >$(srcdir)/time_cc/time_cc_test.ok iuup/iuup_test \ >$(srcdir)/iuup/iuup_test.ok - v110/test_frame \ - >$(srcdir)/v110/test_frame.ok - v110/test_ra1 \ - >$(srcdir)/v110/test_ra1.ok - gsm44021/test_frame_csd \ - >$(srcdir)/gsm44021/test_frame_csd.ok + v110/frame_test \ + >$(srcdir)/v110/frame_test.ok + v110/ra1_test \ + >$(srcdir)/v110/ra1_test.ok + gsm44021/frame_csd_test \ + >$(srcdir)/gsm44021/frame_csd_test.ok osmo_io/osmo_io_test \ >$(srcdir)/osmo_io/osmo_io_test.ok \ 2>$(srcdir)/osmo_io/osmo_io_test.err diff --git a/tests/gsm44021/test_frame_csd.c b/tests/gsm44021/frame_csd_test.c similarity index 100% rename from tests/gsm44021/test_frame_csd.c rename to tests/gsm44021/frame_csd_test.c diff --git a/tests/gsm44021/test_frame_csd.ok b/tests/gsm44021/frame_csd_test.ok similarity index 100% rename from tests/gsm44021/test_frame_csd.ok rename to tests/gsm44021/frame_csd_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index a2c8845..3366995 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -491,22 +491,22 @@ AT_CHECK([$abs_top_builddir/tests/iuup/iuup_test], [0], [expout], [ignore]) AT_CLEANUP -AT_SETUP([v110_test_frame]) -AT_KEYWORDS([v110_test_frame]) -cat $abs_srcdir/v110/test_frame.ok > expout -AT_CHECK([$abs_top_builddir/tests/v110/test_frame], [], [expout],[]) +AT_SETUP([v110_frame_test]) +AT_KEYWORDS([v110_frame_test]) +cat $abs_srcdir/v110/frame_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/v110/frame_test], [], [expout],[]) AT_CLEANUP -AT_SETUP([v110_test_ra1]) -AT_KEYWORDS([v110_test_ra1]) -cat $abs_srcdir/v110/test_ra1.ok > expout -AT_CHECK([$abs_top_builddir/tests/v110/test_ra1], [], [expout],[]) +AT_SETUP([v110_ra1_test]) +AT_KEYWORDS([v110_ra1_test]) +cat $abs_srcdir/v110/ra1_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/v110/ra1_test], [], [expout],[]) AT_CLEANUP -AT_SETUP([gsm44021_test_frame_csd]) -AT_KEYWORDS([gsm44021_test_frame_csd]) -cat $abs_srcdir/gsm44021/test_frame_csd.ok > expout -AT_CHECK([$abs_top_builddir/tests/gsm44021/test_frame_csd], [], [expout],[]) +AT_SETUP([gsm44021_frame_csd_test]) +AT_KEYWORDS([gsm44021_frame_csd_test]) +cat $abs_srcdir/gsm44021/frame_csd_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm44021/frame_csd_test], [], [expout],[]) AT_CLEANUP AT_SETUP([osmo_io]) diff --git a/tests/v110/test_frame.c b/tests/v110/frame_test.c similarity index 100% rename from tests/v110/test_frame.c rename to tests/v110/frame_test.c diff --git a/tests/v110/test_frame.ok b/tests/v110/frame_test.ok similarity index 100% rename from tests/v110/test_frame.ok rename to tests/v110/frame_test.ok diff --git a/tests/v110/test_ra1.c b/tests/v110/ra1_test.c similarity index 100% rename from tests/v110/test_ra1.c rename to tests/v110/ra1_test.c diff --git a/tests/v110/test_ra1.ok b/tests/v110/ra1_test.ok similarity index 100% rename from tests/v110/test_ra1.ok rename to tests/v110/ra1_test.ok -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce Gerrit-Change-Number: 34307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: tests/{v110,gsm44021}: change naming: 'test_' -> '_test'
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email ) Change subject: tests/{v110,gsm44021}: change naming: 'test_' -> '_test' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce Gerrit-Change-Number: 34307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:16:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: .gitignore: add include/osmocom/core/socket_compat.h
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email ) Change subject: .gitignore: add include/osmocom/core/socket_compat.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id7c245579f5a3288a9ea62589ca802e427e54720 Gerrit-Change-Number: 34306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:16:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-gprs[master]: rlcmac: Several fixes and improvements to have 2phase access working
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34308?usp=email ) Change subject: rlcmac: Several fixes and improvements to have 2phase access working ...................................................................... rlcmac: Several fixes and improvements to have 2phase access working Some solutions are not meant to be final ones, but some small workarounds to have the whole thing running until the lower layers are fixed/improved. Related: OS#5500 Change-Id: I94bd0de6917b004cba73d2fffc7cf69b3b5c305d --- M src/rlcmac/sched.c M src/rlcmac/tbf_ul_ass_fsm.c M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 5 files changed, 100 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/rlcmac/sched.c b/src/rlcmac/sched.c index 8709f71..6af2b6a 100644 --- a/src/rlcmac/sched.c +++ b/src/rlcmac/sched.c @@ -222,7 +222,7 @@ if (tbfs->poll_ul_ass) { LOGRLCMAC(LOGL_DEBUG, "(ts=%u,fn=%u,usf=%u) Tx Pkt Control Ack (UL ASS poll)\n", bi->ts, bi->fn, bi->usf); - msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(ul_tbf_as_tbf(tbfs->poll_ul_ass)->gre); + msg = gprs_rlcmac_tbf_ul_ass_create_rlcmac_msg(tbfs->poll_ul_ass, bi); if (msg) return msg; } diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c index 8244f8e..0f0f9ee 100644 --- a/src/rlcmac/tbf_ul_ass_fsm.c +++ b/src/rlcmac/tbf_ul_ass_fsm.c @@ -30,6 +30,7 @@ #include <osmocom/gprs/rlcmac/types.h> #include <osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h> #include <osmocom/gprs/rlcmac/tbf_ul.h> +#include <osmocom/gprs/rlcmac/tbf_dl.h> #include <osmocom/gprs/rlcmac/gre.h> #include <osmocom/gprs/rlcmac/sched.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> @@ -392,9 +393,17 @@ /* If RRBP contains valid data, schedule a response (PKT CONTROL ACK or PKT RESOURCE REQ). */ if (d->dl_block->SP) { uint32_t poll_fn = rrbp2fn(d->fn, d->dl_block->RRBP); + uint32_t next_blk = fn_next_block(fn_next_block(poll_fn)); gprs_rlcmac_pdch_ulc_reserve(g_rlcmac_ctx->sched.ulc[d->ts_nr], poll_fn, GPRS_RLCMAC_PDCH_ULC_POLL_UL_ASS, ul_tbf_as_tbf(ctx->ul_tbf)); + /* We need to wait at least until sending the PKT CTRL + * ACK (in the old CTRL TS) before completing the + * assignment and using the new TS assignment. */ + if (!ctx->tbf_starting_time_exists && fn_cmp(ctx->tbf_starting_time, next_blk) < 0) { + ctx->tbf_starting_time_exists = true; + ctx->tbf_starting_time = next_blk; + } } if (ctx->tbf_starting_time_exists && @@ -409,10 +418,21 @@ } } +static void st_wait_tbf_starting_time2_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *)fi->priv; + + /* Configure lower layers to submit an RTS tick starting at tbf_starting_time + * and scheduler will send event GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME to us. */ + gprs_rlcmac_ul_tbf_submit_configure_req(ctx->ul_tbf, &ctx->phase2_alloc, + ctx->tbf_starting_time_exists, ctx->tbf_starting_time); +} + static void st_wait_tbf_starting_time2(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *)fi->priv; struct tbf_ul_ass_ev_rx_pkt_ul_ass_ctx *d; + struct tbf_ul_ass_ev_create_rlcmac_msg_ctx *data_ctx; int rc; switch (event) { @@ -425,9 +445,26 @@ /* If RRBP contains valid data, schedule a response (PKT CONTROL ACK or PKT RESOURCE REQ). */ if (d->dl_block->SP) { uint32_t poll_fn = rrbp2fn(d->fn, d->dl_block->RRBP); + uint32_t next_blk = fn_next_block(poll_fn); + /* FIXME: double fn_next_block() here is to delay + * release of old TS late enough so that the PKT CTRL ACK + * is transmitted. This is wrong since we basically lose + * the first TS in the new TBF, but otherwise lower layers + * may free the lchan while last burst of the last block is + * still not transmitted... IMHO lower layers need to be + * fixed to delay closing the lchan until all the + * blocks/bursts enqueued are transmitted... */ + next_blk = fn_next_block(next_blk); gprs_rlcmac_pdch_ulc_reserve(g_rlcmac_ctx->sched.ulc[d->ts_nr], poll_fn, GPRS_RLCMAC_PDCH_ULC_POLL_UL_ASS, ul_tbf_as_tbf(ctx->ul_tbf)); + /* We need to wait at least until sending the PKT CTRL + * ACK (in the old CTRL TS) before completing the + * assignment and using the new TS assignment. */ + if (!ctx->tbf_starting_time_exists && fn_cmp(ctx->tbf_starting_time, next_blk) < 0) { + ctx->tbf_starting_time_exists = true; + ctx->tbf_starting_time = next_blk; + } } if (ctx->tbf_starting_time_exists && @@ -440,6 +477,13 @@ case GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME: tbf_ul_ass_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ASS_ST_COMPL); break; + case GPRS_RLCMAC_TBF_UL_ASS_EV_CREATE_RLCMAC_MSG: + data_ctx = (struct tbf_ul_ass_ev_create_rlcmac_msg_ctx *)data; + LOGPFSML(fi, LOGL_INFO, "TS=%u FN=%u Tx Pkt Ctrl Ack\n", data_ctx->ts, data_ctx->fn); + data_ctx->msg = gprs_rlcmac_gre_create_pkt_ctrl_ack(ul_tbf_as_tbf(ctx->ul_tbf)->gre); + if (!data_ctx->msg) + return; + break; default: OSMO_ASSERT(0); } @@ -517,12 +561,14 @@ [GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME2] = { .in_event_mask = X(GPRS_RLCMAC_TBF_UL_ASS_EV_RX_PKT_UL_ASS) | - X(GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME), + X(GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME) | + X(GPRS_RLCMAC_TBF_UL_ASS_EV_CREATE_RLCMAC_MSG), .out_state_mask = X(GPRS_RLCMAC_TBF_UL_ASS_ST_SCHED_PKT_RES_REQ) | X(GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME2) | X(GPRS_RLCMAC_TBF_UL_ASS_ST_COMPL), .name = "WAIT_TBF_STARTING_TIME2", + .onenter = st_wait_tbf_starting_time2_on_enter, .action = st_wait_tbf_starting_time2, }, [GPRS_RLCMAC_TBF_UL_ASS_ST_COMPL] = { @@ -638,6 +684,10 @@ { int rc; ul_tbf->ul_ass_fsm.dl_tbf = dl_tbf; + /* FIXME: Ideally this should only be the TS where the PKT UL ASS was received... */ + ul_tbf->ul_ass_fsm.phase1_alloc.num_ts = dl_tbf->cur_alloc.num_ts; + memcpy(&ul_tbf->ul_ass_fsm.phase1_alloc.ts[0], &dl_tbf->cur_alloc.ts[0], + sizeof(ul_tbf->ul_ass_fsm.phase1_alloc.ts)); rc = osmo_fsm_inst_dispatch(ul_tbf->ul_ass_fsm.fi, GPRS_RLCMAC_TBF_UL_ASS_EV_START_FROM_DL_TBF, NULL); @@ -666,11 +716,21 @@ { int res; - OSMO_ASSERT(gprs_rlcmac_tbf_ul_ass_waiting_tbf_starting_time(ul_tbf)); OSMO_ASSERT(ul_tbf->ul_ass_fsm.tbf_starting_time_exists); - OSMO_ASSERT(ul_tbf->ul_ass_fsm.phase1_alloc.num_ts > 0); - if (!ul_tbf->ul_ass_fsm.phase1_alloc.ts[ts_nr].allocated) - return; + switch (ul_tbf->ul_ass_fsm.fi->state) { + case GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME1: + OSMO_ASSERT(ul_tbf->ul_ass_fsm.phase1_alloc.num_ts > 0); + if (!ul_tbf->ul_ass_fsm.phase1_alloc.ts[ts_nr].allocated) + return; + break; + case GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME2: + OSMO_ASSERT(ul_tbf->ul_ass_fsm.phase2_alloc.num_ts > 0); + if (!ul_tbf->ul_ass_fsm.phase2_alloc.ts[ts_nr].allocated) + return; + break; + default: + OSMO_ASSERT(0); + } res = fn_cmp(fn, ul_tbf->ul_ass_fsm.tbf_starting_time); if (res < 0) {/* fn BEFORE tbf_starting_time */ LOGPTBFUL(ul_tbf, LOGL_DEBUG, "TS=%" PRIu8 " FN=%u Waiting for tbf_starting_time=%u\n", @@ -681,6 +741,7 @@ LOGPTBFUL(ul_tbf, LOGL_ERROR, "TS=%" PRIu8 " FN=%u Received late tick for tbf_starting_time=%u!\n", ts_nr, fn, ul_tbf->ul_ass_fsm.tbf_starting_time); /* fn == tbf_starting time */ + LOGPTBFUL(ul_tbf, LOGL_INFO, "TS=%" PRIu8 " FN=%u TBF_STARTING_TIME reached\n", fn, ts_nr); osmo_fsm_inst_dispatch(ul_tbf->ul_ass_fsm.fi, GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME, NULL); } diff --git a/tests/rlcmac/rlcmac_prim_test.c b/tests/rlcmac/rlcmac_prim_test.c index 6e317b1..35def30 100644 --- a/tests/rlcmac/rlcmac_prim_test.c +++ b/tests/rlcmac/rlcmac_prim_test.c @@ -1136,6 +1136,9 @@ rts_fn = fn_next_block(rts_fn); ts_nr = 6; + /* FIXME: see extra fn_next_block() in libosmo-gprs-rlcmac st_wait_tbf_starting_time2() */ + rts_fn = fn_next_block(rts_fn); + /* Trigger transmission of LLC data (GMM Attach) (first part) */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(ts_nr, rts_fn, usf_li[ts_nr]); rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 0921266..95dc475 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -963,17 +963,25 @@ DLGLOBAL INFO TS=7 FN=26 Rx Pkt UL ASS DLGLOBAL INFO UL_TBF_ASS{WAIT_PKT_UL_ASS}: Received Event RX_PKT_UL_ASS DLGLOBAL DEBUG Register POLL (TS=7 FN=43, reason=UL_ASS) -DLGLOBAL INFO UL_TBF_ASS{WAIT_PKT_UL_ASS}: state_chg to COMPLETED +DLGLOBAL INFO UL_TBF_ASS{WAIT_PKT_UL_ASS}: state_chg to WAIT_TBF_STARTING_TIME2 +DLGLOBAL INFO TBF(UL:NR-0:TLLI-00000001) Send L1CTL-CFG_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0xc0 tbf_starting_time(present=1 fn=52) +DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request +DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) TS=7 FN=43 Waiting for tbf_starting_time=52 +DLGLOBAL DEBUG (ts=7,fn=43,usf=2) Tx Pkt Control Ack (UL ASS poll) +DLGLOBAL INFO UL_TBF_ASS{WAIT_TBF_STARTING_TIME2}: Received Event CREATE_RLCMAC_MSG +DLGLOBAL INFO UL_TBF_ASS{WAIT_TBF_STARTING_TIME2}: TS=7 FN=43 Tx Pkt Ctrl Ack +DLGLOBAL DEBUG GRE(00000001) Tx Packet Control Ack +DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request +DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication +DLGLOBAL INFO TBF(UL:NR-0:TLLI-00000001) TS=52 FN=6 TBF_STARTING_TIME reached +DLGLOBAL INFO UL_TBF_ASS{WAIT_TBF_STARTING_TIME2}: Received Event TBF_STARTING_TIME +DLGLOBAL INFO UL_TBF_ASS{WAIT_TBF_STARTING_TIME2}: state_chg to COMPLETED DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL DLGLOBAL INFO TBF(UL:NR-0:TLLI-00000001) Send L1CTL-CFG_UL_TBF.req ul_tbf_nr=0 ul_slotmask=0xc0 tbf_starting_time(present=0 fn=0) DLGLOBAL DEBUG Tx to lower layers: L1CTL-CFG_UL_TBF.request DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE -DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication -DLGLOBAL DEBUG (ts=7,fn=43,usf=2) Tx Pkt Control Ack (UL ASS poll) -DLGLOBAL DEBUG GRE(00000001) Tx Packet Control Ack -DLGLOBAL DEBUG Tx to lower layers: L1CTL-PDCH_DATA.request -DLGLOBAL DEBUG Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) Sending new block at BSN 0, CS=CS-2 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) Entering Countdown procedure CV=0 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00000001) Dequeue next LLC (len=14) diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index d601794..0c66e24 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -204,8 +204,9 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=21 ts=7 data_len=23 data=[40 08 10 20 00 00 00 00 00 00 00 30 00 00 00 00 00 03 2b 2b 2b 2b 2b ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0xc0 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=23 data=[40 04 00 00 00 04 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b ] +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0xc0 test_rlcmac_prim_up_cb(): Rx GMMRR-LLC_TRANSMITTED.indication TLLI=0x00000001 -test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=47 ts=6 data_len=34 data=[00 06 00 39 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] +test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=52 ts=6 data_len=34 data=[00 06 00 39 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] === test_dl_tbf_ccch_assign_requests_ul_tbf_pacch end === test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x00 === test_ccch_pag_req1 start === -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I94bd0de6917b004cba73d2fffc7cf69b3b5c305d Gerrit-Change-Number: 34308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in libosmo-gprs[master]: rlcmac: Several fixes and improvements to have 2phase access working
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34308?usp=email ) Change subject: rlcmac: Several fixes and improvements to have 2phase access working ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I94bd0de6917b004cba73d2fffc7cf69b3b5c305d Gerrit-Change-Number: 34308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:16:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: l1gprs/l1ctl: Decouple RTS.ind from DL_BLOCK.ind
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34310?usp=email ) Change subject: l1gprs/l1ctl: Decouple RTS.ind from DL_BLOCK.ind ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34310?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1494e0aac7555f6e01b4b435b77140afc42c098e Gerrit-Change-Number: 34310 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:16:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0