2005-04-17 06:20:36 +08:00
|
|
|
/* $Id: netjet.c,v 1.29.2.4 2004/02/11 13:21:34 keil Exp $
|
|
|
|
*
|
|
|
|
* low level stuff for Traverse Technologie NETJet ISDN cards
|
|
|
|
*
|
|
|
|
* Author Karsten Keil
|
|
|
|
* Copyright by Karsten Keil <keil@isdn4linux.de>
|
2012-02-20 11:52:38 +08:00
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* This software may be used and distributed according to the terms
|
|
|
|
* of the GNU General Public License, incorporated herein by reference.
|
|
|
|
*
|
|
|
|
* Thanks to Traverse Technologies Australia for documents and information
|
|
|
|
*
|
|
|
|
* 16-Apr-2002 - led code added - Guy Ellis (guy@traverse.com.au)
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include "hisax.h"
|
|
|
|
#include "isac.h"
|
|
|
|
#include "hscx.h"
|
|
|
|
#include "isdnl1.h"
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/ppp_defs.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/io.h>
|
|
|
|
#include "netjet.h"
|
|
|
|
|
|
|
|
/* Interface functions */
|
|
|
|
|
|
|
|
u_char
|
|
|
|
NETjet_ReadIC(struct IsdnCardState *cs, u_char offset)
|
|
|
|
{
|
|
|
|
u_char ret;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
cs->hw.njet.auxd &= 0xfc;
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.auxd |= (offset >> 4) & 3;
|
2005-04-17 06:20:36 +08:00
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
2012-02-20 11:52:38 +08:00
|
|
|
ret = bytein(cs->hw.njet.isac + ((offset & 0xf) << 2));
|
|
|
|
return (ret);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
NETjet_WriteIC(struct IsdnCardState *cs, u_char offset, u_char value)
|
|
|
|
{
|
|
|
|
cs->hw.njet.auxd &= 0xfc;
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.auxd |= (offset >> 4) & 3;
|
2005-04-17 06:20:36 +08:00
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
2012-02-20 11:52:38 +08:00
|
|
|
byteout(cs->hw.njet.isac + ((offset & 0xf) << 2), value);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
NETjet_ReadICfifo(struct IsdnCardState *cs, u_char *data, int size)
|
|
|
|
{
|
|
|
|
cs->hw.njet.auxd &= 0xfc;
|
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
|
|
|
insb(cs->hw.njet.isac, data, size);
|
|
|
|
}
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
void
|
2005-04-17 06:20:36 +08:00
|
|
|
NETjet_WriteICfifo(struct IsdnCardState *cs, u_char *data, int size)
|
|
|
|
{
|
|
|
|
cs->hw.njet.auxd &= 0xfc;
|
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
|
|
|
outsb(cs->hw.njet.isac, data, size);
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:59:18 +08:00
|
|
|
static void fill_mem(struct BCState *bcs, u_int *pos, u_int cnt, int chan, u_char fill)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2012-02-20 11:52:38 +08:00
|
|
|
u_int mask = 0x000000ff, val = 0, *p = pos;
|
2005-04-17 06:20:36 +08:00
|
|
|
u_int i;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
val |= fill;
|
|
|
|
if (chan) {
|
|
|
|
val <<= 8;
|
|
|
|
mask <<= 8;
|
|
|
|
}
|
|
|
|
mask ^= 0xffffffff;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
*p &= mask;
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ |= val;
|
|
|
|
if (p > bcs->hw.tiger.s_end)
|
|
|
|
p = bcs->hw.tiger.send;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:59:18 +08:00
|
|
|
static void
|
2005-04-17 06:20:36 +08:00
|
|
|
mode_tiger(struct BCState *bcs, int mode, int bc)
|
|
|
|
{
|
|
|
|
struct IsdnCardState *cs = bcs->cs;
|
2012-02-20 11:52:38 +08:00
|
|
|
u_char led;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (cs->debug & L1_DEB_HSCX)
|
|
|
|
debugl1(cs, "Tiger mode %d bchan %d/%d",
|
|
|
|
mode, bc, bcs->channel);
|
|
|
|
bcs->mode = mode;
|
|
|
|
bcs->channel = bc;
|
|
|
|
switch (mode) {
|
2012-02-20 11:52:38 +08:00
|
|
|
case (L1_MODE_NULL):
|
|
|
|
fill_mem(bcs, bcs->hw.tiger.send,
|
|
|
|
NETJET_DMA_TXSIZE, bc, 0xff);
|
|
|
|
if (cs->debug & L1_DEB_HSCX)
|
|
|
|
debugl1(cs, "Tiger stat rec %d/%d send %d",
|
|
|
|
bcs->hw.tiger.r_tot, bcs->hw.tiger.r_err,
|
|
|
|
bcs->hw.tiger.s_tot);
|
|
|
|
if ((cs->bcs[0].mode == L1_MODE_NULL) &&
|
|
|
|
(cs->bcs[1].mode == L1_MODE_NULL)) {
|
|
|
|
cs->hw.njet.dmactrl = 0;
|
|
|
|
byteout(cs->hw.njet.base + NETJET_DMACTRL,
|
|
|
|
cs->hw.njet.dmactrl);
|
|
|
|
byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0);
|
|
|
|
}
|
|
|
|
if (cs->typ == ISDN_CTYPE_NETJET_S)
|
|
|
|
{
|
|
|
|
// led off
|
|
|
|
led = bc & 0x01;
|
|
|
|
led = 0x01 << (6 + led); // convert to mask
|
|
|
|
led = ~led;
|
|
|
|
cs->hw.njet.auxd &= led;
|
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case (L1_MODE_TRANS):
|
|
|
|
break;
|
|
|
|
case (L1_MODE_HDLC_56K):
|
|
|
|
case (L1_MODE_HDLC):
|
|
|
|
fill_mem(bcs, bcs->hw.tiger.send,
|
|
|
|
NETJET_DMA_TXSIZE, bc, 0xff);
|
|
|
|
bcs->hw.tiger.r_state = HDLC_ZERO_SEARCH;
|
|
|
|
bcs->hw.tiger.r_tot = 0;
|
|
|
|
bcs->hw.tiger.r_bitcnt = 0;
|
|
|
|
bcs->hw.tiger.r_one = 0;
|
|
|
|
bcs->hw.tiger.r_err = 0;
|
|
|
|
bcs->hw.tiger.s_tot = 0;
|
|
|
|
if (!cs->hw.njet.dmactrl) {
|
2005-04-17 06:20:36 +08:00
|
|
|
fill_mem(bcs, bcs->hw.tiger.send,
|
2012-02-20 11:52:38 +08:00
|
|
|
NETJET_DMA_TXSIZE, !bc, 0xff);
|
|
|
|
cs->hw.njet.dmactrl = 1;
|
|
|
|
byteout(cs->hw.njet.base + NETJET_DMACTRL,
|
|
|
|
cs->hw.njet.dmactrl);
|
|
|
|
byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0x0f);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* was 0x3f now 0x0f for TJ300 and TJ320 GE 13/07/00 */
|
2012-02-20 11:52:38 +08:00
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendp = bcs->hw.tiger.send;
|
|
|
|
bcs->hw.tiger.free = NETJET_DMA_TXSIZE;
|
|
|
|
test_and_set_bit(BC_FLG_EMPTY, &bcs->Flag);
|
|
|
|
if (cs->typ == ISDN_CTYPE_NETJET_S)
|
|
|
|
{
|
|
|
|
// led on
|
|
|
|
led = bc & 0x01;
|
|
|
|
led = 0x01 << (6 + led); // convert to mask
|
|
|
|
cs->hw.njet.auxd |= led;
|
|
|
|
byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
|
|
|
|
}
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if (cs->debug & L1_DEB_HSCX)
|
|
|
|
debugl1(cs, "tiger: set %x %x %x %x/%x pulse=%d",
|
|
|
|
bytein(cs->hw.njet.base + NETJET_DMACTRL),
|
|
|
|
bytein(cs->hw.njet.base + NETJET_IRQMASK0),
|
|
|
|
bytein(cs->hw.njet.base + NETJET_IRQSTAT0),
|
|
|
|
inl(cs->hw.njet.base + NETJET_DMA_READ_ADR),
|
|
|
|
inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR),
|
|
|
|
bytein(cs->hw.njet.base + NETJET_PULSE_CNT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void printframe(struct IsdnCardState *cs, u_char *buf, int count, char *s) {
|
|
|
|
char tmp[128];
|
|
|
|
char *t = tmp;
|
2012-02-20 11:52:38 +08:00
|
|
|
int i = count, j;
|
2005-04-17 06:20:36 +08:00
|
|
|
u_char *p = buf;
|
|
|
|
|
|
|
|
t += sprintf(t, "tiger %s(%4d)", s, count);
|
2012-02-20 11:52:38 +08:00
|
|
|
while (i > 0) {
|
|
|
|
if (i > 16)
|
|
|
|
j = 16;
|
2005-04-17 06:20:36 +08:00
|
|
|
else
|
2012-02-20 11:52:38 +08:00
|
|
|
j = i;
|
2005-04-17 06:20:36 +08:00
|
|
|
QuickHex(t, p, j);
|
2013-09-14 05:52:04 +08:00
|
|
|
debugl1(cs, "%s", tmp);
|
2005-04-17 06:20:36 +08:00
|
|
|
p += j;
|
|
|
|
i -= j;
|
|
|
|
t = tmp;
|
|
|
|
t += sprintf(t, "tiger %s ", s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// macro for 64k
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
#define MAKE_RAW_BYTE for (j = 0; j < 8; j++) { \
|
|
|
|
bitcnt++; \
|
|
|
|
s_val >>= 1; \
|
|
|
|
if (val & 1) { \
|
|
|
|
s_one++; \
|
|
|
|
s_val |= 0x80; \
|
|
|
|
} else { \
|
|
|
|
s_one = 0; \
|
|
|
|
s_val &= 0x7f; \
|
|
|
|
} \
|
|
|
|
if (bitcnt == 8) { \
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val; \
|
|
|
|
bitcnt = 0; \
|
|
|
|
} \
|
|
|
|
if (s_one == 5) { \
|
|
|
|
s_val >>= 1; \
|
|
|
|
s_val &= 0x7f; \
|
|
|
|
bitcnt++; \
|
|
|
|
s_one = 0; \
|
|
|
|
} \
|
|
|
|
if (bitcnt == 8) { \
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val; \
|
|
|
|
bitcnt = 0; \
|
|
|
|
} \
|
|
|
|
val >>= 1; \
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static int make_raw_data(struct BCState *bcs) {
|
|
|
|
// this make_raw is for 64k
|
2012-02-20 11:52:38 +08:00
|
|
|
register u_int i, s_cnt = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
register u_char j;
|
|
|
|
register u_char val;
|
|
|
|
register u_char s_one = 0;
|
|
|
|
register u_char s_val = 0;
|
|
|
|
register u_char bitcnt = 0;
|
|
|
|
u_int fcs;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!bcs->tx_skb) {
|
|
|
|
debugl1(bcs->cs, "tiger make_raw: NULL skb");
|
2012-02-20 11:52:38 +08:00
|
|
|
return (1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = HDLC_FLAG_VALUE;
|
|
|
|
fcs = PPP_INITFCS;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = 0; i < bcs->tx_skb->len; i++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
val = bcs->tx_skb->data[i];
|
2012-02-20 11:52:38 +08:00
|
|
|
fcs = PPP_FCS(fcs, val);
|
2005-04-17 06:20:36 +08:00
|
|
|
MAKE_RAW_BYTE;
|
|
|
|
}
|
|
|
|
fcs ^= 0xffff;
|
|
|
|
val = fcs & 0xff;
|
|
|
|
MAKE_RAW_BYTE;
|
2012-02-20 11:52:38 +08:00
|
|
|
val = (fcs >> 8) & 0xff;
|
2005-04-17 06:20:36 +08:00
|
|
|
MAKE_RAW_BYTE;
|
|
|
|
val = HDLC_FLAG_VALUE;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (j = 0; j < 8; j++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
bitcnt++;
|
|
|
|
s_val >>= 1;
|
|
|
|
if (val & 1)
|
|
|
|
s_val |= 0x80;
|
|
|
|
else
|
|
|
|
s_val &= 0x7f;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bitcnt == 8) {
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val;
|
|
|
|
bitcnt = 0;
|
|
|
|
}
|
|
|
|
val >>= 1;
|
|
|
|
}
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger make_raw: in %u out %d.%d",
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->tx_skb->len, s_cnt, bitcnt);
|
|
|
|
if (bitcnt) {
|
2012-02-20 11:52:38 +08:00
|
|
|
while (8 > bitcnt++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
s_val >>= 1;
|
|
|
|
s_val |= 0x80;
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val;
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = 0xff; // NJ<->NJ thoughput bug fix
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendcnt = s_cnt;
|
|
|
|
bcs->tx_cnt -= bcs->tx_skb->len;
|
|
|
|
bcs->hw.tiger.sp = bcs->hw.tiger.sendbuf;
|
2012-02-20 11:52:38 +08:00
|
|
|
return (0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// macro for 56k
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
#define MAKE_RAW_BYTE_56K for (j = 0; j < 8; j++) { \
|
|
|
|
bitcnt++; \
|
|
|
|
s_val >>= 1; \
|
|
|
|
if (val & 1) { \
|
|
|
|
s_one++; \
|
|
|
|
s_val |= 0x80; \
|
|
|
|
} else { \
|
|
|
|
s_one = 0; \
|
|
|
|
s_val &= 0x7f; \
|
|
|
|
} \
|
|
|
|
if (bitcnt == 7) { \
|
|
|
|
s_val >>= 1; \
|
|
|
|
s_val |= 0x80; \
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val; \
|
|
|
|
bitcnt = 0; \
|
|
|
|
} \
|
|
|
|
if (s_one == 5) { \
|
|
|
|
s_val >>= 1; \
|
|
|
|
s_val &= 0x7f; \
|
|
|
|
bitcnt++; \
|
|
|
|
s_one = 0; \
|
|
|
|
} \
|
|
|
|
if (bitcnt == 7) { \
|
|
|
|
s_val >>= 1; \
|
|
|
|
s_val |= 0x80; \
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val; \
|
|
|
|
bitcnt = 0; \
|
|
|
|
} \
|
|
|
|
val >>= 1; \
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static int make_raw_data_56k(struct BCState *bcs) {
|
|
|
|
// this make_raw is for 56k
|
2012-02-20 11:52:38 +08:00
|
|
|
register u_int i, s_cnt = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
register u_char j;
|
|
|
|
register u_char val;
|
|
|
|
register u_char s_one = 0;
|
|
|
|
register u_char s_val = 0;
|
|
|
|
register u_char bitcnt = 0;
|
|
|
|
u_int fcs;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!bcs->tx_skb) {
|
|
|
|
debugl1(bcs->cs, "tiger make_raw_56k: NULL skb");
|
2012-02-20 11:52:38 +08:00
|
|
|
return (1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
val = HDLC_FLAG_VALUE;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (j = 0; j < 8; j++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
bitcnt++;
|
|
|
|
s_val >>= 1;
|
|
|
|
if (val & 1)
|
|
|
|
s_val |= 0x80;
|
|
|
|
else
|
|
|
|
s_val &= 0x7f;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bitcnt == 7) {
|
2005-04-17 06:20:36 +08:00
|
|
|
s_val >>= 1;
|
|
|
|
s_val |= 0x80;
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val;
|
|
|
|
bitcnt = 0;
|
|
|
|
}
|
|
|
|
val >>= 1;
|
|
|
|
};
|
|
|
|
fcs = PPP_INITFCS;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = 0; i < bcs->tx_skb->len; i++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
val = bcs->tx_skb->data[i];
|
2012-02-20 11:52:38 +08:00
|
|
|
fcs = PPP_FCS(fcs, val);
|
2005-04-17 06:20:36 +08:00
|
|
|
MAKE_RAW_BYTE_56K;
|
|
|
|
}
|
|
|
|
fcs ^= 0xffff;
|
|
|
|
val = fcs & 0xff;
|
|
|
|
MAKE_RAW_BYTE_56K;
|
2012-02-20 11:52:38 +08:00
|
|
|
val = (fcs >> 8) & 0xff;
|
2005-04-17 06:20:36 +08:00
|
|
|
MAKE_RAW_BYTE_56K;
|
|
|
|
val = HDLC_FLAG_VALUE;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (j = 0; j < 8; j++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
bitcnt++;
|
|
|
|
s_val >>= 1;
|
|
|
|
if (val & 1)
|
|
|
|
s_val |= 0x80;
|
|
|
|
else
|
|
|
|
s_val &= 0x7f;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bitcnt == 7) {
|
2005-04-17 06:20:36 +08:00
|
|
|
s_val >>= 1;
|
|
|
|
s_val |= 0x80;
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val;
|
|
|
|
bitcnt = 0;
|
|
|
|
}
|
|
|
|
val >>= 1;
|
|
|
|
}
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger make_raw_56k: in %u out %d.%d",
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->tx_skb->len, s_cnt, bitcnt);
|
|
|
|
if (bitcnt) {
|
2012-02-20 11:52:38 +08:00
|
|
|
while (8 > bitcnt++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
s_val >>= 1;
|
|
|
|
s_val |= 0x80;
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = s_val;
|
|
|
|
bcs->hw.tiger.sendbuf[s_cnt++] = 0xff; // NJ<->NJ thoughput bug fix
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.sendcnt = s_cnt;
|
|
|
|
bcs->tx_cnt -= bcs->tx_skb->len;
|
|
|
|
bcs->hw.tiger.sp = bcs->hw.tiger.sendbuf;
|
2012-02-20 11:52:38 +08:00
|
|
|
return (0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void got_frame(struct BCState *bcs, int count) {
|
|
|
|
struct sk_buff *skb;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!(skb = dev_alloc_skb(count)))
|
|
|
|
printk(KERN_WARNING "TIGER: receive out of memory\n");
|
|
|
|
else {
|
networking: introduce and use skb_put_data()
A common pattern with skb_put() is to just want to memcpy()
some data into the new space, introduce skb_put_data() for
this.
An spatch similar to the one for skb_put_zero() converts many
of the places using it:
@@
identifier p, p2;
expression len, skb, data;
type t, t2;
@@
(
-p = skb_put(skb, len);
+p = skb_put_data(skb, data, len);
|
-p = (t)skb_put(skb, len);
+p = skb_put_data(skb, data, len);
)
(
p2 = (t2)p;
-memcpy(p2, data, len);
|
-memcpy(p, data, len);
)
@@
type t, t2;
identifier p, p2;
expression skb, data;
@@
t *p;
...
(
-p = skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
|
-p = (t *)skb_put(skb, sizeof(t));
+p = skb_put_data(skb, data, sizeof(t));
)
(
p2 = (t2)p;
-memcpy(p2, data, sizeof(*p));
|
-memcpy(p, data, sizeof(*p));
)
@@
expression skb, len, data;
@@
-memcpy(skb_put(skb, len), data, len);
+skb_put_data(skb, data, len);
(again, manually post-processed to retain some comments)
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 20:29:20 +08:00
|
|
|
skb_put_data(skb, bcs->hw.tiger.rcvbuf, count);
|
2005-04-17 06:20:36 +08:00
|
|
|
skb_queue_tail(&bcs->rqueue, skb);
|
|
|
|
}
|
|
|
|
test_and_set_bit(B_RCVBUFREADY, &bcs->event);
|
|
|
|
schedule_work(&bcs->tqueue);
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bcs->cs->debug & L1_DEB_RECEIVE_FRAME)
|
|
|
|
printframe(bcs->cs, bcs->hw.tiger.rcvbuf, count, "rec");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
static void read_raw(struct BCState *bcs, u_int *buf, int cnt) {
|
2005-04-17 06:20:36 +08:00
|
|
|
int i;
|
|
|
|
register u_char j;
|
|
|
|
register u_char val;
|
2012-02-20 11:52:38 +08:00
|
|
|
u_int *pend = bcs->hw.tiger.rec + NETJET_DMA_RXSIZE - 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
register u_char state = bcs->hw.tiger.r_state;
|
|
|
|
register u_char r_one = bcs->hw.tiger.r_one;
|
|
|
|
register u_char r_val = bcs->hw.tiger.r_val;
|
|
|
|
register u_int bitcnt = bcs->hw.tiger.r_bitcnt;
|
|
|
|
u_int *p = buf;
|
|
|
|
int bits;
|
|
|
|
u_char mask;
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bcs->mode == L1_MODE_HDLC) { // it's 64k
|
2005-04-17 06:20:36 +08:00
|
|
|
mask = 0xff;
|
|
|
|
bits = 8;
|
|
|
|
}
|
|
|
|
else { // it's 56K
|
|
|
|
mask = 0x7f;
|
|
|
|
bits = 7;
|
|
|
|
};
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = 0; i < cnt; i++) {
|
|
|
|
val = bcs->channel ? ((*p >> 8) & 0xff) : (*p & 0xff);
|
2005-04-17 06:20:36 +08:00
|
|
|
p++;
|
|
|
|
if (p > pend)
|
|
|
|
p = bcs->hw.tiger.rec;
|
|
|
|
if ((val & mask) == mask) {
|
|
|
|
state = HDLC_ZERO_SEARCH;
|
|
|
|
bcs->hw.tiger.r_tot++;
|
|
|
|
bitcnt = 0;
|
|
|
|
r_one = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
for (j = 0; j < bits; j++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (state == HDLC_ZERO_SEARCH) {
|
|
|
|
if (val & 1) {
|
|
|
|
r_one++;
|
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
r_one = 0;
|
|
|
|
state = HDLC_FLAG_SEARCH;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger read_raw: zBit(%d,%d,%d) %x",
|
|
|
|
bcs->hw.tiger.r_tot, i, j, val);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
} else if (state == HDLC_FLAG_SEARCH) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (val & 1) {
|
|
|
|
r_one++;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one > 6) {
|
|
|
|
state = HDLC_ZERO_SEARCH;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one == 6) {
|
|
|
|
bitcnt = 0;
|
|
|
|
r_val = 0;
|
|
|
|
state = HDLC_FLAG_FOUND;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger read_raw: flag(%d,%d,%d) %x",
|
|
|
|
bcs->hw.tiger.r_tot, i, j, val);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
} else if (state == HDLC_FLAG_FOUND) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (val & 1) {
|
|
|
|
r_one++;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one > 6) {
|
|
|
|
state = HDLC_ZERO_SEARCH;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
r_val >>= 1;
|
|
|
|
r_val |= 0x80;
|
|
|
|
bitcnt++;
|
|
|
|
}
|
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one == 6) {
|
|
|
|
bitcnt = 0;
|
|
|
|
r_val = 0;
|
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
val >>= 1;
|
|
|
|
continue;
|
2012-02-20 11:52:38 +08:00
|
|
|
} else if (r_one != 5) {
|
2005-04-17 06:20:36 +08:00
|
|
|
r_val >>= 1;
|
|
|
|
r_val &= 0x7f;
|
|
|
|
bitcnt++;
|
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if ((state != HDLC_ZERO_SEARCH) &&
|
2012-02-20 11:52:38 +08:00
|
|
|
!(bitcnt & 7)) {
|
|
|
|
state = HDLC_FRAME_FOUND;
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->hw.tiger.r_fcs = PPP_INITFCS;
|
|
|
|
bcs->hw.tiger.rcvbuf[0] = r_val;
|
2012-02-20 11:52:38 +08:00
|
|
|
bcs->hw.tiger.r_fcs = PPP_FCS(bcs->hw.tiger.r_fcs, r_val);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger read_raw: byte1(%d,%d,%d) rval %x val %x i %x",
|
|
|
|
bcs->hw.tiger.r_tot, i, j, r_val, val,
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->cs->hw.njet.irqstat0);
|
|
|
|
}
|
|
|
|
} else if (state == HDLC_FRAME_FOUND) {
|
|
|
|
if (val & 1) {
|
|
|
|
r_one++;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one > 6) {
|
|
|
|
state = HDLC_ZERO_SEARCH;
|
|
|
|
bitcnt = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
r_val >>= 1;
|
|
|
|
r_val |= 0x80;
|
|
|
|
bitcnt++;
|
|
|
|
}
|
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
if (r_one == 6) {
|
|
|
|
r_val = 0;
|
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
bitcnt++;
|
|
|
|
if (bitcnt & 7) {
|
|
|
|
debugl1(bcs->cs, "tiger: frame not byte aligned");
|
2012-02-20 11:52:38 +08:00
|
|
|
state = HDLC_FLAG_SEARCH;
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->hw.tiger.r_err++;
|
|
|
|
#ifdef ERROR_STATISTIC
|
|
|
|
bcs->err_inv++;
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger frame end(%d,%d): fcs(%x) i %x",
|
|
|
|
i, j, bcs->hw.tiger.r_fcs, bcs->cs->hw.njet.irqstat0);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (bcs->hw.tiger.r_fcs == PPP_GOODFCS) {
|
2012-02-20 11:52:38 +08:00
|
|
|
got_frame(bcs, (bitcnt >> 3) - 3);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
if (bcs->cs->debug) {
|
|
|
|
debugl1(bcs->cs, "tiger FCS error");
|
|
|
|
printframe(bcs->cs, bcs->hw.tiger.rcvbuf,
|
2012-02-20 11:52:38 +08:00
|
|
|
(bitcnt >> 3) - 1, "rec");
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->hw.tiger.r_err++;
|
|
|
|
}
|
|
|
|
#ifdef ERROR_STATISTIC
|
2012-02-20 11:52:38 +08:00
|
|
|
bcs->err_crc++;
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
state = HDLC_FLAG_FOUND;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
bitcnt = 0;
|
|
|
|
} else if (r_one == 5) {
|
2005-04-17 06:20:36 +08:00
|
|
|
val >>= 1;
|
2012-02-20 11:52:38 +08:00
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
r_val >>= 1;
|
|
|
|
r_val &= 0x7f;
|
|
|
|
bitcnt++;
|
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
r_one = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
if ((state == HDLC_FRAME_FOUND) &&
|
2012-02-20 11:52:38 +08:00
|
|
|
!(bitcnt & 7)) {
|
|
|
|
if ((bitcnt >> 3) >= HSCX_BUFMAX) {
|
2005-04-17 06:20:36 +08:00
|
|
|
debugl1(bcs->cs, "tiger: frame too big");
|
2012-02-20 11:52:38 +08:00
|
|
|
r_val = 0;
|
|
|
|
state = HDLC_FLAG_SEARCH;
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->hw.tiger.r_err++;
|
|
|
|
#ifdef ERROR_STATISTIC
|
|
|
|
bcs->err_inv++;
|
|
|
|
#endif
|
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
bcs->hw.tiger.rcvbuf[(bitcnt >> 3) - 1] = r_val;
|
|
|
|
bcs->hw.tiger.r_fcs =
|
|
|
|
PPP_FCS(bcs->hw.tiger.r_fcs, r_val);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
val >>= 1;
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.r_tot++;
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.r_state = state;
|
|
|
|
bcs->hw.tiger.r_one = r_one;
|
|
|
|
bcs->hw.tiger.r_val = r_val;
|
|
|
|
bcs->hw.tiger.r_bitcnt = bitcnt;
|
|
|
|
}
|
|
|
|
|
|
|
|
void read_tiger(struct IsdnCardState *cs) {
|
|
|
|
u_int *p;
|
2012-02-20 11:52:38 +08:00
|
|
|
int cnt = NETJET_DMA_RXSIZE / 2;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((cs->hw.njet.irqstat0 & cs->hw.njet.last_is0) & NETJET_IRQM0_READ) {
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(cs, "tiger warn read double dma %x/%x",
|
2005-04-17 06:20:36 +08:00
|
|
|
cs->hw.njet.irqstat0, cs->hw.njet.last_is0);
|
|
|
|
#ifdef ERROR_STATISTIC
|
|
|
|
if (cs->bcs[0].mode)
|
|
|
|
cs->bcs[0].err_rdo++;
|
|
|
|
if (cs->bcs[1].mode)
|
|
|
|
cs->bcs[1].err_rdo++;
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
cs->hw.njet.last_is0 &= ~NETJET_IRQM0_READ;
|
|
|
|
cs->hw.njet.last_is0 |= (cs->hw.njet.irqstat0 & NETJET_IRQM0_READ);
|
2012-02-20 11:52:38 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cs->hw.njet.irqstat0 & NETJET_IRQM0_READ_1)
|
|
|
|
p = cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1;
|
|
|
|
else
|
|
|
|
p = cs->bcs[0].hw.tiger.rec + cnt - 1;
|
|
|
|
if ((cs->bcs[0].mode == L1_MODE_HDLC) || (cs->bcs[0].mode == L1_MODE_HDLC_56K))
|
|
|
|
read_raw(cs->bcs, p, cnt);
|
|
|
|
|
|
|
|
if ((cs->bcs[1].mode == L1_MODE_HDLC) || (cs->bcs[1].mode == L1_MODE_HDLC_56K))
|
|
|
|
read_raw(cs->bcs + 1, p, cnt);
|
|
|
|
cs->hw.njet.irqstat0 &= ~NETJET_IRQM0_READ;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_raw(struct BCState *bcs, u_int *buf, int cnt);
|
|
|
|
|
|
|
|
void netjet_fill_dma(struct BCState *bcs)
|
|
|
|
{
|
|
|
|
register u_int *p, *sp;
|
|
|
|
register int cnt;
|
|
|
|
|
|
|
|
if (!bcs->tx_skb)
|
|
|
|
return;
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger fill_dma1: c%d %4lx", bcs->channel,
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->Flag);
|
|
|
|
if (test_and_set_bit(BC_FLG_BUSY, &bcs->Flag))
|
|
|
|
return;
|
|
|
|
if (bcs->mode == L1_MODE_HDLC) { // it's 64k
|
|
|
|
if (make_raw_data(bcs))
|
2012-02-20 11:52:38 +08:00
|
|
|
return;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
else { // it's 56k
|
|
|
|
if (make_raw_data_56k(bcs))
|
2012-02-20 11:52:38 +08:00
|
|
|
return;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger fill_dma2: c%d %4lx", bcs->channel,
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->Flag);
|
|
|
|
if (test_and_clear_bit(BC_FLG_NOFRAME, &bcs->Flag)) {
|
|
|
|
write_raw(bcs, bcs->hw.tiger.sendp, bcs->hw.tiger.free);
|
|
|
|
} else if (test_and_clear_bit(BC_FLG_HALF, &bcs->Flag)) {
|
|
|
|
p = bus_to_virt(inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR));
|
|
|
|
sp = bcs->hw.tiger.sendp;
|
|
|
|
if (p == bcs->hw.tiger.s_end)
|
2012-02-20 11:52:38 +08:00
|
|
|
p = bcs->hw.tiger.send - 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (sp == bcs->hw.tiger.s_end)
|
2012-02-20 11:52:38 +08:00
|
|
|
sp = bcs->hw.tiger.send - 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
cnt = p - sp;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (cnt < 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
write_raw(bcs, bcs->hw.tiger.sendp, bcs->hw.tiger.free);
|
|
|
|
} else {
|
|
|
|
p++;
|
|
|
|
cnt++;
|
|
|
|
if (p > bcs->hw.tiger.s_end)
|
|
|
|
p = bcs->hw.tiger.send;
|
|
|
|
p++;
|
|
|
|
cnt++;
|
|
|
|
if (p > bcs->hw.tiger.s_end)
|
|
|
|
p = bcs->hw.tiger.send;
|
|
|
|
write_raw(bcs, p, bcs->hw.tiger.free - cnt);
|
|
|
|
}
|
|
|
|
} else if (test_and_clear_bit(BC_FLG_EMPTY, &bcs->Flag)) {
|
|
|
|
p = bus_to_virt(inl(bcs->cs->hw.njet.base + NETJET_DMA_READ_ADR));
|
|
|
|
cnt = bcs->hw.tiger.s_end - p;
|
|
|
|
if (cnt < 2) {
|
|
|
|
p = bcs->hw.tiger.send + 1;
|
2012-02-20 11:52:38 +08:00
|
|
|
cnt = NETJET_DMA_TXSIZE / 2 - 2;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
p++;
|
|
|
|
p++;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (cnt <= (NETJET_DMA_TXSIZE / 2))
|
|
|
|
cnt += NETJET_DMA_TXSIZE / 2;
|
2005-04-17 06:20:36 +08:00
|
|
|
cnt--;
|
|
|
|
cnt--;
|
|
|
|
}
|
|
|
|
write_raw(bcs, p, cnt);
|
|
|
|
}
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger fill_dma3: c%d %4lx", bcs->channel,
|
2005-04-17 06:20:36 +08:00
|
|
|
bcs->Flag);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_raw(struct BCState *bcs, u_int *buf, int cnt) {
|
2012-02-20 11:52:38 +08:00
|
|
|
u_int mask, val, *p = buf;
|
2005-04-17 06:20:36 +08:00
|
|
|
u_int i, s_cnt;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
|
|
|
if (cnt <= 0)
|
|
|
|
return;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (test_bit(BC_FLG_BUSY, &bcs->Flag)) {
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bcs->hw.tiger.sendcnt > cnt) {
|
2005-04-17 06:20:36 +08:00
|
|
|
s_cnt = cnt;
|
|
|
|
bcs->hw.tiger.sendcnt -= cnt;
|
|
|
|
} else {
|
|
|
|
s_cnt = bcs->hw.tiger.sendcnt;
|
|
|
|
bcs->hw.tiger.sendcnt = 0;
|
|
|
|
}
|
|
|
|
if (bcs->channel)
|
|
|
|
mask = 0xffff00ff;
|
|
|
|
else
|
|
|
|
mask = 0xffffff00;
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = 0; i < s_cnt; i++) {
|
|
|
|
val = bcs->channel ? ((bcs->hw.tiger.sp[i] << 8) & 0xff00) :
|
2005-04-17 06:20:36 +08:00
|
|
|
(bcs->hw.tiger.sp[i]);
|
2012-02-20 11:52:38 +08:00
|
|
|
*p &= mask;
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ |= val;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (p > bcs->hw.tiger.s_end)
|
2005-04-17 06:20:36 +08:00
|
|
|
p = bcs->hw.tiger.send;
|
|
|
|
}
|
|
|
|
bcs->hw.tiger.s_tot += s_cnt;
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger write_raw: c%d %p-%p %d/%d %d %x", bcs->channel,
|
2005-04-17 06:20:36 +08:00
|
|
|
buf, p, s_cnt, cnt,
|
|
|
|
bcs->hw.tiger.sendcnt, bcs->cs->hw.njet.irqstat0);
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX_FIFO)
|
|
|
|
printframe(bcs->cs, bcs->hw.tiger.sp, s_cnt, "snd");
|
|
|
|
bcs->hw.tiger.sp += s_cnt;
|
|
|
|
bcs->hw.tiger.sendp = p;
|
|
|
|
if (!bcs->hw.tiger.sendcnt) {
|
|
|
|
if (!bcs->tx_skb) {
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger write_raw: NULL skb s_cnt %d", s_cnt);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2012-02-20 11:52:38 +08:00
|
|
|
if (test_bit(FLG_LLI_L1WAKEUP, &bcs->st->lli.flag) &&
|
|
|
|
(PACKET_NOACK != bcs->tx_skb->pkt_type)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
u_long flags;
|
|
|
|
spin_lock_irqsave(&bcs->aclock, flags);
|
|
|
|
bcs->ackcnt += bcs->tx_skb->len;
|
|
|
|
spin_unlock_irqrestore(&bcs->aclock, flags);
|
|
|
|
schedule_event(bcs, B_ACKPENDING);
|
|
|
|
}
|
|
|
|
dev_kfree_skb_any(bcs->tx_skb);
|
|
|
|
bcs->tx_skb = NULL;
|
|
|
|
}
|
|
|
|
test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag);
|
|
|
|
bcs->hw.tiger.free = cnt - s_cnt;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (bcs->hw.tiger.free > (NETJET_DMA_TXSIZE / 2))
|
2005-04-17 06:20:36 +08:00
|
|
|
test_and_set_bit(BC_FLG_HALF, &bcs->Flag);
|
|
|
|
else {
|
|
|
|
test_and_clear_bit(BC_FLG_HALF, &bcs->Flag);
|
|
|
|
test_and_set_bit(BC_FLG_NOFRAME, &bcs->Flag);
|
|
|
|
}
|
|
|
|
if ((bcs->tx_skb = skb_dequeue(&bcs->squeue))) {
|
|
|
|
netjet_fill_dma(bcs);
|
|
|
|
} else {
|
|
|
|
mask ^= 0xffffffff;
|
|
|
|
if (s_cnt < cnt) {
|
2012-02-20 11:52:38 +08:00
|
|
|
for (i = s_cnt; i < cnt; i++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
*p++ |= mask;
|
2012-02-20 11:52:38 +08:00
|
|
|
if (p > bcs->hw.tiger.s_end)
|
2005-04-17 06:20:36 +08:00
|
|
|
p = bcs->hw.tiger.send;
|
|
|
|
}
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
|
|
|
debugl1(bcs->cs, "tiger write_raw: fill rest %d",
|
|
|
|
cnt - s_cnt);
|
|
|
|
}
|
|
|
|
test_and_set_bit(B_XMTBUFREADY, &bcs->event);
|
|
|
|
schedule_work(&bcs->tqueue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (test_and_clear_bit(BC_FLG_NOFRAME, &bcs->Flag)) {
|
|
|
|
test_and_set_bit(BC_FLG_HALF, &bcs->Flag);
|
|
|
|
fill_mem(bcs, buf, cnt, bcs->channel, 0xff);
|
|
|
|
bcs->hw.tiger.free += cnt;
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger write_raw: fill half");
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (test_and_clear_bit(BC_FLG_HALF, &bcs->Flag)) {
|
|
|
|
test_and_set_bit(BC_FLG_EMPTY, &bcs->Flag);
|
|
|
|
fill_mem(bcs, buf, cnt, bcs->channel, 0xff);
|
|
|
|
if (bcs->cs->debug & L1_DEB_HSCX)
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(bcs->cs, "tiger write_raw: fill full");
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void write_tiger(struct IsdnCardState *cs) {
|
2012-02-20 11:52:38 +08:00
|
|
|
u_int *p, cnt = NETJET_DMA_TXSIZE / 2;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((cs->hw.njet.irqstat0 & cs->hw.njet.last_is0) & NETJET_IRQM0_WRITE) {
|
2012-02-20 11:52:38 +08:00
|
|
|
debugl1(cs, "tiger warn write double dma %x/%x",
|
2005-04-17 06:20:36 +08:00
|
|
|
cs->hw.njet.irqstat0, cs->hw.njet.last_is0);
|
|
|
|
#ifdef ERROR_STATISTIC
|
|
|
|
if (cs->bcs[0].mode)
|
|
|
|
cs->bcs[0].err_tx++;
|
|
|
|
if (cs->bcs[1].mode)
|
|
|
|
cs->bcs[1].err_tx++;
|
|
|
|
#endif
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
cs->hw.njet.last_is0 &= ~NETJET_IRQM0_WRITE;
|
|
|
|
cs->hw.njet.last_is0 |= (cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE);
|
2012-02-20 11:52:38 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
if (cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE_1)
|
|
|
|
p = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1;
|
|
|
|
else
|
|
|
|
p = cs->bcs[0].hw.tiger.send + cnt - 1;
|
|
|
|
if ((cs->bcs[0].mode == L1_MODE_HDLC) || (cs->bcs[0].mode == L1_MODE_HDLC_56K))
|
|
|
|
write_raw(cs->bcs, p, cnt);
|
|
|
|
if ((cs->bcs[1].mode == L1_MODE_HDLC) || (cs->bcs[1].mode == L1_MODE_HDLC_56K))
|
|
|
|
write_raw(cs->bcs + 1, p, cnt);
|
|
|
|
cs->hw.njet.irqstat0 &= ~NETJET_IRQM0_WRITE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
tiger_l2l1(struct PStack *st, int pr, void *arg)
|
|
|
|
{
|
|
|
|
struct BCState *bcs = st->l1.bcs;
|
|
|
|
struct sk_buff *skb = arg;
|
|
|
|
u_long flags;
|
|
|
|
|
|
|
|
switch (pr) {
|
2012-02-20 11:52:38 +08:00
|
|
|
case (PH_DATA | REQUEST):
|
|
|
|
spin_lock_irqsave(&bcs->cs->lock, flags);
|
|
|
|
if (bcs->tx_skb) {
|
|
|
|
skb_queue_tail(&bcs->squeue, skb);
|
|
|
|
} else {
|
|
|
|
bcs->tx_skb = skb;
|
|
|
|
bcs->cs->BC_Send_Data(bcs);
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&bcs->cs->lock, flags);
|
|
|
|
break;
|
|
|
|
case (PH_PULL | INDICATION):
|
|
|
|
spin_lock_irqsave(&bcs->cs->lock, flags);
|
|
|
|
if (bcs->tx_skb) {
|
|
|
|
printk(KERN_WARNING "tiger_l2l1: this shouldn't happen\n");
|
|
|
|
} else {
|
|
|
|
bcs->tx_skb = skb;
|
|
|
|
bcs->cs->BC_Send_Data(bcs);
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&bcs->cs->lock, flags);
|
|
|
|
break;
|
|
|
|
case (PH_PULL | REQUEST):
|
|
|
|
if (!bcs->tx_skb) {
|
|
|
|
test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags);
|
|
|
|
st->l1.l1l2(st, PH_PULL | CONFIRM, NULL);
|
|
|
|
} else
|
|
|
|
test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags);
|
|
|
|
break;
|
|
|
|
case (PH_ACTIVATE | REQUEST):
|
|
|
|
spin_lock_irqsave(&bcs->cs->lock, flags);
|
|
|
|
test_and_set_bit(BC_FLG_ACTIV, &bcs->Flag);
|
|
|
|
mode_tiger(bcs, st->l1.mode, st->l1.bc);
|
|
|
|
/* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */
|
|
|
|
spin_unlock_irqrestore(&bcs->cs->lock, flags);
|
|
|
|
bcs->cs->cardmsg(bcs->cs, MDL_BC_ASSIGN, (void *)(&st->l1.bc));
|
|
|
|
l1_msg_b(st, pr, arg);
|
|
|
|
break;
|
|
|
|
case (PH_DEACTIVATE | REQUEST):
|
|
|
|
/* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */
|
|
|
|
bcs->cs->cardmsg(bcs->cs, MDL_BC_RELEASE, (void *)(&st->l1.bc));
|
|
|
|
l1_msg_b(st, pr, arg);
|
|
|
|
break;
|
|
|
|
case (PH_DEACTIVATE | CONFIRM):
|
|
|
|
spin_lock_irqsave(&bcs->cs->lock, flags);
|
|
|
|
test_and_clear_bit(BC_FLG_ACTIV, &bcs->Flag);
|
|
|
|
test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag);
|
|
|
|
mode_tiger(bcs, 0, st->l1.bc);
|
|
|
|
spin_unlock_irqrestore(&bcs->cs->lock, flags);
|
|
|
|
st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL);
|
|
|
|
break;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-06-26 05:59:18 +08:00
|
|
|
static void
|
2005-04-17 06:20:36 +08:00
|
|
|
close_tigerstate(struct BCState *bcs)
|
|
|
|
{
|
|
|
|
mode_tiger(bcs, 0, bcs->channel);
|
|
|
|
if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
|
2005-11-07 17:01:29 +08:00
|
|
|
kfree(bcs->hw.tiger.rcvbuf);
|
|
|
|
bcs->hw.tiger.rcvbuf = NULL;
|
|
|
|
kfree(bcs->hw.tiger.sendbuf);
|
|
|
|
bcs->hw.tiger.sendbuf = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
skb_queue_purge(&bcs->rqueue);
|
|
|
|
skb_queue_purge(&bcs->squeue);
|
|
|
|
if (bcs->tx_skb) {
|
|
|
|
dev_kfree_skb_any(bcs->tx_skb);
|
|
|
|
bcs->tx_skb = NULL;
|
|
|
|
test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
open_tigerstate(struct IsdnCardState *cs, struct BCState *bcs)
|
|
|
|
{
|
|
|
|
if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) {
|
|
|
|
if (!(bcs->hw.tiger.rcvbuf = kmalloc(HSCX_BUFMAX, GFP_ATOMIC))) {
|
|
|
|
printk(KERN_WARNING
|
|
|
|
"HiSax: No memory for tiger.rcvbuf\n");
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
if (!(bcs->hw.tiger.sendbuf = kmalloc(RAW_BUFMAX, GFP_ATOMIC))) {
|
|
|
|
printk(KERN_WARNING
|
|
|
|
"HiSax: No memory for tiger.sendbuf\n");
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
skb_queue_head_init(&bcs->rqueue);
|
|
|
|
skb_queue_head_init(&bcs->squeue);
|
|
|
|
}
|
|
|
|
bcs->tx_skb = NULL;
|
|
|
|
bcs->hw.tiger.sendcnt = 0;
|
|
|
|
test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag);
|
|
|
|
bcs->event = 0;
|
|
|
|
bcs->tx_cnt = 0;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:59:18 +08:00
|
|
|
static int
|
2005-04-17 06:20:36 +08:00
|
|
|
setstack_tiger(struct PStack *st, struct BCState *bcs)
|
|
|
|
{
|
|
|
|
bcs->channel = st->l1.bc;
|
|
|
|
if (open_tigerstate(st->l1.hardware, bcs))
|
|
|
|
return (-1);
|
|
|
|
st->l1.bcs = bcs;
|
|
|
|
st->l2.l2l1 = tiger_l2l1;
|
|
|
|
setstack_manager(st);
|
|
|
|
bcs->st = st;
|
|
|
|
setstack_l1_B(st);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2006-07-10 19:44:11 +08:00
|
|
|
void
|
2005-04-17 06:20:36 +08:00
|
|
|
inittiger(struct IsdnCardState *cs)
|
|
|
|
{
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
cs->bcs[0].hw.tiger.send = kmalloc_array(NETJET_DMA_TXSIZE,
|
|
|
|
sizeof(unsigned int),
|
|
|
|
GFP_KERNEL | GFP_DMA);
|
|
|
|
if (!cs->bcs[0].hw.tiger.send) {
|
2005-04-17 06:20:36 +08:00
|
|
|
printk(KERN_WARNING
|
|
|
|
"HiSax: No memory for tiger.send\n");
|
|
|
|
return;
|
|
|
|
}
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->bcs[0].hw.tiger.s_irq = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE / 2 - 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
cs->bcs[0].hw.tiger.s_end = cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1;
|
|
|
|
cs->bcs[1].hw.tiger.send = cs->bcs[0].hw.tiger.send;
|
|
|
|
cs->bcs[1].hw.tiger.s_irq = cs->bcs[0].hw.tiger.s_irq;
|
|
|
|
cs->bcs[1].hw.tiger.s_end = cs->bcs[0].hw.tiger.s_end;
|
2012-02-20 11:52:38 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
memset(cs->bcs[0].hw.tiger.send, 0xff, NETJET_DMA_TXSIZE * sizeof(unsigned int));
|
|
|
|
debugl1(cs, "tiger: send buf %p - %p", cs->bcs[0].hw.tiger.send,
|
|
|
|
cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1);
|
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.send),
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.base + NETJET_DMA_READ_START);
|
2005-04-17 06:20:36 +08:00
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.s_irq),
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.base + NETJET_DMA_READ_IRQ);
|
2005-04-17 06:20:36 +08:00
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.s_end),
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.base + NETJET_DMA_READ_END);
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
cs->bcs[0].hw.tiger.rec = kmalloc_array(NETJET_DMA_RXSIZE,
|
|
|
|
sizeof(unsigned int),
|
|
|
|
GFP_KERNEL | GFP_DMA);
|
|
|
|
if (!cs->bcs[0].hw.tiger.rec) {
|
2005-04-17 06:20:36 +08:00
|
|
|
printk(KERN_WARNING
|
|
|
|
"HiSax: No memory for tiger.rec\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
debugl1(cs, "tiger: rec buf %p - %p", cs->bcs[0].hw.tiger.rec,
|
|
|
|
cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1);
|
|
|
|
cs->bcs[1].hw.tiger.rec = cs->bcs[0].hw.tiger.rec;
|
|
|
|
memset(cs->bcs[0].hw.tiger.rec, 0xff, NETJET_DMA_RXSIZE * sizeof(unsigned int));
|
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.rec),
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.base + NETJET_DMA_WRITE_START);
|
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE / 2 - 1),
|
|
|
|
cs->hw.njet.base + NETJET_DMA_WRITE_IRQ);
|
2005-04-17 06:20:36 +08:00
|
|
|
outl(virt_to_bus(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1),
|
2012-02-20 11:52:38 +08:00
|
|
|
cs->hw.njet.base + NETJET_DMA_WRITE_END);
|
2005-04-17 06:20:36 +08:00
|
|
|
debugl1(cs, "tiger: dmacfg %x/%x pulse=%d",
|
|
|
|
inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR),
|
|
|
|
inl(cs->hw.njet.base + NETJET_DMA_READ_ADR),
|
|
|
|
bytein(cs->hw.njet.base + NETJET_PULSE_CNT));
|
|
|
|
cs->hw.njet.last_is0 = 0;
|
|
|
|
cs->bcs[0].BC_SetStack = setstack_tiger;
|
|
|
|
cs->bcs[1].BC_SetStack = setstack_tiger;
|
|
|
|
cs->bcs[0].BC_Close = close_tigerstate;
|
|
|
|
cs->bcs[1].BC_Close = close_tigerstate;
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:59:18 +08:00
|
|
|
static void
|
2005-04-17 06:20:36 +08:00
|
|
|
releasetiger(struct IsdnCardState *cs)
|
|
|
|
{
|
2005-11-07 17:01:29 +08:00
|
|
|
kfree(cs->bcs[0].hw.tiger.send);
|
|
|
|
cs->bcs[0].hw.tiger.send = NULL;
|
|
|
|
cs->bcs[1].hw.tiger.send = NULL;
|
|
|
|
kfree(cs->bcs[0].hw.tiger.rec);
|
|
|
|
cs->bcs[0].hw.tiger.rec = NULL;
|
|
|
|
cs->bcs[1].hw.tiger.rec = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
release_io_netjet(struct IsdnCardState *cs)
|
|
|
|
{
|
|
|
|
byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0);
|
|
|
|
byteout(cs->hw.njet.base + NETJET_IRQMASK1, 0);
|
|
|
|
releasetiger(cs);
|
|
|
|
release_region(cs->hw.njet.base, 256);
|
|
|
|
}
|