OpenBSC July 2013

openbsc@lists.osmocom.org

28 participants
42 discussions

[PATCH] Add vty command for setting Access control classes

by Ivan Kluchnikov

Hi all, Attached patch adds vty command for setting Access control classes (GSM 02.11 Section 4 Access control) in RACH Control Parameters (GSM 04.08 Section 10.5.2.29 RACH Control Parameters). -- Regards, Ivan Kluchnikov. http://fairwaves.ru

12 years, 2 months

Nokia InSite handover

by Sipos Csaba

Today, after I successfully started two InSite BTS units on the same E1 line, I tried to test the OpenBSC handover function. I got a strange error message, that I have to enable RTP Proxy mode with "-P" in osmo-nitb. Because these units are running from E1, I just simply ask: do we have handover support for E1 based BTSs? Cell reselection and inter BTS voice calls, SMSs are working just fine. BR, Csaba

12 years, 2 months

GPRS roaming

by Andreas Eversberg

hi harald, i know that you talked about before so maybe you can give me a hint. i like to make osmo-sgsn allow roaming (different PLMN of the phone than the one in the RAI of the BTS). regards, andreas

12 years, 2 months

Dropping support for the HSL bts

by Holger Hans Peter Freyther

Good Morning Harald, do you mind if we drop support for the HSL BTS? The support is spewing out compile warnings, now turns up in coverity reports as well and we don't even know if it is working with the latest version of the software running on these BTS. holger

12 years, 2 months

Any BS11 user please test the following patch

by Holger Hans Peter Freyther

Hi, Coverity pointed out a missing break. I have added it now but the fix might break BS11 code that relied on this broken functionality. Could anyone with a BS11 please test this? I will integrate the change in a week. holger

12 years, 2 months

DAHDI and LAPd errors

by Sipos Csaba

Dear Members, From the beginning I am having various LAPd related error messages with Nokia InSite and a DAHDI E1 card. The LAPd connection resets itself several times before a working OML and RSL connection is made. I don't know, maybe this is due to a change in the DAHDI code. I am getting lapd errors during the BTS initialization like this one: ^[[0;m^[[1;36mTue Jul 16 13:55:10 2013 <0005> bsc_init.c:91 shutting down OML for BTS 0 ^[[0;mTue Jul 16 13:55:14 2013 <0018> input/lapd.c:159 LAPD state change on TEI 1: NONE -> ASSIGNED ^[[0;mTue Jul 16 13:55:14 2013 <0018> input/lapd.c:212 LAPD Allocating SAP for SAPI=62 / TEI=1 ^[[0;mTue Jul 16 13:55:14 2013 <0018> input/lapd.c:223 k=1 N200=3 N201=260 T200=1.0 T203=10.0 ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:292 Init DL layer: sequence range = 128, k = 1, history range = 2 ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:229 new state LAPD_STATE_NULL -> LAPD_STATE_IDLE ^[[0;mTue Jul 16 13:55:14 2013 <0018> input/lapd.c:485 LAPD DL-ESTABLISH request TEI=1 SAPI=62 ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:2171 Message DL-ESTABLISH-REQUEST received in state LAPD_STATE_IDLE ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:1685 perform normal establishm. (SABM) ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:229 new state LAPD_STATE_IDLE -> LAPD_STATE_SABM_SENT ^[[0;mTue Jul 16 13:55:14 2013 <0018> input/lapd.c:600 TX: fa 03 7f ^[[0;mTue Jul 16 13:55:14 2013 <0018> lapd_core.c:198 start T200 ^[[0;m^[[1;38mTue Jul 16 13:55:14 2013 <001d> sms_queue.c:220 Attempting to send 20 SMS ^[[0;m^[[1;38mTue Jul 16 13:55:14 2013 <001d> sms_queue.c:280 SMSqueue added 0 messages in 0 rounds ^[[0;mTue Jul 16 13:55:15 2013 <0018> lapd_core.c:551 Timeout T200 (0x822cb80) state=5 ^[[0;mTue Jul 16 13:55:15 2013 <0018> input/lapd.c:600 TX: fa 03 7f ^[[0;mTue Jul 16 13:55:15 2013 <0018> lapd_core.c:198 start T200 ^[[0;mTue Jul 16 13:55:16 2013 <0018> lapd_core.c:551 Timeout T200 (0x822cb80) state=5 ^[[0;mTue Jul 16 13:55:16 2013 <0018> input/lapd.c:600 TX: fa 03 7f ^[[0;mTue Jul 16 13:55:16 2013 <0018> lapd_core.c:198 start T200 ^[[0;mTue Jul 16 13:55:17 2013 <0018> lapd_core.c:551 Timeout T200 (0x822cb80) state=5 ^[[0;mTue Jul 16 13:55:17 2013 <0018> input/lapd.c:600 TX: fa 03 7f ^[[0;mTue Jul 16 13:55:17 2013 <0018> lapd_core.c:198 start T200 ^[[0;mTue Jul 16 13:55:18 2013 <0018> lapd_core.c:551 Timeout T200 (0x822cb80) state=5 ^[[0;mTue Jul 16 13:55:18 2013 <0018> input/lapd.c:628 LAPD DL-RELEASE indication TEI=1 SAPI=62 ^[[0;mTue Jul 16 13:55:18 2013 <0018> lapd_core.c:307 Resetting LAPDm instance ^[[0;mTue Jul 16 13:55:18 2013 <0018> lapd_core.c:229 new state LAPD_STATE_SABM_SENT -> LAPD_STATE_IDLE ^[[0;mTue Jul 16 13:55:18 2013 <0018> lapd_core.c:384 sending MDL-ERROR-IND cause 1 ^[[0;mTue Jul 16 13:55:18 2013 <0018> lapd_core.c:229 new state LAPD_STATE_IDLE -> LAPD_STATE_IDLE ^[[0;m^[[1;36mTue Jul 16 13:55:33 2013 <0005> bsc_init.c:91 shutting down OML for BTS 0 Anyway, it would be nice to know a recommended DAHDI version and/or kernel version which is used during the development or something. For example - as I mentioned it earlier - DAHDI 2.7.x breaks the compatibility with OpenBSC due to the changed addressing scheme. BR, Csaba

