forked from luck/tmp_suning_uos_patched
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>
221 lines
4.8 KiB
C
221 lines
4.8 KiB
C
/*
|
|
* drivers/net/phy/davicom.c
|
|
*
|
|
* Driver for Davicom PHYs
|
|
*
|
|
* Author: Andy Fleming
|
|
*
|
|
* Copyright (c) 2004 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.
|
|
*
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/unistd.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/init.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mii.h>
|
|
#include <linux/ethtool.h>
|
|
#include <linux/phy.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
#define MII_DM9161_SCR 0x10
|
|
#define MII_DM9161_SCR_INIT 0x0610
|
|
#define MII_DM9161_SCR_RMII 0x0100
|
|
|
|
/* DM9161 Interrupt Register */
|
|
#define MII_DM9161_INTR 0x15
|
|
#define MII_DM9161_INTR_PEND 0x8000
|
|
#define MII_DM9161_INTR_DPLX_MASK 0x0800
|
|
#define MII_DM9161_INTR_SPD_MASK 0x0400
|
|
#define MII_DM9161_INTR_LINK_MASK 0x0200
|
|
#define MII_DM9161_INTR_MASK 0x0100
|
|
#define MII_DM9161_INTR_DPLX_CHANGE 0x0010
|
|
#define MII_DM9161_INTR_SPD_CHANGE 0x0008
|
|
#define MII_DM9161_INTR_LINK_CHANGE 0x0004
|
|
#define MII_DM9161_INTR_INIT 0x0000
|
|
#define MII_DM9161_INTR_STOP \
|
|
(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
|
|
| MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
|
|
|
|
/* DM9161 10BT Configuration/Status */
|
|
#define MII_DM9161_10BTCSR 0x12
|
|
#define MII_DM9161_10BTCSR_INIT 0x7800
|
|
|
|
MODULE_DESCRIPTION("Davicom PHY driver");
|
|
MODULE_AUTHOR("Andy Fleming");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
#define DM9161_DELAY 1
|
|
static int dm9161_config_intr(struct phy_device *phydev)
|
|
{
|
|
int temp;
|
|
|
|
temp = phy_read(phydev, MII_DM9161_INTR);
|
|
|
|
if (temp < 0)
|
|
return temp;
|
|
|
|
if(PHY_INTERRUPT_ENABLED == phydev->interrupts )
|
|
temp &= ~(MII_DM9161_INTR_STOP);
|
|
else
|
|
temp |= MII_DM9161_INTR_STOP;
|
|
|
|
temp = phy_write(phydev, MII_DM9161_INTR, temp);
|
|
|
|
return temp;
|
|
}
|
|
|
|
static int dm9161_config_aneg(struct phy_device *phydev)
|
|
{
|
|
int err;
|
|
|
|
/* Isolate the PHY */
|
|
err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
|
|
/* Configure the new settings */
|
|
err = genphy_config_aneg(phydev);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int dm9161_config_init(struct phy_device *phydev)
|
|
{
|
|
int err, temp;
|
|
|
|
/* Isolate the PHY */
|
|
err = phy_write(phydev, MII_BMCR, BMCR_ISOLATE);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
|
|
switch (phydev->interface) {
|
|
case PHY_INTERFACE_MODE_MII:
|
|
temp = MII_DM9161_SCR_INIT;
|
|
break;
|
|
case PHY_INTERFACE_MODE_RMII:
|
|
temp = MII_DM9161_SCR_INIT | MII_DM9161_SCR_RMII;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* Do not bypass the scrambler/descrambler */
|
|
err = phy_write(phydev, MII_DM9161_SCR, temp);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
/* Clear 10BTCSR to default */
|
|
err = phy_write(phydev, MII_DM9161_10BTCSR, MII_DM9161_10BTCSR_INIT);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
|
|
/* Reconnect the PHY, and enable Autonegotiation */
|
|
err = phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
|
|
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int dm9161_ack_interrupt(struct phy_device *phydev)
|
|
{
|
|
int err = phy_read(phydev, MII_DM9161_INTR);
|
|
|
|
return (err < 0) ? err : 0;
|
|
}
|
|
|
|
static struct phy_driver dm9161e_driver = {
|
|
.phy_id = 0x0181b880,
|
|
.name = "Davicom DM9161E",
|
|
.phy_id_mask = 0x0ffffff0,
|
|
.features = PHY_BASIC_FEATURES,
|
|
.config_init = dm9161_config_init,
|
|
.config_aneg = dm9161_config_aneg,
|
|
.read_status = genphy_read_status,
|
|
.driver = { .owner = THIS_MODULE,},
|
|
};
|
|
|
|
static struct phy_driver dm9161a_driver = {
|
|
.phy_id = 0x0181b8a0,
|
|
.name = "Davicom DM9161A",
|
|
.phy_id_mask = 0x0ffffff0,
|
|
.features = PHY_BASIC_FEATURES,
|
|
.config_init = dm9161_config_init,
|
|
.config_aneg = dm9161_config_aneg,
|
|
.read_status = genphy_read_status,
|
|
.driver = { .owner = THIS_MODULE,},
|
|
};
|
|
|
|
static struct phy_driver dm9131_driver = {
|
|
.phy_id = 0x00181b80,
|
|
.name = "Davicom DM9131",
|
|
.phy_id_mask = 0x0ffffff0,
|
|
.features = PHY_BASIC_FEATURES,
|
|
.flags = PHY_HAS_INTERRUPT,
|
|
.config_aneg = genphy_config_aneg,
|
|
.read_status = genphy_read_status,
|
|
.ack_interrupt = dm9161_ack_interrupt,
|
|
.config_intr = dm9161_config_intr,
|
|
.driver = { .owner = THIS_MODULE,},
|
|
};
|
|
|
|
static int __init davicom_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = phy_driver_register(&dm9161e_driver);
|
|
if (ret)
|
|
goto err1;
|
|
|
|
ret = phy_driver_register(&dm9161a_driver);
|
|
if (ret)
|
|
goto err2;
|
|
|
|
ret = phy_driver_register(&dm9131_driver);
|
|
if (ret)
|
|
goto err3;
|
|
return 0;
|
|
|
|
err3:
|
|
phy_driver_unregister(&dm9161a_driver);
|
|
err2:
|
|
phy_driver_unregister(&dm9161e_driver);
|
|
err1:
|
|
return ret;
|
|
}
|
|
|
|
static void __exit davicom_exit(void)
|
|
{
|
|
phy_driver_unregister(&dm9161e_driver);
|
|
phy_driver_unregister(&dm9161a_driver);
|
|
phy_driver_unregister(&dm9131_driver);
|
|
}
|
|
|
|
module_init(davicom_init);
|
|
module_exit(davicom_exit);
|