From patchwork Thu May 3 15:47:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 156731 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A2B6EB6FD0 for ; Fri, 4 May 2012 01:53:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757679Ab2ECPxY (ORCPT ); Thu, 3 May 2012 11:53:24 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:49467 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757563Ab2ECPxC (ORCPT ); Thu, 3 May 2012 11:53:02 -0400 Received: from mailone.linux-pingi.de (p5497CE78.dip.t-dialin.net [84.151.206.120]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MAihL-1SJ3WY0CnT-00BvhJ; Thu, 03 May 2012 17:53:01 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 44BF669FA; Thu, 3 May 2012 17:52:59 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 87EDD9FB77; Thu, 3 May 2012 17:47:33 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Karsten Keil Subject: [PATCHv2 4/7] mISDN: Make layer1 timer 3 value configurable Date: Thu, 3 May 2012 17:47:29 +0200 Message-Id: <1336060052-27119-5-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1336060052-27119-1-git-send-email-kkeil@linux-pingi.de> References: <1336060052-27119-1-git-send-email-kkeil@linux-pingi.de> X-Provags-ID: V02:K0:8tVmFEYZ33qT7Eai/gS4Hr92ORMJtBm5lVVoo6wf0WF DNITGB/GHaTY/LLaR1MNBokuON0PbCwDOhjaxpvwvi0NiBE5+R WbRvX3Lv44DGMjxcoTgjBFtG0gcW5MSsen8/f7Rks7L0aJ+CbV dBWW6gYK04FZFAeE5/UzxOtGl7S3RFHdW4ApHXe6973E4PTOZh Oq1d6SlKZiL/dBocPWaL5YUATsUKvp7pwo7S4g0f84BSUrw2WI OIcsUcwephqlWR+tuH+9ItREpsFVSz9rHDTaxRgCCPO8Di9R/y Di4mCuBnsLuQgCPhTqHKuiLVYcPJgR/OTE4as/pIh4HJ1H+XNL Erepo4WY6R3IihNPH7Nze4DOyIsWwq8NQhwGuFL3RBbmLLAVfO 5fEj7UdVIIBB4Lv1yjvtBV8K2Q6pUR6CiI= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Karsten Keil For certification test it is very useful to change the layer1 timer3 value on runtime. Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/layer1.c | 16 ++++++++++++++-- include/linux/mISDNhw.h | 3 +++ include/linux/mISDNif.h | 3 ++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index 0fc49b3..ff05153 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c @@ -30,11 +30,12 @@ struct layer1 { struct FsmInst l1m; struct FsmTimer timer; int delay; + int t3_value; struct dchannel *dch; dchannel_l1callback *dcb; }; -#define TIMER3_VALUE 7000 +#define TIMER3_DEFAULT_VALUE 7000 static struct Fsm l1fsm_s = {NULL, 0, 0, NULL, NULL}; @@ -233,7 +234,7 @@ l1_activate_s(struct FsmInst *fi, int event, void *arg) { struct layer1 *l1 = fi->userdata; - mISDN_FsmRestartTimer(&l1->timer, TIMER3_VALUE, EV_TIMER3, NULL, 2); + mISDN_FsmRestartTimer(&l1->timer, l1->t3_value, EV_TIMER3, NULL, 2); test_and_set_bit(FLG_L1_T3RUN, &l1->Flags); l1->dcb(l1->dch, HW_RESET_REQ); } @@ -356,6 +357,16 @@ l1_event(struct layer1 *l1, u_int event) release_l1(l1); break; default: + if ((event & ~HW_TIMER3_VMASK) == HW_TIMER3_VALUE) { + int val = event & HW_TIMER3_VMASK; + + if (val < 5) + val = 5; + if (val > 30) + val = 30; + l1->t3_value = val; + break; + } if (*debug & DEBUG_L1) printk(KERN_DEBUG "%s %x unhandled\n", __func__, event); @@ -377,6 +388,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) { nl1->l1m.fsm = &l1fsm_s; nl1->l1m.state = ST_L1_F3; nl1->Flags = 0; + nl1->t3_value = TIMER3_DEFAULT_VALUE; nl1->l1m.debug = *debug & DEBUG_L1_FSM; nl1->l1m.userdata = nl1; nl1->l1m.userint = 0; diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h index 4af8414..de165b5 100644 --- a/include/linux/mISDNhw.h +++ b/include/linux/mISDNhw.h @@ -135,6 +135,9 @@ extern int create_l1(struct dchannel *, dchannel_l1callback *); #define HW_TESTRX_RAW 0x9602 #define HW_TESTRX_HDLC 0x9702 #define HW_TESTRX_OFF 0x9802 +#define HW_TIMER3_IND 0x9902 +#define HW_TIMER3_VALUE 0x9a00 +#define HW_TIMER3_VMASK 0x00FF struct layer1; extern int l1_event(struct layer1 *, u_int); diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index b80f764..9cc8ce5 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -37,7 +37,7 @@ */ #define MISDN_MAJOR_VERSION 1 #define MISDN_MINOR_VERSION 1 -#define MISDN_RELEASE 26 +#define MISDN_RELEASE 27 /* primitives for information exchange * generell format @@ -372,6 +372,7 @@ clear_channelmap(u_int nr, u_char *map) #define MISDN_CTRL_RX_OFF 0x0100 #define MISDN_CTRL_FILL_EMPTY 0x0200 #define MISDN_CTRL_GETPEER 0x0400 +#define MISDN_CTRL_L1_TIMER3 0x0800 #define MISDN_CTRL_HW_FEATURES_OP 0x2000 #define MISDN_CTRL_HW_FEATURES 0x2001 #define MISDN_CTRL_HFC_OP 0x4000