Merge branch 'Macb-power-management-support-for-ZynqMP'
Harini Katakam says: ==================== Macb power management support for ZynqMP This series adds support for macb suspend/resume with system power down. In relation to the above, this series also updates mdio_read/write function for PM and adds tsu clock management. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
c21e18a550
|
|
@ -715,6 +715,8 @@
|
|||
__v; \
|
||||
})
|
||||
|
||||
#define MACB_READ_NSR(bp) macb_readl(bp, NSR)
|
||||
|
||||
/* struct macb_dma_desc - Hardware DMA descriptor
|
||||
* @addr: DMA address of data buffer
|
||||
* @ctrl: Control and status bits
|
||||
|
|
@ -1083,7 +1085,7 @@ struct macb_config {
|
|||
unsigned int dma_burst_length;
|
||||
int (*clk_init)(struct platform_device *pdev, struct clk **pclk,
|
||||
struct clk **hclk, struct clk **tx_clk,
|
||||
struct clk **rx_clk);
|
||||
struct clk **rx_clk, struct clk **tsu_clk);
|
||||
int (*init)(struct platform_device *pdev);
|
||||
int jumbo_max_len;
|
||||
};
|
||||
|
|
@ -1163,6 +1165,7 @@ struct macb {
|
|||
struct clk *hclk;
|
||||
struct clk *tx_clk;
|
||||
struct clk *rx_clk;
|
||||
struct clk *tsu_clk;
|
||||
struct net_device *dev;
|
||||
union {
|
||||
struct macb_stats macb;
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
#include <linux/ip.h>
|
||||
#include <linux/udp.h>
|
||||
#include <linux/tcp.h>
|
||||
#include <linux/iopoll.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include "macb.h"
|
||||
|
||||
#define MACB_RX_BUFFER_SIZE 128
|
||||
|
|
@ -79,6 +81,10 @@
|
|||
*/
|
||||
#define MACB_HALT_TIMEOUT 1230
|
||||
|
||||
#define MACB_PM_TIMEOUT 100 /* ms */
|
||||
|
||||
#define MACB_MDIO_TIMEOUT 1000000 /* in usecs */
|
||||
|
||||
/* DMA buffer descriptor might be different size
|
||||
* depends on hardware configuration:
|
||||
*
|
||||
|
|
@ -318,10 +324,26 @@ static void macb_get_hwaddr(struct macb *bp)
|
|||
eth_hw_addr_random(bp->dev);
|
||||
}
|
||||
|
||||
static int macb_mdio_wait_for_idle(struct macb *bp)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
return readx_poll_timeout(MACB_READ_NSR, bp, val, val & MACB_BIT(IDLE),
|
||||
1, MACB_MDIO_TIMEOUT);
|
||||
}
|
||||
|
||||
static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
|
||||
{
|
||||
struct macb *bp = bus->priv;
|
||||
int value;
|
||||
int status;
|
||||
|
||||
status = pm_runtime_get_sync(&bp->pdev->dev);
|
||||
if (status < 0)
|
||||
goto mdio_pm_exit;
|
||||
|
||||
status = macb_mdio_wait_for_idle(bp);
|
||||
if (status < 0)
|
||||
goto mdio_read_exit;
|
||||
|
||||
macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)
|
||||
| MACB_BF(RW, MACB_MAN_READ)
|
||||
|
|
@ -329,19 +351,32 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
|
|||
| MACB_BF(REGA, regnum)
|
||||
| MACB_BF(CODE, MACB_MAN_CODE)));
|
||||
|
||||
/* wait for end of transfer */
|
||||
while (!MACB_BFEXT(IDLE, macb_readl(bp, NSR)))
|
||||
cpu_relax();
|
||||
status = macb_mdio_wait_for_idle(bp);
|
||||
if (status < 0)
|
||||
goto mdio_read_exit;
|
||||
|
||||
value = MACB_BFEXT(DATA, macb_readl(bp, MAN));
|
||||
status = MACB_BFEXT(DATA, macb_readl(bp, MAN));
|
||||
|
||||
return value;
|
||||
mdio_read_exit:
|
||||
pm_runtime_mark_last_busy(&bp->pdev->dev);
|
||||
pm_runtime_put_autosuspend(&bp->pdev->dev);
|
||||
mdio_pm_exit:
|
||||
return status;
|
||||
}
|
||||
|
||||
static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
|
||||
u16 value)
|
||||
{
|
||||
struct macb *bp = bus->priv;
|
||||
int status;
|
||||
|
||||
status = pm_runtime_get_sync(&bp->pdev->dev);
|
||||
if (status < 0)
|
||||
goto mdio_pm_exit;
|
||||
|
||||
status = macb_mdio_wait_for_idle(bp);
|
||||
if (status < 0)
|
||||
goto mdio_write_exit;
|
||||
|
||||
macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)
|
||||
| MACB_BF(RW, MACB_MAN_WRITE)
|
||||
|
|
@ -350,11 +385,15 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
|
|||
| MACB_BF(CODE, MACB_MAN_CODE)
|
||||
| MACB_BF(DATA, value)));
|
||||
|
||||
/* wait for end of transfer */
|
||||
while (!MACB_BFEXT(IDLE, macb_readl(bp, NSR)))
|
||||
cpu_relax();
|
||||
status = macb_mdio_wait_for_idle(bp);
|
||||
if (status < 0)
|
||||
goto mdio_write_exit;
|
||||
|
||||
return 0;
|
||||
mdio_write_exit:
|
||||
pm_runtime_mark_last_busy(&bp->pdev->dev);
|
||||
pm_runtime_put_autosuspend(&bp->pdev->dev);
|
||||
mdio_pm_exit:
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -2397,12 +2436,18 @@ static int macb_open(struct net_device *dev)
|
|||
|
||||
netdev_dbg(bp->dev, "open\n");
|
||||
|
||||
err = pm_runtime_get_sync(&bp->pdev->dev);
|
||||
if (err < 0)
|
||||
goto pm_exit;
|
||||
|
||||
/* carrier starts down */
|
||||
netif_carrier_off(dev);
|
||||
|
||||
/* if the phy is not yet register, retry later*/
|
||||
if (!dev->phydev)
|
||||
return -EAGAIN;
|
||||
if (!dev->phydev) {
|
||||
err = -EAGAIN;
|
||||
goto pm_exit;
|
||||
}
|
||||
|
||||
/* RX buffers initialization */
|
||||
macb_init_rx_buffer_size(bp, bufsz);
|
||||
|
|
@ -2411,7 +2456,7 @@ static int macb_open(struct net_device *dev)
|
|||
if (err) {
|
||||
netdev_err(dev, "Unable to allocate DMA memory (error %d)\n",
|
||||
err);
|
||||
return err;
|
||||
goto pm_exit;
|
||||
}
|
||||
|
||||
bp->macbgem_ops.mog_init_rings(bp);
|
||||
|
|
@ -2428,6 +2473,11 @@ static int macb_open(struct net_device *dev)
|
|||
if (bp->ptp_info)
|
||||
bp->ptp_info->ptp_init(dev);
|
||||
|
||||
pm_exit:
|
||||
if (err) {
|
||||
pm_runtime_put_sync(&bp->pdev->dev);
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2456,6 +2506,8 @@ static int macb_close(struct net_device *dev)
|
|||
if (bp->ptp_info)
|
||||
bp->ptp_info->ptp_remove(dev);
|
||||
|
||||
pm_runtime_put(&bp->pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -3304,7 +3356,7 @@ static void macb_probe_queues(void __iomem *mem,
|
|||
|
||||
static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
|
||||
struct clk **hclk, struct clk **tx_clk,
|
||||
struct clk **rx_clk)
|
||||
struct clk **rx_clk, struct clk **tsu_clk)
|
||||
{
|
||||
struct macb_platform_data *pdata;
|
||||
int err;
|
||||
|
|
@ -3338,6 +3390,10 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
|
|||
if (IS_ERR(*rx_clk))
|
||||
*rx_clk = NULL;
|
||||
|
||||
*tsu_clk = devm_clk_get(&pdev->dev, "tsu_clk");
|
||||
if (IS_ERR(*tsu_clk))
|
||||
*tsu_clk = NULL;
|
||||
|
||||
err = clk_prepare_enable(*pclk);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "failed to enable pclk (%u)\n", err);
|
||||
|
|
@ -3362,8 +3418,17 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,
|
|||
goto err_disable_txclk;
|
||||
}
|
||||
|
||||
err = clk_prepare_enable(*tsu_clk);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "failed to enable tsu_clk (%u)\n", err);
|
||||
goto err_disable_rxclk;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_disable_rxclk:
|
||||
clk_disable_unprepare(*rx_clk);
|
||||
|
||||
err_disable_txclk:
|
||||
clk_disable_unprepare(*tx_clk);
|
||||
|
||||
|
|
@ -3814,13 +3879,14 @@ static const struct net_device_ops at91ether_netdev_ops = {
|
|||
|
||||
static int at91ether_clk_init(struct platform_device *pdev, struct clk **pclk,
|
||||
struct clk **hclk, struct clk **tx_clk,
|
||||
struct clk **rx_clk)
|
||||
struct clk **rx_clk, struct clk **tsu_clk)
|
||||
{
|
||||
int err;
|
||||
|
||||
*hclk = NULL;
|
||||
*tx_clk = NULL;
|
||||
*rx_clk = NULL;
|
||||
*tsu_clk = NULL;
|
||||
|
||||
*pclk = devm_clk_get(&pdev->dev, "ether_clk");
|
||||
if (IS_ERR(*pclk))
|
||||
|
|
@ -3971,11 +4037,12 @@ static int macb_probe(struct platform_device *pdev)
|
|||
{
|
||||
const struct macb_config *macb_config = &default_gem_config;
|
||||
int (*clk_init)(struct platform_device *, struct clk **,
|
||||
struct clk **, struct clk **, struct clk **)
|
||||
= macb_config->clk_init;
|
||||
struct clk **, struct clk **, struct clk **,
|
||||
struct clk **) = macb_config->clk_init;
|
||||
int (*init)(struct platform_device *) = macb_config->init;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;
|
||||
struct clk *tsu_clk = NULL;
|
||||
unsigned int queue_mask, num_queues;
|
||||
struct macb_platform_data *pdata;
|
||||
bool native_io;
|
||||
|
|
@ -4003,10 +4070,15 @@ static int macb_probe(struct platform_device *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk);
|
||||
err = clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
pm_runtime_set_autosuspend_delay(&pdev->dev, MACB_PM_TIMEOUT);
|
||||
pm_runtime_use_autosuspend(&pdev->dev);
|
||||
pm_runtime_get_noresume(&pdev->dev);
|
||||
pm_runtime_set_active(&pdev->dev);
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
native_io = hw_is_native_io(mem);
|
||||
|
||||
macb_probe_queues(mem, native_io, &queue_mask, &num_queues);
|
||||
|
|
@ -4040,6 +4112,7 @@ static int macb_probe(struct platform_device *pdev)
|
|||
bp->hclk = hclk;
|
||||
bp->tx_clk = tx_clk;
|
||||
bp->rx_clk = rx_clk;
|
||||
bp->tsu_clk = tsu_clk;
|
||||
if (macb_config)
|
||||
bp->jumbo_max_len = macb_config->jumbo_max_len;
|
||||
|
||||
|
|
@ -4141,6 +4214,9 @@ static int macb_probe(struct platform_device *pdev)
|
|||
macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),
|
||||
dev->base_addr, dev->irq, dev->dev_addr);
|
||||
|
||||
pm_runtime_mark_last_busy(&bp->pdev->dev);
|
||||
pm_runtime_put_autosuspend(&bp->pdev->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
err_out_unregister_mdio:
|
||||
|
|
@ -4159,6 +4235,10 @@ static int macb_probe(struct platform_device *pdev)
|
|||
clk_disable_unprepare(hclk);
|
||||
clk_disable_unprepare(pclk);
|
||||
clk_disable_unprepare(rx_clk);
|
||||
clk_disable_unprepare(tsu_clk);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
pm_runtime_dont_use_autosuspend(&pdev->dev);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
@ -4182,10 +4262,16 @@ static int macb_remove(struct platform_device *pdev)
|
|||
mdiobus_free(bp->mii_bus);
|
||||
|
||||
unregister_netdev(dev);
|
||||
clk_disable_unprepare(bp->tx_clk);
|
||||
clk_disable_unprepare(bp->hclk);
|
||||
clk_disable_unprepare(bp->pclk);
|
||||
clk_disable_unprepare(bp->rx_clk);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_dont_use_autosuspend(&pdev->dev);
|
||||
if (!pm_runtime_suspended(&pdev->dev)) {
|
||||
clk_disable_unprepare(bp->tx_clk);
|
||||
clk_disable_unprepare(bp->hclk);
|
||||
clk_disable_unprepare(bp->pclk);
|
||||
clk_disable_unprepare(bp->rx_clk);
|
||||
clk_disable_unprepare(bp->tsu_clk);
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
}
|
||||
of_node_put(bp->phy_node);
|
||||
free_netdev(dev);
|
||||
}
|
||||
|
|
@ -4197,21 +4283,36 @@ static int __maybe_unused macb_suspend(struct device *dev)
|
|||
{
|
||||
struct net_device *netdev = dev_get_drvdata(dev);
|
||||
struct macb *bp = netdev_priv(netdev);
|
||||
struct macb_queue *queue = bp->queues;
|
||||
unsigned long flags;
|
||||
unsigned int q;
|
||||
|
||||
if (!netif_running(netdev))
|
||||
return 0;
|
||||
|
||||
netif_carrier_off(netdev);
|
||||
netif_device_detach(netdev);
|
||||
|
||||
if (bp->wol & MACB_WOL_ENABLED) {
|
||||
macb_writel(bp, IER, MACB_BIT(WOL));
|
||||
macb_writel(bp, WOL, MACB_BIT(MAG));
|
||||
enable_irq_wake(bp->queues[0].irq);
|
||||
netif_device_detach(netdev);
|
||||
} else {
|
||||
clk_disable_unprepare(bp->tx_clk);
|
||||
clk_disable_unprepare(bp->hclk);
|
||||
clk_disable_unprepare(bp->pclk);
|
||||
clk_disable_unprepare(bp->rx_clk);
|
||||
netif_device_detach(netdev);
|
||||
for (q = 0, queue = bp->queues; q < bp->num_queues;
|
||||
++q, ++queue)
|
||||
napi_disable(&queue->napi);
|
||||
phy_stop(netdev->phydev);
|
||||
phy_suspend(netdev->phydev);
|
||||
spin_lock_irqsave(&bp->lock, flags);
|
||||
macb_reset_hw(bp);
|
||||
spin_unlock_irqrestore(&bp->lock, flags);
|
||||
}
|
||||
|
||||
netif_carrier_off(netdev);
|
||||
if (bp->ptp_info)
|
||||
bp->ptp_info->ptp_remove(netdev);
|
||||
pm_runtime_force_suspend(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -4219,24 +4320,76 @@ static int __maybe_unused macb_resume(struct device *dev)
|
|||
{
|
||||
struct net_device *netdev = dev_get_drvdata(dev);
|
||||
struct macb *bp = netdev_priv(netdev);
|
||||
struct macb_queue *queue = bp->queues;
|
||||
unsigned int q;
|
||||
|
||||
if (!netif_running(netdev))
|
||||
return 0;
|
||||
|
||||
pm_runtime_force_resume(dev);
|
||||
|
||||
if (bp->wol & MACB_WOL_ENABLED) {
|
||||
macb_writel(bp, IDR, MACB_BIT(WOL));
|
||||
macb_writel(bp, WOL, 0);
|
||||
disable_irq_wake(bp->queues[0].irq);
|
||||
} else {
|
||||
macb_writel(bp, NCR, MACB_BIT(MPE));
|
||||
for (q = 0, queue = bp->queues; q < bp->num_queues;
|
||||
++q, ++queue)
|
||||
napi_enable(&queue->napi);
|
||||
phy_resume(netdev->phydev);
|
||||
phy_init_hw(netdev->phydev);
|
||||
phy_start(netdev->phydev);
|
||||
}
|
||||
|
||||
bp->macbgem_ops.mog_init_rings(bp);
|
||||
macb_init_hw(bp);
|
||||
macb_set_rx_mode(netdev);
|
||||
netif_device_attach(netdev);
|
||||
if (bp->ptp_info)
|
||||
bp->ptp_info->ptp_init(netdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused macb_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *netdev = platform_get_drvdata(pdev);
|
||||
struct macb *bp = netdev_priv(netdev);
|
||||
|
||||
if (!(device_may_wakeup(&bp->dev->dev))) {
|
||||
clk_disable_unprepare(bp->tx_clk);
|
||||
clk_disable_unprepare(bp->hclk);
|
||||
clk_disable_unprepare(bp->pclk);
|
||||
clk_disable_unprepare(bp->rx_clk);
|
||||
}
|
||||
clk_disable_unprepare(bp->tsu_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused macb_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct net_device *netdev = platform_get_drvdata(pdev);
|
||||
struct macb *bp = netdev_priv(netdev);
|
||||
|
||||
if (!(device_may_wakeup(&bp->dev->dev))) {
|
||||
clk_prepare_enable(bp->pclk);
|
||||
clk_prepare_enable(bp->hclk);
|
||||
clk_prepare_enable(bp->tx_clk);
|
||||
clk_prepare_enable(bp->rx_clk);
|
||||
}
|
||||
|
||||
netif_device_attach(netdev);
|
||||
clk_prepare_enable(bp->tsu_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume);
|
||||
static const struct dev_pm_ops macb_pm_ops = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(macb_suspend, macb_resume)
|
||||
SET_RUNTIME_PM_OPS(macb_runtime_suspend, macb_runtime_resume, NULL)
|
||||
};
|
||||
|
||||
static struct platform_driver macb_driver = {
|
||||
.probe = macb_probe,
|
||||
|
|
|
|||
Loading…
Reference in New Issue