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

net: ethernet: davinci_emac: add pm_runtime support

Browse Source 
Add pm_runtime support to the TI Davinci EMAC driver.

CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mark A. Greer 2012-07-20 15:19:22 +00:00 committed by David S. Miller
parent c6f0b4ea64
commit 3ba9738134
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/net/ethernet/ti/davinci_emac.c
View File

@ -57,6 +57,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/pm_runtime.h>
#include <linux/davinci_emac.h> #include <linux/davinci_emac.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
@ -353,10 +354,6 @@ struct emac_priv {
void (*int_disable) (void); void (*int_disable) (void);
}; };
/* clock frequency for EMAC */
static struct clk *emac_clk;
static unsigned long emac_bus_frequency;
/* EMAC TX Host Error description strings */ /* EMAC TX Host Error description strings */
static char *emac_txhost_errcodes[16] = { static char *emac_txhost_errcodes[16] = {
"No error", "SOP error", "Ownership bit not set in SOP buffer", "No error", "SOP error", "Ownership bit not set in SOP buffer",
@ -1540,6 +1537,8 @@ static int emac_dev_open(struct net_device *ndev)
int k = 0; int k = 0;
struct emac_priv *priv = netdev_priv(ndev); struct emac_priv *priv = netdev_priv(ndev);
pm_runtime_get(&priv->pdev->dev);
netif_carrier_off(ndev); netif_carrier_off(ndev);
for (cnt = 0; cnt < ETH_ALEN; cnt++) for (cnt = 0; cnt < ETH_ALEN; cnt++)
ndev->dev_addr[cnt] = priv->mac_addr[cnt]; ndev->dev_addr[cnt] = priv->mac_addr[cnt];
@ -1609,7 +1608,7 @@ static int emac_dev_open(struct net_device *ndev)
priv->phy_id); priv->phy_id);
ret = PTR_ERR(priv->phydev); ret = PTR_ERR(priv->phydev);
priv->phydev = NULL; priv->phydev = NULL;
return ret; goto err;
} }
priv->link = 0; priv->link = 0;
@ -1650,7 +1649,11 @@ rollback:
res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1); res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1);
m = res->end; m = res->end;
} }
return -EBUSY;
ret = -EBUSY;
err:
pm_runtime_put(&priv->pdev->dev);
return ret;
} }
/** /**
@ -1692,6 +1695,7 @@ static int emac_dev_stop(struct net_device *ndev)
if (netif_msg_drv(priv)) if (netif_msg_drv(priv))
dev_notice(emac_dev, "DaVinci EMAC: %s stopped\n", ndev->name); dev_notice(emac_dev, "DaVinci EMAC: %s stopped\n", ndev->name);
pm_runtime_put(&priv->pdev->dev);
return 0; return 0;
} }
@ -1856,6 +1860,9 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
struct emac_platform_data *pdata; struct emac_platform_data *pdata;
struct device *emac_dev; struct device *emac_dev;
struct cpdma_params dma_params; struct cpdma_params dma_params;
struct clk *emac_clk;
unsigned long emac_bus_frequency;
/* obtain emac clock from kernel */ /* obtain emac clock from kernel */
emac_clk = clk_get(&pdev->dev, NULL); emac_clk = clk_get(&pdev->dev, NULL);
@ -1864,12 +1871,14 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
return -EBUSY; return -EBUSY;
} }
emac_bus_frequency = clk_get_rate(emac_clk); emac_bus_frequency = clk_get_rate(emac_clk);
clk_put(emac_clk);
/* TODO: Probe PHY here if possible */ /* TODO: Probe PHY here if possible */
ndev = alloc_etherdev(sizeof(struct emac_priv)); ndev = alloc_etherdev(sizeof(struct emac_priv));
if (!ndev) { if (!ndev) {
rc = -ENOMEM; rc = -ENOMEM;
goto free_clk; goto no_ndev;
} }
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
@ -1985,15 +1994,13 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
SET_ETHTOOL_OPS(ndev, &ethtool_ops); SET_ETHTOOL_OPS(ndev, &ethtool_ops);
netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT); netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
clk_enable(emac_clk);
/* register the network device */ /* register the network device */
SET_NETDEV_DEV(ndev, &pdev->dev); SET_NETDEV_DEV(ndev, &pdev->dev);
rc = register_netdev(ndev); rc = register_netdev(ndev);
if (rc) { if (rc) {
dev_err(&pdev->dev, "error in register_netdev\n"); dev_err(&pdev->dev, "error in register_netdev\n");
rc = -ENODEV; rc = -ENODEV;
goto netdev_reg_err; goto no_irq_res;
} }
@ -2002,10 +2009,12 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
"(regs: %p, irq: %d)\n", "(regs: %p, irq: %d)\n",
(void *)priv->emac_base_phys, ndev->irq); (void *)priv->emac_base_phys, ndev->irq);
} }
pm_runtime_enable(&pdev->dev);
pm_runtime_resume(&pdev->dev);
return 0; return 0;
netdev_reg_err:
clk_disable(emac_clk);
no_irq_res: no_irq_res:
if (priv->txchan) if (priv->txchan)
cpdma_chan_destroy(priv->txchan); cpdma_chan_destroy(priv->txchan);
@ -2019,8 +2028,7 @@ no_dma:
probe_quit: probe_quit:
free_netdev(ndev); free_netdev(ndev);
free_clk: no_ndev:
clk_put(emac_clk);
return rc; return rc;
} }
@ -2054,9 +2062,6 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev)
iounmap(priv->remap_addr); iounmap(priv->remap_addr);
free_netdev(ndev); free_netdev(ndev);
clk_disable(emac_clk);
clk_put(emac_clk);
return 0; return 0;
} }
@ -2068,8 +2073,6 @@ static int davinci_emac_suspend(struct device *dev)
if (netif_running(ndev)) if (netif_running(ndev))
emac_dev_stop(ndev); emac_dev_stop(ndev);
clk_disable(emac_clk);
return 0; return 0;
} }
@ -2078,8 +2081,6 @@ static int davinci_emac_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
clk_enable(emac_clk);
if (netif_running(ndev)) if (netif_running(ndev))
emac_dev_open(ndev); emac_dev_open(ndev);