* [PATCH net 0/2] Revert fec PTP changes
@ 2022-09-12 7:01 Francesco Dolcini
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Francesco Dolcini @ 2022-09-12 7:01 UTC (permalink / raw)
To: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Marc Kleine-Budde, Guenter Roeck, Andrew Lunn
Cc: Francesco Dolcini
Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
issues and we are at 6.0-rc5.
Francesco Dolcini (2):
Revert "fec: Restart PPS after link state change"
Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
drivers/net/ethernet/freescale/fec.h | 11 +----
drivers/net/ethernet/freescale/fec_main.c | 59 +++++------------------
drivers/net/ethernet/freescale/fec_ptp.c | 57 +++++++---------------
3 files changed, 31 insertions(+), 96 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net 1/2] Revert "fec: Restart PPS after link state change"
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
@ 2022-09-12 7:01 ` Francesco Dolcini
2022-09-12 12:07 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
2022-09-12 7:01 ` [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Francesco Dolcini
` (3 subsequent siblings)
4 siblings, 2 replies; 13+ messages in thread
From: Francesco Dolcini @ 2022-09-12 7:01 UTC (permalink / raw)
To: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Marc Kleine-Budde, Guenter Roeck, Andrew Lunn
Cc: Francesco Dolcini
This reverts commit f79959220fa5fbda939592bf91c7a9ea90419040, this is
creating multiple issues, just not ready to be merged yet.
Link: https://lore.kernel.org/all/20220905180542.GA3685102@roeck-us.net/
Link: https://lore.kernel.org/all/CAHk-=wj1obPoTu1AHj9Bd_BGYjdjDyPP+vT5WMj8eheb3A9WHw@mail.gmail.com/
Fixes: f79959220fa5 ("fec: Restart PPS after link state change")
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
drivers/net/ethernet/freescale/fec.h | 10 ------
drivers/net/ethernet/freescale/fec_main.c | 42 +++--------------------
drivers/net/ethernet/freescale/fec_ptp.c | 29 ----------------
3 files changed, 4 insertions(+), 77 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index d77ee8936c6a..dcfe63f9be06 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -638,13 +638,6 @@ struct fec_enet_private {
int pps_enable;
unsigned int next_counter;
- struct {
- struct timespec64 ts_phc;
- u64 ns_sys;
- u32 at_corr;
- u8 at_inc_corr;
- } ptp_saved_state;
-
u64 ethtool_stats[];
};
@@ -655,8 +648,5 @@ void fec_ptp_disable_hwts(struct net_device *ndev);
int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr);
int fec_ptp_get(struct net_device *ndev, struct ifreq *ifr);
-void fec_ptp_save_state(struct fec_enet_private *fep);
-int fec_ptp_restore_state(struct fec_enet_private *fep);
-
/****************************************************************************/
#endif /* FEC_H */
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 6152f6dbf1bc..4ccd74af09ae 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -286,11 +286,8 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
#define FEC_MMFR_TA (2 << 16)
#define FEC_MMFR_DATA(v) (v & 0xffff)
/* FEC ECR bits definition */
-#define FEC_ECR_RESET BIT(0)
-#define FEC_ECR_ETHEREN BIT(1)
-#define FEC_ECR_MAGICEN BIT(2)
-#define FEC_ECR_SLEEP BIT(3)
-#define FEC_ECR_EN1588 BIT(4)
+#define FEC_ECR_MAGICEN (1 << 2)
+#define FEC_ECR_SLEEP (1 << 3)
#define FEC_MII_TIMEOUT 30000 /* us */
@@ -986,9 +983,6 @@ fec_restart(struct net_device *ndev)
u32 temp_mac[2];
u32 rcntl = OPT_FRAME_SIZE | 0x04;
u32 ecntl = 0x2; /* ETHEREN */
- struct ptp_clock_request ptp_rq = { .type = PTP_CLK_REQ_PPS };
-
- fec_ptp_save_state(fep);
/* Whack a reset. We should wait for this.
* For i.MX6SX SOC, enet use AXI bus, we use disable MAC
@@ -1142,7 +1136,7 @@ fec_restart(struct net_device *ndev)
}
if (fep->bufdesc_ex)
- ecntl |= FEC_ECR_EN1588;
+ ecntl |= (1 << 4);
if (fep->quirks & FEC_QUIRK_DELAYED_CLKS_SUPPORT &&
fep->rgmii_txc_dly)
@@ -1163,14 +1157,6 @@ fec_restart(struct net_device *ndev)
if (fep->bufdesc_ex)
fec_ptp_start_cyclecounter(ndev);
- /* Restart PPS if needed */
- if (fep->pps_enable) {
- /* Clear flag so fec_ptp_enable_pps() doesn't return immediately */
- fep->pps_enable = 0;
- fec_ptp_restore_state(fep);
- fep->ptp_caps.enable(&fep->ptp_caps, &ptp_rq, 1);
- }
-
/* Enable interrupts we wish to service */
if (fep->link)
writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
@@ -1221,8 +1207,6 @@ fec_stop(struct net_device *ndev)
struct fec_enet_private *fep = netdev_priv(ndev);
u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8);
u32 val;
- struct ptp_clock_request ptp_rq = { .type = PTP_CLK_REQ_PPS };
- u32 ecntl = 0;
/* We cannot expect a graceful transmit stop without link !!! */
if (fep->link) {
@@ -1232,8 +1216,6 @@ fec_stop(struct net_device *ndev)
netdev_err(ndev, "Graceful transmit stop did not complete!\n");
}
- fec_ptp_save_state(fep);
-
/* Whack a reset. We should wait for this.
* For i.MX6SX SOC, enet use AXI bus, we use disable MAC
* instead of reset MAC itself.
@@ -1253,28 +1235,12 @@ fec_stop(struct net_device *ndev)
writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
- if (fep->bufdesc_ex)
- ecntl |= FEC_ECR_EN1588;
-
/* We have to keep ENET enabled to have MII interrupt stay working */
if (fep->quirks & FEC_QUIRK_ENET_MAC &&
!(fep->wol_flag & FEC_WOL_FLAG_SLEEP_ON)) {
- ecntl |= FEC_ECR_ETHEREN;
+ writel(2, fep->hwp + FEC_ECNTRL);
writel(rmii_mode, fep->hwp + FEC_R_CNTRL);
}
-
- writel(ecntl, fep->hwp + FEC_ECNTRL);
-
- if (fep->bufdesc_ex)
- fec_ptp_start_cyclecounter(ndev);
-
- /* Restart PPS if needed */
- if (fep->pps_enable) {
- /* Clear flag so fec_ptp_enable_pps() doesn't return immediately */
- fep->pps_enable = 0;
- fec_ptp_restore_state(fep);
- fep->ptp_caps.enable(&fep->ptp_caps, &ptp_rq, 1);
- }
}
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 8dd5a2615a89..af20aa237964 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -625,36 +625,7 @@ void fec_ptp_stop(struct platform_device *pdev)
struct net_device *ndev = platform_get_drvdata(pdev);
struct fec_enet_private *fep = netdev_priv(ndev);
- if (fep->pps_enable)
- fec_ptp_enable_pps(fep, 0);
-
cancel_delayed_work_sync(&fep->time_keep);
if (fep->ptp_clock)
ptp_clock_unregister(fep->ptp_clock);
}
-
-void fec_ptp_save_state(struct fec_enet_private *fep)
-{
- u32 atime_inc_corr;
-
- fec_ptp_gettime(&fep->ptp_caps, &fep->ptp_saved_state.ts_phc);
- fep->ptp_saved_state.ns_sys = ktime_get_ns();
-
- fep->ptp_saved_state.at_corr = readl(fep->hwp + FEC_ATIME_CORR);
- atime_inc_corr = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_CORR_MASK;
- fep->ptp_saved_state.at_inc_corr = (u8)(atime_inc_corr >> FEC_T_INC_CORR_OFFSET);
-}
-
-int fec_ptp_restore_state(struct fec_enet_private *fep)
-{
- u32 atime_inc = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_MASK;
- u64 ns_sys;
-
- writel(fep->ptp_saved_state.at_corr, fep->hwp + FEC_ATIME_CORR);
- atime_inc |= ((u32)fep->ptp_saved_state.at_inc_corr) << FEC_T_INC_CORR_OFFSET;
- writel(atime_inc, fep->hwp + FEC_ATIME_INC);
-
- ns_sys = ktime_get_ns() - fep->ptp_saved_state.ns_sys;
- timespec64_add_ns(&fep->ptp_saved_state.ts_phc, ns_sys);
- return fec_ptp_settime(&fep->ptp_caps, &fep->ptp_saved_state.ts_phc);
-}
--
2.25.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
@ 2022-09-12 7:01 ` Francesco Dolcini
2022-09-12 12:05 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
2022-09-12 7:07 ` [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
` (2 subsequent siblings)
4 siblings, 2 replies; 13+ messages in thread
From: Francesco Dolcini @ 2022-09-12 7:01 UTC (permalink / raw)
To: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Marc Kleine-Budde, Guenter Roeck, Andrew Lunn
Cc: Francesco Dolcini
This reverts commit b353b241f1eb9b6265358ffbe2632fdcb563354f, 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: b353b241f1eb ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
drivers/net/ethernet/freescale/fec.h | 1 +
drivers/net/ethernet/freescale/fec_main.c | 17 +++++++-------
drivers/net/ethernet/freescale/fec_ptp.c | 28 +++++++++++++++--------
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index dcfe63f9be06..a5fed00cb971 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -561,6 +561,7 @@ struct fec_enet_private {
struct clk *clk_2x_txclk;
bool ptp_clk_on;
+ struct mutex ptp_clk_mutex;
unsigned int num_tx_queues;
unsigned int num_rx_queues;
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 4ccd74af09ae..92c55e1a5507 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -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)
{
struct fec_enet_private *fep = netdev_priv(ndev);
- unsigned long flags;
int ret;
if (enable) {
@@ -2004,15 +2003,15 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
return ret;
if (fep->clk_ptp) {
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&fep->ptp_clk_mutex);
ret = clk_prepare_enable(fep->clk_ptp);
if (ret) {
- spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ mutex_unlock(&fep->ptp_clk_mutex);
goto failed_clk_ptp;
} else {
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);
@@ -2027,10 +2026,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
} else {
clk_disable_unprepare(fep->clk_enet_out);
if (fep->clk_ptp) {
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp);
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_2x_txclk);
@@ -2043,10 +2042,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
clk_disable_unprepare(fep->clk_ref);
failed_clk_ref:
if (fep->clk_ptp) {
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp);
fep->ptp_clk_on = false;
- spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ mutex_unlock(&fep->ptp_clk_mutex);
}
failed_clk_ptp:
clk_disable_unprepare(fep->clk_enet_out);
@@ -3881,7 +3880,7 @@ fec_probe(struct platform_device *pdev)
}
fep->ptp_clk_on = false;
- spin_lock_init(&fep->tmreg_lock);
+ mutex_init(&fep->ptp_clk_mutex);
/* clk_ref is optional, depends on board */
fep->clk_ref = devm_clk_get_optional(&pdev->dev, "enet_clk_ref");
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index af20aa237964..3dc3c0b626c2 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -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)
{
- struct fec_enet_private *fep =
+ struct fec_enet_private *adapter =
container_of(ptp, struct fec_enet_private, ptp_caps);
u64 ns;
unsigned long flags;
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&adapter->ptp_clk_mutex);
/* Check the ptp clock */
- if (!fep->ptp_clk_on) {
- spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ if (!adapter->ptp_clk_on) {
+ mutex_unlock(&adapter->ptp_clk_mutex);
return -EINVAL;
}
- ns = timecounter_read(&fep->tc);
- spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ spin_lock_irqsave(&adapter->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);
@@ -402,10 +404,10 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
unsigned long flags;
u32 counter;
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&fep->ptp_clk_mutex);
/* Check the ptp clock */
if (!fep->ptp_clk_on) {
- spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ mutex_unlock(&fep->ptp_clk_mutex);
return -EINVAL;
}
@@ -415,9 +417,11 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp,
*/
counter = ns & fep->cc.mask;
+ spin_lock_irqsave(&fep->tmreg_lock, flags);
writel(counter, fep->hwp + FEC_ATIME);
timecounter_init(&fep->tc, &fep->cc, ns);
spin_unlock_irqrestore(&fep->tmreg_lock, flags);
+ mutex_unlock(&fep->ptp_clk_mutex);
return 0;
}
@@ -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);
unsigned long flags;
- spin_lock_irqsave(&fep->tmreg_lock, flags);
+ mutex_lock(&fep->ptp_clk_mutex);
if (fep->ptp_clk_on) {
+ spin_lock_irqsave(&fep->tmreg_lock, flags);
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);
}
@@ -593,6 +599,8 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx)
}
fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed;
+ spin_lock_init(&fep->tmreg_lock);
+
fec_ptp_start_cyclecounter(ndev);
INIT_DELAYED_WORK(&fep->time_keep, fec_time_keep);
--
2.25.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
2022-09-12 7:01 ` [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Francesco Dolcini
@ 2022-09-12 7:07 ` Francesco Dolcini
2022-09-12 12:28 ` Marc Kleine-Budde
2022-09-20 10:30 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 13+ messages in thread
From: Francesco Dolcini @ 2022-09-12 7:07 UTC (permalink / raw)
To: Csókás Bence
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, netdev, linux-kernel, Marc Kleine-Budde,
Guenter Roeck, Andrew Lunn
On Mon, Sep 12, 2022 at 09:01:41AM +0200, Francesco Dolcini wrote:
> Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
> issues and we are at 6.0-rc5.
Hello Csókás,
the net maintainers will decide how to proceed on this, IMO now we
should just revert both. In parallel you can work on a new patch to
handle the PTP issue you were trying to address.
BR,
Francesco
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
2022-09-12 7:01 ` [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Francesco Dolcini
@ 2022-09-12 12:05 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
1 sibling, 0 replies; 13+ messages in thread
From: Andrew Lunn @ 2022-09-12 12:05 UTC (permalink / raw)
To: Francesco Dolcini
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Marc Kleine-Budde, Guenter Roeck
On Mon, Sep 12, 2022 at 09:01:43AM +0200, Francesco Dolcini wrote:
> This reverts commit b353b241f1eb9b6265358ffbe2632fdcb563354f, 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: b353b241f1eb ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 1/2] Revert "fec: Restart PPS after link state change"
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
@ 2022-09-12 12:07 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
1 sibling, 0 replies; 13+ messages in thread
From: Andrew Lunn @ 2022-09-12 12:07 UTC (permalink / raw)
To: Francesco Dolcini
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Marc Kleine-Budde, Guenter Roeck
On Mon, Sep 12, 2022 at 09:01:42AM +0200, Francesco Dolcini wrote:
> This reverts commit f79959220fa5fbda939592bf91c7a9ea90419040, this is
> creating multiple issues, just not ready to be merged yet.
>
> Link: https://lore.kernel.org/all/20220905180542.GA3685102@roeck-us.net/
> Link: https://lore.kernel.org/all/CAHk-=wj1obPoTu1AHj9Bd_BGYjdjDyPP+vT5WMj8eheb3A9WHw@mail.gmail.com/
> Fixes: f79959220fa5 ("fec: Restart PPS after link state change")
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
` (2 preceding siblings ...)
2022-09-12 7:07 ` [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
@ 2022-09-12 12:28 ` Marc Kleine-Budde
2022-09-12 12:38 ` Francesco Dolcini
2022-09-20 10:30 ` patchwork-bot+netdevbpf
4 siblings, 1 reply; 13+ messages in thread
From: Marc Kleine-Budde @ 2022-09-12 12:28 UTC (permalink / raw)
To: Francesco Dolcini
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Guenter Roeck, Andrew Lunn
[-- Attachment #1: Type: text/plain, Size: 986 bytes --]
On 12.09.2022 09:01:41, Francesco Dolcini wrote:
> Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
> issues and we are at 6.0-rc5.
>
> Francesco Dolcini (2):
> Revert "fec: Restart PPS after link state change"
> Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
Nitpick: I would revert "net: fec: Use a spinlock to guard
`fep->ptp_clk_on`" first, as it's the newer patch.
>
> drivers/net/ethernet/freescale/fec.h | 11 +----
> drivers/net/ethernet/freescale/fec_main.c | 59 +++++------------------
> drivers/net/ethernet/freescale/fec_ptp.c | 57 +++++++---------------
> 3 files changed, 31 insertions(+), 96 deletions(-)
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 1/2] Revert "fec: Restart PPS after link state change"
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
2022-09-12 12:07 ` Andrew Lunn
@ 2022-09-12 12:32 ` Marc Kleine-Budde
1 sibling, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2022-09-12 12:32 UTC (permalink / raw)
To: Francesco Dolcini
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Guenter Roeck, Andrew Lunn
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
On 12.09.2022 09:01:42, Francesco Dolcini wrote:
> This reverts commit f79959220fa5fbda939592bf91c7a9ea90419040, this is
> creating multiple issues, just not ready to be merged yet.
>
> Link: https://lore.kernel.org/all/20220905180542.GA3685102@roeck-us.net/
> Link: https://lore.kernel.org/all/CAHk-=wj1obPoTu1AHj9Bd_BGYjdjDyPP+vT5WMj8eheb3A9WHw@mail.gmail.com/
> Fixes: f79959220fa5 ("fec: Restart PPS after link state change")
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
2022-09-12 7:01 ` [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Francesco Dolcini
2022-09-12 12:05 ` Andrew Lunn
@ 2022-09-12 12:32 ` Marc Kleine-Budde
1 sibling, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2022-09-12 12:32 UTC (permalink / raw)
To: Francesco Dolcini
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Guenter Roeck, Andrew Lunn
[-- Attachment #1: Type: text/plain, Size: 868 bytes --]
On 12.09.2022 09:01:43, Francesco Dolcini wrote:
> This reverts commit b353b241f1eb9b6265358ffbe2632fdcb563354f, 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: b353b241f1eb ("net: fec: Use a spinlock to guard `fep->ptp_clk_on`")
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-12 12:28 ` Marc Kleine-Budde
@ 2022-09-12 12:38 ` Francesco Dolcini
2022-09-20 7:45 ` Thorsten Leemhuis
0 siblings, 1 reply; 13+ messages in thread
From: Francesco Dolcini @ 2022-09-12 12:38 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: Francesco Dolcini, Joakim Zhang, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Csókás Bence, netdev,
linux-kernel, Guenter Roeck, Andrew Lunn
On Mon, Sep 12, 2022 at 02:28:57PM +0200, Marc Kleine-Budde wrote:
> On 12.09.2022 09:01:41, Francesco Dolcini wrote:
> > Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
> > issues and we are at 6.0-rc5.
> >
> > Francesco Dolcini (2):
> > Revert "fec: Restart PPS after link state change"
> > Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
>
> Nitpick: I would revert "net: fec: Use a spinlock to guard
> `fep->ptp_clk_on`" first, as it's the newer patch.
Shame on me, I do 100% agree, I inverted the 2 patches last second.
Francesco
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-12 12:38 ` Francesco Dolcini
@ 2022-09-20 7:45 ` Thorsten Leemhuis
2022-09-20 9:51 ` Paolo Abeni
0 siblings, 1 reply; 13+ messages in thread
From: Thorsten Leemhuis @ 2022-09-20 7:45 UTC (permalink / raw)
To: Francesco Dolcini, Marc Kleine-Budde
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Csókás Bence, netdev, linux-kernel,
Guenter Roeck, Andrew Lunn
On 12.09.22 14:38, Francesco Dolcini wrote:
> On Mon, Sep 12, 2022 at 02:28:57PM +0200, Marc Kleine-Budde wrote:
>> On 12.09.2022 09:01:41, Francesco Dolcini wrote:
>>> Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
>>> issues and we are at 6.0-rc5.
>>>
>>> Francesco Dolcini (2):
>>> Revert "fec: Restart PPS after link state change"
>>> Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
>>
>> Nitpick: I would revert "net: fec: Use a spinlock to guard
>> `fep->ptp_clk_on`" first, as it's the newer patch.
>
> Shame on me, I do 100% agree, I inverted the 2 patches last second.
What's the status of this patchset? It seems it didn't make any progress
in the past few days, or am I missing something?
Just asking, because the thing is: I'm pretty sure that Linus will be
somewhat unhappy if there isn't any attempt to get this fixed before
rc7, as the the problems caused by these patches are known for a while now.
Ciao, Thorsten (wearing his 'the Linux kernel's regression tracker' hat)
P.S.: As the Linux kernel's regression tracker I deal with a lot of
reports and sometimes miss something important when writing mails like
this. If that's the case here, don't hesitate to tell me in a public
reply, it's in everyone's interest to set the public record straight.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-20 7:45 ` Thorsten Leemhuis
@ 2022-09-20 9:51 ` Paolo Abeni
0 siblings, 0 replies; 13+ messages in thread
From: Paolo Abeni @ 2022-09-20 9:51 UTC (permalink / raw)
To: Thorsten Leemhuis, Francesco Dolcini, Marc Kleine-Budde
Cc: Joakim Zhang, David S. Miller, Eric Dumazet, Jakub Kicinski,
Csókás Bence, netdev, linux-kernel, Guenter Roeck,
Andrew Lunn
On Tue, 2022-09-20 at 09:45 +0200, Thorsten Leemhuis wrote:
> On 12.09.22 14:38, Francesco Dolcini wrote:
> > On Mon, Sep 12, 2022 at 02:28:57PM +0200, Marc Kleine-Budde wrote:
> > > On 12.09.2022 09:01:41, Francesco Dolcini wrote:
> > > > Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
> > > > issues and we are at 6.0-rc5.
> > > >
> > > > Francesco Dolcini (2):
> > > > Revert "fec: Restart PPS after link state change"
> > > > Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
> > >
> > > Nitpick: I would revert "net: fec: Use a spinlock to guard
> > > `fep->ptp_clk_on`" first, as it's the newer patch.
> >
> > Shame on me, I do 100% agree, I inverted the 2 patches last second.
>
> What's the status of this patchset? It seems it didn't make any progress
> in the past few days, or am I missing something?
Due to some unfortunate circumstances, we have quite a bit of backlog
in the netdev patchwork. We are working to process it, and the above
revert will be processed before the next rc.
Cheers,
Paolo
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net 0/2] Revert fec PTP changes
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
` (3 preceding siblings ...)
2022-09-12 12:28 ` Marc Kleine-Budde
@ 2022-09-20 10:30 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 13+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-20 10:30 UTC (permalink / raw)
To: Francesco Dolcini
Cc: qiangqing.zhang, davem, edumazet, kuba, pabeni, csokas.bence,
netdev, linux-kernel, mkl, linux, andrew
Hello:
This series was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:
On Mon, 12 Sep 2022 09:01:41 +0200 you wrote:
> Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
> issues and we are at 6.0-rc5.
>
> Francesco Dolcini (2):
> Revert "fec: Restart PPS after link state change"
> Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
>
> [...]
Here is the summary with links:
- [net,1/2] Revert "fec: Restart PPS after link state change"
https://git.kernel.org/netdev/net/c/7b15515fc1ca
- [net,2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`"
https://git.kernel.org/netdev/net/c/01b825f997ac
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-09-20 10:30 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-12 7:01 [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
2022-09-12 7:01 ` [PATCH net 1/2] Revert "fec: Restart PPS after link state change" Francesco Dolcini
2022-09-12 12:07 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
2022-09-12 7:01 ` [PATCH net 2/2] Revert "net: fec: Use a spinlock to guard `fep->ptp_clk_on`" Francesco Dolcini
2022-09-12 12:05 ` Andrew Lunn
2022-09-12 12:32 ` Marc Kleine-Budde
2022-09-12 7:07 ` [PATCH net 0/2] Revert fec PTP changes Francesco Dolcini
2022-09-12 12:28 ` Marc Kleine-Budde
2022-09-12 12:38 ` Francesco Dolcini
2022-09-20 7:45 ` Thorsten Leemhuis
2022-09-20 9:51 ` Paolo Abeni
2022-09-20 10:30 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.