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 smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 288A4C4332F for ; Sat, 4 Nov 2023 15:25:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D4F4640144; Sat, 4 Nov 2023 15:25:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D4F4640144 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1699111544; bh=Reowh79br0P5c3nf7Aco1WeFQ7QDIis/DIPU3CNHkxk=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=3TW0Jksm+VegyOYrNglhf6rj/dXyD7OMPtBvPSRk4aga3BymXns64a8A3h/qs+ebj oiXTTvV6amDLM58C9S6mNy4WdwVFOQ3rUlRTbbdXbniGC1tgCAXFFj+MFXsmMMfHDn ROYGGEYi7cK5EHVvj1WG9M0wsJ2jGA3slatWt1z6Ex6NSb8q/e/vOAM5AQVDbP+4x3 tc1PlH1o2MGL/cWWi84NM3vWobjXcIgt8zNmNI9Y+iyAF0Vcb9fwjqmVmUnawLzgE1 XRYLXMHygR7MnJI1nuhFJT5R92Uxq59TEQwmFI9dQ/4ZytBTMbDBR2S48anyeNWsxk P17LFJYYhi9yw== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yulQgjgnkfw4; Sat, 4 Nov 2023 15:25:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 83075409C8; Sat, 4 Nov 2023 15:25:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 83075409C8 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9920B1BF584 for ; Sat, 4 Nov 2023 15:25:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 70F2F60F44 for ; Sat, 4 Nov 2023 15:25:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 70F2F60F44 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23xweoo-Ufic for ; Sat, 4 Nov 2023 15:25:40 +0000 (UTC) Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9C45C60F41 for ; Sat, 4 Nov 2023 15:25:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9C45C60F41 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0BA8BCE0229; Sat, 4 Nov 2023 15:25:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C433C433C7; Sat, 4 Nov 2023 15:25:30 +0000 (UTC) Date: Sat, 4 Nov 2023 11:25:23 -0400 From: Simon Horman To: Jacob Keller Message-ID: <20231104152523.GI891380@kernel.org> References: <20231103234658.511859-1-jacob.e.keller@intel.com> <20231103234658.511859-4-jacob.e.keller@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231103234658.511859-4-jacob.e.keller@intel.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699111537; bh=RXC0aVEzXpNQmrr7IVwVsn2Tuc9ENbNnCqjKZnXeNuU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vFbreeA4celmK7CrhDLD7TDVutpD9Zl/06XOmuhANy00F0FjW+htciPxTCMz9PbTt C7ht5vYsiO+I5zEuFao7Cc1PDhw3sagdQAdSbFOUolNDVNiYl2+/rX+O0Q/QmRzsR8 s6VR94JRGX9eBaDNb1iI3yhK8iZATpW7S2BUS4pipVtB2zHvGnZOsOTJFI6Ntee0Rn OwPS2hbvSQpEGcvfiBWV0W6COmLAPqFf/Y4PC83rYFiqy4ICx99yfFMdL1bmdvoQhd 7ir2RMNGXTWeqpkDtGCPfn0fzEGCvueXn4Buco5G5HwoLVjIBWgENif4f8pRnWvaRI DDqLO3yUZoXxA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=vFbreeA4 Subject: Re: [Intel-wired-lan] [PATCH iwl-net 3/3] ice: restore timestamp configuration after device reset 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: Intel Wired LAN , Anthony Nguyen , Jesse Brandeburg , netdev@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Fri, Nov 03, 2023 at 04:46:58PM -0700, Jacob Keller wrote: > The driver calls ice_ptp_cfg_timestamp() during ice_ptp_prepare_for_reset() > to disable timestamping while the device is resetting. This operation > destroys the user requested configuration. While the driver does call > ice_ptp_cfg_timestamp in ice_rebuild() to restore some hardware settings > after a reset, it unconditionally passes true or false, resulting in > failure to restore previous user space configuration. > > This results in a device reset forcibly disabling timestamp configuration > regardless of current user settings. > > This was not detected previously due to a quirk of the LinuxPTP ptp4l > application. If ptp4l detects a missing timestamp, it enters a fault state > and performs recovery logic which includes executing SIOCSHWTSTAMP again, > restoring the now accidentally cleared configuration. > > Not every application does this, and for these applications, timestamps > will mysteriously stop after a PF reset, without being restored until an > application restart. > > Fix this by replacing ice_ptp_cfg_timestamp() with two new functions: > > 1) ice_ptp_disable_timestamp_mode() which unconditionally disables the > timestamping logic in ice_ptp_prepare_for_reset() and ice_ptp_release() > > 2) ice_ptp_restore_timestamp_mode() which calls > ice_ptp_restore_tx_interrupt() to restore Tx timestamping configuration, > calls ice_set_rx_tstamp() to restore Rx timestamping configuration, and > issues an immediate TSYN_TX interrupt to ensure that timestamps which > may have occurred during the device reset get processed. > > Modify the ice_ptp_set_timestamp_mode to directly save the user > configuration and then call ice_ptp_restore_timestamp_mode. This way, reset > no longer destroys the saved user configuration. > > This obsoletes the ice_set_tx_tstamp() function which can now be safely > removed. > > With this change, all devices should now restore Tx and Rx timestamping > functionality correctly after a PF reset without application intervention. > > Fixes: 77a781155a65 ("ice: enable receive hardware timestamping") > Fixes: ea9b847cda64 ("ice: enable transmit timestamps for E810 devices") > Signed-off-by: Jacob Keller > Reviewed-by: Jesse Brandeburg Reviewed-by: Simon Horman _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan