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>
186 lines
4.6 KiB
C
186 lines
4.6 KiB
C
/*
|
|
* sni_82596.c -- driver for intel 82596 ethernet controller, as
|
|
* used in older SNI RM machines
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/init.h>
|
|
#include <linux/types.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
|
|
#define SNI_82596_DRIVER_VERSION "SNI RM 82596 driver - Revision: 0.01"
|
|
|
|
static const char sni_82596_string[] = "snirm_82596";
|
|
|
|
#define DMA_ALLOC dma_alloc_coherent
|
|
#define DMA_FREE dma_free_coherent
|
|
#define DMA_WBACK(priv, addr, len) do { } while (0)
|
|
#define DMA_INV(priv, addr, len) do { } while (0)
|
|
#define DMA_WBACK_INV(priv, addr, len) do { } while (0)
|
|
|
|
#define SYSBUS 0x00004400
|
|
|
|
/* big endian CPU, 82596 little endian */
|
|
#define SWAP32(x) cpu_to_le32((u32)(x))
|
|
#define SWAP16(x) cpu_to_le16((u16)(x))
|
|
|
|
#define OPT_MPU_16BIT 0x01
|
|
|
|
#include "lib82596.c"
|
|
|
|
MODULE_AUTHOR("Thomas Bogendoerfer");
|
|
MODULE_DESCRIPTION("i82596 driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:snirm_82596");
|
|
module_param(i596_debug, int, 0);
|
|
MODULE_PARM_DESC(i596_debug, "82596 debug mask");
|
|
|
|
static inline void ca(struct net_device *dev)
|
|
{
|
|
struct i596_private *lp = netdev_priv(dev);
|
|
|
|
writel(0, lp->ca);
|
|
}
|
|
|
|
|
|
static void mpu_port(struct net_device *dev, int c, dma_addr_t x)
|
|
{
|
|
struct i596_private *lp = netdev_priv(dev);
|
|
|
|
u32 v = (u32) (c) | (u32) (x);
|
|
|
|
if (lp->options & OPT_MPU_16BIT) {
|
|
writew(v & 0xffff, lp->mpu_port);
|
|
wmb(); /* order writes to MPU port */
|
|
udelay(1);
|
|
writew(v >> 16, lp->mpu_port);
|
|
} else {
|
|
writel(v, lp->mpu_port);
|
|
wmb(); /* order writes to MPU port */
|
|
udelay(1);
|
|
writel(v, lp->mpu_port);
|
|
}
|
|
}
|
|
|
|
|
|
static int __devinit sni_82596_probe(struct platform_device *dev)
|
|
{
|
|
struct net_device *netdevice;
|
|
struct i596_private *lp;
|
|
struct resource *res, *ca, *idprom, *options;
|
|
int retval = -ENOMEM;
|
|
void __iomem *mpu_addr;
|
|
void __iomem *ca_addr;
|
|
u8 __iomem *eth_addr;
|
|
|
|
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
ca = platform_get_resource(dev, IORESOURCE_MEM, 1);
|
|
options = platform_get_resource(dev, 0, 0);
|
|
idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
|
|
if (!res || !ca || !options || !idprom)
|
|
return -ENODEV;
|
|
mpu_addr = ioremap_nocache(res->start, 4);
|
|
if (!mpu_addr)
|
|
return -ENOMEM;
|
|
ca_addr = ioremap_nocache(ca->start, 4);
|
|
if (!ca_addr)
|
|
goto probe_failed_free_mpu;
|
|
|
|
printk(KERN_INFO "Found i82596 at 0x%x\n", res->start);
|
|
|
|
netdevice = alloc_etherdev(sizeof(struct i596_private));
|
|
if (!netdevice)
|
|
goto probe_failed_free_ca;
|
|
|
|
SET_NETDEV_DEV(netdevice, &dev->dev);
|
|
platform_set_drvdata (dev, netdevice);
|
|
|
|
netdevice->base_addr = res->start;
|
|
netdevice->irq = platform_get_irq(dev, 0);
|
|
|
|
eth_addr = ioremap_nocache(idprom->start, 0x10);
|
|
if (!eth_addr)
|
|
goto probe_failed;
|
|
|
|
/* someone seems to like messed up stuff */
|
|
netdevice->dev_addr[0] = readb(eth_addr + 0x0b);
|
|
netdevice->dev_addr[1] = readb(eth_addr + 0x0a);
|
|
netdevice->dev_addr[2] = readb(eth_addr + 0x09);
|
|
netdevice->dev_addr[3] = readb(eth_addr + 0x08);
|
|
netdevice->dev_addr[4] = readb(eth_addr + 0x07);
|
|
netdevice->dev_addr[5] = readb(eth_addr + 0x06);
|
|
iounmap(eth_addr);
|
|
|
|
if (!netdevice->irq) {
|
|
printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
|
|
__FILE__, netdevice->base_addr);
|
|
goto probe_failed;
|
|
}
|
|
|
|
lp = netdev_priv(netdevice);
|
|
lp->options = options->flags & IORESOURCE_BITS;
|
|
lp->ca = ca_addr;
|
|
lp->mpu_port = mpu_addr;
|
|
|
|
retval = i82596_probe(netdevice);
|
|
if (retval == 0)
|
|
return 0;
|
|
|
|
probe_failed:
|
|
free_netdev(netdevice);
|
|
probe_failed_free_ca:
|
|
iounmap(ca_addr);
|
|
probe_failed_free_mpu:
|
|
iounmap(mpu_addr);
|
|
return retval;
|
|
}
|
|
|
|
static int __devexit sni_82596_driver_remove(struct platform_device *pdev)
|
|
{
|
|
struct net_device *dev = platform_get_drvdata(pdev);
|
|
struct i596_private *lp = netdev_priv(dev);
|
|
|
|
unregister_netdev(dev);
|
|
DMA_FREE(dev->dev.parent, sizeof(struct i596_private),
|
|
lp->dma, lp->dma_addr);
|
|
iounmap(lp->ca);
|
|
iounmap(lp->mpu_port);
|
|
free_netdev (dev);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver sni_82596_driver = {
|
|
.probe = sni_82596_probe,
|
|
.remove = __devexit_p(sni_82596_driver_remove),
|
|
.driver = {
|
|
.name = sni_82596_string,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __devinit sni_82596_init(void)
|
|
{
|
|
printk(KERN_INFO SNI_82596_DRIVER_VERSION "\n");
|
|
return platform_driver_register(&sni_82596_driver);
|
|
}
|
|
|
|
|
|
static void __exit sni_82596_exit(void)
|
|
{
|
|
platform_driver_unregister(&sni_82596_driver);
|
|
}
|
|
|
|
module_init(sni_82596_init);
|
|
module_exit(sni_82596_exit);
|