power/sysmobts: Add a manual ms power level control

Currently the DSP is instructed to achieve a given uplink
power target but there are circumstances (e.g. EMV testing)
where we need more control over it. The "manual/software/osmo"
power control can only be implemented per TRX and not per
lchan. Add a very very basic control that checks the MS Power
used by the phone, the actual receive level and then adjust
the power.

The code doesn't take the history into account, if the phone
can not reach the requested power level the code will be stuck
(e.g. no timeout based on multiframes). It has a mode for a
fixed power control but no way to set it yet.

The change of the mode requires a restart of the software.

Conflicts:
	include/osmo-bts/bts_model.h
	src/common/vty.c
	src/osmo-bts-sysmo/l1_if.c
	src/osmo-bts-sysmo/l1_if.h
	src/osmo-bts-sysmo/oml.c
	tests/sysmobts/sysmobts_test.c

1 files changed, 29 insertions, 10 deletions

diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c
index 4ebf6646..cc3f23b5 100644
--- a/src/osmo-bts-sysmo/oml.c
+++ b/src/osmo-bts-sysmo/oml.c
@@ -322,7 +322,8 @@ static int trx_init(struct gsm_bts_trx *trx)
 	dev_par->u16Arfcn = trx->arfcn;
 	dev_par->u16BcchArfcn = trx->bts->c0->arfcn;
 	dev_par->u8NbTsc = trx->bts->bsic & 7;
-	dev_par->fRxPowerLevel = fl1h->ul_power_target;
+	dev_par->fRxPowerLevel = trx_ms_pwr_ctrl_is_osmo(trx)
+					? 0.0 : fl1h->ul_power_target;
 	dev_par->fTxPowerLevel = sysmobts_get_power_trx(trx);
 	LOGP(DL1C, LOGL_NOTICE, "Init TRX (ARFCN %u, TSC %u, RxPower % 2f dBm, "
 		"TxPower % 2.2f dBm\n", dev_par->u16Arfcn, dev_par->u8NbTsc,
@@ -894,12 +895,16 @@ static int mph_send_activate_req(struct gsm_lchan *lchan, struct sapi_cmd *cmd)
 	case GsmL1_Sapi_Prach:
 		lch_par->prach.u8Bsic = lchan->ts->trx->bts->bsic;
 		break;
-	case GsmL1_Sapi_Pdtch:
-	case GsmL1_Sapi_Pacch:
 	case GsmL1_Sapi_Sacch:
 		/*
-		 * TODO: For the SACCH we need to set the u8MsPowerLevel when
-		 * doing manual MS power control. */
+		 * For the SACCH we need to set the u8MsPowerLevel when
+		 * doing manual MS power control.
+		 */
+		if (trx_ms_pwr_ctrl_is_osmo(lchan->ts->trx))
+			lch_par->sacch.u8MsPowerLevel = lchan->ms_power_ctrl.current;
+		/* fall through */
+	case GsmL1_Sapi_Pdtch:
+	case GsmL1_Sapi_Pacch:
 		/*
 		 * Be sure that every packet is received, even if it
 		 * fails. In this case the length might be lower or 0.
@@ -1136,7 +1141,8 @@ err:
 
 static int mph_send_config_logchpar(struct gsm_lchan *lchan, struct sapi_cmd *cmd)
 {
-	struct femtol1_hdl *fl1h = trx_femtol1_hdl(lchan->ts->trx);
+	struct gsm_bts_trx *trx = lchan->ts->trx;
+	struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
 	struct msgb *msg = l1p_msgb_alloc();
 	GsmL1_MphConfigReq_t *conf_req;
 	GsmL1_LogChParam_t *lch_par;
@@ -1146,7 +1152,7 @@ static int mph_send_config_logchpar(struct gsm_lchan *lchan, struct sapi_cmd *cm
 	/* update multi-rate config */
 	conf_req = prim_init(msgb_l1prim(msg), GsmL1_PrimId_MphConfigReq, fl1h);
 	conf_req->cfgParamId = GsmL1_ConfigParamId_SetLogChParams;
-	conf_req->cfgParams.setLogChParams.sapi = lchan_to_GsmL1_Sapi_t(lchan);
+	conf_req->cfgParams.setLogChParams.sapi = cmd->sapi;
 	conf_req->cfgParams.setLogChParams.u8Tn = lchan->ts->nr;
 	conf_req->cfgParams.setLogChParams.subCh = lchan_to_GsmL1_SubCh_t(lchan);
 	conf_req->cfgParams.setLogChParams.dir = cmd->dir;
@@ -1155,6 +1161,10 @@ static int mph_send_config_logchpar(struct gsm_lchan *lchan, struct sapi_cmd *cm
 	lch_par = &conf_req->cfgParams.setLogChParams.logChParams;
 	lchan2lch_par(lch_par, lchan);
 
+	/* Update the MS Power Level */
+	if (cmd->sapi == GsmL1_Sapi_Sacch && trx_ms_pwr_ctrl_is_osmo(trx))
+		lch_par->sacch.u8MsPowerLevel = lchan->ms_power_ctrl.current;
+
 	/* FIXME: update encryption */
 
 	LOGP(DL1C, LOGL_INFO, "%s MPH-CONFIG.req (%s) ",
@@ -1172,19 +1182,19 @@ static int mph_send_config_logchpar(struct gsm_lchan *lchan, struct sapi_cmd *cm
 	return l1if_gsm_req_compl(fl1h, msg, chmod_modif_compl_cb);
 }
 
-static void enqueue_sapi_logchpar_cmd(struct gsm_lchan *lchan, int dir)
+static void enqueue_sapi_logchpar_cmd(struct gsm_lchan *lchan, int dir, GsmL1_Sapi_t sapi)
 {
 	struct sapi_cmd *cmd = talloc_zero(lchan->ts->trx, struct sapi_cmd);
 
 	cmd->dir = dir;
+	cmd->sapi = sapi;
 	cmd->type = SAPI_CMD_CONFIG_LOGCH_PARAM;
 	queue_sapi_command(lchan, cmd);
 }
 
 static int tx_confreq_logchpar(struct gsm_lchan *lchan, uint8_t direction)
 {
-	enqueue_sapi_logchpar_cmd(lchan, direction);
-
+	enqueue_sapi_logchpar_cmd(lchan, direction, lchan_to_GsmL1_Sapi_t(lchan));
 	return 0;
 }
 
@@ -1267,6 +1277,15 @@ int l1if_set_ciphering(struct femtol1_hdl *fl1h,
 	return 0;
 }
 
+int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan)
+{
+	if (lchan->state != LCHAN_S_ACTIVE)
+		return -1;
+
+	enqueue_sapi_logchpar_cmd(lchan, GsmL1_Dir_RxUplink, GsmL1_Sapi_Sacch);
+	return 0;
+}
+
 int bts_model_rsl_mode_modify(struct gsm_lchan *lchan)
 {
 	if (lchan->state != LCHAN_S_ACTIVE)