Re: [PATCH iwl-next 4/7] ice: Cache perout/extts requests and check flags

[Simon Horman <horms@kernel.org>]

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 <arkadiusz.kubalewski@intel.com>
> Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>

...

> 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 :)

...