cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity
osmo-pcu/src/bts.cpp

1026 lines
28 KiB
C++
Raw Normal View History

bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
/*
* Copyright (C) 2013 by Holger Hans Peter Freyther
*
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation; either version 3 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include <bts.h>
bts: Introduce a PollController that has the responsibility to poll For each frame indication received by the BTS the poll controller is asked to expire timedout entries.
2013-10-17 18:12:37 +00:00
#include <poll_controller.h>
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
#include <tbf.h>
encoding: Move the functions into the encoding class Add some TODO to this class. E.g. they could all work on the bitvec and the parameter handling could better.
2013-10-19 17:04:03 +00:00
#include <encoding.h>
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
#include <decoding.h>
#include <rlc.h>
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
#include <pcu_l1_if.h>
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
#include <gprs_rlcmac.h>
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
#include <gprs_debug.h>
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
extern "C" {
#include <osmocom/core/talloc.h>
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
#include <osmocom/core/msgb.h>
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
}
bts: Introduce a PollController that has the responsibility to poll For each frame indication received by the BTS the poll controller is asked to expire timedout entries.
2013-10-17 18:12:37 +00:00
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
#include <arpa/inet.h>
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
#include <errno.h>
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
#include <string.h>
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
extern void *tall_pcu_ctx;
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
static BTS s_bts;
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
/**
* For gcc-4.4 compat do not use extended initializer list but keep the
* order from the enum here. Once we support GCC4.7 and up we can change
* the code below.
*/
static const struct rate_ctr_desc bts_ctr_description[] = {
{ "tbf.dl.alloc", "TBF DL Allocated "},
{ "tbf.dl.freed", "TBF DL Freed "},
{ "tbf.ul.alloc", "TBF UL Allocated "},
{ "tbf.ul.freed", "TBF UL Freed "},
tbf: Count how often we re-use a TBF that was already being deactivated
2013-11-13 14:02:50 +00:00
{ "tbf.reused", "TBF Reused "},
rlc: Count the sent and resent RLC blocks
2013-11-13 18:36:57 +00:00
{ "rlc.sent", "RLC Sent "},
{ "rlc.resent", "RLC Resent "},
tbf: Count how often we re-start a BSN in the send routine There appears to be a scheduling issue. Even without any NACKs we are re-transmitting a lot of frames. It might be because of this.
2013-11-23 23:01:50 +00:00
{ "rlc.restarted", "RLC Restarted "},
rlc: Count the window stalls on the RLC level
2013-11-19 16:09:37 +00:00
{ "rlc.stalled", "RLC Stalled "},
rlc: Count nacked frames in the statistics too
2013-11-23 00:01:19 +00:00
{ "rlc.nacked", "RLC Nacked "},
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
{ "decode.errors", "Decode Errors "},
sba: Count SBA allocation, frees and timeouts Add a warning about the receive message poking in the internal of the sba. This will be cleaned up in a follow up commit
2013-10-27 09:00:47 +00:00
{ "sba.allocated", "SBA Allocated "},
{ "sba.freed", "SBA Freed "},
{ "sba.timedout", "SBA Timeout "},
llc: Count timedout and silently dropped frames A DL tbf can be discarded and then the already queued LLCs will be silently dropped. Count this event.
2013-10-27 09:34:31 +00:00
{ "llc.timeout", "Timedout Frames "},
{ "llc.dropped", "Dropped Frames "},
bts: Count the number of llc frames that were "scheduled" to be sent This does not mean that they have been successfully transferred to the SGSN/MS but at least that they have reached a certain point in the message flow.
2013-11-13 15:43:26 +00:00
{ "llc.scheduled", "Scheduled Frames "},
bts: Count the rach frames we receive
2013-10-27 09:50:35 +00:00
{ "rach.requests", "RACH requests "},
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
};
static const struct rate_ctr_group_desc bts_ctrg_desc = {
"bts",
"BTS Statistics",
ARRAY_SIZE(bts_ctr_description),
bts_ctr_description,
};
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
BTS* BTS::main_bts()
{
return &s_bts;
}
struct gprs_rlcmac_bts *BTS::bts_data()
{
return &m_bts;
}
struct gprs_rlcmac_bts *bts_main_data()
{
return BTS::main_bts()->bts_data();
}
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
struct rate_ctr_group *bts_main_data_stats()
{
return BTS::main_bts()->rate_counters();
}
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
BTS::BTS()
bts: Move the frame_number into the BTS sructure The current_frame is an attribute of the BTS. Move it from the pcu_l1_if.cpp into the BTS. As the next step we can trigger actions depending on the change of the frame.
2013-10-17 17:59:56 +00:00
: m_cur_fn(0)
bts: Introduce a PollController that has the responsibility to poll For each frame indication received by the BTS the poll controller is asked to expire timedout entries.
2013-10-17 18:12:37 +00:00
, m_pollController(*this)
sba: Create a SBAController that will manage the sbas for a BTS The PollController is a friend of the SBAController and is allowed to access the internal list. The list is hidden from everyone else. This is done because the calculation of timeout should belong into the PollController and not into the SBAController.
2013-10-19 18:47:12 +00:00
, m_sba(*this)
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
{
memset(&m_bts, 0, sizeof(m_bts));
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
INIT_LLIST_HEAD(&m_bts.ul_tbfs);
INIT_LLIST_HEAD(&m_bts.dl_tbfs);
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
m_bts.bts = this;
bts: Add backpointers to the PDCH and TRX structures This will allow to kill various parameters from all the functions as we can walk back.
2013-10-20 08:14:03 +00:00
/* initialize back pointers */
for (size_t trx_no = 0; trx_no < ARRAY_SIZE(m_bts.trx); ++trx_no) {
struct gprs_rlcmac_trx *trx = &m_bts.trx[trx_no];
trx->trx_no = trx_no;
trx->bts = this;
for (size_t ts_no = 0; ts_no < ARRAY_SIZE(trx->pdch); ++ts_no) {
struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_no];
pdch->ts_no = ts_no;
pdch->trx = trx;
}
}
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
m_ratectrs = rate_ctr_group_alloc(tall_pcu_ctx, &bts_ctrg_desc, 0);
bts: Introduce a singleton for the BTS and use it in the code Compared to the previous code there will be a branch to get the global pointer so the code will be slightly slower than the previous version but it allows us to start creating objects but still use the code from C. It is best approach I have found so far. One downside of C++ is that by default talloc will not be used (unless we override the new operator to use talloc. Right now we need to memset the C data structure by hand. The benefit of enforcing a better structure should is more important though.
2013-10-17 17:41:11 +00:00
}
bts: Move the frame_number into the BTS sructure The current_frame is an attribute of the BTS. Move it from the pcu_l1_if.cpp into the BTS. As the next step we can trigger actions depending on the change of the frame.
2013-10-17 17:59:56 +00:00
bts: Start creating statistics inside the BTS code
2013-10-27 08:02:31 +00:00
BTS::~BTS()
{
rate_ctr_group_free(m_ratectrs);
}
bts: Move the frame_number into the BTS sructure The current_frame is an attribute of the BTS. Move it from the pcu_l1_if.cpp into the BTS. As the next step we can trigger actions depending on the change of the frame.
2013-10-17 17:59:56 +00:00
void BTS::set_current_frame_number(int fn)
{
m_cur_fn = fn;
bts: Introduce a PollController that has the responsibility to poll For each frame indication received by the BTS the poll controller is asked to expire timedout entries.
2013-10-17 18:12:37 +00:00
m_pollController.expireTimedout(m_cur_fn);
bts: Move the frame_number into the BTS sructure The current_frame is an attribute of the BTS. Move it from the pcu_l1_if.cpp into the BTS. As the next step we can trigger actions depending on the change of the frame.
2013-10-17 17:59:56 +00:00
}
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
int BTS::add_paging(uint8_t chan_needed, uint8_t *identity_lv)
{
uint8_t l, trx, ts, any_tbf = 0;
struct gprs_rlcmac_tbf *tbf;
struct gprs_rlcmac_paging *pag;
uint8_t slot_mask[8];
int8_t first_ts; /* must be signed */
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
llist_head *tbfs_lists[] = {
&m_bts.ul_tbfs,
&m_bts.dl_tbfs,
NULL
};
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
LOGP(DRLCMAC, LOGL_INFO, "Add RR paging: chan-needed=%d MI=%s\n",
chan_needed, osmo_hexdump(identity_lv + 1, identity_lv[0]));
/* collect slots to page
* Mark slots for every TBF, but only mark one of it.
* Mark only the first slot found.
* Don't mark, if TBF uses a different slot that is already marked. */
memset(slot_mask, 0, sizeof(slot_mask));
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
for (l = 0; tbfs_lists[l]; l++) {
llist_for_each_entry(tbf, tbfs_lists[l], list) {
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
first_ts = -1;
for (ts = 0; ts < 8; ts++) {
if (tbf->pdch[ts]) {
/* remember the first slot found */
if (first_ts < 0)
first_ts = ts;
/* break, if we already marked a slot */
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
if ((slot_mask[tbf->trx->trx_no] & (1 << ts)))
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
break;
}
}
/* mark first slot found, if none is marked already */
if (ts == 8 && first_ts >= 0) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "- %s uses "
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
"TRX=%d TS=%d, so we mark\n",
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
tbf_name(tbf),
tbf->trx->trx_no, first_ts);
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
slot_mask[tbf->trx->trx_no] |= (1 << first_ts);
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
} else
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "- %s uses "
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
"already marked TRX=%d TS=%d\n",
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
tbf_name(tbf),
tbf->trx->trx_no, ts);
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
}
}
/* Now we have a list of marked slots. Every TBF uses at least one
* of these slots. */
/* schedule paging to all marked slots */
for (trx = 0; trx < 8; trx++) {
if (slot_mask[trx] == 0)
continue;
for (ts = 0; ts < 8; ts++) {
if ((slot_mask[trx] & (1 << ts))) {
/* schedule */
pag = talloc_zero(tall_pcu_ctx,
struct gprs_rlcmac_paging);
if (!pag)
return -ENOMEM;
pag->chan_needed = chan_needed;
memcpy(pag->identity_lv, identity_lv,
identity_lv[0] + 1);
m_bts.trx[trx].pdch[ts].add_paging(pag);
LOGP(DRLCMAC, LOGL_INFO, "Paging on PACCH of "
"TRX=%d TS=%d\n", trx, ts);
pdch: Only say we have paged when this has actually been done
2013-10-19 16:33:52 +00:00
any_tbf = 1;
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
}
}
}
if (!any_tbf)
LOGP(DRLCMAC, LOGL_INFO, "No paging, because no TBF\n");
return 0;
}
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
/* search for active downlink tbf */
gprs_rlcmac_tbf *BTS::dl_tbf_by_tlli(uint32_t tlli)
{
return tbf_by_tlli(tlli, GPRS_RLCMAC_DL_TBF);
}
/* search for active uplink tbf */
gprs_rlcmac_tbf *BTS::ul_tbf_by_tlli(uint32_t tlli)
{
return tbf_by_tlli(tlli, GPRS_RLCMAC_UL_TBF);
}
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
/* search for active downlink or uplink tbf */
gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir)
{
struct gprs_rlcmac_tbf *tbf;
if (dir == GPRS_RLCMAC_UL_TBF) {
llist_for_each_entry(tbf, &m_bts.ul_tbfs, list) {
if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
&& tbf->tlli() == tlli && tbf->is_tlli_valid())
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
return tbf;
}
} else {
llist_for_each_entry(tbf, &m_bts.dl_tbfs, list) {
if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
&& tbf->tlli() == tlli)
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
return tbf;
}
}
return NULL;
}
gprs_rlcmac_tbf *BTS::tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts)
{
struct gprs_rlcmac_tbf *tbf;
/* only one TBF can poll on specific TS/FN, because scheduler can only
* schedule one downlink control block (with polling) at a FN per TS */
llist_for_each_entry(tbf, &m_bts.ul_tbfs, list) {
if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)
&& tbf->poll_state == GPRS_RLCMAC_POLL_SCHED
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
&& tbf->poll_fn == fn && tbf->trx->trx_no == trx
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
&& tbf->control_ts == ts)
return tbf;
}
llist_for_each_entry(tbf, &m_bts.dl_tbfs, list) {
if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)
&& tbf->poll_state == GPRS_RLCMAC_POLL_SCHED
tbf: Remove the trx_no field from the tbf, go through the trx object
2013-10-27 12:44:37 +00:00
&& tbf->poll_fn == fn && tbf->trx->trx_no == trx
bts/tbf: Move the lists into the BTS and do the look-up from the BTS The list belongs to the BTS. This makes cleaning this up more easy and establishes a hierachy of resources that start from the BTS. The debug_diagram code is now broken.
2013-10-19 19:10:38 +00:00
&& tbf->control_ts == ts)
return tbf;
}
return NULL;
}
tbf/pdch/bts: Move the tbf look-up by tfi into the BTS
2013-10-26 17:10:43 +00:00
/* lookup TBF Entity (by TFI) */
gprs_rlcmac_tbf *BTS::tbf_by_tfi(uint8_t tfi, uint8_t trx,
enum gprs_rlcmac_tbf_direction dir)
{
struct gprs_rlcmac_tbf *tbf;
if (tfi >= 32 || trx >= 8)
return NULL;
if (dir == GPRS_RLCMAC_UL_TBF)
tbf = m_bts.trx[trx].ul_tbf[tfi];
else
tbf = m_bts.trx[trx].dl_tbf[tfi];
if (!tbf)
return NULL;
if (tbf->state_is_not(GPRS_RLCMAC_RELEASING))
return tbf;
return NULL;
}
tbf/bts: Move the tfi_find_free into the bts
2013-10-26 17:17:58 +00:00
/* FIXME: spread resources over multiple TRX. Also add option to use same
* TRX in case of existing TBF for TLLI in the other direction. */
/* search for free TFI and return TFI, TRX */
int BTS::tfi_find_free(enum gprs_rlcmac_tbf_direction dir,
uint8_t *_trx, int8_t use_trx)
{
struct gprs_rlcmac_pdch *pdch;
struct gprs_rlcmac_tbf **tbfp;
uint8_t trx_from, trx_to, trx, ts, tfi;
if (use_trx >= 0 && use_trx < 8)
trx_from = trx_to = use_trx;
else {
trx_from = 0;
trx_to = 7;
}
/* on TRX find first enabled TS */
for (trx = trx_from; trx <= trx_to; trx++) {
for (ts = 0; ts < 8; ts++) {
pdch = &m_bts.trx[trx].pdch[ts];
if (!pdch->is_enabled())
continue;
break;
}
if (ts < 8)
break;
}
if (trx > trx_to) {
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH available.\n");
return -EINVAL;
}
LOGP(DRLCMAC, LOGL_DEBUG, "Searching for first unallocated TFI: "
"TRX=%d first TS=%d\n", trx, ts);
if (dir == GPRS_RLCMAC_UL_TBF)
tbfp = m_bts.trx[trx].ul_tbf;
else
tbfp = m_bts.trx[trx].dl_tbf;
for (tfi = 0; tfi < 32; tfi++) {
if (!tbfp[tfi])
break;
}
if (tfi < 32) {
LOGP(DRLCMAC, LOGL_DEBUG, " Found TFI=%d.\n", tfi);
*_trx = trx;
return tfi;
}
LOGP(DRLCMAC, LOGL_NOTICE, "No TFI available.\n");
return -1;
}
bts: Move rcv_imm_ass_cnf into the bts code
2013-10-26 17:49:16 +00:00
int BTS::rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn)
{
struct gprs_rlcmac_tbf *tbf;
uint8_t plen;
uint32_t tlli;
/* move to IA Rest Octets */
plen = data[0] >> 2;
data += 1 + plen;
if ((*data & 0xf0) != 0xd0) {
LOGP(DRLCMAC, LOGL_ERROR, "Got IMM.ASS confirm, but rest "
"octets do not start with bit sequence 'HH01' "
"(Packet Downlink Assignment)\n");
return -EINVAL;
}
/* get TLLI from downlink assignment */
tlli = (*data++) << 28;
tlli |= (*data++) << 20;
tlli |= (*data++) << 12;
tlli |= (*data++) << 4;
tlli |= (*data++) >> 4;
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
tbf = dl_tbf_by_tlli(tlli);
bts: Move rcv_imm_ass_cnf into the bts code
2013-10-26 17:49:16 +00:00
if (!tbf) {
LOGP(DRLCMAC, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI=%08x "
"does not exit\n", tlli);
return -EINVAL;
}
LOGP(DRLCMAC, LOGL_DEBUG, "Got IMM.ASS confirm for TLLI=%08x\n", tlli);
if (tbf->dir.dl.wait_confirm)
tbf_timer_start(tbf, 0, Tassign_agch);
return 0;
}
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta)
{
struct gprs_rlcmac_tbf *tbf;
bts: Rename ts and trx to ts_no and trx_no as we operate on number
2013-12-25 17:56:34 +00:00
uint8_t trx_no, ts_no = 0;
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
int8_t tfi; /* must be signed */
uint8_t sb = 0;
uint32_t sb_fn = 0;
int rc;
uint8_t plen;
bts: Count the rach frames we receive
2013-10-27 09:50:35 +00:00
rach_frame();
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF on RACH, so we provide "
"one:\n");
if ((ra & 0xf8) == 0x70) {
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block "
"allocation\n");
sb = 1;
} else if (m_bts.force_two_phase) {
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single phase access, "
"but we force two phase access\n");
sb = 1;
}
if (qta < 0)
qta = 0;
if (qta > 252)
qta = 252;
if (sb) {
bts: Rename ts and trx to ts_no and trx_no as we operate on number
2013-12-25 17:56:34 +00:00
rc = sba()->alloc(&trx_no, &ts_no, &sb_fn, qta >> 2);
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
if (rc < 0)
return rc;
LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] RACH qbit-ta=%d "
"ra=0x%02x, Fn=%d (%d,%d,%d)\n", qta, ra, Fn,
(Fn / (26 * 51)) % 32, Fn % 51, Fn % 26);
LOGP(DRLCMAC, LOGL_INFO, "TX: Immediate Assignment Uplink "
"(AGCH)\n");
} else {
// Create new TBF
#warning "Copy and pate with other routines.."
bts: Rename ts and trx to ts_no and trx_no as we operate on number
2013-12-25 17:56:34 +00:00
tfi = tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1);
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
if (tfi < 0) {
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
/* FIXME: send reject */
return -EBUSY;
}
/* set class to 0, since we don't know the multislot class yet */
bts: Rename ts and trx to ts_no and trx_no as we operate on number
2013-12-25 17:56:34 +00:00
tbf = tbf_alloc(&m_bts, NULL, GPRS_RLCMAC_UL_TBF, tfi, trx_no, 0, 1);
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
if (!tbf) {
misc: Fix typo.. resource in english only has one 's'
2013-10-27 09:38:31 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n");
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
/* FIXME: send reject */
return -EBUSY;
}
tbf->ta = qta >> 2;
tbf_new_state(tbf, GPRS_RLCMAC_FLOW);
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_CCCH);
tbf_timer_start(tbf, 3169, m_bts.t3169, 0);
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "%s [UPLINK] START\n",
tbf_name(tbf));
LOGP(DRLCMAC, LOGL_DEBUG, "%s RX: [PCU <- BTS] RACH "
"qbit-ta=%d ra=0x%02x, Fn=%d (%d,%d,%d)\n",
tbf_name(tbf),
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
qta, ra, Fn, (Fn / (26 * 51)) % 32, Fn % 51, Fn % 26);
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
LOGP(DRLCMAC, LOGL_INFO, "%s TX: START Immediate "
"Assignment Uplink (AGCH)\n", tbf_name(tbf));
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
}
bitvec *immediate_assignment = bitvec_alloc(22) /* without plen */;
bitvec_unhex(immediate_assignment,
"2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
if (sb)
plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 0, ra,
bts: Rename ts and trx to ts_no and trx_no as we operate on number
2013-12-25 17:56:34 +00:00
Fn, qta >> 2, m_bts.trx[trx_no].arfcn, ts_no,
m_bts.trx[trx_no].pdch[ts_no].tsc, 0, 0, 0, 0, sb_fn, 1,
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
m_bts.alpha, m_bts.gamma, -1);
else
plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 0, ra,
tbf: Kill the tsc member as it duplicates data We can just use first_ts and the trx/pdch to extract this information. Avoid duplication of data.
2013-12-25 19:22:35 +00:00
Fn, tbf->ta, tbf->trx->arfcn, tbf->first_ts, tbf->tsc(),
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf->tfi(), tbf->dir.ul.usf[tbf->first_ts], 0, 0, 0, 0,
bts: Move gprs_rlcmac_rcv_rach into the BTS class
2013-10-26 18:56:20 +00:00
m_bts.alpha, m_bts.gamma, -1);
pcu_l1if_tx_agch(immediate_assignment, plen);
bitvec_free(immediate_assignment);
return 0;
}
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
/* depending on the current TBF, we assign on PACCH or AGCH */
void BTS::trigger_dl_ass(
struct gprs_rlcmac_tbf *tbf,
struct gprs_rlcmac_tbf *old_tbf, const char *imsi)
{
/* stop pending timer */
tbf->stop_timer();
/* check for downlink tbf: */
if (old_tbf) {
LOGP(DRLCMAC, LOGL_DEBUG, "Send dowlink assignment on "
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"PACCH, because %s exists\n", tbf_name(old_tbf));
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
old_tbf->dl_ass_state = GPRS_RLCMAC_DL_ASS_SEND_ASS;
/* use TA from old TBF */
tbf->ta = old_tbf->ta;
tbf/bts, encoding: Keep track of WAIT_RELEASE state for DL assignment The current code does not properly distinguish between DL assignments to reuse a tbf (after it was put in state WAIT_RELEASE) and DL assignments for an active tbf to change the allocation of the PDCH timeslots. This patch introduces a new variable was_releasing which remembers if trigger_dl_ass() was called with a tbf in state WAIT_RELEASE. In that case we have to set the CONTROL_ACK field in the download assignment. This should allow us to send DL assignments to change PDCH TS allocation of a tbf before we enter FLOW state.
2014-05-30 15:58:00 +00:00
tbf->was_releasing = tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE);
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
/* change state */
tbf_new_state(tbf, GPRS_RLCMAC_ASSIGN);
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_PACCH);
/* start timer */
tbf_timer_start(tbf, 0, Tassign_pacch);
} else {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "Send dowlink assignment for %s on PCH, no TBF exist (IMSI=%s)\n", tbf_name(tbf), imsi);
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
if (!imsi || strlen(imsi) < 3) {
LOGP(DRLCMAC, LOGL_ERROR, "No valid IMSI!\n");
return;
}
tbf/bts, encoding: Keep track of WAIT_RELEASE state for DL assignment The current code does not properly distinguish between DL assignments to reuse a tbf (after it was put in state WAIT_RELEASE) and DL assignments for an active tbf to change the allocation of the PDCH timeslots. This patch introduces a new variable was_releasing which remembers if trigger_dl_ass() was called with a tbf in state WAIT_RELEASE. In that case we have to set the CONTROL_ACK field in the download assignment. This should allow us to send DL assignments to change PDCH TS allocation of a tbf before we enter FLOW state.
2014-05-30 15:58:00 +00:00
tbf->was_releasing = tbf->state_is(GPRS_RLCMAC_WAIT_RELEASE);
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
/* change state */
tbf_new_state(tbf, GPRS_RLCMAC_ASSIGN);
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_CCCH);
tbf: Have one imsi field and assign it through a function Have one IMSI field per TBF and assign through a function call. The IMSI should be used to look-up the TBF on the SGSN->PCU direction.
2013-10-27 19:57:35 +00:00
tbf->assign_imsi(imsi);
bts: Move gprs_rlcmac_trigger_downlink_assignment into BTS
2013-10-26 18:27:44 +00:00
/* send immediate assignment */
tbf->bts->snd_dl_ass(tbf, 0, imsi);
tbf->dir.dl.wait_confirm = 1;
}
}
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi)
{
int plen;
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_INFO, "TX: START %s Immediate Assignment Downlink (PCH)\n", tbf_name(tbf));
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
bitvec *immediate_assignment = bitvec_alloc(22); /* without plen */
bitvec_unhex(immediate_assignment, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
/* use request reference that has maximum distance to current time,
* so the assignment will not conflict with possible RACH requests. */
plen = Encoding::write_immediate_assignment(&m_bts, immediate_assignment, 1, 125,
(tbf->pdch[tbf->first_ts]->last_rts_fn + 21216) % 2715648, tbf->ta,
tbf: Kill the tsc member as it duplicates data We can just use first_ts and the trx/pdch to extract this information. Avoid duplication of data.
2013-12-25 19:22:35 +00:00
tbf->trx->arfcn, tbf->first_ts, tbf->tsc(), tbf->tfi(), 0, tbf->tlli(), poll,
tbf: Move gprs_rlcmac_poll_timeout into the tbf Move the gprs_rlcmac_poll_timeout method into the tbf class and gprs_rlcmac_downlink_assignment into the BTS.
2013-10-26 18:12:59 +00:00
tbf->poll_fn, 0, m_bts.alpha, m_bts.gamma, -1);
pcu_l1if_tx_pch(immediate_assignment, plen, imsi);
bitvec_free(immediate_assignment);
}
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
/*
* PDCH code below. TODO: move to a separate file
*/
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
void gprs_rlcmac_pdch::enable()
{
/* TODO: Check if there are still allocated resources.. */
INIT_LLIST_HEAD(&paging_list);
m_is_enabled = 1;
}
void gprs_rlcmac_pdch::disable()
{
/* TODO.. kick free_resources once we know the TRX/TS we are on */
m_is_enabled = 0;
}
pdch: Simplify the reset code, rename variables to XYZ_no Simplify the reset code now that the PDCH can know where it is located. Rename the variables in the sba to trx_no and ts_no as it stores the number and not the actual thing.
2013-10-20 14:37:05 +00:00
void gprs_rlcmac_pdch::free_resources()
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
{
struct gprs_rlcmac_paging *pag;
/* we are not enabled. there should be no resources */
if (!is_enabled())
return;
/* kick all TBF on slot */
gprs_rlcmac_tbf::free_all(this);
/* flush all pending paging messages */
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
while ((pag = dequeue_paging()))
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
talloc_free(pag);
pdch: Simplify the reset code, rename variables to XYZ_no Simplify the reset code now that the PDCH can know where it is located. Rename the variables in the sba to trx_no and ts_no as it stores the number and not the actual thing.
2013-10-20 14:37:05 +00:00
trx->bts->sba()->free_resources(this);
pdch: Move enable/disable into the PDCH code When a PDCH is disabled all resources should be freed. This is currently not possible as the PDCH does not know where it belongs to. On top of that the list (and other resources) should be properly initialized on construction so that disable() is idempotent and does not check if it was disabled. During the re-factoring I noticed that during a sysmobts re-start some resources are not freed. I left a warning in the code to resolve this issue later.
2013-10-19 15:37:48 +00:00
}
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
struct gprs_rlcmac_paging *gprs_rlcmac_pdch::dequeue_paging()
{
struct gprs_rlcmac_paging *pag;
if (llist_empty(&paging_list))
return NULL;
pag = llist_entry(paging_list.next, struct gprs_rlcmac_paging, list);
llist_del(&pag->list);
return pag;
}
struct msgb *gprs_rlcmac_pdch::packet_paging_request()
{
struct gprs_rlcmac_paging *pag;
struct msgb *msg;
unsigned wp = 0, len;
/* no paging, no message */
pag = dequeue_paging();
if (!pag)
return NULL;
LOGP(DRLCMAC, LOGL_DEBUG, "Scheduling paging\n");
/* alloc message */
msg = msgb_alloc(23, "pag ctrl block");
if (!msg) {
talloc_free(pag);
return NULL;
}
bitvec *pag_vec = bitvec_alloc(23);
if (!pag_vec) {
msgb_free(msg);
talloc_free(pag);
return NULL;
}
encoding: Move the functions into the encoding class Add some TODO to this class. E.g. they could all work on the bitvec and the parameter handling could better.
2013-10-19 17:04:03 +00:00
wp = Encoding::write_packet_paging_request(pag_vec);
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
/* loop until message is full */
while (pag) {
/* try to add paging */
if ((pag->identity_lv[1] & 0x07) == 4) {
/* TMSI */
LOGP(DRLCMAC, LOGL_DEBUG, "- TMSI=0x%08x\n",
ntohl(*((uint32_t *)(pag->identity_lv + 1))));
len = 1 + 1 + 1 + 32 + 2 + 1;
if (pag->identity_lv[0] != 5) {
LOGP(DRLCMAC, LOGL_ERROR, "TMSI paging with "
"MI != 5 octets!\n");
goto continue_next;
}
} else {
/* MI */
LOGP(DRLCMAC, LOGL_DEBUG, "- MI=%s\n",
osmo_hexdump(pag->identity_lv + 1,
pag->identity_lv[0]));
len = 1 + 1 + 1 + 4 + (pag->identity_lv[0]<<3) + 2 + 1;
if (pag->identity_lv[0] > 8) {
LOGP(DRLCMAC, LOGL_ERROR, "Paging with "
"MI > 8 octets!\n");
goto continue_next;
}
}
if (wp + len > 184) {
LOGP(DRLCMAC, LOGL_DEBUG, "- Does not fit, so schedule "
"next time\n");
/* put back paging record, because does not fit */
llist_add_tail(&pag->list, &paging_list);
break;
}
encoding: Move the functions into the encoding class Add some TODO to this class. E.g. they could all work on the bitvec and the parameter handling could better.
2013-10-19 17:04:03 +00:00
Encoding::write_repeated_page_info(pag_vec, wp, pag->identity_lv[0],
pdch: Move paging dequeue into the PDCH object Rely on packet_paging_request returning NULL in case the queue is empty. We should move the write_packet_paging_request into a separate file/object as well.
2013-10-19 16:15:44 +00:00
pag->identity_lv + 1, pag->chan_needed);
continue_next:
talloc_free(pag);
pag = dequeue_paging();
}
bitvec_pack(pag_vec, msgb_put(msg, 23));
RlcMacDownlink_t * mac_control_block = (RlcMacDownlink_t *)talloc_zero(tall_pcu_ctx, RlcMacDownlink_t);
LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Paging Request +++++++++++++++++++++++++\n");
decode_gsm_rlcmac_downlink(pag_vec, mac_control_block);
LOGPC(DCSN1, LOGL_NOTICE, "\n");
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- TX : Packet Paging Request -------------------------\n");
bitvec_free(pag_vec);
talloc_free(mac_control_block);
return msg;
}
bts/pdch: Move the adding of paging to the BTS/PDCH objects Only the gprs_rlcmac_pdch will manipulate the paging list now. There can be various more refactorings of the code but they can be done later. E.g. on memory allocation failure we can continue instead of leaving the code, we should also set any_tbf only after things have been paged.
2013-10-19 16:28:59 +00:00
void gprs_rlcmac_pdch::add_paging(struct gprs_rlcmac_paging *pag)
{
llist_add(&pag->list, &paging_list);
}
pdch: Instead of passing bts, trx, ts use the pdch All dispatching will go through the PDCH. This will clean a lot of the look-ups inside the gprs_rlcmac_data.c and continue with adding structure to the pcu code.
2013-10-26 14:42:38 +00:00
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
/* receive UL data block
*
* The blocks are defragmented and forwarded as LLC frames, if complete.
*/
pdch: Remove the trx_no/ts_no parameter and use/caclulate it on demand Simplify the depedencies and use the inline functions when we need to figure out the numbers.
2013-10-26 16:53:16 +00:00
int gprs_rlcmac_pdch::rcv_data_block_acknowledged(uint8_t *data, uint8_t len, int8_t rssi)
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
{
struct gprs_rlcmac_tbf *tbf;
struct rlc_ul_header *rh = (struct rlc_ul_header *)data;
switch (len) {
case 54:
/* omitting spare bits */
len = 53;
break;
case 40:
/* omitting spare bits */
len = 39;
break;
case 34:
/* omitting spare bits */
len = 33;
break;
case 23:
break;
default:
bts: Provide the first set of counters
2013-10-27 08:50:15 +00:00
bts()->decode_error();
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
LOGP(DRLCMACUL, LOGL_ERROR, "Dropping data block with invalid"
"length: %d)\n", len);
return -EINVAL;
}
/* find TBF inst from given TFI */
tbf/pdch/bts: Move the tbf look-up by tfi into the BTS
2013-10-26 17:10:43 +00:00
tbf = bts()->tbf_by_tfi(rh->tfi, trx_no(), GPRS_RLCMAC_UL_TBF);
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
if (!tbf) {
misc: Change the logging for the tbf and what to log TLLIs got printed as TBF. Fix that but also rename things to TFI. The TFI is not required to be unique per BTS but it is the indicator we use right now.
2013-10-27 11:30:46 +00:00
LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA unknown TFI=%d\n",
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
rh->tfi);
return 0;
}
tbf: Move the llc handling into the tbf (from the bts) This will be moved to a LLC class in the future but after this we can make the sns/ws private now and have little to update outside the tbf.
2013-11-06 18:16:43 +00:00
return tbf->rcv_data_block_acknowledged(data, len, rssi);
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
}
bts: Pass the Packet_Control_Acknowledgement_t into the recv method
2013-10-27 12:35:30 +00:00
void gprs_rlcmac_pdch::rcv_control_ack(Packet_Control_Acknowledgement_t *packet, uint32_t fn)
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
{
struct gprs_rlcmac_tbf *tbf;
uint32_t tlli = 0;
bts: Pass the Packet_Control_Acknowledgement_t into the recv method
2013-10-27 12:35:30 +00:00
tlli = packet->TLLI;
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
tbf = bts()->tbf_by_poll_fn(fn, trx_no(), ts_no);
if (!tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET CONTROL ACK with "
misc: Change the logging for the tbf and what to log TLLIs got printed as TBF. Fix that but also rename things to TFI. The TFI is not required to be unique per BTS but it is the indicator we use right now.
2013-10-27 11:30:46 +00:00
"unknown FN=%u TLLI=0x%08x (TRX %d TS %d)\n",
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
fn, tlli, trx_no(), ts_no);
return;
}
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
tbf->update_tlli(tlli);
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] %s Packet Control Ack\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
tbf->poll_state = GPRS_RLCMAC_POLL_NONE;
/* check if this control ack belongs to packet uplink ack */
if (tbf->ul_ack_state == GPRS_RLCMAC_UL_ACK_WAIT_ACK) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "TBF: [UPLINK] END %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
tbf->ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE;
if ((tbf->state_flags &
(1 << GPRS_RLCMAC_FLAG_TO_UL_ACK))) {
tbf->state_flags &=
~(1 << GPRS_RLCMAC_FLAG_TO_UL_ACK);
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered uplink "
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"ack for UL %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
}
tbf_free(tbf);
return;
}
if (tbf->dl_ass_state == GPRS_RLCMAC_DL_ASS_WAIT_ACK) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "TBF: [UPLINK] DOWNLINK ASSIGNED %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
/* reset N3105 */
tbf->n3105 = 0;
tbf->dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE;
if (tbf->direction == GPRS_RLCMAC_UL_TBF)
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
tbf = bts()->dl_tbf_by_tlli(tbf->tlli());
bts: Further logging improvements for TFI/TLLI output
2013-10-27 12:35:46 +00:00
#warning "TBF is changing on the way... *sigh*"
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
if (!tbf) {
LOGP(DRLCMAC, LOGL_ERROR, "Got ACK, but DL "
bts: Further logging improvements for TFI/TLLI output
2013-10-27 12:35:46 +00:00
"TBF is gone TLLI=0x%08x\n", tlli);
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
return;
}
tbf_new_state(tbf, GPRS_RLCMAC_FLOW);
/* stop pending assignment timer */
tbf->stop_timer();
if ((tbf->state_flags &
(1 << GPRS_RLCMAC_FLAG_TO_DL_ASS))) {
tbf->state_flags &=
~(1 << GPRS_RLCMAC_FLAG_TO_DL_ASS);
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered downlink "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"assignment for %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
}
tbf_assign_control_ts(tbf);
return;
}
if (tbf->ul_ass_state == GPRS_RLCMAC_UL_ASS_WAIT_ACK) {
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "TBF: [DOWNLINK] UPLINK ASSIGNED %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
/* reset N3105 */
tbf->n3105 = 0;
tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE;
#warning "TBF is changing on the way... *sigh*"
if (tbf->direction == GPRS_RLCMAC_DL_TBF)
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
tbf = bts()->ul_tbf_by_tlli(tbf->tlli());
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
if (!tbf) {
LOGP(DRLCMAC, LOGL_ERROR, "Got ACK, but UL "
tbf: Log the TFI and TLLI so we can try to figure out more from logs <0002> tbf.cpp:444 Poll timeout for DL TBF=0 <0002> tbf.cpp:513 - Timeout for polling PACKET DOWNLINK ACK. <0002> tbf.cpp:688 - Assignment was on PACCH <0002> tbf.cpp:694 - Downlink ACK was received <0008> gprs_bssgp_pcu.cpp:154 LLC [SGSN -> PCU] = TLLI: 0xd6942c78 IMSI: 274080000004765 len: 506 <0002> bts.cpp:974 PACKET DOWNLINK ACK with unknown FN=2213128 TFI=0 (TRX 0 TS 6)
2013-10-27 11:42:58 +00:00
"TBF is gone TLLI=0x%08x\n", tlli);
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
return;
}
tbf_new_state(tbf, GPRS_RLCMAC_FLOW);
if ((tbf->state_flags &
(1 << GPRS_RLCMAC_FLAG_TO_UL_ASS))) {
tbf->state_flags &=
~(1 << GPRS_RLCMAC_FLAG_TO_UL_ASS);
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered uplink "
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
"assignment for UL %s\n", tbf_name(tbf));
pdch: Move handling of control_ack to a separate method Kill the unused tfi parameter
2013-10-27 10:02:05 +00:00
}
tbf_assign_control_ts(tbf);
return;
}
LOGP(DRLCMAC, LOGL_ERROR, "Error: received PACET CONTROL ACK "
"at no request\n");
}
bts: Use Packet_Downlink_Ack_Nack_t as parameter
2013-10-27 10:41:01 +00:00
void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_nack, uint32_t fn)
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
{
int8_t tfi = 0; /* must be signed */
struct gprs_rlcmac_tbf *tbf;
int rc;
bts: Use Packet_Downlink_Ack_Nack_t as parameter
2013-10-27 10:41:01 +00:00
tfi = ack_nack->DOWNLINK_TFI;
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
tbf = bts()->tbf_by_poll_fn(fn, trx_no(), ts_no);
if (!tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with "
"unknown FN=%u TFI=%d (TRX %d TS %d)\n",
fn, tfi, trx_no(), ts_no);
return;
}
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
if (tbf->tfi() != tfi) {
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with "
"wrong TFI=%d, ignoring!\n", tfi);
return;
}
tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_DL_ACK);
if ((tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) {
tbf->state_flags &= ~(1 << GPRS_RLCMAC_FLAG_TO_DL_ACK);
LOGP(DRLCMAC, LOGL_NOTICE, "Recovered downlink ack "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"for %s\n", tbf_name(tbf));
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
}
/* reset N3105 */
tbf->n3105 = 0;
tbf->stop_t3191();
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] %s Packet Downlink Ack/Nack\n", tbf_name(tbf));
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
tbf->poll_state = GPRS_RLCMAC_POLL_NONE;
tbf/bts: Rename tbf->snd_dl_ack to tbf->rcvd_dl_ack This function is called to act upon a received DL ACK packet so this name makes more sense.
2014-05-30 15:57:59 +00:00
rc = tbf->rcvd_dl_ack(
bts: Use Packet_Downlink_Ack_Nack_t as parameter
2013-10-27 10:41:01 +00:00
ack_nack->Ack_Nack_Description.FINAL_ACK_INDICATION,
ack_nack->Ack_Nack_Description.STARTING_SEQUENCE_NUMBER,
ack_nack->Ack_Nack_Description.RECEIVED_BLOCK_BITMAP);
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
if (rc == 1) {
tbf_free(tbf);
return;
}
/* check for channel request */
bts: Use Packet_Downlink_Ack_Nack_t as parameter
2013-10-27 10:41:01 +00:00
if (ack_nack->Exist_Channel_Request_Description) {
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF in ack "
"message, so we provide one:\n");
tbf: Make the tlli "private" and update the updating code Now all updates to the tlli/tlli_valid are in one place. If we implement the policy to update the matching/linked TBF we can now to do it in a single place. Add a todo item for that as I am waiting for feedback from the mailinglist.
2013-10-27 16:01:14 +00:00
tbf_alloc_ul(bts_data(), tbf->trx->trx_no, tbf->ms_class, tbf->tlli(), tbf->ta, tbf);
bts: Move handling of MT_PACKET_DOWNLINK_ACK_NACK to separate function Kill the tlli assignment as it is never used.
2013-10-27 10:07:17 +00:00
/* schedule uplink assignment */
tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS;
}
}
bts: Simplify the code and use Packet_Resource_Request_t*
2013-10-27 10:37:53 +00:00
void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t fn)
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
{
struct gprs_rlcmac_tbf *tbf;
struct gprs_rlcmac_sba *sba;
int rc;
bts: Simplify the code and use Packet_Resource_Request_t*
2013-10-27 10:37:53 +00:00
if (request->ID.UnionType) {
bts: Kill dead stores of the tlli/tfi, fix the log message again The code meant to print the tfi and not the tlli. Update it.
2013-10-27 14:42:25 +00:00
uint32_t tlli = request->ID.u.TLLI;
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
uint8_t ms_class = 0;
struct gprs_rlcmac_tbf *dl_tbf;
uint8_t ta;
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
tbf = bts()->ul_tbf_by_tlli(tlli);
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
if (tbf) {
LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"TLLI=0x%08x while %s still "
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
"exists. Killing pending DL TBF\n",
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tlli, tbf_name(tbf));
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
tbf_free(tbf);
tbf = NULL;
}
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
bts, tbf: Separate functions for dl/ul tbf_by_tlli lookup In the future we want to separate ul and dl tbf into different classes that inherit from a common base. Ticket: SYS#389 Sponsored-by: On-Waves ehf
2014-07-02 15:58:14 +00:00
if ((dl_tbf = bts()->dl_tbf_by_tlli(tlli))) {
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from "
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
"TLLI=0x%08x while %s still exists. "
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
"Killing pending DL TBF\n", tlli,
tbf: Make tfi private and update the code All logging code that used tbf->tfi is now using tbf_name to print the the TBF. External code is now using tfi() which is inlined and should result in the same code being generated as before (+debug code that can be stripped).
2013-10-27 19:31:47 +00:00
tbf_name(dl_tbf));
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
tbf_free(dl_tbf);
tbf: Make finding use-after-free more easy and set to NULL or return Make finding use-after-free more easy by setting things to NULL or simply return after tbf_free(this) has been called.
2014-01-16 09:09:42 +00:00
dl_tbf = NULL;
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
}
LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF "
"in packet resource request of single "
"block, so we provide one:\n");
sba = bts()->sba()->find(this, fn);
if (!sba) {
LOGP(DRLCMAC, LOGL_NOTICE, "MS requests UL TBF "
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
"in packet resource request of single "
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
"block, but there is no resource request "
"scheduled!\n");
rc = bts()->timing_advance()->recall(tlli);
if (rc >= 0)
ta = rc;
else
ta = 0;
} else {
ta = sba->ta;
bts()->timing_advance()->remember(tlli, ta);
bts()->sba()->free_sba(sba);
}
if (request->Exist_MS_Radio_Access_capability)
ms_class = Decoding::get_ms_class_by_capability(&request->MS_Radio_Access_capability);
if (!ms_class)
LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n");
tbf = tbf_alloc_ul(bts_data(), trx_no(), ms_class, tlli, ta, NULL);
if (!tbf)
return;
/* set control ts to current MS's TS, until assignment complete */
LOGP(DRLCMAC, LOGL_DEBUG, "Change control TS to %d until assinment is complete.\n", ts_no);
tbf->control_ts = ts_no;
/* schedule uplink assignment */
tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS;
return;
}
if (request->ID.u.Global_TFI.UnionType) {
int8_t tfi = request->ID.u.Global_TFI.u.DOWNLINK_TFI;
tbf = bts()->tbf_by_tfi(tfi, trx_no(), GPRS_RLCMAC_DL_TBF);
if (!tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESSOURCE REQ unknown downlink TFI=%d\n", tfi);
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
return;
}
} else {
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
int8_t tfi = request->ID.u.Global_TFI.u.UPLINK_TFI;
tbf = bts()->tbf_by_tfi(tfi, trx_no(), GPRS_RLCMAC_UL_TBF);
if (!tbf) {
LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESSOURCE REQ unknown uplink TFI=%d\n", tfi);
return;
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
}
}
bts: Simplify rcv_resource_request, remove logically dead code tbf = find if (tbf) { tbf_free(tbf); tbf = NULL; } if (!tbf) { code... } Remove the if (!tbf) and indention as the tbf is always to be NULL.
2013-10-27 14:44:21 +00:00
tbf: Create tbf_name and use it in log statements This is like gsm_lchan_name and should be used in log statements. This way we can easily change the information that is printed and we know how to search things. The other part is that direct use of tfi/tlli is removed which will allow us to make them private and at the same time start to resolve the "tlli" updated in many places. Not old log statements are changed yet. This will done whenever a bad log statement is seen on the console...
2013-10-27 15:39:36 +00:00
LOGP(DRLCMAC, LOGL_ERROR, "RX: [PCU <- BTS] %s FIXME: Packet resource request\n", tbf_name(tbf));
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
}
bts: Work with the Packet_Measurement_Report_t
2013-10-27 10:19:13 +00:00
void gprs_rlcmac_pdch::rcv_measurement_report(Packet_Measurement_Report_t *report, uint32_t fn)
bts: Move the MT_PACKET_MEASUREMENT_REPORT handling to a new method
2013-10-27 10:16:20 +00:00
{
struct gprs_rlcmac_sba *sba;
sba = bts()->sba()->find(this, fn);
if (!sba) {
LOGP(DRLCMAC, LOGL_NOTICE, "MS send measurement "
"in packet resource request of single "
"block, but there is no resource request "
bts: Log the TLLI inside the report we get
2013-10-27 11:47:48 +00:00
"scheduled! TLLI=0x%08x\n", report->TLLI);
bts: Move the MT_PACKET_MEASUREMENT_REPORT handling to a new method
2013-10-27 10:16:20 +00:00
} else {
bts: Work with the Packet_Measurement_Report_t
2013-10-27 10:19:13 +00:00
bts()->timing_advance()->remember(report->TLLI, sba->ta);
bts: Move the MT_PACKET_MEASUREMENT_REPORT handling to a new method
2013-10-27 10:16:20 +00:00
bts()->sba()->free_sba(sba);
}
bts: Work with the Packet_Measurement_Report_t
2013-10-27 10:19:13 +00:00
gprs_rlcmac_meas_rep(report);
bts: Move the MT_PACKET_MEASUREMENT_REPORT handling to a new method
2013-10-27 10:16:20 +00:00
}
bts: Move handling of MT_PACKET_RESOURCE_REQUEST to a method Move the code to a new method
2013-10-27 10:11:18 +00:00
/* Received Uplink RLC control block. */
int gprs_rlcmac_pdch::rcv_control_block(
bitvec *rlc_block, uint32_t fn)
{
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
RlcMacUplink_t * ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t);
LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++\n");
decode_gsm_rlcmac_uplink(rlc_block, ul_control_block);
LOGPC(DCSN1, LOGL_NOTICE, "\n");
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- RX : Uplink Control Block -------------------------\n");
switch (ul_control_block->u.MESSAGE_TYPE) {
case MT_PACKET_CONTROL_ACK:
bts: Pass the Packet_Control_Acknowledgement_t into the recv method
2013-10-27 12:35:30 +00:00
rcv_control_ack(&ul_control_block->u.Packet_Control_Acknowledgement, fn);
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
break;
case MT_PACKET_DOWNLINK_ACK_NACK:
bts: Use Packet_Downlink_Ack_Nack_t as parameter
2013-10-27 10:41:01 +00:00
rcv_control_dl_ack_nack(&ul_control_block->u.Packet_Downlink_Ack_Nack, fn);
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
break;
case MT_PACKET_RESOURCE_REQUEST:
bts: Simplify the code and use Packet_Resource_Request_t*
2013-10-27 10:37:53 +00:00
rcv_resource_request(&ul_control_block->u.Packet_Resource_Request, fn);
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
break;
case MT_PACKET_MEASUREMENT_REPORT:
bts: Work with the Packet_Measurement_Report_t
2013-10-27 10:19:13 +00:00
rcv_measurement_report(&ul_control_block->u.Packet_Measurement_Report, fn);
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
break;
bts: Count the rach frames we receive
2013-10-27 09:50:35 +00:00
case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK:
/* ignoring it. change the SI to not force sending these? */
break;
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
default:
bts: Provide the first set of counters
2013-10-27 08:50:15 +00:00
bts()->decode_error();
bts: Print the kind of message type not known.
2013-10-27 09:36:37 +00:00
LOGP(DRLCMAC, LOGL_NOTICE,
"RX: [PCU <- BTS] unknown control block(%d) received\n",
ul_control_block->u.MESSAGE_TYPE);
pdch: Move the giant switch/case of gprs_rlcmac_rcv_control_block Move the dispatch into the PDCH. This needs to be split up further into understandable blocks.
2013-10-26 15:38:37 +00:00
}
talloc_free(ul_control_block);
return 1;
}
pdch/tbf: Move gprs_rlcmac_rcv_data_block_acknowledged into the pdch Move the method into the PDCH. Extract the finding of TLLI into a new class called Decoding. Move the assemble and forward LLC frames into the TBF as it is poking in the internals of the TBF.
2013-10-26 15:32:04 +00:00
pdch: Move the dispatch of gprs_rlcmac_rcv_block into the pdch
2013-10-26 14:54:10 +00:00
/* received RLC/MAC block from L1 */
pdch: Instead of passing bts, trx, ts use the pdch All dispatching will go through the PDCH. This will clean a lot of the look-ups inside the gprs_rlcmac_data.c and continue with adding structure to the pcu code.
2013-10-26 14:42:38 +00:00
int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t rssi)
{
pdch: Move the dispatch of gprs_rlcmac_rcv_block into the pdch
2013-10-26 14:54:10 +00:00
unsigned payload = data[0] >> 6;
bitvec *block;
int rc = 0;
switch (payload) {
case GPRS_RLCMAC_DATA_BLOCK:
pdch: Remove the trx_no/ts_no parameter and use/caclulate it on demand Simplify the depedencies and use the inline functions when we need to figure out the numbers.
2013-10-26 16:53:16 +00:00
rc = rcv_data_block_acknowledged(data, len, rssi);
pdch: Move the dispatch of gprs_rlcmac_rcv_block into the pdch
2013-10-26 14:54:10 +00:00
break;
case GPRS_RLCMAC_CONTROL_BLOCK:
block = bitvec_alloc(len);
if (!block)
return -ENOMEM;
bitvec_unpack(block, data);
pdch: Remove the trx_no/ts_no parameter and use/caclulate it on demand Simplify the depedencies and use the inline functions when we need to figure out the numbers.
2013-10-26 16:53:16 +00:00
rc = rcv_control_block(block, fn);
pdch: Move the dispatch of gprs_rlcmac_rcv_block into the pdch
2013-10-26 14:54:10 +00:00
bitvec_free(block);
break;
case GPRS_RLCMAC_CONTROL_BLOCK_OPT:
LOGP(DRLCMAC, LOGL_NOTICE, "GPRS_RLCMAC_CONTROL_BLOCK_OPT block payload is not supported.\n");
break;
default:
LOGP(DRLCMAC, LOGL_NOTICE, "Unknown RLCMAC block payload(%u).\n", payload);
rc = -EINVAL;
}
return rc;
pdch: Instead of passing bts, trx, ts use the pdch All dispatching will go through the PDCH. This will clean a lot of the look-ups inside the gprs_rlcmac_data.c and continue with adding structure to the pcu code.
2013-10-26 14:42:38 +00:00
}
gprs_rlcmac_pdch: Don't access private members This patch introduces methods to get ul and dl tbf by tfi and uses them in gprs_rlcmac_sched. Sponsored by: On-Waves ehf
2014-06-04 12:56:09 +00:00
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi)
gprs_rlcmac_pdch: Don't access private members This patch introduces methods to get ul and dl tbf by tfi and uses them in gprs_rlcmac_sched. Sponsored by: On-Waves ehf
2014-06-04 12:56:09 +00:00
{
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
gprs_rlcmac_tbf *tbf;
llist_for_each_entry(tbf, tbf_list, list) {
if (tbf->tfi() != tfi)
continue;
if (!tbf->pdch[ts_no])
continue;
return tbf;
}
return NULL;
gprs_rlcmac_pdch: Don't access private members This patch introduces methods to get ul and dl tbf by tfi and uses them in gprs_rlcmac_sched. Sponsored by: On-Waves ehf
2014-06-04 12:56:09 +00:00
}
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
gprs_rlcmac_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi)
gprs_rlcmac_pdch: Don't access private members This patch introduces methods to get ul and dl tbf by tfi and uses them in gprs_rlcmac_sched. Sponsored by: On-Waves ehf
2014-06-04 12:56:09 +00:00
{
gprs_rlcmac_pdch: Get rid of ul/dl_tbf The current code keeps a reference to all tbfs in the bts and another reference in the pdch. This allows for the possibility of both lists to go out of sync. This patch removes the pdch-specific list of ul and dl tbfs and uses the lists in the bts to lookup tbfs everywhere. Performance for going through the global list is not an issue yet. We can optimize this later and in a better way. Sponsored-by: On-Waves ehf
2014-05-30 18:21:30 +00:00
return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi);
}
gprs_rlcmac_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi)
{
return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi);
gprs_rlcmac_pdch: Don't access private members This patch introduces methods to get ul and dl tbf by tfi and uses them in gprs_rlcmac_sched. Sponsored by: On-Waves ehf
2014-06-04 12:56:09 +00:00
}