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

Commit 1230ff53 authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura
Browse files

msm: emac: power management support 



Add Runtime power management support. Also cleanup suspend/resume
functions by removing unwanted code.

Change-Id: I94381178843f824dc3a67a23a2bddd2303b0ed65
Signed-off-by: default avatarNiranjana Vishwanathapura <nvishwan@codeaurora.org>
parent 01364e16

drivers/net/ethernet/msm/emac/emac.h

+5 −3
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ 
#define EMAC_DMA_ADDR_LO(_addr) \

		((u32)((u64)(_addr) & DMA_ADDR_LO_MASK))



/* 4 emac core irqs */

/* 4 emac core irqs; 1 wol irq */

#define EMAC_NUM_CORE_IRQ     4

#define EMAC_WOL_IRQ          4

#define EMAC_NUM_IRQ          5



/* mdio/mdc gpios */

#define EMAC_NUM_GPIO         2
@@ -577,7 +579,7 @@ struct emac_tx_queue { 
struct emac_adapter {

	struct net_device *netdev;



	struct emac_irq_info  irq_info[EMAC_NUM_CORE_IRQ];

	struct emac_irq_info  irq_info[EMAC_NUM_IRQ];

	struct emac_gpio_info gpio_info[EMAC_NUM_GPIO];



	/* dma parameters */

drivers/net/ethernet/msm/emac/emac_defines.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#define DEV_REV_NUM_BMSK                                       0xff0000

#define DEV_REV_NUM_SHFT                                             16

#define INT_RD_CLR_EN                                            0x4000

#define LPW_CLK_SEL                                                0x80

#define LPW_STATE                                                  0x20

#define LPW_MODE                                                   0x10

#define SOFT_RST                                                    0x1



/* EMAC_MDIO_CTRL */

drivers/net/ethernet/msm/emac/emac_hw.c

+48 −28
Original line number Diff line number Diff line
@@ -362,6 +362,31 @@ int emac_check_phy_link(struct emac_hw *hw, u32 *speed, bool *link_up) 
	return retval;

}



int emac_hw_get_lpa_speed(struct emac_hw *hw, u32 *speed)

{

	int retval;

	u16 lpa, stat1000;



	retval = emac_read_phy_reg(hw, MII_LPA, &lpa);

	retval |= emac_read_phy_reg(hw, MII_STAT1000, &stat1000);

	if (retval)

		return retval;



	*speed = EMAC_LINK_SPEED_10_HALF;

	if (lpa & LPA_10FULL)

		*speed = EMAC_LINK_SPEED_10_FULL;

	else if (lpa & LPA_10HALF)

		*speed = EMAC_LINK_SPEED_10_HALF;

	else if (lpa & LPA_100FULL)

		*speed = EMAC_LINK_SPEED_100_FULL;

	else if (lpa & LPA_100HALF)

		*speed = EMAC_LINK_SPEED_100_HALF;

	else if (stat1000 & LPA_1000FULL)

		*speed = EMAC_LINK_SPEED_1GB_FULL;



	return 0;

}



/* INTR */

void emac_hw_enable_intr(struct emac_hw *hw)

{
@@ -514,66 +539,59 @@ void emac_hw_config_mac_ctrl(struct emac_hw *hw) 
}



/* Wake On LAN (WOL) */

int emac_hw_config_wol(struct emac_hw *hw, u32 wufc)

void emac_hw_config_wol(struct emac_hw *hw, u32 wufc)

{

	u32 wol = 0;



	wol |= WK_FRAME_EN;

	/* turn on magic packet event */

	if (wufc & EMAC_WOL_MAGIC)

		wol |= MG_FRAME_EN | MG_FRAME_PME;

		wol |= MG_FRAME_EN | MG_FRAME_PME | WK_FRAME_EN;



	/* turn on link up event */

	if (wufc & EMAC_WOL_PHY)

		wol |=  LK_CHG_EN | LK_CHG_PME;



	emac_reg_w32(hw, EMAC, EMAC_WOL_CTRL0, wol);

	emac_reg_update32(hw, EMAC_CSR, EMAC_EMAC_WRAPPER_CSR2, 0, WOL_EN);

	wmb();



	return 0;

}



/* Power Management */

int emac_hw_config_pow_save(struct emac_hw *hw, u32 speed, bool wol_en,

			    bool tx_en, bool rx_en)

void emac_hw_config_pow_save(struct emac_hw *hw, u32 speed,

			     bool wol_en, bool rx_en)

{

	u32 dma_mas, mac;



	dma_mas = emac_reg_r32(hw, EMAC, EMAC_DMA_MAS_CTRL);

	dma_mas &= ~MASTER_CTRL_CLK_SEL_DIS;

	dma_mas &= ~LPW_CLK_SEL;

	dma_mas |= LPW_STATE;



	mac = emac_reg_r32(hw, EMAC, EMAC_MAC_CTRL);

	mac = (mac & ~SPEED_BMSK) |

		(((u32)emac_mac_speed_1000 << SPEED_SHFT) & SPEED_BMSK);



	mac &= ~(FULLD | RXEN | TXEN);

	mac = (mac & ~SPEED_BMSK) |

	  (((u32)emac_mac_speed_10_100 << SPEED_SHFT) & SPEED_BMSK);



	if (wol_en) {

		if (rx_en)

			mac |= (RXEN | BROAD_EN);



		if (tx_en)

			mac |= TXEN;



		if (EMAC_LINK_SPEED_1GB_FULL == speed) {

		/* If WOL is enabled, set link speed/duplex for mac */

		if (EMAC_LINK_SPEED_1GB_FULL == speed)

			mac = (mac & ~SPEED_BMSK) |

			  (((u32)emac_mac_speed_1000 << SPEED_SHFT) &

			   SPEED_BMSK);

		}

		if ((EMAC_LINK_SPEED_10_FULL == speed) ||

		    (EMAC_LINK_SPEED_100_FULL == speed) ||

		    (EMAC_LINK_SPEED_1GB_FULL == speed))

			mac |= FULLD;



		if (EMAC_LINK_SPEED_10_FULL == speed ||

		    EMAC_LINK_SPEED_100_FULL == speed ||

		    EMAC_LINK_SPEED_1GB_FULL == speed)

			mac |= FULLD;

	} else {

		dma_mas |= MASTER_CTRL_CLK_SEL_DIS;

		/* select lower clock speed if WOL is disabled */

		dma_mas |= LPW_CLK_SEL;

	}



	emac_reg_w32(hw, EMAC, EMAC_DMA_MAS_CTRL, dma_mas);

	emac_reg_w32(hw, EMAC, EMAC_MAC_CTRL, mac);

	wmb();



	return 0;

}



/* Config descriptor rings */
@@ -915,8 +933,8 @@ void emac_hw_start_mac(struct emac_hw *hw) 
	emac_reg_w32(hw, EMAC_CSR, EMAC_EMAC_WRAPPER_CSR1, csr1);

	emac_reg_w32(hw, EMAC, EMAC_MAC_CTRL, mac);



	/* clear all interrupts, set interrupt read clear */

	emac_reg_w32(hw, EMAC, EMAC_DMA_MAS_CTRL, INT_RD_CLR_EN);

	/* enable interrupt read clear, low power sleep mode and normal state */

	emac_reg_w32(hw, EMAC, EMAC_DMA_MAS_CTRL, (INT_RD_CLR_EN | LPW_MODE));



	if (CHK_HW_FLAG(PTP_EN)) {

		if (hw->link_speed == EMAC_LINK_SPEED_1GB_FULL)
@@ -929,6 +947,8 @@ void emac_hw_start_mac(struct emac_hw *hw) 


	emac_reg_update32(hw, EMAC, EMAC_ATHR_HEADER_CTRL,

			  (HEADER_ENABLE | HEADER_CNT_EN), 0);



	emac_reg_update32(hw, EMAC_CSR, EMAC_EMAC_WRAPPER_CSR2, 0, WOL_EN);

	wmb();

}

drivers/net/ethernet/msm/emac/emac_hw.h

+4 −3
Original line number Diff line number Diff line
@@ -40,12 +40,13 @@ extern int emac_setup_phy_link(struct emac_hw *hw, u32 speed, 
extern int emac_setup_phy_link_speed(struct emac_hw *hw, u32 speed,

				     bool autoneg, bool fc);

extern int emac_check_phy_link(struct emac_hw *hw, u32 *speed, bool *link_up);

extern int emac_hw_get_lpa_speed(struct emac_hw *hw, u32 *speed);

extern int emac_hw_ack_phy_intr(struct emac_hw *hw);

extern int emac_hw_init_phy(struct emac_hw *hw);

extern int emac_hw_reset_phy(struct emac_hw *hw);



extern int emac_hw_config_pow_save(struct emac_hw *hw, u32 speed, bool wol_en,

				   bool tx_en, bool rx_en);

extern void emac_hw_config_pow_save(struct emac_hw *hw, u32 speed, bool wol_en,

				    bool rx_en);

/* MAC */

extern void emac_hw_enable_intr(struct emac_hw *hw);

extern void emac_hw_disable_intr(struct emac_hw *hw);
@@ -54,7 +55,7 @@ extern void emac_hw_clear_mc_addr(struct emac_hw *hw); 


extern void emac_hw_config_mac_ctrl(struct emac_hw *hw);

extern void emac_hw_config_rss(struct emac_hw *hw);

extern int emac_hw_config_wol(struct emac_hw *hw, u32 wufc);

extern void emac_hw_config_wol(struct emac_hw *hw, u32 wufc);

extern int emac_hw_config_fc(struct emac_hw *hw);



extern void emac_hw_reset_mac(struct emac_hw *hw);

drivers/net/ethernet/msm/emac/emac_main.c

+116 −59
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/ipv6.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/tcp.h>

#include <linux/io.h>
@@ -53,6 +54,7 @@ module_param_named(msglvl, msm_emac_msglvl, int, S_IRUGO | S_IWUSR | S_IWGRP); 
static int emac_up(struct emac_adapter *adpt);

static void emac_down(struct emac_adapter *adpt, u32 ctrl);

static irqreturn_t emac_interrupt(int irq, void *data);

static irqreturn_t emac_wol_interrupt(int irq, void *data);



/* EMAC HW has an issue with interrupt assignment because of which

   following receive rss queue to interrupt mapping is used.
@@ -62,7 +64,7 @@ static irqreturn_t emac_interrupt(int irq, void *data); 
   core2       3

   core3       x (unsigned)

*/

static struct emac_irq_info emac_irq[EMAC_NUM_CORE_IRQ] = {

static struct emac_irq_info emac_irq[EMAC_NUM_IRQ] = {

	{ 0, "emac_core0_irq", emac_interrupt, EMAC_INT_STATUS,

	  EMAC_INT_MASK, IMR_NORMAL_MASK | RX_PKT_INT1, NULL, NULL },

	{ 0, "emac_core1_irq", emac_interrupt, EMAC_INT1_STATUS,
@@ -71,6 +73,8 @@ static struct emac_irq_info emac_irq[EMAC_NUM_CORE_IRQ] = { 
	  EMAC_INT2_MASK, RX_PKT_INT3, NULL, NULL },

	{ 0, "emac_core3_irq", emac_interrupt, EMAC_INT3_STATUS,

	  EMAC_INT3_MASK, 0, NULL, NULL },

	{ 0, "emac_wol_irq", emac_wol_interrupt, 0,

	  0, 0, NULL, NULL },

};



static struct emac_gpio_info emac_gpio[EMAC_NUM_GPIO] = {
@@ -828,6 +832,15 @@ static int emac_start_xmit(struct sk_buff *skb, 
}



/* ISR */

static irqreturn_t emac_wol_interrupt(int irq, void *data)

{

	struct emac_irq_info *irq_info = data;

	struct emac_adapter *adpt = irq_info->adpt;



	emac_dbg(adpt, wol, "EMAC wol interrupt received\n");

	return IRQ_HANDLED;

}



static irqreturn_t emac_interrupt(int irq, void *data)

{

	struct emac_irq_info *irq_info = data;
@@ -1387,14 +1400,18 @@ static int emac_up(struct emac_adapter *adpt) 
		}

	}



	for (i = 0; i < EMAC_NUM_CORE_IRQ; i++) {

	for (i = 0; i < EMAC_NUM_IRQ; i++) {

		struct emac_irq_info *irq_info = &adpt->irq_info[i];

		if (irq_info->irq == 0)

			continue;



		retval = request_irq(irq_info->irq, irq_info->handler,

				     0, irq_info->name, irq_info);

		if (retval) {

			emac_err(adpt, "Unable to allocate interrupt %d: %d\n",

				 irq_info->irq, retval);

			while (--i >= 0)

				if (adpt->irq_info[i].irq)

					free_irq(adpt->irq_info[i].irq,

						 &adpt->irq_info[i]);

			goto err_request_irq;
@@ -1436,7 +1453,9 @@ static void emac_down(struct emac_adapter *adpt, u32 ctrl) 


	emac_disable_intr(adpt);

	emac_napi_disable_all(adpt);

	for (i = 0; i < EMAC_NUM_CORE_IRQ; i++)



	for (i = 0; i < EMAC_NUM_IRQ; i++)

		if (adpt->irq_info[i].irq)

			free_irq(adpt->irq_info[i].irq, &adpt->irq_info[i]);



	for (i = 0; i < EMAC_NUM_GPIO; i++)
@@ -1449,6 +1468,7 @@ static void emac_down(struct emac_adapter *adpt, u32 ctrl) 
	if (ctrl & EMAC_HW_CTRL_RESET_MAC)

		emac_hw_reset_mac(hw);



	pm_runtime_put_noidle(netdev->dev.parent);

	adpt->hw.link_speed = EMAC_LINK_SPEED_UNKNOWN;

	emac_clean_all_tx_queues(adpt);

	emac_clean_all_rx_queues(adpt);
@@ -1469,6 +1489,9 @@ static int emac_open(struct net_device *netdev) 
		goto err_alloc_rtx;

	}



	pm_runtime_set_active(netdev->dev.parent);

	pm_runtime_enable(netdev->dev.parent);



	retval = emac_up(adpt);

	if (retval)

		goto err_up;
@@ -1491,6 +1514,7 @@ static int emac_close(struct net_device *netdev) 
	while (CHK_AND_SET_ADPT_FLAG(STATE_RESETTING))

		msleep(20); /* Reset might take few 10s of ms */



	pm_runtime_disable(netdev->dev.parent);

	if (!CHK_ADPT_FLAG(STATE_DOWN))

		emac_down(adpt, EMAC_HW_CTRL_RESET_MAC);

	else
@@ -1711,19 +1735,20 @@ static void emac_link_task_routine(struct emac_adapter *adpt) 
	emac_check_phy_link(hw, &hw->link_speed, &hw->link_up);

	link_desc = emac_get_link_speed_desc(hw->link_speed);



	if (!hw->link_up && time_after(adpt->link_jiffies, jiffies))

		SET_ADPT_FLAG(TASK_LSC_REQ);



	if (hw->link_up) {

		if (netif_carrier_ok(netdev))

			goto link_task_done;



		pm_runtime_get_sync(netdev->dev.parent);

		emac_info(adpt, timer, "NIC Link is Up %s\n", link_desc);



		emac_hw_start_mac(hw);

		netif_carrier_on(netdev);

		netif_wake_queue(netdev);

	} else {

		if (time_after(adpt->link_jiffies, jiffies))

			SET_ADPT_FLAG(TASK_LSC_REQ);



		/* only continue if link was up previously */

		if (!netif_carrier_ok(netdev))

			goto link_task_done;
@@ -1734,8 +1759,12 @@ static void emac_link_task_routine(struct emac_adapter *adpt) 
		netif_carrier_off(netdev);



		emac_hw_stop_mac(hw);

		pm_runtime_put_sync(netdev->dev.parent);

	}



	/* link state transition, kick timer */

	mod_timer(&adpt->emac_timer, jiffies);



link_task_done:

	CLI_ADPT_FLAG(STATE_RESETTING);

}
@@ -1762,6 +1791,9 @@ static void emac_timer_routine(unsigned long data) 
	struct emac_adapter *adpt = (struct emac_adapter *)data;

	unsigned long delay;



	if (pm_runtime_status_suspended(adpt->netdev->dev.parent))

		return;



	/* poll faster when waiting for link */

	if (CHK_ADPT_FLAG(TASK_LSC_REQ))

		delay = HZ / 10;
@@ -1963,18 +1995,54 @@ static void emac_init_adapter(struct emac_adapter *adpt) 
		emac_ptp_init(hw);

}



#ifdef CONFIG_PM

static int emac_shutdown_internal(struct platform_device *pdev, bool *wakeup)

#ifdef CONFIG_PM_RUNTIME

static int emac_runtime_suspend(struct device *device)

{

	struct platform_device *pdev = to_platform_device(device);

	struct net_device *netdev = dev_get_drvdata(&pdev->dev);

	struct emac_adapter *adpt = netdev_priv(netdev);

	struct emac_hw *hw = &adpt->hw;

	u32 wufc = adpt->wol;

	u16 lpa, i;



	/* clear phy interrupt */

	emac_hw_ack_phy_intr(hw);



	emac_hw_config_pow_save(hw, adpt->hw.link_speed, !!wufc,

				!!(wufc & EMAC_WOL_MAGIC));

	return 0;

}



static int emac_runtime_idle(struct device *device)

{

	struct platform_device *pdev = to_platform_device(device);

	struct net_device *netdev = dev_get_drvdata(&pdev->dev);



	/* schedule to enter runtime suspend state if the link does

	   not come back up within the specified time

	*/

	pm_schedule_suspend(netdev->dev.parent,

			    jiffies_to_msecs(EMAC_TRY_LINK_TIMEOUT));

	return -EBUSY;

}

#endif /* CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM_SLEEP

static int emac_suspend(struct device *device)

{

	struct platform_device *pdev = to_platform_device(device);

	struct net_device *netdev = dev_get_drvdata(&pdev->dev);

	struct emac_adapter *adpt = netdev_priv(netdev);

	struct emac_hw *hw = &adpt->hw;

	u32 wufc = adpt->wol;

	u16 i;

	u32 speed, adv_speed;

	bool link_up;

	bool link_up = false;

	int retval = 0;



	/* cannot suspend if WOL is disabled */

	if (!adpt->irq_info[EMAC_WOL_IRQ].irq)

		return -EPERM;



	netif_device_detach(netdev);

	if (netif_running(netdev)) {

		/* ensure no task is running and no reset is in progress */
@@ -1989,25 +2057,15 @@ static int emac_shutdown_internal(struct platform_device *pdev, bool *wakeup) 
	emac_check_phy_link(hw, &speed, &link_up);



	if (link_up) {

		retval = emac_read_phy_reg(hw, MII_LPA, &lpa);

		if (retval)

			return retval;



		adv_speed = EMAC_LINK_SPEED_10_HALF;

		if (lpa & LPA_10FULL)

			adv_speed = EMAC_LINK_SPEED_10_FULL;

		else if (lpa & LPA_10HALF)

		adv_speed = EMAC_LINK_SPEED_10_HALF;

		else if (lpa & LPA_100FULL)

			adv_speed = EMAC_LINK_SPEED_100_FULL;

		else if (lpa & LPA_100HALF)

			adv_speed = EMAC_LINK_SPEED_100_HALF;

		emac_hw_get_lpa_speed(hw, &adv_speed);



		retval = emac_setup_phy_link(hw, adv_speed, true,

					     !hw->disable_fc_autoneg);

		if (retval)

			return retval;



		link_up = false;

		for (i = 0; i < EMAC_MAX_SETUP_LNK_CYCLE; i++) {

			retval = emac_check_phy_link(hw, &speed, &link_up);

			if ((!retval) && link_up)
@@ -2016,41 +2074,28 @@ static int emac_shutdown_internal(struct platform_device *pdev, bool *wakeup) 
			/* link can take upto few seconds to come up */

			msleep(100);

		}

	} else {

		speed = EMAC_LINK_SPEED_10_HALF;

		link_up = false;

	}



	if (!link_up)

		speed = EMAC_LINK_SPEED_10_HALF;



	hw->link_speed = speed;

	hw->link_up = link_up;



	retval = emac_hw_config_wol(hw, wufc);

	if (retval)

		return retval;



	/* clear phy interrupt */

	retval = emac_hw_ack_phy_intr(hw);

	if (retval)

		return retval;



	retval = emac_hw_config_pow_save(hw, adpt->hw.link_speed,

			(wufc ? true : false), false,

			(wufc & EMAC_WOL_MAGIC ? true : false));

	if (retval)

		return retval;



	*wakeup = wufc ? true : false;

	emac_hw_config_wol(hw, wufc);

	emac_hw_config_pow_save(hw, adpt->hw.link_speed, !!wufc,

				!!(wufc & EMAC_WOL_MAGIC));

	return 0;

}



static int emac_suspend(struct platform_device *pdev, pm_message_t state)

{

	bool wakeup;



	return emac_shutdown_internal(pdev, &wakeup);

}



static int emac_resume(struct platform_device *pdev)

static int emac_resume(struct device *device)

{

	struct platform_device *pdev = to_platform_device(device);

	struct net_device *netdev = dev_get_drvdata(&pdev->dev);

	struct emac_adapter *adpt = netdev_priv(netdev);

	struct emac_hw *hw = &adpt->hw;
@@ -2063,10 +2108,7 @@ static int emac_resume(struct platform_device *pdev) 
	if (retval)

		return retval;



	retval = emac_hw_config_wol(hw, 0);

	if (retval)

		return retval;



	emac_hw_config_wol(hw, 0);

	if (netif_running(netdev)) {

		retval = emac_up(adpt);

		if (retval)
@@ -2090,11 +2132,16 @@ static int emac_get_resources(struct platform_device *pdev, 
	char *res_name[NUM_EMAC_REG_BASES] = {"emac", "emac_csr", "emac_1588"};



	/* get irqs */

	for (i = 0; i < EMAC_NUM_CORE_IRQ; i++) {

	for (i = 0; i < EMAC_NUM_IRQ; i++) {

		struct emac_irq_info *irq_info = &adpt->irq_info[i];

		retval = platform_get_irq_byname(pdev, irq_info->name);

		if (retval < 0)

			goto err_res;

		if (retval < 0) {

			/* If WOL IRQ is not specified, WOL is disabled */

			if (i == EMAC_WOL_IRQ)

				continue;

			else

				return retval;

		}



		irq_info->irq = retval;

	}
@@ -2186,6 +2233,7 @@ static int emac_probe(struct platform_device *pdev) 
		adpt->irq_info[i].adpt = adpt;

		adpt->irq_info[i].rxque = &adpt->rx_queue[i];

	}

	adpt->irq_info[EMAC_WOL_IRQ].adpt = adpt;



	hw->phy_addr = 0;

	adpt->tstamp_en = true;
@@ -2301,16 +2349,25 @@ static int emac_remove(struct platform_device *pdev) 
	return 0;

}



static const struct dev_pm_ops emac_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(

		emac_suspend,

		emac_resume

	)

	SET_RUNTIME_PM_OPS(

		emac_runtime_suspend,

		NULL,

		emac_runtime_idle

	)

};



static struct platform_driver emac_platform_driver = {

	.probe   = emac_probe,

	.remove  = __devexit_p(emac_remove),

#ifdef CONFIG_PM

	.suspend = emac_suspend,

	.resume  = emac_resume,

#endif

	.driver = {

		.owner = THIS_MODULE,

		.name	= "msm_emac"

		.name	= "msm_emac",

		.pm = &emac_pm_ops,

	},

};