From patchwork Thu Apr 10 10:33:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alvaro Neira X-Patchwork-Id: 338087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ganesha.gnumonks.org (ganesha.gnumonks.org [213.95.27.120]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D85BD140098 for ; Thu, 10 Apr 2014 20:34:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=ganesha.gnumonks.org) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1WYCJ2-0000iM-SB; Thu, 10 Apr 2014 12:34:05 +0200 Received: from mail.sysmocom.de ([144.76.43.93]) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1WYCIp-0000iF-Nm for openbsc@lists.osmocom.org; Thu, 10 Apr 2014 12:33:55 +0200 Received: from localhost.localdomain (186.169.216.87.static.jazztel.es [87.216.169.186]) by mail.sysmocom.de (Postfix) with ESMTPA id 5EB6851DBB for ; Thu, 10 Apr 2014 10:33:51 +0000 (UTC) From: Alvaro Neira Ayuso To: openbsc@lists.osmocom.org Subject: [osmo-bts PATCH 3/3 v2] main: Added support for changing the max_power_red in sbts2050 Date: Thu, 10 Apr 2014 12:33:22 +0200 Message-Id: <1397126002-29151-1-git-send-email-anayuso@sysmocom.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396960835-14662-1-git-send-email-anayuso@sysmocom.de> References: <1396960835-14662-1-git-send-email-anayuso@sysmocom.de> MIME-Version: 1.0 X-Spam-Score: 0.1 (/) X-Spam-Report: SpamASsassin versoin 3.3.1 on ganesha.gnumonks.org summary: Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 TW_SB BODY: Odd Letter Triples with SB X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openbsc-bounces@lists.osmocom.org Errors-To: openbsc-bounces@lists.osmocom.org From: Álvaro Neira Ayuso Added functions for changing the max_power_red in case of we receive a Failure Event report from the manager. The sbts2050 change the max_power_red to the value that we have configured in the manager and the sbts2050 restore this value to the initial value if the bts don't receive another Failure Event report in the same time that we check the temperature in the manager. Signed-off-by: Alvaro Neira Ayuso --- [changes in v2] * Renamed the constant variable tlv_add_info_len() to TLV_INFO_LEN src/osmo-bts-sysmo/main.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 7e332ad..9ced374 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -54,11 +55,14 @@ #define IPA_OML_PROTO 0xFF +#define TEMP_TIMER_SECS ((6 * 3600) + 1) + #include "utils.h" #include "eeprom.h" #include "l1_if.h" #include "hw_misc.h" #include "btsconfig.h" +#include /* FIXME: read from real hardware */ const uint8_t abis_mac[6] = { 0,1,2,3,4,5 }; @@ -297,6 +301,60 @@ static int write_pid_file(char *procname) } #ifdef BUILD_SBTS2050 +static int init_max_power_red; +static int new_max_power_red; +static int status_change_power_red = 0; + +enum { + SBTS2050_DISABLE_CHANGE_POWER = 0, + SBTS2050_ENABLE_CHANGE_POWER, +}; + +#define oml_tlv_parse(dec, buf, len) \ + tlv_parse(dec, &abis_nm_att_tlvdef, buf, len, 0, 0) + +/* size of the struct plus 1 Bytes of tag and 2 Bytes for the length */ +#define TLV_ADD_INFO_LEN (sizeof(struct sbts2050_config_info) + 3) + +static struct osmo_timer_list power_timer; +static void change_max_power_red_cb(void *data) +{ + struct gsm_bts *bts = data; + + if (status_change_power_red == SBTS2050_ENABLE_CHANGE_POWER) { + if (bts->c0->max_power_red != new_max_power_red) { + init_max_power_red = bts->c0->max_power_red; + bts->c0->max_power_red = new_max_power_red; + } + status_change_power_red = SBTS2050_DISABLE_CHANGE_POWER; + osmo_timer_schedule(&power_timer, TEMP_TIMER_SECS, 0); + } else if (status_change_power_red == SBTS2050_DISABLE_CHANGE_POWER) + bts->c0->max_power_red = init_max_power_red; +} + +static int take_max_power_red(struct msgb *msg) +{ + struct sbts2050_config_info *config_info; + struct tlv_parsed tlv_out; + int rc; + + rc = oml_tlv_parse(&tlv_out, msg->tail - TLV_ADD_INFO_LEN, + TLV_ADD_INFO_LEN); + + if (rc < 0) + return -1; + + config_info = + (struct sbts2050_config_info *) TLVP_VAL(&tlv_out, NM_ATT_ADD_INFO); + + new_max_power_red = config_info->max_power_red; + + status_change_power_red = SBTS2050_ENABLE_CHANGE_POWER; + change_max_power_red_cb(bts); + + return 0; +} + static int test_recv_msg(struct msgb *msg) { struct ipaccess_head *hh; @@ -376,6 +434,11 @@ static int read_sock(struct osmo_fd *fd, unsigned int what) goto err; } + if (take_max_power_red(msg) < 0) { + LOGP(DL1C, LOGL_NOTICE, "Failed Add_info: Malformed message"); + goto err; + } + mo = &bts->mo; msg->trx = mo->bts->c0; @@ -422,6 +485,9 @@ static int sbts2050_sock_unix_init(struct osmo_fd *accept, struct osmo_fd *read) read->fd = -1; accept->data = read; + power_timer.cb = change_max_power_red_cb; + power_timer.data = bts; + rc = osmo_sock_unix_init_ofd(accept, SOCK_SEQPACKET, 0, SOCKET_PATH, OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); return rc;