mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +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>
342 lines
8.3 KiB
C
342 lines
8.3 KiB
C
/*
|
|
* drivers/net/gianfar_sysfs.c
|
|
*
|
|
* Gianfar Ethernet Driver
|
|
* This driver is designed for the non-CPM ethernet controllers
|
|
* on the 85xx and 83xx family of integrated processors
|
|
* Based on 8260_io/fcc_enet.c
|
|
*
|
|
* Author: Andy Fleming
|
|
* Maintainer: Kumar Gala (galak@kernel.crashing.org)
|
|
* Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
|
|
*
|
|
* Copyright 2002-2009 Freescale Semiconductor, Inc.
|
|
*
|
|
* 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.
|
|
*
|
|
* Sysfs file creation and management
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/unistd.h>
|
|
#include <linux/init.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/device.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <linux/module.h>
|
|
|
|
#include "gianfar.h"
|
|
|
|
static ssize_t gfar_show_bd_stash(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%s\n", priv->bd_stash_en ? "on" : "off");
|
|
}
|
|
|
|
static ssize_t gfar_set_bd_stash(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
int new_setting = 0;
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BD_STASHING))
|
|
return count;
|
|
|
|
|
|
/* Find out the new setting */
|
|
if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))
|
|
new_setting = 1;
|
|
else if (!strncmp("off", buf, count - 1) ||
|
|
!strncmp("0", buf, count - 1))
|
|
new_setting = 0;
|
|
else
|
|
return count;
|
|
|
|
|
|
local_irq_save(flags);
|
|
lock_rx_qs(priv);
|
|
|
|
/* Set the new stashing value */
|
|
priv->bd_stash_en = new_setting;
|
|
|
|
temp = gfar_read(®s->attr);
|
|
|
|
if (new_setting)
|
|
temp |= ATTR_BDSTASH;
|
|
else
|
|
temp &= ~(ATTR_BDSTASH);
|
|
|
|
gfar_write(®s->attr, temp);
|
|
|
|
unlock_rx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(bd_stash, 0644, gfar_show_bd_stash, gfar_set_bd_stash);
|
|
|
|
static ssize_t gfar_show_rx_stash_size(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%d\n", priv->rx_stash_size);
|
|
}
|
|
|
|
static ssize_t gfar_set_rx_stash_size(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
unsigned int length = simple_strtoul(buf, NULL, 0);
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BUF_STASHING))
|
|
return count;
|
|
|
|
local_irq_save(flags);
|
|
lock_rx_qs(priv);
|
|
|
|
if (length > priv->rx_buffer_size)
|
|
goto out;
|
|
|
|
if (length == priv->rx_stash_size)
|
|
goto out;
|
|
|
|
priv->rx_stash_size = length;
|
|
|
|
temp = gfar_read(®s->attreli);
|
|
temp &= ~ATTRELI_EL_MASK;
|
|
temp |= ATTRELI_EL(length);
|
|
gfar_write(®s->attreli, temp);
|
|
|
|
/* Turn stashing on/off as appropriate */
|
|
temp = gfar_read(®s->attr);
|
|
|
|
if (length)
|
|
temp |= ATTR_BUFSTASH;
|
|
else
|
|
temp &= ~(ATTR_BUFSTASH);
|
|
|
|
gfar_write(®s->attr, temp);
|
|
|
|
out:
|
|
unlock_rx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(rx_stash_size, 0644, gfar_show_rx_stash_size,
|
|
gfar_set_rx_stash_size);
|
|
|
|
/* Stashing will only be enabled when rx_stash_size != 0 */
|
|
static ssize_t gfar_show_rx_stash_index(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%d\n", priv->rx_stash_index);
|
|
}
|
|
|
|
static ssize_t gfar_set_rx_stash_index(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
unsigned short index = simple_strtoul(buf, NULL, 0);
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BUF_STASHING))
|
|
return count;
|
|
|
|
local_irq_save(flags);
|
|
lock_rx_qs(priv);
|
|
|
|
if (index > priv->rx_stash_size)
|
|
goto out;
|
|
|
|
if (index == priv->rx_stash_index)
|
|
goto out;
|
|
|
|
priv->rx_stash_index = index;
|
|
|
|
temp = gfar_read(®s->attreli);
|
|
temp &= ~ATTRELI_EI_MASK;
|
|
temp |= ATTRELI_EI(index);
|
|
gfar_write(®s->attreli, temp);
|
|
|
|
out:
|
|
unlock_rx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(rx_stash_index, 0644, gfar_show_rx_stash_index,
|
|
gfar_set_rx_stash_index);
|
|
|
|
static ssize_t gfar_show_fifo_threshold(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%d\n", priv->fifo_threshold);
|
|
}
|
|
|
|
static ssize_t gfar_set_fifo_threshold(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
unsigned int length = simple_strtoul(buf, NULL, 0);
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (length > GFAR_MAX_FIFO_THRESHOLD)
|
|
return count;
|
|
|
|
local_irq_save(flags);
|
|
lock_tx_qs(priv);
|
|
|
|
priv->fifo_threshold = length;
|
|
|
|
temp = gfar_read(®s->fifo_tx_thr);
|
|
temp &= ~FIFO_TX_THR_MASK;
|
|
temp |= length;
|
|
gfar_write(®s->fifo_tx_thr, temp);
|
|
|
|
unlock_tx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(fifo_threshold, 0644, gfar_show_fifo_threshold,
|
|
gfar_set_fifo_threshold);
|
|
|
|
static ssize_t gfar_show_fifo_starve(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%d\n", priv->fifo_starve);
|
|
}
|
|
|
|
static ssize_t gfar_set_fifo_starve(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
unsigned int num = simple_strtoul(buf, NULL, 0);
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (num > GFAR_MAX_FIFO_STARVE)
|
|
return count;
|
|
|
|
local_irq_save(flags);
|
|
lock_tx_qs(priv);
|
|
|
|
priv->fifo_starve = num;
|
|
|
|
temp = gfar_read(®s->fifo_tx_starve);
|
|
temp &= ~FIFO_TX_STARVE_MASK;
|
|
temp |= num;
|
|
gfar_write(®s->fifo_tx_starve, temp);
|
|
|
|
unlock_tx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(fifo_starve, 0644, gfar_show_fifo_starve,
|
|
gfar_set_fifo_starve);
|
|
|
|
static ssize_t gfar_show_fifo_starve_off(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
|
|
return sprintf(buf, "%d\n", priv->fifo_starve_off);
|
|
}
|
|
|
|
static ssize_t gfar_set_fifo_starve_off(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(to_net_dev(dev));
|
|
struct gfar __iomem *regs = priv->gfargrp[0].regs;
|
|
unsigned int num = simple_strtoul(buf, NULL, 0);
|
|
u32 temp;
|
|
unsigned long flags;
|
|
|
|
if (num > GFAR_MAX_FIFO_STARVE_OFF)
|
|
return count;
|
|
|
|
local_irq_save(flags);
|
|
lock_tx_qs(priv);
|
|
|
|
priv->fifo_starve_off = num;
|
|
|
|
temp = gfar_read(®s->fifo_tx_starve_shutoff);
|
|
temp &= ~FIFO_TX_STARVE_OFF_MASK;
|
|
temp |= num;
|
|
gfar_write(®s->fifo_tx_starve_shutoff, temp);
|
|
|
|
unlock_tx_qs(priv);
|
|
local_irq_restore(flags);
|
|
|
|
return count;
|
|
}
|
|
|
|
static DEVICE_ATTR(fifo_starve_off, 0644, gfar_show_fifo_starve_off,
|
|
gfar_set_fifo_starve_off);
|
|
|
|
void gfar_init_sysfs(struct net_device *dev)
|
|
{
|
|
struct gfar_private *priv = netdev_priv(dev);
|
|
int rc;
|
|
|
|
/* Initialize the default values */
|
|
priv->fifo_threshold = DEFAULT_FIFO_TX_THR;
|
|
priv->fifo_starve = DEFAULT_FIFO_TX_STARVE;
|
|
priv->fifo_starve_off = DEFAULT_FIFO_TX_STARVE_OFF;
|
|
|
|
/* Create our sysfs files */
|
|
rc = device_create_file(&dev->dev, &dev_attr_bd_stash);
|
|
rc |= device_create_file(&dev->dev, &dev_attr_rx_stash_size);
|
|
rc |= device_create_file(&dev->dev, &dev_attr_rx_stash_index);
|
|
rc |= device_create_file(&dev->dev, &dev_attr_fifo_threshold);
|
|
rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve);
|
|
rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve_off);
|
|
if (rc)
|
|
dev_err(&dev->dev, "Error creating gianfar sysfs files.\n");
|
|
}
|