mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
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>
352 lines
7.2 KiB
C
352 lines
7.2 KiB
C
/*
|
|
* Comtrol SV11 card driver
|
|
*
|
|
* This is a slightly odd Z85230 synchronous driver. All you need to
|
|
* know basically is
|
|
*
|
|
* Its a genuine Z85230
|
|
*
|
|
* It supports DMA using two DMA channels in SYNC mode. The driver doesn't
|
|
* use these facilities
|
|
*
|
|
* The control port is at io+1, the data at io+3 and turning off the DMA
|
|
* is done by writing 0 to io+4
|
|
*
|
|
* The hardware does the bus handling to avoid the need for delays between
|
|
* touching control registers.
|
|
*
|
|
* Port B isnt wired (why - beats me)
|
|
*
|
|
* Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/net.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/if_arp.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/hdlc.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/slab.h>
|
|
#include <net/arp.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/io.h>
|
|
#include <asm/dma.h>
|
|
#include <asm/byteorder.h>
|
|
#include "z85230.h"
|
|
|
|
static int dma;
|
|
|
|
/*
|
|
* Network driver support routines
|
|
*/
|
|
|
|
static inline struct z8530_dev* dev_to_sv(struct net_device *dev)
|
|
{
|
|
return (struct z8530_dev *)dev_to_hdlc(dev)->priv;
|
|
}
|
|
|
|
/*
|
|
* Frame receive. Simple for our card as we do HDLC and there
|
|
* is no funny garbage involved
|
|
*/
|
|
|
|
static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)
|
|
{
|
|
/* Drop the CRC - it's not a good idea to try and negotiate it ;) */
|
|
skb_trim(skb, skb->len - 2);
|
|
skb->protocol = hdlc_type_trans(skb, c->netdevice);
|
|
skb_reset_mac_header(skb);
|
|
skb->dev = c->netdevice;
|
|
/*
|
|
* Send it to the PPP layer. We don't have time to process
|
|
* it right now.
|
|
*/
|
|
netif_rx(skb);
|
|
}
|
|
|
|
/*
|
|
* We've been placed in the UP state
|
|
*/
|
|
|
|
static int hostess_open(struct net_device *d)
|
|
{
|
|
struct z8530_dev *sv11 = dev_to_sv(d);
|
|
int err = -1;
|
|
|
|
/*
|
|
* Link layer up
|
|
*/
|
|
switch (dma) {
|
|
case 0:
|
|
err = z8530_sync_open(d, &sv11->chanA);
|
|
break;
|
|
case 1:
|
|
err = z8530_sync_dma_open(d, &sv11->chanA);
|
|
break;
|
|
case 2:
|
|
err = z8530_sync_txdma_open(d, &sv11->chanA);
|
|
break;
|
|
}
|
|
|
|
if (err)
|
|
return err;
|
|
|
|
err = hdlc_open(d);
|
|
if (err) {
|
|
switch (dma) {
|
|
case 0:
|
|
z8530_sync_close(d, &sv11->chanA);
|
|
break;
|
|
case 1:
|
|
z8530_sync_dma_close(d, &sv11->chanA);
|
|
break;
|
|
case 2:
|
|
z8530_sync_txdma_close(d, &sv11->chanA);
|
|
break;
|
|
}
|
|
return err;
|
|
}
|
|
sv11->chanA.rx_function = hostess_input;
|
|
|
|
/*
|
|
* Go go go
|
|
*/
|
|
|
|
netif_start_queue(d);
|
|
return 0;
|
|
}
|
|
|
|
static int hostess_close(struct net_device *d)
|
|
{
|
|
struct z8530_dev *sv11 = dev_to_sv(d);
|
|
/*
|
|
* Discard new frames
|
|
*/
|
|
sv11->chanA.rx_function = z8530_null_rx;
|
|
|
|
hdlc_close(d);
|
|
netif_stop_queue(d);
|
|
|
|
switch (dma) {
|
|
case 0:
|
|
z8530_sync_close(d, &sv11->chanA);
|
|
break;
|
|
case 1:
|
|
z8530_sync_dma_close(d, &sv11->chanA);
|
|
break;
|
|
case 2:
|
|
z8530_sync_txdma_close(d, &sv11->chanA);
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
|
|
{
|
|
/* struct z8530_dev *sv11=dev_to_sv(d);
|
|
z8530_ioctl(d,&sv11->chanA,ifr,cmd) */
|
|
return hdlc_ioctl(d, ifr, cmd);
|
|
}
|
|
|
|
/*
|
|
* Passed network frames, fire them downwind.
|
|
*/
|
|
|
|
static netdev_tx_t hostess_queue_xmit(struct sk_buff *skb,
|
|
struct net_device *d)
|
|
{
|
|
return z8530_queue_xmit(&dev_to_sv(d)->chanA, skb);
|
|
}
|
|
|
|
static int hostess_attach(struct net_device *dev, unsigned short encoding,
|
|
unsigned short parity)
|
|
{
|
|
if (encoding == ENCODING_NRZ && parity == PARITY_CRC16_PR1_CCITT)
|
|
return 0;
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* Description block for a Comtrol Hostess SV11 card
|
|
*/
|
|
|
|
static const struct net_device_ops hostess_ops = {
|
|
.ndo_open = hostess_open,
|
|
.ndo_stop = hostess_close,
|
|
.ndo_change_mtu = hdlc_change_mtu,
|
|
.ndo_start_xmit = hdlc_start_xmit,
|
|
.ndo_do_ioctl = hostess_ioctl,
|
|
};
|
|
|
|
static struct z8530_dev *sv11_init(int iobase, int irq)
|
|
{
|
|
struct z8530_dev *sv;
|
|
struct net_device *netdev;
|
|
/*
|
|
* Get the needed I/O space
|
|
*/
|
|
|
|
if (!request_region(iobase, 8, "Comtrol SV11")) {
|
|
printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n",
|
|
iobase);
|
|
return NULL;
|
|
}
|
|
|
|
sv = kzalloc(sizeof(struct z8530_dev), GFP_KERNEL);
|
|
if (!sv)
|
|
goto err_kzalloc;
|
|
|
|
/*
|
|
* Stuff in the I/O addressing
|
|
*/
|
|
|
|
sv->active = 0;
|
|
|
|
sv->chanA.ctrlio = iobase + 1;
|
|
sv->chanA.dataio = iobase + 3;
|
|
sv->chanB.ctrlio = -1;
|
|
sv->chanB.dataio = -1;
|
|
sv->chanA.irqs = &z8530_nop;
|
|
sv->chanB.irqs = &z8530_nop;
|
|
|
|
outb(0, iobase + 4); /* DMA off */
|
|
|
|
/* We want a fast IRQ for this device. Actually we'd like an even faster
|
|
IRQ ;) - This is one driver RtLinux is made for */
|
|
|
|
if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
|
|
"Hostess SV11", sv) < 0) {
|
|
printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
|
|
goto err_irq;
|
|
}
|
|
|
|
sv->irq = irq;
|
|
sv->chanA.private = sv;
|
|
sv->chanA.dev = sv;
|
|
sv->chanB.dev = sv;
|
|
|
|
if (dma) {
|
|
/*
|
|
* You can have DMA off or 1 and 3 thats the lot
|
|
* on the Comtrol.
|
|
*/
|
|
sv->chanA.txdma = 3;
|
|
sv->chanA.rxdma = 1;
|
|
outb(0x03 | 0x08, iobase + 4); /* DMA on */
|
|
if (request_dma(sv->chanA.txdma, "Hostess SV/11 (TX)"))
|
|
goto err_txdma;
|
|
|
|
if (dma == 1)
|
|
if (request_dma(sv->chanA.rxdma, "Hostess SV/11 (RX)"))
|
|
goto err_rxdma;
|
|
}
|
|
|
|
/* Kill our private IRQ line the hostess can end up chattering
|
|
until the configuration is set */
|
|
disable_irq(irq);
|
|
|
|
/*
|
|
* Begin normal initialise
|
|
*/
|
|
|
|
if (z8530_init(sv)) {
|
|
printk(KERN_ERR "Z8530 series device not found.\n");
|
|
enable_irq(irq);
|
|
goto free_dma;
|
|
}
|
|
z8530_channel_load(&sv->chanB, z8530_dead_port);
|
|
if (sv->type == Z85C30)
|
|
z8530_channel_load(&sv->chanA, z8530_hdlc_kilostream);
|
|
else
|
|
z8530_channel_load(&sv->chanA, z8530_hdlc_kilostream_85230);
|
|
|
|
enable_irq(irq);
|
|
|
|
/*
|
|
* Now we can take the IRQ
|
|
*/
|
|
|
|
sv->chanA.netdevice = netdev = alloc_hdlcdev(sv);
|
|
if (!netdev)
|
|
goto free_dma;
|
|
|
|
dev_to_hdlc(netdev)->attach = hostess_attach;
|
|
dev_to_hdlc(netdev)->xmit = hostess_queue_xmit;
|
|
netdev->netdev_ops = &hostess_ops;
|
|
netdev->base_addr = iobase;
|
|
netdev->irq = irq;
|
|
|
|
if (register_hdlc_device(netdev)) {
|
|
printk(KERN_ERR "hostess: unable to register HDLC device.\n");
|
|
free_netdev(netdev);
|
|
goto free_dma;
|
|
}
|
|
|
|
z8530_describe(sv, "I/O", iobase);
|
|
sv->active = 1;
|
|
return sv;
|
|
|
|
free_dma:
|
|
if (dma == 1)
|
|
free_dma(sv->chanA.rxdma);
|
|
err_rxdma:
|
|
if (dma)
|
|
free_dma(sv->chanA.txdma);
|
|
err_txdma:
|
|
free_irq(irq, sv);
|
|
err_irq:
|
|
kfree(sv);
|
|
err_kzalloc:
|
|
release_region(iobase, 8);
|
|
return NULL;
|
|
}
|
|
|
|
static void sv11_shutdown(struct z8530_dev *dev)
|
|
{
|
|
unregister_hdlc_device(dev->chanA.netdevice);
|
|
z8530_shutdown(dev);
|
|
free_irq(dev->irq, dev);
|
|
if (dma) {
|
|
if (dma == 1)
|
|
free_dma(dev->chanA.rxdma);
|
|
free_dma(dev->chanA.txdma);
|
|
}
|
|
release_region(dev->chanA.ctrlio - 1, 8);
|
|
free_netdev(dev->chanA.netdevice);
|
|
kfree(dev);
|
|
}
|
|
|
|
static int io = 0x200;
|
|
static int irq = 9;
|
|
|
|
module_param(io, int, 0);
|
|
MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
|
|
module_param(dma, int, 0);
|
|
MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX");
|
|
module_param(irq, int, 0);
|
|
MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card");
|
|
|
|
MODULE_AUTHOR("Alan Cox");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("Modular driver for the Comtrol Hostess SV11");
|
|
|
|
static struct z8530_dev *sv11_unit;
|
|
|
|
int init_module(void)
|
|
{
|
|
if ((sv11_unit = sv11_init(io, irq)) == NULL)
|
|
return -ENODEV;
|
|
return 0;
|
|
}
|
|
|
|
void cleanup_module(void)
|
|
{
|
|
if (sv11_unit)
|
|
sv11_shutdown(sv11_unit);
|
|
}
|