Commit 9756bb63 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-fixes' 



Joakim Zhang says:

====================
patches for stmmac

A patch set for stmmac, fix some driver issues.

ChangeLogs:
V1->V2:
	* add Fixes tag.
	* add patch 5/5 into this patch set.

V2->V3:
	* rebase to latest net tree where fixes go.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 007ab534 f119cc98

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c

+1 −8
Original line number Diff line number Diff line
@@ -246,13 +246,7 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
		goto err_parse_dt;

	}



	ret = dma_set_mask_and_coherent(&pdev->dev,

					DMA_BIT_MASK(dwmac->ops->addr_width));

	if (ret) {

		dev_err(&pdev->dev, "DMA mask set failed\n");

		goto err_dma_mask;

	}



	plat_dat->addr64 = dwmac->ops->addr_width;

	plat_dat->init = imx_dwmac_init;

	plat_dat->exit = imx_dwmac_exit;

	plat_dat->fix_mac_speed = imx_dwmac_fix_speed;
@@ -272,7 +266,6 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
err_dwmac_init:

err_drv_probe:

	imx_dwmac_exit(pdev, plat_dat->bsp_priv);

err_dma_mask:

err_parse_dt:

err_match_data:

	stmmac_remove_config_dt(pdev, plat_dat);

drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ int dwmac4_dma_reset(void __iomem *ioaddr) 


	return readl_poll_timeout(ioaddr + DMA_BUS_MODE, value,

				 !(value & DMA_BUS_MODE_SFT_RESET),

				 10000, 100000);

				 10000, 1000000);

}



void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan)

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+40 −11
Original line number Diff line number Diff line
@@ -1533,6 +1533,19 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv, u32 queue) 
		stmmac_free_tx_buffer(priv, queue, i);

}



/**

 * stmmac_free_tx_skbufs - free TX skb buffers

 * @priv: private structure

 */

static void stmmac_free_tx_skbufs(struct stmmac_priv *priv)

{

	u32 tx_queue_cnt = priv->plat->tx_queues_to_use;

	u32 queue;



	for (queue = 0; queue < tx_queue_cnt; queue++)

		dma_free_tx_skbufs(priv, queue);

}



/**

 * free_dma_rx_desc_resources - free RX dma desc resources

 * @priv: private structure
@@ -2895,9 +2908,6 @@ static int stmmac_release(struct net_device *dev) 
	struct stmmac_priv *priv = netdev_priv(dev);

	u32 chan;



	if (priv->eee_enabled)

		del_timer_sync(&priv->eee_ctrl_timer);



	if (device_may_wakeup(priv->device))

		phylink_speed_down(priv->phylink, false);

	/* Stop and disconnect the PHY */
@@ -2916,6 +2926,11 @@ static int stmmac_release(struct net_device *dev) 
	if (priv->lpi_irq > 0)

		free_irq(priv->lpi_irq, dev);



	if (priv->eee_enabled) {

		priv->tx_path_in_lpi_mode = false;

		del_timer_sync(&priv->eee_ctrl_timer);

	}



	/* Stop TX/RX DMA and clear the descriptors */

	stmmac_stop_all_dma(priv);
@@ -4930,6 +4945,14 @@ int stmmac_dvr_probe(struct device *device, 
		dev_info(priv->device, "SPH feature enabled\n");

	}



	/* The current IP register MAC_HW_Feature1[ADDR64] only define

	 * 32/40/64 bit width, but some SOC support others like i.MX8MP

	 * support 34 bits but it map to 40 bits width in MAC_HW_Feature1[ADDR64].

	 * So overwrite dma_cap.addr64 according to HW real design.

	 */

	if (priv->plat->addr64)

		priv->dma_cap.addr64 = priv->plat->addr64;



	if (priv->dma_cap.addr64) {

		ret = dma_set_mask_and_coherent(device,

				DMA_BIT_MASK(priv->dma_cap.addr64));
@@ -5142,6 +5165,11 @@ int stmmac_suspend(struct device *dev) 
	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)

		del_timer_sync(&priv->tx_queue[chan].txtimer);



	if (priv->eee_enabled) {

		priv->tx_path_in_lpi_mode = false;

		del_timer_sync(&priv->eee_ctrl_timer);

	}



	/* Stop TX/RX DMA */

	stmmac_stop_all_dma(priv);
@@ -5247,11 +5275,20 @@ int stmmac_resume(struct device *dev) 
			return ret;

	}



	if (!device_may_wakeup(priv->device) || !priv->plat->pmt) {

		rtnl_lock();

		phylink_start(priv->phylink);

		/* We may have called phylink_speed_down before */

		phylink_speed_up(priv->phylink);

		rtnl_unlock();

	}



	rtnl_lock();

	mutex_lock(&priv->lock);



	stmmac_reset_queues_param(priv);



	stmmac_free_tx_skbufs(priv);

	stmmac_clear_descriptors(priv);



	stmmac_hw_setup(ndev, false);
@@ -5265,14 +5302,6 @@ int stmmac_resume(struct device *dev) 
	mutex_unlock(&priv->lock);

	rtnl_unlock();



	if (!device_may_wakeup(priv->device) || !priv->plat->pmt) {

		rtnl_lock();

		phylink_start(priv->phylink);

		/* We may have called phylink_speed_down before */

		phylink_speed_up(priv->phylink);

		rtnl_unlock();

	}



	phylink_mac_change(priv->phylink, true);



	netif_device_attach(ndev);

include/linux/stmmac.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct plat_stmmacenet_data { 
	int unicast_filter_entries;

	int tx_fifo_size;

	int rx_fifo_size;

	u32 addr64;

	u32 rx_queues_to_use;

	u32 tx_queues_to_use;

	u8 rx_sched_algorithm;