Commit d8b879c0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ethernet-ti-am65-cpsw-fix-set-channel-operation' 

Roger Quadros says:

====================
net: ethernet: ti: am65-cpsw: Fix set channel operation

This contains a critical bug fix for the recently merged suspend/resume
support [1] that broke set channel operation. (ethtool -L eth0 tx <n>)

As there were 2 dependent patches on top of the offending commit [1]
first revert them and then apply them back after the correct fix.

[1] fd23df72 ("net: ethernet: ti: am65-cpsw: Add suspend/resume support")
====================

Link: https://lore.kernel.org/r/20221206094419.19478-1-rogerq@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e1228581 020b232f

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+105 −92
Original line number Diff line number Diff line
@@ -133,11 +133,6 @@ 
			 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)

{
@@ -379,20 +374,6 @@ 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,
@@ -421,7 +402,6 @@ 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 */
@@ -453,8 +433,7 @@ static int am65_cpsw_nuss_common_open(struct am65_cpsw_common *common) 
						  GFP_KERNEL);

		if (!skb) {

			dev_err(common->dev, "cannot allocate skb\n");

			ret = -ENOMEM;

			goto err;

			return -ENOMEM;

		}



		ret = am65_cpsw_nuss_rx_push(common, skb);
@@ -463,7 +442,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);

			goto err;

			return ret;

		}

		kmemleak_not_leak(skb);

	}
@@ -472,7 +451,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)

			goto err;

			return ret;

		napi_enable(&common->tx_chns[i].napi_tx);

	}
@@ -484,12 +463,6 @@ 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);
@@ -543,9 +516,6 @@ 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;

}
@@ -587,7 +557,6 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *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)
@@ -595,19 +564,17 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) 


	/* 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_wait_for_idle(port->slave.mac_sl, 100);

	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");

	if (reg) {

		dev_err(common->dev, "soft RESET didn't complete\n");

		return -ETIMEDOUT;

	}



	/* Notify the stack of the actual queue counts. */

	ret = netif_set_real_num_tx_queues(ndev, common->tx_ch_num);
@@ -1539,9 +1506,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(struct am65_cpsw_common *common)

static void am65_cpsw_nuss_free_tx_chns(void *data)

{

	struct device *dev = common->dev;

	struct am65_cpsw_common *common = data;

	int i;



	for (i = 0; i < common->tx_ch_num; i++) {
@@ -1553,11 +1520,7 @@ static void am65_cpsw_nuss_free_tx_chns(struct am65_cpsw_common *common) 
		if (!IS_ERR_OR_NULL(tx_chn->tx_chn))

			k3_udma_glue_release_tx_chn(tx_chn->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);

		memset(tx_chn, 0, sizeof(*tx_chn));

	}

}
@@ -1566,10 +1529,12 @@ 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 < 0))

		if (tx_chn->irq)

			devm_free_irq(dev, tx_chn->irq, tx_chn);



		netif_napi_del(&tx_chn->napi_tx);
@@ -1584,6 +1549,32 @@ void am65_cpsw_nuss_remove_tx_chns(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;



	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;

}



static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common)

{

	u32  max_desc_num = ALIGN(AM65_CPSW_MAX_TX_DESC, MAX_SKB_FRAGS);
@@ -1639,7 +1630,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;
@@ -1648,41 +1639,59 @@ 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);

	ret = am65_cpsw_nuss_ndev_add_tx_napi(common);

	if (ret) {

			dev_err(dev, "failure requesting tx%u irq %u, %d\n",

				tx_chn->id, tx_chn->irq, ret);

			tx_chn->irq = -EINVAL;

		dev_err(dev, "Failed to add tx NAPI %d\n", ret);

		goto err;

	}

	}



	return 0;



err:

	am65_cpsw_nuss_free_tx_chns(common);

	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;

	}



	return ret;

}



static void am65_cpsw_nuss_free_rx_chns(struct am65_cpsw_common *common)

static void am65_cpsw_nuss_free_rx_chns(void *data)

{

	struct am65_cpsw_common *common = data;

	struct am65_cpsw_rx_chn *rx_chn;



	rx_chn = &common->rx_chns;



	if (!IS_ERR_OR_NULL(rx_chn->desc_pool))

		k3_cppi_desc_pool_destroy(rx_chn->desc_pool);



	if (!IS_ERR_OR_NULL(rx_chn->rx_chn))

		k3_udma_glue_release_rx_chn(rx_chn->rx_chn);

}



