Commit 8f3184b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-dwmac-mediatec-clock-fix' 



Biao Huang says:

====================
stmmac: dwmac-mediatek: fix clock issue

changes in v5:
1. add reivewd-by as Matthias's comments.
2. fix "warning: unused variable 'ret' [-Wunused-variable]" as Jakub's comments

changes in v4:
1. improve commit message and test ko insertion/remove as Matthias's comments.
2. add patch "net: stmmac: fix pm runtime issue in stmmac_dvr_remove()" to
   fix vlan filter deletion issue.
3. add patch "net: stmmac: fix unbalanced ptp clock issue in suspend/resume flow"
   to fix unbalanced ptp clock issue in suspend/resume flow.

changes in v3:
1. delete mediatek_dwmac_exit() since there is no operation in it,
as Matthias's comments.

changes in v2:
1. clock configuration is still needed in probe,
and invoke mediatek_dwmac_clks_config() instead.
2. update commit message.

v1:
remove duplicated clock configuration in init/exit.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 782d86fe f4c7d894

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

+21 −28
Original line number Diff line number Diff line
@@ -576,32 +576,7 @@ static int mediatek_dwmac_init(struct platform_device *pdev, void *priv) 
		}

	}



	ret = clk_bulk_prepare_enable(variant->num_clks, plat->clks);

	if (ret) {

		dev_err(plat->dev, "failed to enable clks, err = %d\n", ret);

		return ret;

	}



	ret = clk_prepare_enable(plat->rmii_internal_clk);

	if (ret) {

		dev_err(plat->dev, "failed to enable rmii internal clk, err = %d\n", ret);

		goto err_clk;

	}



	return 0;



err_clk:

	clk_bulk_disable_unprepare(variant->num_clks, plat->clks);

	return ret;

}



static void mediatek_dwmac_exit(struct platform_device *pdev, void *priv)

{

	struct mediatek_dwmac_plat_data *plat = priv;

	const struct mediatek_dwmac_variant *variant = plat->variant;



	clk_disable_unprepare(plat->rmii_internal_clk);

	clk_bulk_disable_unprepare(variant->num_clks, plat->clks);

}



static int mediatek_dwmac_clks_config(void *priv, bool enabled)
@@ -643,7 +618,6 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, 
	plat->addr64 = priv_plat->variant->dma_bit_mask;

	plat->bsp_priv = priv_plat;

	plat->init = mediatek_dwmac_init;

	plat->exit = mediatek_dwmac_exit;

	plat->clks_config = mediatek_dwmac_clks_config;

	if (priv_plat->variant->dwmac_fix_mac_speed)

		plat->fix_mac_speed = priv_plat->variant->dwmac_fix_mac_speed;
@@ -712,13 +686,32 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) 
	mediatek_dwmac_common_data(pdev, plat_dat, priv_plat);

	mediatek_dwmac_init(pdev, priv_plat);



	ret = mediatek_dwmac_clks_config(priv_plat, true);

	if (ret)

		return ret;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret) {

		stmmac_remove_config_dt(pdev, plat_dat);

		return ret;

		goto err_drv_probe;

	}



	return 0;



err_drv_probe:

	mediatek_dwmac_clks_config(priv_plat, false);

	return ret;

}



static int mediatek_dwmac_remove(struct platform_device *pdev)

{

	struct mediatek_dwmac_plat_data *priv_plat = get_stmmac_bsp_priv(&pdev->dev);

	int ret;



	ret = stmmac_pltfr_remove(pdev);

	mediatek_dwmac_clks_config(priv_plat, false);



	return ret;

}



static const struct of_device_id mediatek_dwmac_match[] = {
@@ -733,7 +726,7 @@ MODULE_DEVICE_TABLE(of, mediatek_dwmac_match); 


static struct platform_driver mediatek_dwmac_driver = {

	.probe  = mediatek_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove = mediatek_dwmac_remove,

	.driver = {

		.name           = "dwmac-mediatek",

		.pm		= &stmmac_pltfr_pm_ops,

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

+11 −11
Original line number Diff line number Diff line
@@ -834,19 +834,10 @@ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags) 
	struct timespec64 now;

	u32 sec_inc = 0;

	u64 temp = 0;

	int ret;



	if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))

		return -EOPNOTSUPP;



	ret = clk_prepare_enable(priv->plat->clk_ptp_ref);

	if (ret < 0) {

		netdev_warn(priv->dev,

			    "failed to enable PTP reference clock: %pe\n",

			    ERR_PTR(ret));

		return ret;

	}



	stmmac_config_hw_tstamping(priv, priv->ptpaddr, systime_flags);

	priv->systime_flags = systime_flags;
@@ -3270,6 +3261,14 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) 


	stmmac_mmc_setup(priv);



	if (ptp_register) {

		ret = clk_prepare_enable(priv->plat->clk_ptp_ref);

		if (ret < 0)

			netdev_warn(priv->dev,

				    "failed to enable PTP reference clock: %pe\n",

				    ERR_PTR(ret));

	}



	ret = stmmac_init_ptp(priv);

	if (ret == -EOPNOTSUPP)

		netdev_info(priv->dev, "PTP not supported by HW\n");
@@ -7213,8 +7212,6 @@ int stmmac_dvr_remove(struct device *dev) 
	netdev_info(priv->dev, "%s: removing driver", __func__);



	pm_runtime_get_sync(dev);

	pm_runtime_disable(dev);

	pm_runtime_put_noidle(dev);



	stmmac_stop_all_dma(priv);

	stmmac_mac_set(priv, priv->ioaddr, false);
@@ -7241,6 +7238,9 @@ int stmmac_dvr_remove(struct device *dev) 
	mutex_destroy(&priv->lock);

	bitmap_free(priv->af_xdp_zc_qps);



	pm_runtime_disable(dev);

	pm_runtime_put_noidle(dev);



	return 0;

}

EXPORT_SYMBOL_GPL(stmmac_dvr_remove);

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

+7 −1
Original line number Diff line number Diff line
@@ -815,7 +815,13 @@ static int __maybe_unused stmmac_pltfr_noirq_resume(struct device *dev) 
		if (ret)

			return ret;



		stmmac_init_tstamp_counter(priv, priv->systime_flags);

		ret = clk_prepare_enable(priv->plat->clk_ptp_ref);

		if (ret < 0) {

			netdev_warn(priv->dev,

				    "failed to enable PTP reference clock: %pe\n",

				    ERR_PTR(ret));

			return ret;

		}

	}



	return 0;