12 years, 2 months

Fixing power off in osmo-trx

by Alexander Chemeris

Hi Thomas, I've made some progress in making osmo-trx able to power off/on without restart. At this moment it's almost there - the only big remaining issue I see is some bug with UHD device start/stop. It seems we do not re-initialize it properly and assert (num_rd == OUTCHUNK) fails. I hope you could fix that. I completely re-wrote Thread class to make starting/stopping threads a synchronous reliable operation. I also introduced shutdown() function to FIFOServiceLoopThread, ControlServiceLoopThread and TransmitPriorityQueueServiceLoopThread. This method takes care of un-blocking a thread from a blocking read from a queue or a socket. Few bugs in the other code is fixed as well. Details are below, please review the patches. Patch set is checked into https://github.com/fairwaves/osmo-trx under achemeris/stable_threads and achemeris/poweroff_hack branches. > commit c5da6607b4d17706380de72e0814e28f03624c51 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 14:57:14 2013 +0400 > > Transceiver52M: Fix crash in uhd_device destructor due to deleting statically allocated memory. This is a genuine bug, should be fixed upstream. > commit dbd27a60b6ed99fd6fd2339ffafccc0d759fa2fc > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sat Jul 13 21:26:39 2013 +0400 > > CommonLibs: Fix compile time warnings. Fixes annoying warning. > commit 8eaa40dd6c2a783306d809aec98c2937e15068f3 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 16:23:32 2013 +0400 > > Transceiver52M: Remove unused thread mAlignRadioServiceLoopThread; This actually leads to crash when Thread class is abstract. > commit b8646946526903d2bbfa657690936b9bcba80ca5 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sat Jul 13 22:29:12 2013 +0400 > > CommonLibs: DEBUG: Mark interthread classes which are not used in OsmoTRX. I've added this comments just to simplify debugging. I.e. I don't want to debug interthread primitives which we do not use. > commit 69b6a6dfcd882df180e9d5e9856225f4b1d2eeed > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 01:43:04 2013 +0400 > > CommonLibs: Allow NULLs to be retrieved from InterthreadQueue. > > We need a way to stop InterthreadQueue blocking read to be able to shutdown > a thread. The easiest way to do that is to push NULL to the queue, but the > original implementation will just ignore that and continue blocking. After > the change the blocking read() will exit with NULL result which is perfectly > fine with us. > > Ideally we should change all methods of InterthreadQueue to return a status > value to indicate normal exits, timeouts, etc. Right now the only way to > indicate an error is returning NULL, which could be a valid operation. > > commit d4a8c1360e5d54188b648766dde199fa37f2ed27 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 02:00:00 2013 +0400 > > CommonLibs: Add shutdown() method to the DatagramSocket class. > > This method is useful to abort a blocking operations on a socket during shutdown. > > commit 302a9198df85e4f771368f24d8445dec7c8b2203 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 12:04:44 2013 +0400 > > CommonLibs: Signal::wait() should return the value which pthread_cond_timedwait() returns. > > commit e279124660a2add686e6c9266d18a9bb0cf43258 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 12:38:25 2013 +0400 > > CommonLibs: Rewrite Threads class to be predictable during start/stop. > > Current implementation strictly synchronize thread startup and shutdown > to make sure a thread is actually started on startThread() exit and > that it's stopped on stopThread() exit (or an error is returned). > > I also changed the Thread class to be used as a parent class for > an actual thread. This way we could provide much better logical > separation between variables used by different threads. Which will > (hopefully) reduce number of issues with inter-thread communications. > > commit de202e343564913e0591de10850e617d7de55b6b > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 12:42:52 2013 +0400 > > Transceiver52M: Port all threads to the new Thread interface. > > Also note that we introduced shutdown() method for Transceiver threads which > implement proper shutdown of threads when they are in blocking read state. > This involves using shutdown() on sockets and pushing NULL to queues. > > With this change we should be able to start/stop transceiver channels at > arbitrary moments. > > commit 129ad76b15f1fdf0588d5a24fe2d0f7ef3df274e > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 12:48:37 2013 +0400 > > Transceiver52M: Delay is no longer needed at the transceiver exit, threads should shut down cleanly. > > commit 604f65e69f2317dd5dc1aeb8faf3c107cd8a2231 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 13:22:31 2013 +0400 > > CommonLibs: Port InterthreadTest and SocketsTest to the new Thread API. > > commit c4038ef54c806c8c00f7fa28bc2b8b200bc3356f > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 13:24:16 2013 +0400 > > CommonLibs: Adding a new ThreadsTest testsuite. > > It's very basic at this moment. We should add a stress-test for thread > start/stop at least. This is the meat of the branch. At this stage everything works fine, threads are shutdown properly, but power off command still doesn't power off the transceiver. > commit c0f0da4ec8e0068a562f427a89a899bf190bc74a > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 23:07:31 2013 +0400 > > Transceiver52M: HACK: Exit transceiver on POWEROFF command. > > This hack allows OsmoBTS to correctly restart itself with different parameters. > We assume that transceiver is run as a service and will be restarted on exit. > > commit 806a64b1df40871543e9ae34386463d08a564147 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 22:58:55 2013 +0400 > > Transceiver52M: Start and stop all threads on POWERON/POWEROFF. > > This change reveals some issue with the UHD start/stop code. Specifically, > we get a failed assert in RadioInterface::pullBuffer() (num_rd == OUTCHUNK > with num_rd=0) with the POWERON/POWEROFF/POWERON sequence. These patches implements actual power off command. They are split into a separate branch, because they lead to assert failure I mentioned above. In my setup it's 100% reproducible. I hope you could fix that. > commit 4c39dd4b492b439742911aa70623d41ad634d7f4 > Author: Alexander Chemeris <Alexander.Chemeris(a)gmail.com> > Date: Sun Jul 14 22:45:40 2013 +0400 > > Transceiver52M: Introduce usage counting for DriveLoop and RadioInterface. > > The reason is to allow them to be started from any TRX. I.e. they are started > when the first TRX starts and stopped when the last TRX stops. This hack is a workaround for the assert failure above - it shuts down the complete transceiver in a hope that it will be restarted by external means. Meant as to be used in production while we don't have the assert failure fixed. -- Regards, Alexander Chemeris. CEO, Fairwaves LLC / ООО УмРадио http://fairwaves.ru