static void am65_cpsw_nuss_remove_rx_chns(void *data)

{

	struct am65_cpsw_common *common = data;

	struct am65_cpsw_rx_chn *rx_chn;

	struct device *dev = common->dev;



	rx_chn = &common->rx_chns;

	devm_remove_action(dev, am65_cpsw_nuss_free_rx_chns, common);



	if (!(rx_chn->irq < 0))

		devm_free_irq(common->dev, rx_chn->irq, common);

		devm_free_irq(dev, rx_chn->irq, common);



	netif_napi_del(&common->napi_rx);



	if (!IS_ERR_OR_NULL(rx_chn->desc_pool))

		k3_cppi_desc_pool_destroy(rx_chn->desc_pool);



	if (!IS_ERR_OR_NULL(rx_chn->rx_chn))

		k3_udma_glue_release_rx_chn(rx_chn->rx_chn);



	common->rx_flow_id_base = -1;

}



static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)
@@ -1700,7 +1709,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 = -1;

	rx_cfg.flow_id_base = common->rx_flow_id_base;



	/* init all flows */

	rx_chn->dev = dev;
@@ -1772,20 +1781,24 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common) 
		}

	}



	netif_napi_add(common->dma_ndev, &common->napi_rx,

		       am65_cpsw_nuss_rx_poll);



	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);

	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;

	}



	return ret;

}
@@ -2105,26 +2118,9 @@ static int am65_cpsw_nuss_init_ndevs(struct am65_cpsw_common *common) 
			return ret;

	}



	netif_napi_add(common->dma_ndev, &common->napi_rx,

		       am65_cpsw_nuss_rx_poll);



	return ret;

}



static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)

{

	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);

	}



	return 0;

}



static void am65_cpsw_nuss_cleanup_ndev(struct am65_cpsw_common *common)

{

	struct am65_cpsw_port *port;
@@ -2587,7 +2583,11 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) 
	struct am65_cpsw_port *port;

	int ret = 0, i;



	ret = am65_cpsw_nuss_ndev_add_tx_napi(common);

	/* init tx channels */

	ret = am65_cpsw_nuss_init_tx_chns(common);

	if (ret)

		return ret;

	ret = am65_cpsw_nuss_init_rx_chns(common);

	if (ret)

		return ret;
@@ -2634,10 +2634,8 @@ int am65_cpsw_nuss_update_tx_chns(struct am65_cpsw_common *common, int num_tx) 


	common->tx_ch_num = num_tx;

	ret = am65_cpsw_nuss_init_tx_chns(common);

	if (ret)

		return ret;



	return am65_cpsw_nuss_ndev_add_tx_napi(common);

	return ret;

}



struct am65_cpsw_soc_pdata {
@@ -2745,6 +2743,7 @@ 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;
@@ -2878,10 +2877,10 @@ static int am65_cpsw_nuss_remove(struct platform_device *pdev) 
static int am65_cpsw_nuss_suspend(struct device *dev)

{

	struct am65_cpsw_common *common = dev_get_drvdata(dev);

	struct am65_cpsw_host *host_p = am65_common_get_host(common);

	struct am65_cpsw_port *port;

	struct net_device *ndev;

	int i, ret;

	struct am65_cpsw_host *host_p = am65_common_get_host(common);



	cpsw_ale_dump(common->ale, common->ale_context);

	host_p->vid_context = readl(host_p->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
@@ -2907,6 +2906,9 @@ static int am65_cpsw_nuss_suspend(struct device *dev) 


	am65_cpts_suspend(common->cpts);



	am65_cpsw_nuss_remove_rx_chns(common);

	am65_cpsw_nuss_remove_tx_chns(common);



	return 0;

}
@@ -2918,6 +2920,17 @@ static int am65_cpsw_nuss_resume(struct device *dev) 
	int i, ret;

	struct am65_cpsw_host *host_p = am65_common_get_host(common);



	ret = am65_cpsw_nuss_init_tx_chns(common);

	if (ret)

		return ret;

	ret = am65_cpsw_nuss_init_rx_chns(common);

	if (ret)

		return ret;



	/* If RX IRQ was disabled before suspend, keep it disabled */

	if (common->rx_irq_disabled)

		disable_irq(common->rx_chns.irq);



	am65_cpts_resume(common->cpts);



	for (i = 0; i < common->port_num; i++) {