| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID:
<PAXPR04MB8510B574A53DAD7E1256A9E688692@PAXPR04MB8510.eurprd04.prod.outlook.com>
Date: Wed, 25 Sep 2024 04:37:25 +0000
From: Wei Fang <wei.fang@....com>
To: Csókás, Bence <csokas.bence@...lan.hu>, Frank Li
<frank.li@....com>
CC: Shenwei Wang <shenwei.wang@....com>, Clark Wang <xiaoning.wang@....com>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo
Abeni <pabeni@...hat.com>, Richard Cochran <richardcochran@...il.com>, "David
S. Miller" <davem@...emloft.net>, "imx@...ts.linux.dev"
<imx@...ts.linux.dev>, "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH net 1/2] net: fec: Restart PPS after link state change
> -----Original Message-----
> From: Csókás, Bence <csokas.bence@...lan.hu>
> Sent: 2024年9月24日 17:37
> To: Frank Li <Frank.Li@...escale.com>; David S. Miller
> <davem@...emloft.net>; imx@...ts.linux.dev; netdev@...r.kernel.org;
> linux-kernel@...r.kernel.org
> Cc: Csókás, Bence <csokas.bence@...lan.hu>; Wei Fang <wei.fang@....com>;
> Shenwei Wang <shenwei.wang@....com>; Clark Wang
> <xiaoning.wang@....com>; Eric Dumazet <edumazet@...gle.com>; Jakub
> Kicinski <kuba@...nel.org>; Paolo Abeni <pabeni@...hat.com>; Richard
> Cochran <richardcochran@...il.com>
> Subject: [PATCH net 1/2] net: fec: Restart PPS after link state change
>
The "v2" descriptor is missing in the subject, and correct the mail address
of Frank.
> On link state change, the controller gets reset, causing PPS to drop out.
> Re-enable PPS if it was enabled before the controller reset.
>
> Fixes: 6605b730c061 ("FEC: Add time stamping code and a PTP hardware
> clock")
> Signed-off-by: Csókás, Bence <csokas.bence@...lan.hu>
> ---
>
> Notes:
> Changes in v2:
> - store pps_enable's pre-reset value and clear it on restore
> - acquire tmreg_lock when reading/writing fep->pps_enable
>
> drivers/net/ethernet/freescale/fec.h | 6 +++++
> drivers/net/ethernet/freescale/fec_main.c | 11 ++++++++-
> drivers/net/ethernet/freescale/fec_ptp.c | 30 +++++++++++++++++++++++
> 3 files changed, 46 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.h
> b/drivers/net/ethernet/freescale/fec.h
> index a19cb2a786fd..0552317a2554 100644
> --- a/drivers/net/ethernet/freescale/fec.h
> +++ b/drivers/net/ethernet/freescale/fec.h
> @@ -691,10 +691,16 @@ struct fec_enet_private {
> /* XDP BPF Program */
> struct bpf_prog *xdp_prog;
>
> + struct {
> + int pps_enable;
> + } ptp_saved_state;
> +
> u64 ethtool_stats[];
> };
>
> void fec_ptp_init(struct platform_device *pdev, int irq_idx);
> +void fec_ptp_restore_state(struct fec_enet_private *fep); void
> +fec_ptp_save_state(struct fec_enet_private *fep);
> void fec_ptp_stop(struct platform_device *pdev); void
> fec_ptp_start_cyclecounter(struct net_device *ndev); int fec_ptp_set(struct
> net_device *ndev, struct kernel_hwtstamp_config *config, diff --git
> a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index acbb627d51bf..31ebf6a4f973 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1077,6 +1077,8 @@ fec_restart(struct net_device *ndev)
> u32 rcntl = OPT_FRAME_SIZE | 0x04;
> u32 ecntl = FEC_ECR_ETHEREN;
>
> + 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.
> @@ -1244,8 +1246,10 @@ fec_restart(struct net_device *ndev)
> writel(ecntl, fep->hwp + FEC_ECNTRL);
> fec_enet_active_rxring(ndev);
>
> - if (fep->bufdesc_ex)
> + if (fep->bufdesc_ex) {
> fec_ptp_start_cyclecounter(ndev);
> + fec_ptp_restore_state(fep);
> + }
>
> /* Enable interrupts we wish to service */
> if (fep->link)
> @@ -1336,6 +1340,8 @@ 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.
> @@ -1366,6 +1372,9 @@ fec_stop(struct net_device *ndev)
> val = readl(fep->hwp + FEC_ECNTRL);
> val |= FEC_ECR_EN1588;
> writel(val, fep->hwp + FEC_ECNTRL);
> +
> + fec_ptp_start_cyclecounter(ndev);
> + fec_ptp_restore_state(fep);
> }
> }
>
> diff --git a/drivers/net/ethernet/freescale/fec_ptp.c
> b/drivers/net/ethernet/freescale/fec_ptp.c
> index 4cffda363a14..df1ef023493b 100644
> --- a/drivers/net/ethernet/freescale/fec_ptp.c
> +++ b/drivers/net/ethernet/freescale/fec_ptp.c
> @@ -764,6 +764,36 @@ void fec_ptp_init(struct platform_device *pdev, int
> irq_idx)
> schedule_delayed_work(&fep->time_keep, HZ); }
>
> +void fec_ptp_save_state(struct fec_enet_private *fep) {
> + unsigned long flags;
> +
> + spin_lock_irqsave(&fep->tmreg_lock, flags);
> +
> + fep->ptp_saved_state.pps_enable = fep->pps_enable;
> +
> + spin_unlock_irqrestore(&fep->tmreg_lock, flags); }
> +
> +/* Restore PTP functionality after a reset */ void
> +fec_ptp_restore_state(struct fec_enet_private *fep) {
> + unsigned long flags;
> +
> + spin_lock_irqsave(&fep->tmreg_lock, flags);
> +
> + /* Reset turned it off, so adjust our status flag */
> + fep->pps_enable = 0;
> +
> + spin_unlock_irqrestore(&fep->tmreg_lock, flags);
> +
> + /* Restart PPS if needed */
> + if (fep->ptp_saved_state.pps_enable) {
It's better to put " fep->pps_enable = 0" here so that it does
not need to be set when PPS is disabled.
> + /* Re-enable PPS */
> + fec_ptp_enable_pps(fep, 1);
> + }
> +}
> +
> void fec_ptp_stop(struct platform_device *pdev) {
> struct net_device *ndev = platform_get_drvdata(pdev);
> --
> 2.34.1
>
Powered by blists - more mailing lists