12 years, 2 months

[PATCH 1/7] Remove obsolete osmo-bts-bb code

by Andreas Eversberg

--- configure.ac | 1 - src/Makefile.am | 2 +- src/osmo-bts-bb/Makefile.am | 8 -- src/osmo-bts-bb/l1ctl.c | 304 -------------------------------------------- src/osmo-bts-bb/main.c | 215 ------------------------------- 5 files changed, 1 insertion(+), 529 deletions(-) delete mode 100644 src/osmo-bts-bb/Makefile.am delete mode 100644 src/osmo-bts-bb/l1ctl.c delete mode 100644 src/osmo-bts-bb/main.c diff --git a/configure.ac b/configure.ac index 5abed70..1ca0dbe 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,6 @@ AC_OUTPUT( src/Makefile src/common/Makefile src/osmo-bts-sysmo/Makefile -dnl src/osmo-bts-bb/Makefile include/Makefile include/osmo-bts/Makefile tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 92bbed9..e2eab0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = common #osmo-bts-bb +SUBDIRS = common if ENABLE_SYSMOBTS SUBDIRS += osmo-bts-sysmo diff --git a/src/osmo-bts-bb/Makefile.am b/src/osmo-bts-bb/Makefile.am deleted file mode 100644 index 022931a..0000000 --- a/src/osmo-bts-bb/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) -LDADD = $(LIBOSMOCORE_LIBS) - -bin_PROGRAMS = osmo-bts-bb - -osmo_bts_bb_SOURCES = main.c -osmo_bts_bb_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/src/osmo-bts-bb/l1ctl.c b/src/osmo-bts-bb/l1ctl.c deleted file mode 100644 index ccba37b..0000000 --- a/src/osmo-bts-bb/l1ctl.c +++ /dev/null @@ -1,304 +0,0 @@ -/* Layer1 control code, talking L1CTL protocol with L1 on the phone */ - -/* (C) 2010 by Holger Hans Peter Freyther <zecke(a)selfish.org> - * (C) 2010 by Harald Welte <laforge(a)gnumonks.org> - * (C) 2011 by Andreas Eversberg <jolly(a)eversberg.eu> - * - * All Rights Reserved - * - * 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. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <stdio.h> -#include <stdint.h> -#include <string.h> -#include <errno.h> - -#include <arpa/inet.h> - -#include <l1ctl_proto.h> - -#include <osmocom/core/signal.h> -#include <osmocom/core/timer.h> -#include <osmocom/core/msgb.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/gsm/gsm_utils.h> -#include <osmocom/gsm/gsmtap_util.h> -#include <osmocom/gsm/protocol/gsm_04_08.h> -#include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocom/gsm/rsl.h> - -#include <osmocom/bb/common/l1ctl.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/common/l1l2_interface.h> -#include <osmocom/bb/common/lapdm.h> -#include <osmo-bts/logging.h> -#include <osmo-bts/abis.h> -#include <osmo-bts/rtp.h> -#include <osmo-bts/bts.h> - -static struct msgb *osmo_l1_alloc(uint8_t msg_type) -{ - struct l1ctl_hdr *l1h; - struct msgb *msg = msgb_alloc_headroom(256, 4, "osmo_l1"); - - if (!msg) { - LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory.\n"); - return NULL; - } - - msg->l1h = msgb_put(msg, sizeof(*l1h)); - l1h = (struct l1ctl_hdr *) msg->l1h; - l1h->msg_type = msg_type; - - return msg; -} - - -static int osmo_make_band_arfcn(struct osmocom_ms *ms, uint16_t arfcn) -{ - /* TODO: Include the band */ - return arfcn; -} - -/* Receive L1CTL_DATA_IND (Data Indication from L1) */ -int rx_ph_data_ind(struct osmocom_ms *ms, struct msgb *msg) -{ - struct l1ctl_info_dl *dl, dl_cpy; - struct l1ctl_data_ind *ccch; - struct lapdm_entity *le; - struct rx_meas_stat *meas = &ms->meas; - uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; - struct gsm_time tm; - struct osmobts_ms *bts_ms = container_of(ms, struct osmobts_ms, ms); - struct osmobts_lchan *lchan; - - if (msgb_l3len(msg) < sizeof(*ccch)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Data Ind: %u\n", - msgb_l3len(msg)); - msgb_free(msg); - return -1; - } - - dl = (struct l1ctl_info_dl *) msg->l1h; - msg->l2h = dl->payload; - ccch = (struct l1ctl_data_ind *) msg->l2h; - - gsm_fn2gsmtime(&tm, ntohl(dl->frame_nr)); - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); - lchan = bts_ms->trx->slot[chan_ts].lchan[chan_ss]; - if (!lchan) { - LOGP(DL1C, LOGL_ERROR, "Data IND for non existing lchan\n"); - msgb_free(msg); - return -1; - } - LOGP(DL1C, LOGL_NOTICE, "RX: %s | %s(%.4u/%.2u/%.2u) %d dBm\n", - rsl_chan_nr_str(dl->chan_nr), - hexdump(ccch->data, sizeof(ccch->data)), - tm.t1, tm.t2, tm.t3, (int)dl->rx_level-110); - - meas->last_fn = ntohl(dl->frame_nr); - meas->frames++; - meas->snr += dl->snr; - meas->berr += dl->num_biterr; - meas->rxlev += dl->rx_level; - - if (dl->fire_crc >= 2) { - LOGP(DL1C, LOGL_NOTICE, "Dropping frame with %u bit errors\n", - dl->num_biterr); - msgb_free(msg); - return 0; - } - - /* send CCCH data via GSMTAP */ - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); - gsmtap_sendmsg(ntohs(dl->band_arfcn), chan_ts, gsmtap_chan_type, chan_ss, - tm.fn, dl->rx_level-110, dl->snr, ccch->data, - sizeof(ccch->data)); - - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &lchan->l2_entity.lapdm_acch; - else - le = &lchan->l2_entity.lapdm_dcch; - /* make local stack copy of l1ctl_info_dl, as LAPDm will - * overwrite skb hdr */ - memcpy(&dl_cpy, dl, sizeof(dl_cpy)); - - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - - /* send it up into LAPDm */ - l2_ph_data_ind(msg, le, &dl_cpy); - - return 0; -} - -/* Receive L1CTL_DATA_CONF (Data Confirm from L1) */ -static int rx_ph_data_conf(struct osmocom_ms *ms, struct msgb *msg) -{ - struct l1ctl_info_dl *dl; - struct lapdm_entity *le; - uint8_t chan_type, chan_ts, chan_ss; - struct osmobts_ms *bts_ms = container_of(ms, struct osmobts_ms, ms); - struct osmobts_lchan *lchan; - - dl = (struct l1ctl_info_dl *) msg->l1h; - - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); - lchan = bts_ms->trx->slot[chan_ts].lchan[chan_ss]; - if (!lchan) { - LOGP(DL1C, LOGL_ERROR, "Data IND for non existing lchan\n"); - msgb_free(msg); - return -1; - } - - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &lchan->l2_entity.lapdm_acch; - else - le = &lchan->l2_entity.lapdm_dcch; - - /* send it up into LAPDm */ - l2_ph_data_conf(msg, le); - - return 0; -} - -/* Transmit L1CTL_DATA_REQ */ -int l1ctl_tx_data_req(struct osmocom_ms *ms, struct msgb *msg, - uint8_t chan_nr, uint8_t link_id) -{ - struct l1ctl_hdr *l1h; - struct l1ctl_info_ul *l1i_ul; - uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; - - if (msgb_l2len(msg) > GSM_MACBLOCK_LEN) { - LOGP(DL1C, LOGL_ERROR, "L1 cannot handle message length " - "> 23 (%u)\n", msgb_l2len(msg)); - msgb_free(msg); - return -EINVAL; - } else if (msgb_l2len(msg) < GSM_MACBLOCK_LEN) - LOGP(DL1C, LOGL_ERROR, "L1 message length < 23 (%u) " - "doesn't seem right!\n", msgb_l2len(msg)); - - /* send copy via GSMTAP */ - rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_sendmsg(0|0x4000, chan_ts, gsmtap_chan_type, chan_ss, - 0, 127, 255, msg->l2h, msgb_l2len(msg)); - - LOGP(DL1C, LOGL_NOTICE, "TX: %s | %s\n", rsl_chan_nr_str(chan_nr), - hexdump(msg->l2h, msgb_l2len(msg))); - - /* prepend uplink info header */ - l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); - - l1i_ul->chan_nr = chan_nr; - l1i_ul->link_id = link_id; - - /* prepend l1 header */ - msg->l1h = msgb_push(msg, sizeof(*l1h)); - l1h = (struct l1ctl_hdr *) msg->l1h; - l1h->msg_type = L1CTL_DATA_REQ; - - printf("todo: transcode message\n"); - - return osmo_send_l1(ms, msg); -} - -/* Transmit L1CTL_RESET_REQ */ -int l1ctl_tx_reset_req(struct osmocom_ms *ms, uint8_t type) -{ - struct msgb *msg; - struct l1ctl_reset *res; - - msg = osmo_l1_alloc(L1CTL_RESET_REQ); - if (!msg) - return -1; - - LOGP(DL1C, LOGL_INFO, "Tx Reset Req (%u)\n", type); - res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); - res->type = type; - - return osmo_send_l1(ms, msg); -} - -/* Receive L1CTL_RESET_IND */ -static int rx_l1_reset(struct osmocom_ms *ms) -{ - LOGP(DL1C, LOGL_INFO, "Layer1 Reset indication\n"); - dispatch_signal(SS_L1CTL, S_L1CTL_RESET, ms); - - return 0; -} - -/* Receive incoming data from L1 using L1CTL format */ -int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg) -{ - int rc = 0; - struct l1ctl_hdr *l1h; - struct l1ctl_info_dl *dl; - - if (msgb_l2len(msg) < sizeof(*dl)) { - LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", - msgb_l2len(msg)); - msgb_free(msg); - return -1; - } - - l1h = (struct l1ctl_hdr *) msg->l1h; - - /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, - as the l1ctl header is of no interest to subsequent code */ - msg->l1h = l1h->data; - - switch (l1h->msg_type) { - case L1CTL_DATA_IND: - rc = rx_ph_data_ind(ms, msg); - break; - case L1CTL_DATA_CONF: - rc = rx_ph_data_conf(ms, msg); - break; - case L1CTL_RESET_IND: - case L1CTL_RESET_CONF: - rc = rx_l1_reset(ms); - msgb_free(msg); - break; - default: - LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", l1h->msg_type); - msgb_free(msg); - break; - } - - return rc; -} - -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power) -{ - return -ENOTSUP; -} - -int l1ctl_tx_rach_req(struct osmocom_ms *ms, uint8_t ra, uint16_t offset, - uint8_t combined) -{ - return -ENOTSUP; -} - - diff --git a/src/osmo-bts-bb/main.c b/src/osmo-bts-bb/main.c deleted file mode 100644 index 7300b68..0000000 --- a/src/osmo-bts-bb/main.c +++ /dev/null @@ -1,215 +0,0 @@ -/* (C) 2011 by Andreas Eversberg <jolly(a)eversberg.eu> - * - * All Rights Reserved - * - * 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. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <netinet/in.h> -#include <osmocom/core/talloc.h> -#include <osmocom/core/signal.h> -#include <osmocom/core/timer.h> -#include <osmocom/core/select.h> -#include <osmo-bts/logging.h> -//#include <osmocom/bb/common/osmocom_data.h> -#include <osmo-bts/support.h> -#include <osmo-bts/abis.h> -#include <osmo-bts/rtp.h> -#include <osmo-bts/bts.h> - -#include <net/if.h> - -#define _GNU_SOURCE -#include <getopt.h> -#include <stdlib.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/ioctl.h> -#include <netdb.h> -#include <string.h> -#include <time.h> - -struct log_target *stderr_target; -char *debugs = "DL1C:DLAPDM:DABIS:DOML:DRSL:DSUM"; - -void *l23_ctx = NULL; -static struct osmocom_bts *bts; -int debug_set = 0; -char *software_version = "0.0"; -uint8_t abis_mac[6] = { 0, 1, 2, 3, 4, 5 }; -char *bsc_host = "localhost"; -char *bts_id = "1801/0"; -int quit = 0; - -// FIXME this is a hack -static void get_mac(void) -{ - struct if_nameindex *ifn = if_nameindex(); - struct ifreq ifr; - int sock; - int ret; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - return; - - memset(&ifr, 0, sizeof(ifr)); - if (!ifn) - return; - while (ifn->if_name) { - strncpy(ifr.ifr_name, ifn->if_name, sizeof(ifr.ifr_name)-1); - ret = ioctl(sock, SIOCGIFHWADDR, &ifr); - if (ret == 0 && !!memcmp(ifr.ifr_hwaddr.sa_data, - "\0\0\0\0\0\0", 6)) { - memcpy(abis_mac, ifr.ifr_hwaddr.sa_data, 6); - printf("Using MAC address of %s: " - "'%02x:%02x:%02x:%02x:%02x:%02x'\n", - ifn->if_name, - abis_mac[0], abis_mac[1], abis_mac[2], - abis_mac[3], abis_mac[4], abis_mac[5]); - break; - } - ifn++; - } -// if_freenameindex(ifn); -} - -static void print_usage(const char *app) -{ - printf("Usage: %s [option]\n", app); - printf(" -h --help this text\n"); - printf(" -d --debug Change debug flags. (-d %s)\n", debugs); - printf(" -i --bsc-ip IP address of the BSC\n"); -} - -static void handle_options(int argc, char **argv) -{ - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - {"help", 0, 0, 'h'}, - {"debug", 1, 0, 'd'}, - {"bsc-ip", 1, 0, 'i'}, - {0, 0, 0, 0}, - }; - - c = getopt_long(argc, argv, "hd:i:", - long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(argv[0]); - exit(0); - case 'd': - log_parse_category_mask(stderr_target, optarg); - debug_set = 1; - break; - case 'i': - bsc_host = strdup(optarg); - break; - default: - break; - } - } -} - -void sighandler(int sigset) -{ - if (sigset == SIGHUP || sigset == SIGPIPE) - return; - - fprintf(stderr, "Signal %d recevied.\n", sigset); - - /* in case there is a lockup during exit */ - signal(SIGINT, SIG_DFL); - signal(SIGHUP, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGPIPE, SIG_DFL); - - quit = 1; -// dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL); -} - -int main(int argc, char **argv) -{ - int ret; - struct hostent *hostent; - struct in_addr *ina; - uint32_t bsc_ip; - uint8_t maskv_tx[2], maskv_rx[2]; - - printf("((*))\n"); - printf(" |\n"); - printf(" / \\ OsmoBTS\n"); - - get_mac(); - bts_support_init(); - - srand(time(NULL)); - - log_init(&log_info); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); - - l23_ctx = talloc_named_const(NULL, 1, "layer2 context"); - - handle_options(argc, argv); - - if (!debug_set) - log_parse_category_mask(stderr_target, debugs); - log_set_log_level(stderr_target, LOGL_INFO); - - hostent = gethostbyname(bsc_host); - if (!hostent) { - fprintf(stderr, "Failed to resolve BSC hostname '%s'.\n", - bsc_host); - } - ina = (struct in_addr *) hostent->h_addr; - bsc_ip = ntohl(ina->s_addr); - printf("Using BSC at IP: '%d.%d.%d.%d'\n", bsc_ip >> 24, - (bsc_ip >> 16) & 0xff, (bsc_ip >> 8) & 0xff, bsc_ip & 0xff); - - printf("Using BTS ID: '%s'\n", bts_id); - bts = create_bts(1, bts_id); - if (!bts) - exit(-1); - maskv_tx[0] = 0x55; - maskv_rx[0] = 0x55; - ret = create_ms(bts->trx[0], 1, maskv_tx, maskv_rx); - if (ret < 0) - goto fail; - ret = abis_open(&bts->link, bsc_ip); - if (ret < 0) - goto fail; - - signal(SIGINT, sighandler); - signal(SIGHUP, sighandler); - signal(SIGTERM, sighandler); - signal(SIGPIPE, sighandler); - - while (!quit) { - work_bts(bts); - osmo_select_main(0); - } - -fail: - destroy_bts(bts); - - return 0; -} -- 1.8.1.5

12 years, 3 months

[PATCH] oml: Add a missing break switch for NM_OC_BS11

by Holger Hans Peter Freyther

It appears to me that for NM_OC_BS11 mo was either NULL or the one mo value from NM_OC_BS11_RACK. The break inside the nested switch case didn't break from the outer one. Fixes Coverity: CID 1040728 --- openbsc/src/libcommon/gsm_data_shared.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c index 9a50f6b..1b0814c 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon/gsm_data_shared.c @@ -390,6 +390,7 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, default: return NULL; } + break; case NM_OC_BS11_RACK: mo = &bts->bs11.rack.mo; break; -- 1.8.3.2

12 years, 3 months

Fwd: DSP optimization

by Alexander Chemeris

Hi all, I'm moving this conversation from private to public. I think Sylvain and Andreas might be interested in participating. ---------- Forwarded message ---------- From: Thomas Tsou <tom(a)tsou.cc> Date: Tue, Jul 9, 2013 at 2:51 AM Subject: Re: DSP optimization To: Alexander Chemeris <alexander.chemeris(a)gmail.com> On Mon, Jul 8, 2013 at 6:52 AM, Alexander Chemeris <alexander.chemeris(a)gmail.com> wrote: > Wow, optimization of 5-16x for Viterbi is huge indeed. I wonder what > would be results for our Atoms. Without SSE, just C only butterfly, the improvement is around 4x. SSE 3 (Atom) forces a small change on the normalization (not separated out yet), but the results weren't very far off from SSE 4.1 when I tested on Core 2 Duo. I might try to manipulate the interface to read in the state tables instead of the generator polynomials. That would really help with testing and integration, but I'm not sure yet. There are many ways to go here. > What is problematic with the runtime detection? CPU autodetection on > Linux should be as easy as reading /proc/cpuinfo. But I see an issue > is with correctly setting up build system to generate all version on > the same run. I think we could leave CPU autodetection for the > "everything else" milestone, using compile time selection for now. I think compile time detection is more appropriate. For GSM / LTE we're almost always dealing with fixed sized vectors and not odd calculations (e.g. 1023 size FFT), so it's unlikely that the results will change on repeated runs. /proc/cpuinfo parsing scripts I've seen have been prone to breakage. If you have a really good one, let me know. I usually prefer to run configure checks against the actual instruction, but that can get messy with a lot of checks. Anyhow, I'm not worrying about this now. > What repository will you push at? We need to have at least master > branch and dual-channel branch working with the optimizations. And I > believe everyone would be happy to see optimizations in the > libosmocore for the benefit of other projects as well. I don't foresee > any issues with a slight change in the API of libosmocore if it is > justified - just send an RFC/patch to the OpenBSC mailing list and it > will be reviewed. Non-Viterbi changes are sigProc.cpp changes only, so they are not branch-specific - they will probably merge into the oldest available OpenBTS releases. The Viterbi changes merge into Andreas's branch, which is a very large change. For now, somebody needs to write it, which is why I'm considering making the interfaces match. Attached are the standalone unit test cases for SSE 4.2. As previously mentioned, Atom needs SSE3 only. I'll add the ifdefs for those shortly. I don't know if there's an appropriate repository for these right now - linking libosmocore from the transceiver for comparison purposes only seems silly. I just generated a temporary tarball for the time being. Thomas -- Regards, Alexander Chemeris. CEO, Fairwaves LLC / ООО УмРадио http://fairwaves.ru

12 years, 3 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC July 2013