forked from Minki/linux
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>
182 lines
4.0 KiB
C
182 lines
4.0 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2009 Cavium Networks
|
|
*/
|
|
|
|
#include <linux/gfp.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/phy.h>
|
|
|
|
#include <asm/octeon/octeon.h>
|
|
#include <asm/octeon/cvmx-smix-defs.h>
|
|
|
|
#define DRV_VERSION "1.0"
|
|
#define DRV_DESCRIPTION "Cavium Networks Octeon SMI/MDIO driver"
|
|
|
|
struct octeon_mdiobus {
|
|
struct mii_bus *mii_bus;
|
|
int unit;
|
|
int phy_irq[PHY_MAX_ADDR];
|
|
};
|
|
|
|
static int octeon_mdiobus_read(struct mii_bus *bus, int phy_id, int regnum)
|
|
{
|
|
struct octeon_mdiobus *p = bus->priv;
|
|
union cvmx_smix_cmd smi_cmd;
|
|
union cvmx_smix_rd_dat smi_rd;
|
|
int timeout = 1000;
|
|
|
|
smi_cmd.u64 = 0;
|
|
smi_cmd.s.phy_op = 1; /* MDIO_CLAUSE_22_READ */
|
|
smi_cmd.s.phy_adr = phy_id;
|
|
smi_cmd.s.reg_adr = regnum;
|
|
cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
|
|
|
|
do {
|
|
/*
|
|
* Wait 1000 clocks so we don't saturate the RSL bus
|
|
* doing reads.
|
|
*/
|
|
cvmx_wait(1000);
|
|
smi_rd.u64 = cvmx_read_csr(CVMX_SMIX_RD_DAT(p->unit));
|
|
} while (smi_rd.s.pending && --timeout);
|
|
|
|
if (smi_rd.s.val)
|
|
return smi_rd.s.dat;
|
|
else
|
|
return -EIO;
|
|
}
|
|
|
|
static int octeon_mdiobus_write(struct mii_bus *bus, int phy_id,
|
|
int regnum, u16 val)
|
|
{
|
|
struct octeon_mdiobus *p = bus->priv;
|
|
union cvmx_smix_cmd smi_cmd;
|
|
union cvmx_smix_wr_dat smi_wr;
|
|
int timeout = 1000;
|
|
|
|
smi_wr.u64 = 0;
|
|
smi_wr.s.dat = val;
|
|
cvmx_write_csr(CVMX_SMIX_WR_DAT(p->unit), smi_wr.u64);
|
|
|
|
smi_cmd.u64 = 0;
|
|
smi_cmd.s.phy_op = 0; /* MDIO_CLAUSE_22_WRITE */
|
|
smi_cmd.s.phy_adr = phy_id;
|
|
smi_cmd.s.reg_adr = regnum;
|
|
cvmx_write_csr(CVMX_SMIX_CMD(p->unit), smi_cmd.u64);
|
|
|
|
do {
|
|
/*
|
|
* Wait 1000 clocks so we don't saturate the RSL bus
|
|
* doing reads.
|
|
*/
|
|
cvmx_wait(1000);
|
|
smi_wr.u64 = cvmx_read_csr(CVMX_SMIX_WR_DAT(p->unit));
|
|
} while (smi_wr.s.pending && --timeout);
|
|
|
|
if (timeout <= 0)
|
|
return -EIO;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init octeon_mdiobus_probe(struct platform_device *pdev)
|
|
{
|
|
struct octeon_mdiobus *bus;
|
|
int i;
|
|
int err = -ENOENT;
|
|
|
|
bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
|
|
if (!bus)
|
|
return -ENOMEM;
|
|
|
|
/* The platform_device id is our unit number. */
|
|
bus->unit = pdev->id;
|
|
|
|
bus->mii_bus = mdiobus_alloc();
|
|
|
|
if (!bus->mii_bus)
|
|
goto err;
|
|
|
|
/*
|
|
* Standard Octeon evaluation boards don't support phy
|
|
* interrupts, we need to poll.
|
|
*/
|
|
for (i = 0; i < PHY_MAX_ADDR; i++)
|
|
bus->phy_irq[i] = PHY_POLL;
|
|
|
|
bus->mii_bus->priv = bus;
|
|
bus->mii_bus->irq = bus->phy_irq;
|
|
bus->mii_bus->name = "mdio-octeon";
|
|
snprintf(bus->mii_bus->id, MII_BUS_ID_SIZE, "%x", bus->unit);
|
|
bus->mii_bus->parent = &pdev->dev;
|
|
|
|
bus->mii_bus->read = octeon_mdiobus_read;
|
|
bus->mii_bus->write = octeon_mdiobus_write;
|
|
|
|
dev_set_drvdata(&pdev->dev, bus);
|
|
|
|
err = mdiobus_register(bus->mii_bus);
|
|
if (err)
|
|
goto err_register;
|
|
|
|
dev_info(&pdev->dev, "Version " DRV_VERSION "\n");
|
|
|
|
return 0;
|
|
err_register:
|
|
mdiobus_free(bus->mii_bus);
|
|
|
|
err:
|
|
devm_kfree(&pdev->dev, bus);
|
|
return err;
|
|
}
|
|
|
|
static int __exit octeon_mdiobus_remove(struct platform_device *pdev)
|
|
{
|
|
struct octeon_mdiobus *bus;
|
|
|
|
bus = dev_get_drvdata(&pdev->dev);
|
|
|
|
mdiobus_unregister(bus->mii_bus);
|
|
mdiobus_free(bus->mii_bus);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver octeon_mdiobus_driver = {
|
|
.driver = {
|
|
.name = "mdio-octeon",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = octeon_mdiobus_probe,
|
|
.remove = __exit_p(octeon_mdiobus_remove),
|
|
};
|
|
|
|
void octeon_mdiobus_force_mod_depencency(void)
|
|
{
|
|
/* Let ethernet drivers force us to be loaded. */
|
|
}
|
|
EXPORT_SYMBOL(octeon_mdiobus_force_mod_depencency);
|
|
|
|
static int __init octeon_mdiobus_mod_init(void)
|
|
{
|
|
return platform_driver_register(&octeon_mdiobus_driver);
|
|
}
|
|
|
|
static void __exit octeon_mdiobus_mod_exit(void)
|
|
{
|
|
platform_driver_unregister(&octeon_mdiobus_driver);
|
|
}
|
|
|
|
module_init(octeon_mdiobus_mod_init);
|
|
module_exit(octeon_mdiobus_mod_exit);
|
|
|
|
MODULE_DESCRIPTION(DRV_DESCRIPTION);
|
|
MODULE_VERSION(DRV_VERSION);
|
|
MODULE_AUTHOR("David Daney");
|
|
MODULE_LICENSE("GPL");
|