From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: Horatiu Vultur <horatiu.vultur@microchip.com>
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, richardcochran@gmail.com,
jacob.e.keller@intel.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, UNGLinuxDriver@microchip.com
Subject: Re: [PATCH net] net: lan966x: Remove ptp traps in case the ptp is not enabled.
Date: Wed, 15 May 2024 01:21:49 +0300 [thread overview]
Message-ID: <20240514222149.mhwtp3kduebb4zzs@skbuf> (raw)
In-Reply-To: <20240514193500.577403-1-horatiu.vultur@microchip.com>
On Tue, May 14, 2024 at 09:35:00PM +0200, Horatiu Vultur wrote:
> Lan966x is adding ptp traps to redirect the ptp frames to the CPU such
> that the HW will not forward these frames anywhere. The issue is that in
> case ptp is not enabled and the timestamping source is et to
> HWTSTAMP_SOURCE_NETDEV then these traps would not be removed on the
> error path.
> Fix this by removing the traps in this case as they are not needed.
>
> Fixes: 54e1ed69c40a ("net: lan966x: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set()")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
> drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> index 2635ef8958c80..318676e42bb62 100644
> --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> @@ -479,8 +479,10 @@ static int lan966x_port_hwtstamp_set(struct net_device *dev,
> return err;
>
> if (cfg->source == HWTSTAMP_SOURCE_NETDEV) {
> - if (!port->lan966x->ptp)
> + if (!port->lan966x->ptp) {
> + lan966x_ptp_del_traps(port);
> return -EOPNOTSUPP;
> + }
>
> err = lan966x_ptp_hwtstamp_set(port, cfg, extack);
> if (err) {
> --
> 2.34.1
>
Alternatively, the -EOPNOTSUPP check could be moved before programming
the traps in the first place.
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
next prev parent reply other threads:[~2024-05-14 22:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 19:35 [PATCH net] net: lan966x: Remove ptp traps in case the ptp is not enabled Horatiu Vultur
2024-05-14 22:21 ` Vladimir Oltean [this message]
2024-05-16 6:48 ` Horatiu Vultur
2024-05-17 10:04 ` Vladimir Oltean
2024-05-17 10:18 ` Horatiu Vultur
2024-05-17 10:23 ` Vladimir Oltean
2024-05-17 10:53 ` Horatiu Vultur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240514222149.mhwtp3kduebb4zzs@skbuf \
--to=vladimir.oltean@nxp.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horatiu.vultur@microchip.com \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox