mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
net: ethernet: ti: am65-cpsw: Add suspend/resume support
Add PM handlers for System suspend/resume. As DMA driver doesn't yet support suspend/resume we free up the DMA channels at suspend and acquire and initialize them at resume. Move the init/free dma calls to ndo_open/close() hooks so it is symmetric and easier to invoke from suspend/resume handler. As CPTS looses contect during suspend/resume, invoke the necessary CPTS suspend/resume helpers. Signed-off-by: Roger Quadros <rogerq@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roger Quadros
David S. Miller
parent
cef122d4cf
commit
fd23df72f2
1 changed files with 166 additions and 55 deletions
|
|
@ -24,6 +24,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/sys_soc.h>
|
||||
#include <linux/dma/ti-cppi5.h>
|
||||
|
|
@ -132,6 +133,11 @@
|
|||
NETIF_MSG_IFUP | NETIF_MSG_PROBE | NETIF_MSG_IFDOWN | \
|
||||
NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
|
||||
|
||||
static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common);
|
||||
static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common);
|
||||
static void am65_cpsw_nuss_free_tx_chns(struct am65_cpsw_common *common);
|
||||
static void am65_cpsw_nuss_free_rx_chns(struct am65_cpsw_common *common);
|
||||
|
||||
static void am65_cpsw_port_set_sl_mac(struct am65_cpsw_port *slave,
|
||||
const u8 *dev_addr)
|
||||
{
|
||||
|
|
@ -373,6 +379,20 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
if (common->usage_count)
|
||||
return 0;
|
||||
|
||||
/* init tx/rx channels */
|
||||
ret = am65_cpsw_nuss_init_tx_chns(common);
|
||||
if (ret) {
|
||||
dev_err(common->dev, "init_tx_chns failed\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = am65_cpsw_nuss_init_rx_chns(common);
|
||||
if (ret) {
|
||||
dev_err(common->dev, "init_rx_chns failed\n");
|
||||
am65_cpsw_nuss_free_tx_chns(common);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Control register */
|
||||
writel(AM65_CPSW_CTL_P0_ENABLE | AM65_CPSW_CTL_P0_TX_CRC_REMOVE |
|
||||
AM65_CPSW_CTL_VLAN_AWARE | AM65_CPSW_CTL_P0_RX_PAD,
|
||||
|
|
@ -401,6 +421,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
/* disable priority elevation */
|
||||
writel(0, common->cpsw_base + AM65_CPSW_REG_PTYPE);
|
||||
|
||||
cpsw_ale_control_set(common->ale, 0, ALE_CLEAR, 1);
|
||||
cpsw_ale_start(common->ale);
|
||||
|
||||
/* limit to one RX flow only */
|
||||
|
|
@ -432,7 +453,8 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
GFP_KERNEL);
|
||||
if (!skb) {
|
||||
dev_err(common->dev, "cannot allocate skb\n");
|
||||
return -ENOMEM;
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = am65_cpsw_nuss_rx_push(common, skb);
|
||||
|
|
@ -441,7 +463,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
"cannot submit skb to channel rx, error %d\n",
|
||||
ret);
|
||||
kfree_skb(skb);
|
||||
return ret;
|
||||
goto err;
|
||||
}
|
||||
kmemleak_not_leak(skb);
|
||||
}
|
||||
|
|
@ -450,7 +472,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
for (i = 0; i < common->tx_ch_num; i++) {
|
||||
ret = k3_udma_glue_enable_tx_chn(common->tx_chns[i].tx_chn);
|
||||
if (ret)
|
||||
return ret;
|
||||
goto err;
|
||||
napi_enable(&common->tx_chns[i].napi_tx);
|
||||
}
|
||||
|
||||
|
|
@ -462,6 +484,12 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common)
|
|||
|
||||
dev_dbg(common->dev, "cpsw_nuss started\n");
|
||||
return 0;
|
||||
|
||||
err:
|
||||
am65_cpsw_nuss_free_tx_chns(common);
|
||||
am65_cpsw_nuss_free_rx_chns(common);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void am65_cpsw_nuss_tx_cleanup(void *data, dma_addr_t desc_dma);
|
||||
|
|
@ -515,6 +543,9 @@ static int am65_cpsw_nuss_common_stop(struct am65_cpsw_common *common)
|
|||
writel(0, common->cpsw_base + AM65_CPSW_REG_CTL);
|
||||
writel(0, common->cpsw_base + AM65_CPSW_REG_STAT_PORT_EN);
|
||||
|
||||
am65_cpsw_nuss_free_tx_chns(common);
|
||||
am65_cpsw_nuss_free_rx_chns(common);
|
||||
|
||||
dev_dbg(common->dev, "cpsw_nuss stopped\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -555,11 +586,29 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev)
|
|||
struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
|
||||
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
|
||||
int ret, i;
|
||||
u32 reg;
|
||||
int tmo;
|
||||
|
||||
ret = pm_runtime_resume_and_get(common->dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* Idle MAC port */
|
||||
cpsw_sl_ctl_set(port->slave.mac_sl, CPSW_SL_CTL_CMD_IDLE);
|
||||
|
||||
tmo = cpsw_sl_wait_for_idle(port->slave.mac_sl, 100);
|
||||
dev_info(common->dev, "down msc_sl %08x tmo %d\n",
|
||||
cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_MACSTATUS), tmo);
|
||||
|
||||
cpsw_sl_ctl_reset(port->slave.mac_sl);
|
||||
|
||||
/* soft reset MAC */
|
||||
cpsw_sl_reg_write(port->slave.mac_sl, CPSW_SL_SOFT_RESET, 1);
|
||||
mdelay(1);
|
||||
reg = cpsw_sl_reg_read(port->slave.mac_sl, CPSW_SL_SOFT_RESET);
|
||||
if (reg)
|
||||
dev_info(common->dev, "mac reset not yet done\n");
|
||||
|
||||
/* Notify the stack of the actual queue counts. */
|
||||
ret = netif_set_real_num_tx_queues(ndev, common->tx_ch_num);
|
||||
if (ret) {
|
||||
|
|
@ -1491,9 +1540,9 @@ static void am65_cpsw_nuss_slave_disable_unused(struct am65_cpsw_port *port)
|
|||
cpsw_sl_ctl_reset(port->slave.mac_sl);
|
||||
}
|
||||
|
||||
static void am65_cpsw_nuss_free_tx_chns(void *data)
|
||||
static void am65_cpsw_nuss_free_tx_chns(struct am65_cpsw_common *common)
|
||||
{
|
||||
struct am65_cpsw_common *common = data;
|
||||
struct device *dev = common->dev;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < common->tx_ch_num; i++) {
|
||||
|
|
@ -1505,7 +1554,11 @@ static void am65_cpsw_nuss_free_tx_chns(void *data)
|
|||
if (!IS_ERR_OR_NULL(tx_chn->tx_chn))
|
||||
k3_udma_glue_release_tx_chn(tx_chn->tx_chn);
|
||||
|
||||
memset(tx_chn, 0, sizeof(*tx_chn));
|
||||
/* Don't clear tx_chn memory as we need to preserve
|
||||
* data between suspend/resume
|
||||
*/
|
||||
if (!(tx_chn->irq < 0))
|
||||
devm_free_irq(dev, tx_chn->irq, tx_chn);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1514,12 +1567,10 @@ void am65_cpsw_nuss_remove_tx_chns(struct am65_cpsw_common *common)
|
|||
struct device *dev = common->dev;
|
||||
int i;
|
||||
|
||||
devm_remove_action(dev, am65_cpsw_nuss_free_tx_chns, common);
|
||||
|
||||
for (i = 0; i < common->tx_ch_num; i++) {
|
||||
struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i];
|
||||
|
||||
if (tx_chn->irq)
|
||||
if (!(tx_chn->irq < 0))
|
||||
devm_free_irq(dev, tx_chn->irq, tx_chn);
|
||||
|
||||
netif_napi_del(&tx_chn->napi_tx);
|
||||
|
|
@ -1589,7 +1640,7 @@ static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common)
|
|||
}
|
||||
|
||||
tx_chn->irq = k3_udma_glue_tx_get_irq(tx_chn->tx_chn);
|
||||
if (tx_chn->irq <= 0) {
|
||||
if (tx_chn->irq < 0) {
|
||||
dev_err(dev, "Failed to get tx dma irq %d\n",
|
||||
tx_chn->irq);
|
||||
goto err;
|
||||
|
|
@ -1598,25 +1649,36 @@ static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common)
|
|||
snprintf(tx_chn->tx_chn_name,
|
||||
sizeof(tx_chn->tx_chn_name), "%s-tx%d",
|
||||
dev_name(dev), tx_chn->id);
|
||||
|
||||
ret = devm_request_irq(dev, tx_chn->irq,
|
||||
am65_cpsw_nuss_tx_irq,
|
||||
IRQF_TRIGGER_HIGH,
|
||||
tx_chn->tx_chn_name, tx_chn);
|
||||
if (ret) {
|
||||
dev_err(dev, "failure requesting tx%u irq %u, %d\n",
|
||||
tx_chn->id, tx_chn->irq, ret);
|
||||
tx_chn->irq = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
i = devm_add_action(dev, am65_cpsw_nuss_free_tx_chns, common);
|
||||
if (i) {
|
||||
dev_err(dev, "Failed to add free_tx_chns action %d\n", i);
|
||||
return i;
|
||||
}
|
||||
am65_cpsw_nuss_free_tx_chns(common);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void am65_cpsw_nuss_free_rx_chns(void *data)
|
||||
static void am65_cpsw_nuss_free_rx_chns(struct am65_cpsw_common *common)
|
||||
{
|
||||
struct am65_cpsw_common *common = data;
|
||||
struct am65_cpsw_rx_chn *rx_chn;
|
||||
|
||||
rx_chn = &common->rx_chns;
|
||||
|
||||
if (!(rx_chn->irq < 0))
|
||||
devm_free_irq(common->dev, rx_chn->irq, common);
|
||||
|
||||
if (!IS_ERR_OR_NULL(rx_chn->desc_pool))
|
||||
k3_cppi_desc_pool_destroy(rx_chn->desc_pool);
|
||||
|
||||
|
|
@ -1639,7 +1701,7 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)
|
|||
|
||||
rx_cfg.swdata_size = AM65_CPSW_NAV_SW_DATA_SIZE;
|
||||
rx_cfg.flow_id_num = AM65_CPSW_MAX_RX_FLOWS;
|
||||
rx_cfg.flow_id_base = common->rx_flow_id_base;
|
||||
rx_cfg.flow_id_base = -1;
|
||||
|
||||
/* init all flows */
|
||||
rx_chn->dev = dev;
|
||||
|
|
@ -1711,13 +1773,21 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)
|
|||
}
|
||||
}
|
||||
|
||||
err:
|
||||
i = devm_add_action(dev, am65_cpsw_nuss_free_rx_chns, common);
|
||||
if (i) {
|
||||
dev_err(dev, "Failed to add free_rx_chns action %d\n", i);
|
||||
return i;
|
||||
ret = devm_request_irq(dev, rx_chn->irq,
|
||||
am65_cpsw_nuss_rx_irq,
|
||||
IRQF_TRIGGER_HIGH, dev_name(dev), common);
|
||||
if (ret) {
|
||||
dev_err(dev, "failure requesting rx irq %u, %d\n",
|
||||
rx_chn->irq, ret);
|
||||
rx_chn->irq = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
am65_cpsw_nuss_free_rx_chns(common);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1982,6 +2052,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx)
|
|||
port->slave.phylink_config.dev = &port->ndev->dev;
|
||||
port->slave.phylink_config.type = PHYLINK_NETDEV;
|
||||
port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000FD;
|
||||
port->slave.phylink_config.mac_managed_pm = true; /* MAC does PM */
|
||||
|
||||
if (phy_interface_mode_is_rgmii(port->slave.phy_if)) {
|
||||
phy_interface_set_rgmii(port->slave.phylink_config.supported_interfaces);
|
||||
|
|
@ -2043,28 +2114,16 @@ static int am65_cpsw_nuss_init_ndevs(struct am65_cpsw_common *common)
|
|||
|
||||
static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)
|
||||
{
|
||||
struct device *dev = common->dev;
|
||||
int i, ret = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < common->tx_ch_num; i++) {
|
||||
struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i];
|
||||
|
||||
netif_napi_add_tx(common->dma_ndev, &tx_chn->napi_tx,
|
||||
am65_cpsw_nuss_tx_poll);
|
||||
|
||||
ret = devm_request_irq(dev, tx_chn->irq,
|
||||
am65_cpsw_nuss_tx_irq,
|
||||
IRQF_TRIGGER_HIGH,
|
||||
tx_chn->tx_chn_name, tx_chn);
|
||||
if (ret) {
|
||||
dev_err(dev, "failure requesting tx%u irq %u, %d\n",
|
||||
tx_chn->id, tx_chn->irq, ret);
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
|
||||
err:
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void am65_cpsw_nuss_cleanup_ndev(struct am65_cpsw_common *common)
|
||||
|
|
@ -2533,15 +2592,6 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = devm_request_irq(dev, common->rx_chns.irq,
|
||||
am65_cpsw_nuss_rx_irq,
|
||||
IRQF_TRIGGER_HIGH, dev_name(dev), common);
|
||||
if (ret) {
|
||||
dev_err(dev, "failure requesting rx irq %u, %d\n",
|
||||
common->rx_chns.irq, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = am65_cpsw_nuss_register_devlink(common);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -2695,7 +2745,6 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
|
|||
if (common->port_num < 1 || common->port_num > AM65_CPSW_MAX_PORTS)
|
||||
return -ENOENT;
|
||||
|
||||
common->rx_flow_id_base = -1;
|
||||
init_completion(&common->tdown_complete);
|
||||
common->tx_ch_num = 1;
|
||||
common->pf_p0_rx_ptype_rrobin = false;
|
||||
|
|
@ -2737,14 +2786,6 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
|
|||
|
||||
am65_cpsw_nuss_get_ver(common);
|
||||
|
||||
/* init tx channels */
|
||||
ret = am65_cpsw_nuss_init_tx_chns(common);
|
||||
if (ret)
|
||||
goto err_of_clear;
|
||||
ret = am65_cpsw_nuss_init_rx_chns(common);
|
||||
if (ret)
|
||||
goto err_of_clear;
|
||||
|
||||
ret = am65_cpsw_nuss_init_host_p(common);
|
||||
if (ret)
|
||||
goto err_of_clear;
|
||||
|
|
@ -2829,10 +2870,80 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int am65_cpsw_nuss_suspend(struct device *dev)
|
||||
{
|
||||
struct am65_cpsw_common *common = dev_get_drvdata(dev);
|
||||
struct am65_cpsw_port *port;
|
||||
struct net_device *ndev;
|
||||
int i, ret;
|
||||
|
||||
for (i = 0; i < common->port_num; i++) {
|
||||
port = &common->ports[i];
|
||||
ndev = port->ndev;
|
||||
|
||||
if (!ndev)
|
||||
continue;
|
||||
|
||||
netif_device_detach(ndev);
|
||||
if (netif_running(ndev)) {
|
||||
rtnl_lock();
|
||||
ret = am65_cpsw_nuss_ndo_slave_stop(ndev);
|
||||
rtnl_unlock();
|
||||
if (ret < 0) {
|
||||
netdev_err(ndev, "failed to stop: %d", ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
am65_cpts_suspend(common->cpts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int am65_cpsw_nuss_resume(struct device *dev)
|
||||
{
|
||||
struct am65_cpsw_common *common = dev_get_drvdata(dev);
|
||||
struct am65_cpsw_port *port;
|
||||
struct net_device *ndev;
|
||||
int i, ret;
|
||||
|
||||
am65_cpts_resume(common->cpts);
|
||||
|
||||
for (i = 0; i < common->port_num; i++) {
|
||||
port = &common->ports[i];
|
||||
ndev = port->ndev;
|
||||
|
||||
if (!ndev)
|
||||
continue;
|
||||
|
||||
if (netif_running(ndev)) {
|
||||
rtnl_lock();
|
||||
ret = am65_cpsw_nuss_ndo_slave_open(ndev);
|
||||
rtnl_unlock();
|
||||
if (ret < 0) {
|
||||
netdev_err(ndev, "failed to start: %d", ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
netif_device_attach(ndev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PM_SLEEP */
|
||||
|
||||
static const struct dev_pm_ops am65_cpsw_nuss_dev_pm_ops = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(am65_cpsw_nuss_suspend, am65_cpsw_nuss_resume)
|
||||
};
|
||||
|
||||
static struct platform_driver am65_cpsw_nuss_driver = {
|
||||
.driver = {
|
||||
.name = AM65_CPSW_DRV_NAME,
|
||||
.of_match_table = am65_cpsw_nuss_of_mtable,
|
||||
.pm = &am65_cpsw_nuss_dev_pm_ops,
|
||||
},
|
||||
.probe = am65_cpsw_nuss_probe,
|
||||
.remove = am65_cpsw_nuss_remove,
|
||||
|
|
|
|||
Loading…
Reference in a new issue