Commit 109c2de9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'lynx-28g-fixes' 



Vladimir Oltean says:

====================
Fixes for lynx-28g PHY driver

This series fixes some issues in the Lynx 28G SerDes driver, namely an
oops when unloading the module, a race between the periodic workqueue
and the PHY API, and a race between phy_set_mode_ext() calls on multiple
lanes on the same SerDes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f291209e 139ad114

drivers/phy/freescale/phy-fsl-lynx-28g.c

+24 −3
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ struct lynx_28g_lane { 
struct lynx_28g_priv {

	void __iomem *base;

	struct device *dev;

	/* Serialize concurrent access to registers shared between lanes,

	 * like PCCn

	 */

	spinlock_t pcc_lock;

	struct lynx_28g_pll pll[LYNX_28G_NUM_PLL];

	struct lynx_28g_lane lane[LYNX_28G_NUM_LANE];
@@ -397,6 +401,8 @@ static int lynx_28g_set_mode(struct phy *phy, enum phy_mode mode, int submode) 
	if (powered_up)

		lynx_28g_power_off(phy);



	spin_lock(&priv->pcc_lock);



	switch (submode) {

	case PHY_INTERFACE_MODE_SGMII:

	case PHY_INTERFACE_MODE_1000BASEX:
@@ -413,6 +419,8 @@ static int lynx_28g_set_mode(struct phy *phy, enum phy_mode mode, int submode) 
	lane->interface = submode;



out:

	spin_unlock(&priv->pcc_lock);



	/* Power up the lane if necessary */

	if (powered_up)

		lynx_28g_power_on(phy);
@@ -508,11 +516,12 @@ static void lynx_28g_cdr_lock_check(struct work_struct *work) 
	for (i = 0; i < LYNX_28G_NUM_LANE; i++) {

		lane = &priv->lane[i];



		if (!lane->init)

			continue;

		mutex_lock(&lane->phy->mutex);



		if (!lane->powered_up)

		if (!lane->init || !lane->powered_up) {

			mutex_unlock(&lane->phy->mutex);

			continue;

		}



		rrstctl = lynx_28g_lane_read(lane, LNaRRSTCTL);

		if (!(rrstctl & LYNX_28G_LNaRRSTCTL_CDR_LOCK)) {
@@ -521,6 +530,8 @@ static void lynx_28g_cdr_lock_check(struct work_struct *work) 
				rrstctl = lynx_28g_lane_read(lane, LNaRRSTCTL);

			} while (!(rrstctl & LYNX_28G_LNaRRSTCTL_RST_DONE));

		}



		mutex_unlock(&lane->phy->mutex);

	}

	queue_delayed_work(system_power_efficient_wq, &priv->cdr_check,

			   msecs_to_jiffies(1000));
@@ -593,6 +604,7 @@ static int lynx_28g_probe(struct platform_device *pdev) 


	dev_set_drvdata(dev, priv);



	spin_lock_init(&priv->pcc_lock);

	INIT_DELAYED_WORK(&priv->cdr_check, lynx_28g_cdr_lock_check);



	queue_delayed_work(system_power_efficient_wq, &priv->cdr_check,
@@ -604,6 +616,14 @@ static int lynx_28g_probe(struct platform_device *pdev) 
	return PTR_ERR_OR_ZERO(provider);

}



static void lynx_28g_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct lynx_28g_priv *priv = dev_get_drvdata(dev);



	cancel_delayed_work_sync(&priv->cdr_check);

}



static const struct of_device_id lynx_28g_of_match_table[] = {

	{ .compatible = "fsl,lynx-28g" },

	{ },
@@ -612,6 +632,7 @@ MODULE_DEVICE_TABLE(of, lynx_28g_of_match_table); 


static struct platform_driver lynx_28g_driver = {

	.probe	= lynx_28g_probe,

	.remove_new = lynx_28g_remove,

	.driver	= {

		.name = "lynx-28g",

		.of_match_table = lynx_28g_of_match_table,