mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
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>
255 lines
6.6 KiB
C
255 lines
6.6 KiB
C
/*
|
|
* Copyright (c) 2009 Peter Holik
|
|
*
|
|
* Intellon usb PLC (Powerline Communications) usb net driver
|
|
*
|
|
* http://www.tandel.be/downloads/INT51X1_Datasheet.pdf
|
|
*
|
|
* Based on the work of Jan 'RedBully' Seiffert
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or.
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mii.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/usbnet.h>
|
|
|
|
#define INT51X1_VENDOR_ID 0x09e1
|
|
#define INT51X1_PRODUCT_ID 0x5121
|
|
|
|
#define INT51X1_HEADER_SIZE 2 /* 2 byte header */
|
|
|
|
#define PACKET_TYPE_PROMISCUOUS (1 << 0)
|
|
#define PACKET_TYPE_ALL_MULTICAST (1 << 1) /* no filter */
|
|
#define PACKET_TYPE_DIRECTED (1 << 2)
|
|
#define PACKET_TYPE_BROADCAST (1 << 3)
|
|
#define PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
|
|
|
|
#define SET_ETHERNET_PACKET_FILTER 0x43
|
|
|
|
static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|
{
|
|
int len;
|
|
|
|
if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
|
|
netdev_err(dev->net, "unexpected tiny rx frame\n");
|
|
return 0;
|
|
}
|
|
|
|
len = le16_to_cpu(*(__le16 *)&skb->data[skb->len - 2]);
|
|
|
|
skb_trim(skb, len);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static struct sk_buff *int51x1_tx_fixup(struct usbnet *dev,
|
|
struct sk_buff *skb, gfp_t flags)
|
|
{
|
|
int pack_len = skb->len;
|
|
int pack_with_header_len = pack_len + INT51X1_HEADER_SIZE;
|
|
int headroom = skb_headroom(skb);
|
|
int tailroom = skb_tailroom(skb);
|
|
int need_tail = 0;
|
|
__le16 *len;
|
|
|
|
/* if packet and our header is smaler than 64 pad to 64 (+ ZLP) */
|
|
if ((pack_with_header_len) < dev->maxpacket)
|
|
need_tail = dev->maxpacket - pack_with_header_len + 1;
|
|
/*
|
|
* usbnet would send a ZLP if packetlength mod urbsize == 0 for us,
|
|
* but we need to know ourself, because this would add to the length
|
|
* we send down to the device...
|
|
*/
|
|
else if (!(pack_with_header_len % dev->maxpacket))
|
|
need_tail = 1;
|
|
|
|
if (!skb_cloned(skb) &&
|
|
(headroom + tailroom >= need_tail + INT51X1_HEADER_SIZE)) {
|
|
if (headroom < INT51X1_HEADER_SIZE || tailroom < need_tail) {
|
|
skb->data = memmove(skb->head + INT51X1_HEADER_SIZE,
|
|
skb->data, skb->len);
|
|
skb_set_tail_pointer(skb, skb->len);
|
|
}
|
|
} else {
|
|
struct sk_buff *skb2;
|
|
|
|
skb2 = skb_copy_expand(skb,
|
|
INT51X1_HEADER_SIZE,
|
|
need_tail,
|
|
flags);
|
|
dev_kfree_skb_any(skb);
|
|
if (!skb2)
|
|
return NULL;
|
|
skb = skb2;
|
|
}
|
|
|
|
pack_len += need_tail;
|
|
pack_len &= 0x07ff;
|
|
|
|
len = (__le16 *) __skb_push(skb, INT51X1_HEADER_SIZE);
|
|
*len = cpu_to_le16(pack_len);
|
|
|
|
if(need_tail)
|
|
memset(__skb_put(skb, need_tail), 0, need_tail);
|
|
|
|
return skb;
|
|
}
|
|
|
|
static void int51x1_async_cmd_callback(struct urb *urb)
|
|
{
|
|
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
|
|
int status = urb->status;
|
|
|
|
if (status < 0)
|
|
dev_warn(&urb->dev->dev, "async callback failed with %d\n", status);
|
|
|
|
kfree(req);
|
|
usb_free_urb(urb);
|
|
}
|
|
|
|
static void int51x1_set_multicast(struct net_device *netdev)
|
|
{
|
|
struct usb_ctrlrequest *req;
|
|
int status;
|
|
struct urb *urb;
|
|
struct usbnet *dev = netdev_priv(netdev);
|
|
u16 filter = PACKET_TYPE_DIRECTED | PACKET_TYPE_BROADCAST;
|
|
|
|
if (netdev->flags & IFF_PROMISC) {
|
|
/* do not expect to see traffic of other PLCs */
|
|
filter |= PACKET_TYPE_PROMISCUOUS;
|
|
netdev_info(dev->net, "promiscuous mode enabled\n");
|
|
} else if (!netdev_mc_empty(netdev) ||
|
|
(netdev->flags & IFF_ALLMULTI)) {
|
|
filter |= PACKET_TYPE_ALL_MULTICAST;
|
|
netdev_dbg(dev->net, "receive all multicast enabled\n");
|
|
} else {
|
|
/* ~PROMISCUOUS, ~MULTICAST */
|
|
netdev_dbg(dev->net, "receive own packets only\n");
|
|
}
|
|
|
|
urb = usb_alloc_urb(0, GFP_ATOMIC);
|
|
if (!urb) {
|
|
netdev_warn(dev->net, "Error allocating URB\n");
|
|
return;
|
|
}
|
|
|
|
req = kmalloc(sizeof(*req), GFP_ATOMIC);
|
|
if (!req) {
|
|
netdev_warn(dev->net, "Error allocating control msg\n");
|
|
goto out;
|
|
}
|
|
|
|
req->bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
|
|
req->bRequest = SET_ETHERNET_PACKET_FILTER;
|
|
req->wValue = cpu_to_le16(filter);
|
|
req->wIndex = 0;
|
|
req->wLength = 0;
|
|
|
|
usb_fill_control_urb(urb, dev->udev, usb_sndctrlpipe(dev->udev, 0),
|
|
(void *)req, NULL, 0,
|
|
int51x1_async_cmd_callback,
|
|
(void *)req);
|
|
|
|
status = usb_submit_urb(urb, GFP_ATOMIC);
|
|
if (status < 0) {
|
|
netdev_warn(dev->net, "Error submitting control msg, sts=%d\n",
|
|
status);
|
|
goto out1;
|
|
}
|
|
return;
|
|
out1:
|
|
kfree(req);
|
|
out:
|
|
usb_free_urb(urb);
|
|
}
|
|
|
|
static const struct net_device_ops int51x1_netdev_ops = {
|
|
.ndo_open = usbnet_open,
|
|
.ndo_stop = usbnet_stop,
|
|
.ndo_start_xmit = usbnet_start_xmit,
|
|
.ndo_tx_timeout = usbnet_tx_timeout,
|
|
.ndo_change_mtu = usbnet_change_mtu,
|
|
.ndo_set_mac_address = eth_mac_addr,
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
.ndo_set_multicast_list = int51x1_set_multicast,
|
|
};
|
|
|
|
static int int51x1_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
{
|
|
int status = usbnet_get_ethernet_addr(dev, 3);
|
|
|
|
if (status)
|
|
return status;
|
|
|
|
dev->net->hard_header_len += INT51X1_HEADER_SIZE;
|
|
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
|
|
dev->net->netdev_ops = &int51x1_netdev_ops;
|
|
|
|
return usbnet_get_endpoints(dev, intf);
|
|
}
|
|
|
|
static const struct driver_info int51x1_info = {
|
|
.description = "Intellon usb powerline adapter",
|
|
.bind = int51x1_bind,
|
|
.rx_fixup = int51x1_rx_fixup,
|
|
.tx_fixup = int51x1_tx_fixup,
|
|
.in = 1,
|
|
.out = 2,
|
|
.flags = FLAG_ETHER,
|
|
};
|
|
|
|
static const struct usb_device_id products[] = {
|
|
{
|
|
USB_DEVICE(INT51X1_VENDOR_ID, INT51X1_PRODUCT_ID),
|
|
.driver_info = (unsigned long) &int51x1_info,
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(usb, products);
|
|
|
|
static struct usb_driver int51x1_driver = {
|
|
.name = "int51x1",
|
|
.id_table = products,
|
|
.probe = usbnet_probe,
|
|
.disconnect = usbnet_disconnect,
|
|
.suspend = usbnet_suspend,
|
|
.resume = usbnet_resume,
|
|
};
|
|
|
|
static int __init int51x1_init(void)
|
|
{
|
|
return usb_register(&int51x1_driver);
|
|
}
|
|
module_init(int51x1_init);
|
|
|
|
static void __exit int51x1_exit(void)
|
|
{
|
|
usb_deregister(&int51x1_driver);
|
|
}
|
|
module_exit(int51x1_exit);
|
|
|
|
MODULE_AUTHOR("Peter Holik");
|
|
MODULE_DESCRIPTION("Intellon usb powerline adapter");
|
|
MODULE_LICENSE("GPL");
|