Commit 01b825f9 authored by Francesco Dolcini's avatar Francesco Dolcini Committed by Paolo Abeni

Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"

This reverts commit b353b241, this is
creating multiple issues, just not ready to be merged yet.

Link: https://lore.kernel.org/all/CAHk-=wj1obPoTu1AHj9Bd_BGYjdjDyPP+vT5WMj8eheb3A9WHw@mail.gmail.com/
Link: https://lore.kernel.org/all/20220907143915.5w65kainpykfobte@pengutronix.de/
Fixes: b353b241 ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
Signed-off-by: default avatarFrancesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 7b15515f
...@@ -561,6 +561,7 @@ struct fec_enet_private { ...@@ -561,6 +561,7 @@ struct fec_enet_private {
struct clk *clk_2x_txclk; struct clk *clk_2x_txclk;
bool ptp_clk_on; bool ptp_clk_on;
struct mutex ptp_clk_mutex;
unsigned int num_tx_queues; unsigned int num_tx_queues;
unsigned int num_rx_queues; unsigned int num_rx_queues;
......
...@@ -1995,7 +1995,6 @@ static void fec_enet_phy_reset_after_clk_enable(struct net_device *ndev) ...@@ -1995,7 +1995,6 @@ static void fec_enet_phy_reset_after_clk_enable(struct net_device *ndev)
static int fec_enet_clk_enable(struct net_device *ndev, bool enable) static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
{ {
struct fec_enet_private *fep = netdev_priv(ndev); struct fec_enet_private *fep = netdev_priv(ndev);
unsigned long flags;
int ret; int ret;
if (enable) { if (enable) {
...@@ -2004,15 +2003,15 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) ...@@ -2004,15 +2003,15 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
return ret; return ret;
if (fep->clk_ptp) { if (fep->clk_ptp) {
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&fep->ptp_clk_mutex);
ret = clk_prepare_enable(fep->clk_ptp); ret = clk_prepare_enable(fep->clk_ptp);
if (ret) { if (ret) {
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&fep->ptp_clk_mutex);
goto failed_clk_ptp; goto failed_clk_ptp;
} else { } else {
fep->ptp_clk_on = true; fep->ptp_clk_on = true;
} }
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&fep->ptp_clk_mutex);
} }
ret = clk_prepare_enable(fep->clk_ref); ret = clk_prepare_enable(fep->clk_ref);
...@@ -2027,10 +2026,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) ...@@ -2027,10 +2026,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
} else { } else {
clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_enet_out);
if (fep->clk_ptp) { if (fep->clk_ptp) {
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp); clk_disable_unprepare(fep->clk_ptp);
fep->ptp_clk_on = false; fep->ptp_clk_on = false;
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&fep->ptp_clk_mutex);
} }
clk_disable_unprepare(fep->clk_ref); clk_disable_unprepare(fep->clk_ref);
clk_disable_unprepare(fep->clk_2x_txclk); clk_disable_unprepare(fep->clk_2x_txclk);
...@@ -2043,10 +2042,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) ...@@ -2043,10 +2042,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
clk_disable_unprepare(fep->clk_ref); clk_disable_unprepare(fep->clk_ref);
failed_clk_ref: failed_clk_ref:
if (fep->clk_ptp) { if (fep->clk_ptp) {
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp); clk_disable_unprepare(fep->clk_ptp);
fep->ptp_clk_on = false; fep->ptp_clk_on = false;
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&fep->ptp_clk_mutex);
} }
failed_clk_ptp: failed_clk_ptp:
clk_disable_unprepare(fep->clk_enet_out); clk_disable_unprepare(fep->clk_enet_out);
...@@ -3881,7 +3880,7 @@ fec_probe(struct platform_device *pdev) ...@@ -3881,7 +3880,7 @@ fec_probe(struct platform_device *pdev)
} }
fep->ptp_clk_on = false; fep->ptp_clk_on = false;
spin_lock_init(&fep->tmreg_lock); mutex_init(&fep->ptp_clk_mutex);
/* clk_ref is optional, depends on board */ /* clk_ref is optional, depends on board */
fep->clk_ref = devm_clk_get_optional(&pdev->dev, "enet_clk_ref"); fep->clk_ref = devm_clk_get_optional(&pdev->dev, "enet_clk_ref");
......
...@@ -365,19 +365,21 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) ...@@ -365,19 +365,21 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
*/ */
static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts) static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{ {
struct fec_enet_private *fep = struct fec_enet_private *adapter =
container_of(ptp, struct fec_enet_private, ptp_caps); container_of(ptp, struct fec_enet_private, ptp_caps);
u64 ns; u64 ns;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&adapter->ptp_clk_mutex);
/* Check the ptp clock */ /* Check the ptp clock */
if (!fep->ptp_clk_on) { if (!adapter->ptp_clk_on) {
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&adapter->ptp_clk_mutex);
return -EINVAL; return -EINVAL;
} }
ns = timecounter_read(&fep->tc); spin_lock_irqsave(&adapter->tmreg_lock, flags);
spin_unlock_irqrestore(&fep->tmreg_lock, flags); ns = timecounter_read(&adapter->tc);
spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
mutex_unlock(&adapter->ptp_clk_mutex);
*ts = ns_to_timespec64(ns); *ts = ns_to_timespec64(ns);
...@@ -402,10 +404,10 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp, ...@@ -402,10 +404,10 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
unsigned long flags; unsigned long flags;
u32 counter; u32 counter;
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&fep->ptp_clk_mutex);
/* Check the ptp clock */ /* Check the ptp clock */
if (!fep->ptp_clk_on) { if (!fep->ptp_clk_on) {
spin_unlock_irqrestore(&fep->tmreg_lock, flags); mutex_unlock(&fep->ptp_clk_mutex);
return -EINVAL; return -EINVAL;
} }
...@@ -415,9 +417,11 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp, ...@@ -415,9 +417,11 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
*/ */
counter = ns & fep->cc.mask; counter = ns & fep->cc.mask;
spin_lock_irqsave(&fep->tmreg_lock, flags);
writel(counter, fep->hwp + FEC_ATIME); writel(counter, fep->hwp + FEC_ATIME);
timecounter_init(&fep->tc, &fep->cc, ns); timecounter_init(&fep->tc, &fep->cc, ns);
spin_unlock_irqrestore(&fep->tmreg_lock, flags); spin_unlock_irqrestore(&fep->tmreg_lock, flags);
mutex_unlock(&fep->ptp_clk_mutex);
return 0; return 0;
} }
...@@ -514,11 +518,13 @@ static void fec_time_keep(struct work_struct *work) ...@@ -514,11 +518,13 @@ static void fec_time_keep(struct work_struct *work)
struct fec_enet_private *fep = container_of(dwork, struct fec_enet_private, time_keep); struct fec_enet_private *fep = container_of(dwork, struct fec_enet_private, time_keep);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&fep->tmreg_lock, flags); mutex_lock(&fep->ptp_clk_mutex);
if (fep->ptp_clk_on) { if (fep->ptp_clk_on) {
spin_lock_irqsave(&fep->tmreg_lock, flags);
timecounter_read(&fep->tc); timecounter_read(&fep->tc);
}
spin_unlock_irqrestore(&fep->tmreg_lock, flags); spin_unlock_irqrestore(&fep->tmreg_lock, flags);
}
mutex_unlock(&fep->ptp_clk_mutex);
schedule_delayed_work(&fep->time_keep, HZ); schedule_delayed_work(&fep->time_keep, HZ);
} }
...@@ -593,6 +599,8 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx) ...@@ -593,6 +599,8 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
} }
fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed; fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed;
spin_lock_init(&fep->tmreg_lock);
fec_ptp_start_cyclecounter(ndev); fec_ptp_start_cyclecounter(ndev);
INIT_DELAYED_WORK(&fep->time_keep, fec_time_keep); INIT_DELAYED_WORK(&fep->time_keep, fec_time_keep);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment