leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phy: add phy_mac_interrupt() to use with PHY_IGNORE_INTERRUPT

Browse Source 
There is currently no way for an Ethernet MAC driver servicing PHY link
interrupts to notify this to the PHY state machine without defining its
own state machine. Since most drivers are not so special, introduce a
helper: phy_mac_interrupt() which can be called from a link up/down
interrupt routine to update the PHY state machine. To avoid code
duplication some refactoring has been done to expose the workqueue and
its corresponding callback internally.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2013-05-19 22:53:43 +00:00 committed by David S. Miller
parent 2c7b49212a
commit 5ea94e7686
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/phy/phy.c
View File

@ -419,8 +419,6 @@ out_unlock:
EXPORT_SYMBOL(phy_start_aneg); EXPORT_SYMBOL(phy_start_aneg);
static void phy_change(struct work_struct *work);
/** /**
* phy_start_machine - start PHY state machine tracking * phy_start_machine - start PHY state machine tracking
* @phydev: the phy_device struct * @phydev: the phy_device struct
@ -565,8 +563,6 @@ int phy_start_interrupts(struct phy_device *phydev)
{ {
int err = 0; int err = 0;
INIT_WORK(&phydev->phy_queue, phy_change);
atomic_set(&phydev->irq_disable, 0); atomic_set(&phydev->irq_disable, 0);
if (request_irq(phydev->irq, phy_interrupt, if (request_irq(phydev->irq, phy_interrupt,
IRQF_SHARED, IRQF_SHARED,
@ -623,7 +619,7 @@ EXPORT_SYMBOL(phy_stop_interrupts);
* phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes * phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes
* @work: work_struct that describes the work to be done * @work: work_struct that describes the work to be done
*/ */
static void phy_change(struct work_struct *work) void phy_change(struct work_struct *work)
{ {
int err; int err;
struct phy_device *phydev = struct phy_device *phydev =
@ -922,6 +918,14 @@ void phy_state_machine(struct work_struct *work)
schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ); schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
} }
void phy_mac_interrupt(struct phy_device *phydev, int new_link)
{
cancel_work_sync(&phydev->phy_queue);
phydev->link = new_link;
schedule_work(&phydev->phy_queue);
}
EXPORT_SYMBOL(phy_mac_interrupt);
static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad, static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad,
int addr) int addr)
{ {

1
drivers/net/phy/phy_device.c
View File

@ -189,6 +189,7 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
mutex_init(&dev->lock); mutex_init(&dev->lock);
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
INIT_WORK(&dev->phy_queue, phy_change);
/* Request the appropriate module unconditionally; don't /* Request the appropriate module unconditionally; don't
bother trying to do so only if it isn't already loaded, bother trying to do so only if it isn't already loaded,

2
include/linux/phy.h
View File

@ -557,6 +557,8 @@ void phy_drivers_unregister(struct phy_driver *drv, int n);
int phy_driver_register(struct phy_driver *new_driver); int phy_driver_register(struct phy_driver *new_driver);
int phy_drivers_register(struct phy_driver *new_driver, int n); int phy_drivers_register(struct phy_driver *new_driver, int n);
void phy_state_machine(struct work_struct *work); void phy_state_machine(struct work_struct *work);
void phy_change(struct work_struct *work);
void phy_mac_interrupt(struct phy_device *phydev, int new_link);
void phy_start_machine(struct phy_device *phydev, void phy_start_machine(struct phy_device *phydev,
void (*handler)(struct net_device *)); void (*handler)(struct net_device *));
void phy_stop_machine(struct phy_device *phydev); void phy_stop_machine(struct phy_device *phydev);