[vty] Add option to disable RF on a given TRX.
- Make sure that on runtime the Radio Carrier can be locked and unlocked. The vty code calls into the Abis NM to lock/unlock the channel and the state is stored there. - Make sure that on start the Radio Carries remains offline and we are not starting it. On start the radio carrier is either locked or unlocked. This means the RSL will not connect until the RF is unlocked. It will connect then. To see RSL bringup failures one needs to parse the RSL nack message. - When the TRX is locked on startup the RSL link will only be established after it will be unlocked.
This commit is contained in:
parent
7622a99f95
commit
1c8b480c46
|
@ -257,6 +257,9 @@ struct gsm_bts_trx {
|
|||
} bs11;
|
||||
};
|
||||
struct gsm_bts_trx_ts ts[TRX_NR_TS];
|
||||
|
||||
/* NM state */
|
||||
int rf_locked;
|
||||
};
|
||||
|
||||
enum gsm_bts_type {
|
||||
|
@ -518,4 +521,6 @@ static inline int is_siemens_bts(struct gsm_bts *bts)
|
|||
enum gsm_auth_policy gsm_auth_policy_parse(const char *arg);
|
||||
const char *gsm_auth_policy_name(enum gsm_auth_policy policy);
|
||||
|
||||
void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -2699,6 +2699,19 @@ int abis_nm_ipaccess_set_attr(struct gsm_bts *bts, u_int8_t obj_class,
|
|||
attr, attr_len);
|
||||
}
|
||||
|
||||
void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked)
|
||||
{
|
||||
int new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED;
|
||||
|
||||
trx->rf_locked = locked;
|
||||
if (!trx->bts || !trx->bts->oml_link)
|
||||
return;
|
||||
|
||||
abis_nm_chg_adm_state(trx->bts, NM_OC_RADIO_CARRIER,
|
||||
trx->bts->bts_nr, trx->nr, 0xff,
|
||||
new_state);
|
||||
}
|
||||
|
||||
static const char *ipacc_testres_names[] = {
|
||||
[NM_IPACC_TESTRES_SUCCESS] = "SUCCESS",
|
||||
[NM_IPACC_TESTRES_TIMEOUT] = "TIMEOUT",
|
||||
|
|
|
@ -420,7 +420,18 @@ static int sw_activ_rep(struct msgb *mb)
|
|||
/* TRX software is active, tell it to initiate RSL Link */
|
||||
abis_nm_ipaccess_rsl_connect(trx, 0, 3003, trx->rsl_tei);
|
||||
break;
|
||||
case NM_OC_RADIO_CARRIER:
|
||||
case NM_OC_RADIO_CARRIER: {
|
||||
/*
|
||||
* Locking the radio carrier will make it go
|
||||
* offline again and we would come here. The
|
||||
* framework should determine that there was
|
||||
* no change and avoid recursion.
|
||||
*
|
||||
* This code is here to make sure that on start
|
||||
* a TRX remains locked.
|
||||
*/
|
||||
int rc_state = trx->rf_locked ?
|
||||
NM_STATE_LOCKED : NM_STATE_UNLOCKED;
|
||||
/* Patch ARFCN into radio attribute */
|
||||
nanobts_attr_radio[5] &= 0xf0;
|
||||
nanobts_attr_radio[5] |= trx->arfcn >> 8;
|
||||
|
@ -429,10 +440,11 @@ static int sw_activ_rep(struct msgb *mb)
|
|||
sizeof(nanobts_attr_radio));
|
||||
abis_nm_chg_adm_state(trx->bts, foh->obj_class,
|
||||
trx->bts->bts_nr, trx->nr, 0xff,
|
||||
NM_STATE_UNLOCKED);
|
||||
rc_state);
|
||||
abis_nm_opstart(trx->bts, foh->obj_class, trx->bts->bts_nr,
|
||||
trx->nr, 0xff);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include <openbsc/gsm_data.h>
|
||||
#include <openbsc/talloc.h>
|
||||
#include <openbsc/abis_nm.h>
|
||||
|
||||
void *tall_bsc_ctx;
|
||||
|
||||
|
|
|
@ -1200,6 +1200,17 @@ DEFUN(cfg_trx_rsl_e1_tei,
|
|||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN(cfg_trx_rf_locked,
|
||||
cfg_trx_rf_locked_cmd,
|
||||
"rf_locked (0|1)",
|
||||
"Turn off RF of the TRX.\n")
|
||||
{
|
||||
int locked = atoi(argv[0]);
|
||||
struct gsm_bts_trx *trx = vty->index;
|
||||
|
||||
gsm_trx_lock_rf(trx, locked);
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
/* per TS configuration */
|
||||
DEFUN(cfg_ts,
|
||||
|
@ -1321,6 +1332,7 @@ int bsc_vty_init(struct gsm_network *net)
|
|||
install_element(TRX_NODE, &cfg_trx_max_power_red_cmd);
|
||||
install_element(TRX_NODE, &cfg_trx_rsl_e1_cmd);
|
||||
install_element(TRX_NODE, &cfg_trx_rsl_e1_tei_cmd);
|
||||
install_element(TRX_NODE, &cfg_trx_rf_locked_cmd);
|
||||
|
||||
install_element(TRX_NODE, &cfg_ts_cmd);
|
||||
install_node(&ts_node, dummy_config_write);
|
||||
|
|
Loading…
Reference in New Issue