Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8446676 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'phy-led-triggers' 



Zach Brown says:

====================
Add support for led triggers on phy link state change

Fix skge driver that declared enum contants that conflicted with enum
constants in linux/leds.h

Create function that encapsulates actions taken during the adjust phy link step
of phy state changes.

Create function that provides list of speeds currently supported by the phy.

Add support for led triggers on phy link state changes by adding
a config option. When set the config option will create a set of led triggers
for each phy device. Users can use the led triggers to represent link state
changes on the phy.

v2:
 * New patch that creates phy_adjust_link function to encapsulate actions taken
   when adjusting phy link during phy state changes
 * led trigger speed strings changed to match existing phy speed strings
 * New function that maps speeds to led triggers
 * Replace magic constants with definitions when declaring trigger name
   buffer and number of triggers.
v3:
 * Changed LED_ON to LED_REG_ON in skge driver to avoid possible future
   conflict and improve consistency.
 * Dropped rtl8712 patch that was accepted separately.
v4:
 * tweaked commit message
v5
 * Changed commit message to explain relationship between the new triggers and
   leds driven by phys.
 * Added new patch that creates phy_supported_speeds function.
 * Moved phy_leds_triggers_register and phy_leds_triggers_unregister to
   phy_attach and phy_detach respectively. This change is so the
   phydev->supported field will be filled by the time the triggers are
   registered.
 * Changed hardcoded list of triggers to dynamic list determined by speeds
   return by phy_supported_speeds.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5bb61cb5 2e0bc452

drivers/net/ethernet/marvell/skge.c

+3 −3
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ static const char *skge_pause(enum pause_status status) 
static void skge_link_up(struct skge_port *skge)

{

	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG),

		    LED_BLK_OFF|LED_SYNC_OFF|LED_ON);

		    LED_BLK_OFF|LED_SYNC_OFF|LED_REG_ON);



	netif_carrier_on(skge->netdev);

	netif_wake_queue(skge->netdev);
@@ -1062,7 +1062,7 @@ static void skge_link_up(struct skge_port *skge) 


static void skge_link_down(struct skge_port *skge)

{

	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);

	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_REG_OFF);

	netif_carrier_off(skge->netdev);

	netif_stop_queue(skge->netdev);
@@ -2668,7 +2668,7 @@ static int skge_down(struct net_device *dev) 
	if (hw->ports == 1)

		free_irq(hw->pdev->irq, hw);



	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);

	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_REG_OFF);

	if (is_genesis(hw))

		genesis_stop(skge);

	else

drivers/net/ethernet/marvell/skge.h

+2 −2
Original line number Diff line number Diff line
@@ -662,8 +662,8 @@ enum { 
	LED_BLK_OFF	= 1<<4,	/* Link LED Blinking Off */

	LED_SYNC_ON	= 1<<3,	/* Use Sync Wire to switch LED */

	LED_SYNC_OFF	= 1<<2,	/* Disable Sync Wire Input */

	LED_ON	= 1<<1,	/* switch LED on */

	LED_OFF	= 1<<0,	/* switch LED off */

	LED_REG_ON	= 1<<1,	/* switch LED on */

	LED_REG_OFF	= 1<<0,	/* switch LED off */

};



/* Receive GMAC FIFO (YUKON) */

drivers/net/phy/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -15,6 +15,19 @@ if PHYLIB 
config SWPHY

	bool



config LED_TRIGGER_PHY

	bool "Support LED triggers for tracking link state"

	depends on LEDS_TRIGGERS

	---help---

	  Adds support for a set of LED trigger events per-PHY.  Link

	  state change will trigger the events, for consumption by an

	  LED class driver.  There are triggers for each link speed currently

	  supported by the phy, and are of the form:

	       <mii bus id>:<phy>:<speed>



	  Where speed is in the form:

		<Speed in megabits>Mbps or <Speed in gigabits>Gbps



comment "MDIO bus device drivers"



config MDIO_BCM_IPROC

drivers/net/phy/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


libphy-y			:= phy.o phy_device.o mdio_bus.o mdio_device.o

libphy-$(CONFIG_SWPHY)		+= swphy.o

libphy-$(CONFIG_LED_TRIGGER_PHY)	+= phy_led_triggers.o



obj-$(CONFIG_PHYLIB)		+= libphy.o

drivers/net/phy/phy.c

