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 951A3C2BD09 for ; Mon, 1 Jul 2024 13:26:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5BC3040275; Mon, 1 Jul 2024 13:26:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 2KmQwYiYXqcv; Mon, 1 Jul 2024 13:26:53 +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 smtp2.osuosl.org 8256140495 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1719840413; bh=p2ePqA/CvLGCVr7WaMKU0WaTn0I/74/bg4I3oxHkrSY=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=CKZbvq5Xf1VkyS0VeRY1w0T62anb1Em76dQmy14JnavDbLz2L65N1foi77Npn0XOb oNs4FecQ2qMGk8XfTWoEYjhNzfOCuAEwOW5SQYlR1Gv73hRGIEdMKuz17Tpk1ivYbS Gn+1XRyZ0+u1VUvmwaVIV7FYuXLejFSsO+UEAuhBHIQJHkdkmKPaDMz+3fvRWaKLS0 Rx3JfHTgYO0QijXFpXgCyTgbScDf6E0M1k85bRZtVyTntyDffTO0sWveHOtiPVKIGC DurChFnY1tfg913smub28QaYfUMVEm6YQEsKk204GGloncn6WyXT3L+PjlCLKafwYW zOVyGhZKwQtCw== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8256140495; Mon, 1 Jul 2024 13:26:53 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3A5121BF338 for ; Mon, 1 Jul 2024 13:26:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 32D7640495 for ; Mon, 1 Jul 2024 13:26:52 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SGeBKTD30udm for ; Mon, 1 Jul 2024 13:26:51 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=145.40.73.55; helo=sin.source.kernel.org; envelope-from=horms@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org B49AA40275 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B49AA40275 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by smtp2.osuosl.org (Postfix) with ESMTPS id B49AA40275 for ; Mon, 1 Jul 2024 13:26:50 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C15A0CE13D5; Mon, 1 Jul 2024 13:26:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF6E3C116B1; Mon, 1 Jul 2024 13:26:45 +0000 (UTC) Date: Mon, 1 Jul 2024 14:26:43 +0100 From: Simon Horman To: Karol Kolacinski Message-ID: <20240701132643.GB17134@kernel.org> References: <20240627151127.284884-9-karol.kolacinski@intel.com> <20240627151127.284884-13-karol.kolacinski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240627151127.284884-13-karol.kolacinski@intel.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719840407; bh=UECbh9wJXU8IDXyagbQVCkv9/60GTr2VMGPjK0k90E8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=M5xkmTMOC3vYvqztucl18WmOQ3yZGZINLUX5oieDt/bwByEjUUaqC+fQxUU4BRWJz B8wH5GQmkWfHWcBkOb3axyWOmQB7ZdpTzW/4C7oquN12h9IEXwrjKkpRGAGisnMtKE JK+xj5qwdO12exV0a7nKVC4/45BYmS5hQgmrew28u4cQ/BrDxXVpKFoDUlYrp/cpJc MG3SCB/Zv6pZ3RDLoO+paFUryzvxuXrZpZvA+I8rgFDonZJ4fC8ep22SAoFJrov6UL qUXp3wZWvrYYdIQ3H81x9A7BDIZ3O5pnl46Q6dc9Z0916gD7kfGCM6b3jIInRNCvES DQhZH4WsdLeeg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=M5xkmTMO Subject: Re: [Intel-wired-lan] [PATCH iwl-next 4/7] ice: Cache perout/extts requests and check flags 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, Arkadiusz Kubalewski , intel-wired-lan@lists.osuosl.org, przemyslaw.kitszel@intel.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Thu, Jun 27, 2024 at 05:09:28PM +0200, Karol Kolacinski wrote: > Cache original PTP GPIO requests instead of saving each parameter in > internal structures for periodic output or external timestamp request. > > Factor out all periodic output register writes from ice_ptp_cfg_clkout > to a separate function to improve readability. > > Reviewed-by: Arkadiusz Kubalewski > Signed-off-by: Karol Kolacinski ... > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h ... > @@ -259,13 +246,18 @@ struct ice_ptp_pin_desc { > * @work: delayed work function for periodic tasks > * @cached_phc_time: a cached copy of the PHC time for timestamp extension > * @cached_phc_jiffies: jiffies when cached_phc_time was last updated > - * @ext_ts_chan: the external timestamp channel in use > + * @kworker: kwork thread for handling periodic work > * @ext_ts_irq: the external timestamp IRQ in use > * @pin_desc: structure defining pins > * @ice_pin_desc: internal structure describing pin relations > +<<<<<<< HEAD > * @kworker: kwork thread for handling periodic work > * @perout_channels: periodic output data > * @extts_channels: channels for external timestamps > +======= > + * @perout_rqs: cached periodic output requests > + * @extts_rqs: cached external timestamp requests > +>>>>>>> de618462ed43 (ice: Cache perout/extts requests and check flags) > * @info: structure defining PTP hardware capabilities > * @clock: pointer to registered PTP clock device > * @tstamp_config: hardware timestamping configuration I think something went wrong when resolving a merge at some point :) ... From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9067415E5BA for ; Mon, 1 Jul 2024 13:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719840407; cv=none; b=o/Sb56Y5TOLJkPgen8lhUj2TFJYwjuHUnqB4CHhBwXRilsZARC6fSgER6hUP64NQ6RowBU4HdOqEA4iOUzlssv8EOpPM3O/tvhVzhM6TyxMP+hXAuo5j2Ql5f3Bi8EA9yRVw7E7oH0ZfWV3kpVBlKrCF21+QJNx9W6hqIg1jjtI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719840407; c=relaxed/simple; bh=UECbh9wJXU8IDXyagbQVCkv9/60GTr2VMGPjK0k90E8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=adx43eudHYvx73r1FONvzZzX8u5SfvyzNnc1YtCus6NuO8fcV6K9+JnSCvgmR/As6jdpUs5EYnUifhPHty26/s2kbiqWeMyfNnXMTbg0oPs4jvKRynrPj1hzg4qANEBArMpi+4mzCobYyEu4lCPlaaAE7NEjqG6GaHzXFtibF4E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M5xkmTMO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M5xkmTMO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF6E3C116B1; Mon, 1 Jul 2024 13:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719840407; bh=UECbh9wJXU8IDXyagbQVCkv9/60GTr2VMGPjK0k90E8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=M5xkmTMOC3vYvqztucl18WmOQ3yZGZINLUX5oieDt/bwByEjUUaqC+fQxUU4BRWJz B8wH5GQmkWfHWcBkOb3axyWOmQB7ZdpTzW/4C7oquN12h9IEXwrjKkpRGAGisnMtKE JK+xj5qwdO12exV0a7nKVC4/45BYmS5hQgmrew28u4cQ/BrDxXVpKFoDUlYrp/cpJc MG3SCB/Zv6pZ3RDLoO+paFUryzvxuXrZpZvA+I8rgFDonZJ4fC8ep22SAoFJrov6UL qUXp3wZWvrYYdIQ3H81x9A7BDIZ3O5pnl46Q6dc9Z0916gD7kfGCM6b3jIInRNCvES DQhZH4WsdLeeg== Date: Mon, 1 Jul 2024 14:26:43 +0100 From: Simon Horman To: Karol Kolacinski Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, Arkadiusz Kubalewski Subject: Re: [PATCH iwl-next 4/7] ice: Cache perout/extts requests and check flags Message-ID: <20240701132643.GB17134@kernel.org> References: <20240627151127.284884-9-karol.kolacinski@intel.com> <20240627151127.284884-13-karol.kolacinski@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240627151127.284884-13-karol.kolacinski@intel.com> On Thu, Jun 27, 2024 at 05:09:28PM +0200, Karol Kolacinski wrote: > Cache original PTP GPIO requests instead of saving each parameter in > internal structures for periodic output or external timestamp request. > > Factor out all periodic output register writes from ice_ptp_cfg_clkout > to a separate function to improve readability. > > Reviewed-by: Arkadiusz Kubalewski > Signed-off-by: Karol Kolacinski ... > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h ... > @@ -259,13 +246,18 @@ struct ice_ptp_pin_desc { > * @work: delayed work function for periodic tasks > * @cached_phc_time: a cached copy of the PHC time for timestamp extension > * @cached_phc_jiffies: jiffies when cached_phc_time was last updated > - * @ext_ts_chan: the external timestamp channel in use > + * @kworker: kwork thread for handling periodic work > * @ext_ts_irq: the external timestamp IRQ in use > * @pin_desc: structure defining pins > * @ice_pin_desc: internal structure describing pin relations > +<<<<<<< HEAD > * @kworker: kwork thread for handling periodic work > * @perout_channels: periodic output data > * @extts_channels: channels for external timestamps > +======= > + * @perout_rqs: cached periodic output requests > + * @extts_rqs: cached external timestamp requests > +>>>>>>> de618462ed43 (ice: Cache perout/extts requests and check flags) > * @info: structure defining PTP hardware capabilities > * @clock: pointer to registered PTP clock device > * @tstamp_config: hardware timestamping configuration I think something went wrong when resolving a merge at some point :) ...