From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BD79C27C79 for ; Wed, 19 Jun 2024 16:43:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0782B4147F; Wed, 19 Jun 2024 16:43:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id P4grlF0oifk0; Wed, 19 Jun 2024 16:42:59 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EDADA413CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1718815379; bh=flOkWb5d2/WzEzU6OYA2rHi+kmvrGIGrflW9K277+sQ=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=BOECaEL3VJmIZfGdqk4O8Fi14CqyNAt0r/uP9YMmQwif0AIFviaZY78EPo4kv2CmK dhpMtIeZbFQb4XYnklR6AuWNKnQJKEq+/1HNWEDJ1B9VmPlkAJXBDrTpvYAhQWhnDC IvBvVNPHuWnHY9a5CKIbBxkVEmKfm5DaaLlNTWZjKguGfXglP0ONigQ93o0TqSE5lS oQlRXJ//RM+lYbj5qvdi5vTriHy986+P3rRn3uWLaxEK+p7gArm2IQBImRkgS2M0dP 5Vp0ceDgydgu7hSb5TXf9+HCvyMmeLkzrBi/sRszbgtLrFMfLhk3sH3RHSbbxHadzy MUBi9gTISkFlg== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id EDADA413CD; Wed, 19 Jun 2024 16:42:58 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AD9951BF370 for ; Wed, 19 Jun 2024 16:42:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 978668426E for ; Wed, 19 Jun 2024 16:42:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id IfhDVt-NnBTZ for ; Wed, 19 Jun 2024 16:42:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2604:1380:40e1:4800::1; helo=sin.source.kernel.org; envelope-from=horms@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 6A48D842D3 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6A48D842D3 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6A48D842D3 for ; Wed, 19 Jun 2024 16:42:56 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5D7FBCE1DC3; Wed, 19 Jun 2024 16:42:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28027C2BBFC; Wed, 19 Jun 2024 16:42:49 +0000 (UTC) Date: Wed, 19 Jun 2024 17:42:47 +0100 From: Simon Horman To: Karol Kolacinski Message-ID: <20240619164247.GK690967@kernel.org> References: <20240618104310.1429515-1-karol.kolacinski@intel.com> <20240618104310.1429515-2-karol.kolacinski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240618104310.1429515-2-karol.kolacinski@intel.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718815371; bh=Prisqet5/3qScXbJ+8JlF2VLayZ0w3KdlQsw2CiQZjs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RlBsEfYCPsU8qD2KyFDb7wpkDzsrH08IFZKavp7ta2Dg3D4ff6avaxGPQXYWHT3zx f0RKQEhMUzHp+iofray7A+kRVOfhNFpT8DmDC/1KsgL0+QrmpvT+W7nklrbLyfHnUq 2IIl1XxAFJoCyPRONUw/GkN73j9mWO6RuVzPQXGEWJ12P+8HqellBcBWTAFfwDnLGN PiehNDnuyDKDSTtsDzJxCek4YY6s2NpJM00ts1FVKdFUa0ZCTgoULjTKPZzL0IhC/I xc6D4jPCKNhbWw7aLZJ2kph+4scuRQ6YTTUwoRzR+c9+4iyWyIFXSXYYePnC4eoLG/ GEYlbPc0ukTQg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=RlBsEfYC Subject: Re: [Intel-wired-lan] [PATCH iwl-net 1/3] ice: Fix improper extts handling X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, Jacob Keller , intel-wired-lan@lists.osuosl.org, Milena Olech Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Tue, Jun 18, 2024 at 12:41:36PM +0200, Karol Kolacinski wrote: > From: Milena Olech > > Extts events are disabled and enabled by the application ts2phc. > However, in case where the driver is removed when the application is > running, channel remains enabled. As a result, in the next run of the > app, two channels are enabled and the information "extts on unexpected > channel" is printed to the user. > > To avoid that, extts events shall be disabled when PTP is released. > > Fixes: 172db5f91d5f ("ice: add support for auxiliary input/output pins") > Reviewed-by: Przemek Kitszel > Co-developed-by: Jacob Keller > Signed-off-by: Jacob Keller > Signed-off-by: Milena Olech > Signed-off-by: Karol Kolacinski Hi Milena and Karol, Some feedback from my side. ... > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c > index 0f17fc1181d2..30f1f910e6d9 100644 > --- a/drivers/net/ethernet/intel/ice/ice_ptp.c > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c > @@ -1584,27 +1584,24 @@ void ice_ptp_extts_event(struct ice_pf *pf) > /** > * ice_ptp_cfg_extts - Configure EXTTS pin and channel > * @pf: Board private structure > - * @ena: true to enable; false to disable > * @chan: GPIO channel (0-3) > - * @gpio_pin: GPIO pin > - * @extts_flags: request flags from the ptp_extts_request.flags > - */ > -static int > -ice_ptp_cfg_extts(struct ice_pf *pf, bool ena, unsigned int chan, u32 gpio_pin, > - unsigned int extts_flags) > + * @config: desired EXTTS configuration. > + * @store: If set to true, the values will be stored > + * > + * Configure an external timestamp event on the requested channel. > + */ nit: There is an extra leading space on the line above. Also, although not strictly related to this change, please consider adding a Returns: section to this kernel doc. > +static void ice_ptp_cfg_extts(struct ice_pf *pf, unsigned int chan, > + struct ice_extts_channel *config, bool store) ... > @@ -1869,21 +1915,31 @@ static int ice_ptp_gpio_enable_e823(struct ptp_clock_info *info, > struct ptp_clock_request *rq, int on) > { > struct ice_pf *pf = ptp_info_to_pf(info); > - struct ice_perout_channel clk_cfg = {0}; > int err; > > switch (rq->type) { > case PTP_CLK_REQ_PPS: > + { > + struct ice_perout_channel clk_cfg = {}; > + > clk_cfg.gpio_pin = PPS_PIN_INDEX; > clk_cfg.period = NSEC_PER_SEC; > clk_cfg.ena = !!on; > > err = ice_ptp_cfg_clkout(pf, PPS_CLK_GEN_CHAN, &clk_cfg, true); > break; > + } > case PTP_CLK_REQ_EXTTS: > - err = ice_ptp_cfg_extts(pf, !!on, rq->extts.index, > - TIME_SYNC_PIN_INDEX, rq->extts.flags); > + { > + struct ice_extts_channel extts_cfg = {}; > + > + extts_cfg.flags = rq->extts.flags; > + extts_cfg.gpio_pin = TIME_SYNC_PIN_INDEX; > + extts_cfg.ena = !!on; > + > + ice_ptp_cfg_extts(pf, rq->extts.index, &extts_cfg, true); > break; This function returns err. But with this patch err is uninitialised here. Perhaps err be set to the return value of ice_ptp_cfg_extts() as it was before this patch? Flagged by allmodconfig W=1 builds with gcc-13 and clang-18, and Smatch. > + } > default: > return -EOPNOTSUPP; > } ...