netdev - Re: [PATCH net v1 1/1] net: stmmac: Assign configured channel value to EXTTS event

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 18 Jun 2024 15:07:58 +0200
From: Wojciech Drewek <wojciech.drewek@...el.com>
To: Oleksij Rempel <o.rempel@...gutronix.de>, Alexandre Torgue
	<alexandre.torgue@...s.st.com>, Jose Abreu <joabreu@...opsys.com>, "David S.
 Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, "Jakub
 Kicinski" <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Maxime Coquelin
	<mcoquelin.stm32@...il.com>
CC: <stable@...r.kernel.org>, <kernel@...gutronix.de>,
	<linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>, Richard Cochran
	<richardcochran@...il.com>, Tan Tee Min <tee.min.tan@...el.com>, "Wong Vee
 Khee" <vee.khee.wong@...ux.intel.com>
Subject: Re: [PATCH net v1 1/1] net: stmmac: Assign configured channel value
 to EXTTS event



On 18.06.2024 09:38, Oleksij Rempel wrote:
> Assign the configured channel value to the EXTTS event in the timestamp
> interrupt handler. Without assigning the correct channel, applications
> like ts2phc will refuse to accept the event, resulting in errors such
> as:
> ...
> ts2phc[656.834]: config item end1.ts2phc.pin_index is 0
> ts2phc[656.834]: config item end1.ts2phc.channel is 3
> ts2phc[656.834]: config item end1.ts2phc.extts_polarity is 2
> ts2phc[656.834]: config item end1.ts2phc.extts_correction is 0
> ...
> ts2phc[656.862]: extts on unexpected channel
> ts2phc[658.141]: extts on unexpected channel
> ts2phc[659.140]: extts on unexpected channel
> 
> Fixes: f4da56529da60 ("net: stmmac: Add support for external trigger timestamping")
> Cc: stable@...r.kernel.org
> Signed-off-by: Oleksij Rempel <o.rempel@...gutronix.de>
> ---

Reviewed-by: Wojciech Drewek <wojciech.drewek@...el.com>

>  drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
> index f05bd757dfe52..5ef52ef2698fb 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
> @@ -218,6 +218,7 @@ static void timestamp_interrupt(struct stmmac_priv *priv)
>  {
>  	u32 num_snapshot, ts_status, tsync_int;
>  	struct ptp_clock_event event;
> +	u32 acr_value, channel;
>  	unsigned long flags;
>  	u64 ptp_time;
>  	int i;
> @@ -243,12 +244,15 @@ static void timestamp_interrupt(struct stmmac_priv *priv)
>  	num_snapshot = (ts_status & GMAC_TIMESTAMP_ATSNS_MASK) >>
>  		       GMAC_TIMESTAMP_ATSNS_SHIFT;
>  
> +	acr_value = readl(priv->ptpaddr + PTP_ACR);
> +	channel = ilog2(FIELD_GET(PTP_ACR_MASK, acr_value));
> +
>  	for (i = 0; i < num_snapshot; i++) {
>  		read_lock_irqsave(&priv->ptp_lock, flags);
>  		get_ptptime(priv->ptpaddr, &ptp_time);
>  		read_unlock_irqrestore(&priv->ptp_lock, flags);
>  		event.type = PTP_CLOCK_EXTTS;
> -		event.index = 0;
> +		event.index = channel;
>  		event.timestamp = ptp_time;
>  		ptp_clock_event(priv->ptp_clock, &event);
>  	}