+49 −8
Original line number Diff line number Diff line
@@ -260,6 +260,41 @@ static inline unsigned int phy_find_valid(unsigned int idx, u32 features) 
	return idx < MAX_NUM_SETTINGS ? idx : MAX_NUM_SETTINGS - 1;

}



/**

 * phy_supported_speeds - return all speeds currently supported by a phy device

 * @phy: The phy device to return supported speeds of.

 * @speeds: buffer to store supported speeds in.

 * @size:   size of speeds buffer.

 *

 * Description: Returns the number of supported speeds, and fills the speeds

 * buffer with the supported speeds. If speeds buffer is too small to contain

 * all currently supported speeds, will return as many speeds as can fit.

 */

unsigned int phy_supported_speeds(struct phy_device *phy,

				  unsigned int *speeds,

				  unsigned int size)

{

	unsigned int count = 0;

	unsigned int idx = 0;



	while (idx < MAX_NUM_SETTINGS && count < size) {

		idx = phy_find_valid(idx, phy->supported);



		if (!(settings[idx].setting & phy->supported))

			break;



		/* Assumes settings are grouped by speed */

		if ((count == 0) ||

		    (speeds[count - 1] != settings[idx].speed)) {

			speeds[count] = settings[idx].speed;

			count++;

		}

		idx++;

	}



	return count;

}



/**

 * phy_check_valid - check if there is a valid PHY setting which matches

 *		     speed, duplex, and feature mask
@@ -908,6 +943,12 @@ void phy_start(struct phy_device *phydev) 
}

EXPORT_SYMBOL(phy_start);



static void phy_adjust_link(struct phy_device *phydev)

{

	phydev->adjust_link(phydev->attached_dev);

	phy_led_trigger_change_speed(phydev);

}



/**

 * phy_state_machine - Handle the state machine

 * @work: work_struct that describes the work to be done
@@ -950,7 +991,7 @@ void phy_state_machine(struct work_struct *work) 
		if (!phydev->link) {

			phydev->state = PHY_NOLINK;

			netif_carrier_off(phydev->attached_dev);

			phydev->adjust_link(phydev->attached_dev);

			phy_adjust_link(phydev);

			break;

		}
@@ -963,7 +1004,7 @@ void phy_state_machine(struct work_struct *work) 
		if (err > 0) {

			phydev->state = PHY_RUNNING;

			netif_carrier_on(phydev->attached_dev);

			phydev->adjust_link(phydev->attached_dev);

			phy_adjust_link(phydev);



		} else if (0 == phydev->link_timeout--)

			needs_aneg = true;
@@ -990,7 +1031,7 @@ void phy_state_machine(struct work_struct *work) 
			}

			phydev->state = PHY_RUNNING;

			netif_carrier_on(phydev->attached_dev);

			phydev->adjust_link(phydev->attached_dev);

			phy_adjust_link(phydev);

		}

		break;

	case PHY_FORCING:
@@ -1006,7 +1047,7 @@ void phy_state_machine(struct work_struct *work) 
				needs_aneg = true;

		}



		phydev->adjust_link(phydev->attached_dev);

		phy_adjust_link(phydev);

		break;

	case PHY_RUNNING:

		/* Only register a CHANGE if we are polling and link changed
@@ -1035,7 +1076,7 @@ void phy_state_machine(struct work_struct *work) 
			netif_carrier_off(phydev->attached_dev);

		}



		phydev->adjust_link(phydev->attached_dev);

		phy_adjust_link(phydev);



		if (phy_interrupt_is_valid(phydev))

			err = phy_config_interrupt(phydev,
@@ -1045,7 +1086,7 @@ void phy_state_machine(struct work_struct *work) 
		if (phydev->link) {

			phydev->link = 0;

			netif_carrier_off(phydev->attached_dev);

			phydev->adjust_link(phydev->attached_dev);

			phy_adjust_link(phydev);

			do_suspend = true;

		}

		break;
@@ -1069,7 +1110,7 @@ void phy_state_machine(struct work_struct *work) 
				} else	{

					phydev->state = PHY_NOLINK;

				}

				phydev->adjust_link(phydev->attached_dev);

				phy_adjust_link(phydev);

			} else {

				phydev->state = PHY_AN;

				phydev->link_timeout = PHY_AN_TIMEOUT;
@@ -1085,7 +1126,7 @@ void phy_state_machine(struct work_struct *work) 
			} else	{

				phydev->state = PHY_NOLINK;

			}

			phydev->adjust_link(phydev->attached_dev);

			phy_adjust_link(phydev);

		}

		break;

	}