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

Commit 450b05c1 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: add support for controlling EEE 



When EEE is enabled, negotiate this feature with the PHY and make sure
that the capability checking, local EEE advertisement, link partner EEE
advertisement and auto-negotiation resolution returned by phy_init_eee()
is positive, and enable EEE at the switch level.

While querying the current EEE settings, verify the low-power indication
and indicate its status.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7905288f

drivers/net/dsa/bcm_sf2.c

+73 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,19 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) 
	core_writel(priv, reg, CORE_STS_OVERRIDE_IMP);

	core_writel(priv, reg, CORE_STS_OVERRIDE_IMP);

}

}





static void bcm_sf2_eee_enable_set(struct dsa_switch *ds, int port, bool enable)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	u32 reg;



	reg = core_readl(priv, CORE_EEE_EN_CTRL);

	if (enable)

		reg |= 1 << port;

	else

		reg &= ~(1 << port);

	core_writel(priv, reg, CORE_EEE_EN_CTRL);

}



static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,

static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,

			      struct phy_device *phy)

			      struct phy_device *phy)

{

{
@@ -247,6 +260,10 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 




	bcm_sf2_imp_vlan_setup(ds, cpu_port);

	bcm_sf2_imp_vlan_setup(ds, cpu_port);





	/* If EEE was enabled, restore it */

	if (priv->port_sts[port].eee.eee_enabled)

		bcm_sf2_eee_enable_set(ds, port, true);



	return 0;

	return 0;

}

}
@@ -279,6 +296,60 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port, 
	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);

	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);

}

}





/* Returns 0 if EEE was not enabled, or 1 otherwise

 */

static int bcm_sf2_eee_init(struct dsa_switch *ds, int port,

			    struct phy_device *phy)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	struct ethtool_eee *p = &priv->port_sts[port].eee;

	int ret;



	p->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full);



	ret = phy_init_eee(phy, 0);

	if (ret)

		return 0;



	bcm_sf2_eee_enable_set(ds, port, true);



	return 1;

}



static int bcm_sf2_sw_get_eee(struct dsa_switch *ds, int port,

			      struct ethtool_eee *e)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	struct ethtool_eee *p = &priv->port_sts[port].eee;

	u32 reg;



	reg = core_readl(priv, CORE_EEE_LPI_INDICATE);

	e->eee_enabled = p->eee_enabled;

	e->eee_active = !!(reg & (1 << port));



	return 0;

}



static int bcm_sf2_sw_set_eee(struct dsa_switch *ds, int port,

			      struct phy_device *phydev,

			      struct ethtool_eee *e)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	struct ethtool_eee *p = &priv->port_sts[port].eee;



	p->eee_enabled = e->eee_enabled;



	if (!p->eee_enabled) {

		bcm_sf2_eee_enable_set(ds, port, false);

	} else {

		p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);

		if (!p->eee_enabled)

			return -EOPNOTSUPP;

	}



	return 0;

}



static irqreturn_t bcm_sf2_switch_0_isr(int irq, void *dev_id)

static irqreturn_t bcm_sf2_switch_0_isr(int irq, void *dev_id)

{

{

	struct bcm_sf2_priv *priv = dev_id;

	struct bcm_sf2_priv *priv = dev_id;
@@ -792,6 +863,8 @@ static struct dsa_switch_driver bcm_sf2_switch_driver = { 
	.set_wol		= bcm_sf2_sw_set_wol,

	.set_wol		= bcm_sf2_sw_set_wol,

	.port_enable		= bcm_sf2_port_setup,

	.port_enable		= bcm_sf2_port_setup,

	.port_disable		= bcm_sf2_port_disable,

	.port_disable		= bcm_sf2_port_disable,

	.get_eee		= bcm_sf2_sw_get_eee,

	.set_eee		= bcm_sf2_sw_set_eee,

};

};





static int __init bcm_sf2_init(void)

static int __init bcm_sf2_init(void)

drivers/net/dsa/bcm_sf2.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/mii.h>

#include <linux/mii.h>

#include <linux/ethtool.h>





#include <net/dsa.h>

#include <net/dsa.h>
@@ -43,6 +44,8 @@ struct bcm_sf2_hw_params { 




struct bcm_sf2_port_status {

struct bcm_sf2_port_status {

	unsigned int link;

	unsigned int link;



	struct ethtool_eee eee;

};

};





struct bcm_sf2_priv {

struct bcm_sf2_priv {

drivers/net/dsa/bcm_sf2_regs.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -225,4 +225,7 @@ 
#define CORE_PORT_VLAN_CTL_PORT(x)	(0xc400 + ((x) * 0x8))

#define CORE_PORT_VLAN_CTL_PORT(x)	(0xc400 + ((x) * 0x8))

#define  PORT_VLAN_CTRL_MASK		0x1ff

#define  PORT_VLAN_CTRL_MASK		0x1ff





#define CORE_EEE_EN_CTRL		0x24800

#define CORE_EEE_LPI_INDICATE		0x24810



#endif /* __BCM_SF2_REGS_H */
 
#endif /* __BCM_SF2_REGS_H */