forked from luck/tmp_suning_uos_patched
5a0e3ad6af
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>
296 lines
7.9 KiB
C
296 lines
7.9 KiB
C
/*
|
|
* Linux ARCnet driver - "cap mode" packet encapsulation.
|
|
* It adds sequence numbers to packets for communicating between a user space
|
|
* application and the driver. After a transmit it sends a packet with protocol
|
|
* byte 0 back up to the userspace containing the sequence number of the packet
|
|
* plus the transmit-status on the ArcNet.
|
|
*
|
|
* Written 2002-4 by Esben Nielsen, Vestas Wind Systems A/S
|
|
* Derived from arc-rawmode.c by Avery Pennarun.
|
|
* arc-rawmode was in turned based on skeleton.c, see below.
|
|
*
|
|
* **********************
|
|
*
|
|
* The original copyright of skeleton.c was as follows:
|
|
*
|
|
* skeleton.c Written 1993 by Donald Becker.
|
|
* Copyright 1993 United States Government as represented by the
|
|
* Director, National Security Agency. This software may only be used
|
|
* and distributed according to the terms of the GNU General Public License as
|
|
* modified by SRC, incorporated herein by reference.
|
|
*
|
|
* **********************
|
|
*
|
|
* For more details, see drivers/net/arcnet.c
|
|
*
|
|
* **********************
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/init.h>
|
|
#include <linux/if_arp.h>
|
|
#include <net/arp.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/arcdevice.h>
|
|
|
|
#define VERSION "arcnet: cap mode (`c') encapsulation support loaded.\n"
|
|
|
|
|
|
static void rx(struct net_device *dev, int bufnum,
|
|
struct archdr *pkthdr, int length);
|
|
static int build_header(struct sk_buff *skb,
|
|
struct net_device *dev,
|
|
unsigned short type,
|
|
uint8_t daddr);
|
|
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
|
|
int bufnum);
|
|
static int ack_tx(struct net_device *dev, int acked);
|
|
|
|
|
|
static struct ArcProto capmode_proto =
|
|
{
|
|
'r',
|
|
XMTU,
|
|
0,
|
|
rx,
|
|
build_header,
|
|
prepare_tx,
|
|
NULL,
|
|
ack_tx
|
|
};
|
|
|
|
|
|
static void arcnet_cap_init(void)
|
|
{
|
|
int count;
|
|
|
|
for (count = 1; count <= 8; count++)
|
|
if (arc_proto_map[count] == arc_proto_default)
|
|
arc_proto_map[count] = &capmode_proto;
|
|
|
|
/* for cap mode, we only set the bcast proto if there's no better one */
|
|
if (arc_bcast_proto == arc_proto_default)
|
|
arc_bcast_proto = &capmode_proto;
|
|
|
|
arc_proto_default = &capmode_proto;
|
|
arc_raw_proto = &capmode_proto;
|
|
}
|
|
|
|
|
|
#ifdef MODULE
|
|
|
|
static int __init capmode_module_init(void)
|
|
{
|
|
printk(VERSION);
|
|
arcnet_cap_init();
|
|
return 0;
|
|
}
|
|
|
|
static void __exit capmode_module_exit(void)
|
|
{
|
|
arcnet_unregister_proto(&capmode_proto);
|
|
}
|
|
module_init(capmode_module_init);
|
|
module_exit(capmode_module_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
#endif /* MODULE */
|
|
|
|
|
|
|
|
/* packet receiver */
|
|
static void rx(struct net_device *dev, int bufnum,
|
|
struct archdr *pkthdr, int length)
|
|
{
|
|
struct arcnet_local *lp = netdev_priv(dev);
|
|
struct sk_buff *skb;
|
|
struct archdr *pkt = pkthdr;
|
|
char *pktbuf, *pkthdrbuf;
|
|
int ofs;
|
|
|
|
BUGMSG(D_DURING, "it's a raw(cap) packet (length=%d)\n", length);
|
|
|
|
if (length >= MinTU)
|
|
ofs = 512 - length;
|
|
else
|
|
ofs = 256 - length;
|
|
|
|
skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
|
|
if (skb == NULL) {
|
|
BUGMSG(D_NORMAL, "Memory squeeze, dropping packet.\n");
|
|
dev->stats.rx_dropped++;
|
|
return;
|
|
}
|
|
skb_put(skb, length + ARC_HDR_SIZE + sizeof(int));
|
|
skb->dev = dev;
|
|
skb_reset_mac_header(skb);
|
|
pkt = (struct archdr *)skb_mac_header(skb);
|
|
skb_pull(skb, ARC_HDR_SIZE);
|
|
|
|
/* up to sizeof(pkt->soft) has already been copied from the card */
|
|
/* squeeze in an int for the cap encapsulation */
|
|
|
|
/* use these variables to be sure we count in bytes, not in
|
|
sizeof(struct archdr) */
|
|
pktbuf=(char*)pkt;
|
|
pkthdrbuf=(char*)pkthdr;
|
|
memcpy(pktbuf, pkthdrbuf, ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto));
|
|
memcpy(pktbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto)+sizeof(int),
|
|
pkthdrbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto),
|
|
sizeof(struct archdr)-ARC_HDR_SIZE-sizeof(pkt->soft.cap.proto));
|
|
|
|
if (length > sizeof(pkt->soft))
|
|
lp->hw.copy_from_card(dev, bufnum, ofs + sizeof(pkt->soft),
|
|
pkt->soft.raw + sizeof(pkt->soft)
|
|
+ sizeof(int),
|
|
length - sizeof(pkt->soft));
|
|
|
|
BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
|
|
|
|
skb->protocol = cpu_to_be16(ETH_P_ARCNET);
|
|
netif_rx(skb);
|
|
}
|
|
|
|
|
|
/*
|
|
* Create the ARCnet hard/soft headers for cap mode.
|
|
* There aren't any soft headers in cap mode - not even the protocol id.
|
|
*/
|
|
static int build_header(struct sk_buff *skb,
|
|
struct net_device *dev,
|
|
unsigned short type,
|
|
uint8_t daddr)
|
|
{
|
|
int hdr_size = ARC_HDR_SIZE;
|
|
struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size);
|
|
|
|
BUGMSG(D_PROTO, "Preparing header for cap packet %x.\n",
|
|
*((int*)&pkt->soft.cap.cookie[0]));
|
|
/*
|
|
* Set the source hardware address.
|
|
*
|
|
* This is pretty pointless for most purposes, but it can help in
|
|
* debugging. ARCnet does not allow us to change the source address in
|
|
* the actual packet sent)
|
|
*/
|
|
pkt->hard.source = *dev->dev_addr;
|
|
|
|
/* see linux/net/ethernet/eth.c to see where I got the following */
|
|
|
|
if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) {
|
|
/*
|
|
* FIXME: fill in the last byte of the dest ipaddr here to better
|
|
* comply with RFC1051 in "noarp" mode.
|
|
*/
|
|
pkt->hard.dest = 0;
|
|
return hdr_size;
|
|
}
|
|
/* otherwise, just fill it in and go! */
|
|
pkt->hard.dest = daddr;
|
|
|
|
return hdr_size; /* success */
|
|
}
|
|
|
|
|
|
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
|
|
int bufnum)
|
|
{
|
|
struct arcnet_local *lp = netdev_priv(dev);
|
|
struct arc_hardware *hard = &pkt->hard;
|
|
int ofs;
|
|
|
|
|
|
/* hard header is not included in packet length */
|
|
length -= ARC_HDR_SIZE;
|
|
/* And neither is the cookie field */
|
|
length -= sizeof(int);
|
|
|
|
BUGMSG(D_DURING, "prepare_tx: txbufs=%d/%d/%d\n",
|
|
lp->next_tx, lp->cur_tx, bufnum);
|
|
|
|
BUGMSG(D_PROTO, "Sending for cap packet %x.\n",
|
|
*((int*)&pkt->soft.cap.cookie[0]));
|
|
|
|
if (length > XMTU) {
|
|
/* should never happen! other people already check for this. */
|
|
BUGMSG(D_NORMAL, "Bug! prepare_tx with size %d (> %d)\n",
|
|
length, XMTU);
|
|
length = XMTU;
|
|
}
|
|
if (length > MinTU) {
|
|
hard->offset[0] = 0;
|
|
hard->offset[1] = ofs = 512 - length;
|
|
} else if (length > MTU) {
|
|
hard->offset[0] = 0;
|
|
hard->offset[1] = ofs = 512 - length - 3;
|
|
} else
|
|
hard->offset[0] = ofs = 256 - length;
|
|
|
|
BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
|
|
length,ofs);
|
|
|
|
// Copy the arcnet-header + the protocol byte down:
|
|
lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);
|
|
lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft.cap.proto,
|
|
sizeof(pkt->soft.cap.proto));
|
|
|
|
// Skip the extra integer we have written into it as a cookie
|
|
// but write the rest of the message:
|
|
lp->hw.copy_to_card(dev, bufnum, ofs+1,
|
|
((unsigned char*)&pkt->soft.cap.mes),length-1);
|
|
|
|
lp->lastload_dest = hard->dest;
|
|
|
|
return 1; /* done */
|
|
}
|
|
|
|
|
|
static int ack_tx(struct net_device *dev, int acked)
|
|
{
|
|
struct arcnet_local *lp = netdev_priv(dev);
|
|
struct sk_buff *ackskb;
|
|
struct archdr *ackpkt;
|
|
int length=sizeof(struct arc_cap);
|
|
|
|
BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
|
|
lp->outgoing.skb->protocol, acked);
|
|
|
|
BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
|
|
|
|
/* Now alloc a skb to send back up through the layers: */
|
|
ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC);
|
|
if (ackskb == NULL) {
|
|
BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
|
|
goto free_outskb;
|
|
}
|
|
|
|
skb_put(ackskb, length + ARC_HDR_SIZE );
|
|
ackskb->dev = dev;
|
|
|
|
skb_reset_mac_header(ackskb);
|
|
ackpkt = (struct archdr *)skb_mac_header(ackskb);
|
|
/* skb_pull(ackskb, ARC_HDR_SIZE); */
|
|
|
|
|
|
skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
|
|
ARC_HDR_SIZE + sizeof(struct arc_cap));
|
|
ackpkt->soft.cap.proto=0; /* using protocol 0 for acknowledge */
|
|
ackpkt->soft.cap.mes.ack=acked;
|
|
|
|
BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
|
|
*((int*)&ackpkt->soft.cap.cookie[0]));
|
|
|
|
ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
|
|
|
|
BUGLVL(D_SKB) arcnet_dump_skb(dev, ackskb, "ack_tx_recv");
|
|
netif_rx(ackskb);
|
|
|
|
free_outskb:
|
|
dev_kfree_skb_irq(lp->outgoing.skb);
|
|
lp->outgoing.proto = NULL; /* We are always finished when in this protocol */
|
|
|
|
return 0;
|
|
}
|