mISDN: Make layer1 timer 3 value configurable

For certification test it is very useful to change the layer1
timer3 value on runtime.

Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 36 insertions, 11 deletions

diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index c0b8c960ee3f..6bf2c58795a3 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -868,7 +868,7 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -878,6 +878,9 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
                 }
                 ret = fc->isac.ctrl(&fc->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = fc->isac.ctrl(&fc->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: %s unknown Op %x\n", fc->name, __func__, cq->op);
                 ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 43013316b9b0..4c128e4bb5cf 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -4161,7 +4161,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_HFC_OP;
+                cq->op = MISDN_CTRL_HFC_OP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_HFC_WD_INIT: /* init the watchdog */
                 wd_cnt = cq->p1 & 0xf;
@@ -4191,6 +4191,9 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
                                __func__);
                 HFC_outb(hc, R_BERT_WD_MD, hc->hw.r_bert_wd_md | V_WD_RES);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(dch->l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
         default:
                 printk(KERN_WARNING "%s: unknown Op %x\n",
                        __func__, cq->op);
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index e2c83a2d7691..5fe993e2dee9 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1819,7 +1819,7 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
                 cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_CONNECT |
-                        MISDN_CTRL_DISCONNECT;
+                         MISDN_CTRL_DISCONNECT | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* channel 0 disabled loop */
@@ -1896,6 +1896,9 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
                 Write_hfc(hc, HFCPCI_CONNECT, hc->hw.conn);
                 hc->hw.trm &= 0x7f;     /* disable IOM-loop */
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(hc->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
         default:
                 printk(KERN_WARNING "%s: unknown Op %x\n",
                        __func__, cq->op);
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 884369f09cad..92d4a78bc0a5 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -603,10 +603,11 @@ isac_l1hw(struct mISDNchannel *ch, struct sk_buff *skb)
 }
 
 static int
-isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
+isac_ctrl(struct isac_hw *isac, u32 cmd, unsigned long para)
 {
         u8 tl = 0;
-        u_long flags;
+        unsigned long flags;
+        int ret = 0;
 
         switch (cmd) {
         case HW_TESTLOOP:
@@ -626,12 +627,15 @@ isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
                 }
                 spin_unlock_irqrestore(isac->hwlock, flags);
                 break;
+        case HW_TIMER3_VALUE:
+                ret = l1_event(isac->dch.l1, HW_TIMER3_VALUE | (para & 0xff));
+                break;
         default:
                 pr_debug("%s: %s unknown command %x %lx\n", isac->name,
                          __func__, cmd, para);
-                return -1;
+                ret = -1;
         }
-        return 0;
+        return ret;
 }
 
 static int
@@ -1526,7 +1530,7 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -1536,6 +1540,9 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
                 }
                 ret = ipac->ctrl(ipac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = ipac->isac.ctrl(&ipac->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: unknown CTRL OP %x\n", ipac->name, cq->op);
                 ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index c726e09d0981..27998d7188a5 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -837,7 +837,7 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -847,6 +847,9 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
                 }
                 ret = card->isac.ctrl(&card->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = card->isac.ctrl(&card->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: %s unknown Op %x\n", card->name, __func__, cq->op);
                 ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
index 04689935148b..93f344d74e54 100644
--- a/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/drivers/isdn/hardware/mISDN/speedfax.c
@@ -224,7 +224,7 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                 break;
         case MISDN_CTRL_LOOP:
                 /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -234,6 +234,9 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
                 }
                 ret = sf->isac.ctrl(&sf->isac, HW_TESTLOOP, cq->channel);
                 break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = sf->isac.ctrl(&sf->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
         default:
                 pr_info("%s: unknown Op %x\n", sf->name, cq->op);
                 ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 2183357f0799..1d044670ff66 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1035,7 +1035,10 @@ channel_ctrl(struct w6692_hw *card, struct mISDN_ctrl_req *cq)
 
         switch (cq->op) {
         case MISDN_CTRL_GETOP:
-                cq->op = 0;
+                cq->op = MISDN_CTRL_L1_TIMER3;
+                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(card->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
                 break;
         default:
                 pr_info("%s: unknown CTRL OP %x\n", card->name, cq->op);