Commit 97ed20a0 authored by Sergey Temerkhanov's avatar Sergey Temerkhanov Committed by Tony Nguyen
Browse files

ice: Add ice_get_ctrl_ptp() wrapper to simplify the code 



Add ice_get_ctrl_ptp() wrapper to simplify the PTP support code
in the functions that do not use ctrl_pf directly.
Add the control PF pointer to struct ice_adapter
Rearrange fields in struct ice_adapter

Signed-off-by: default avatarSergey Temerkhanov <sergey.temerkhanov@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 5e077645

drivers/net/ethernet/intel/ice/ice_adapter.h

+4 −1
Original line number Diff line number Diff line
@@ -8,18 +8,21 @@ 
#include <linux/refcount_types.h>



struct pci_dev;

struct ice_pf;



/**

 * struct ice_adapter - PCI adapter resources shared across PFs

 * @ptp_gltsyn_time_lock: Spinlock protecting access to the GLTSYN_TIME

 *                        register of the PTP clock.

 * @refcount: Reference count. struct ice_pf objects hold the references.

 * @ctrl_pf: Control PF of the adapter

 */

struct ice_adapter {

	refcount_t refcount;

	/* For access to the GLTSYN_TIME register */

	spinlock_t ptp_gltsyn_time_lock;



	refcount_t refcount;

	struct ice_pf *ctrl_pf;

};



struct ice_adapter *ice_adapter_get(const struct pci_dev *pdev);

drivers/net/ethernet/intel/ice/ice_ptp.c

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ static const struct ice_ptp_pin_desc ice_pin_desc_e810_sma[] = { 
	{  UFL2, {  3, -1 }},

};



static struct ice_pf *ice_get_ctrl_pf(struct ice_pf *pf)

{

	return !pf->adapter ? NULL : pf->adapter->ctrl_pf;

}



static __maybe_unused struct ice_ptp *ice_get_ctrl_ptp(struct ice_pf *pf)

{

	struct ice_pf *ctrl_pf = ice_get_ctrl_pf(pf);



	return !ctrl_pf ? NULL : &ctrl_pf->ptp;

}



/**

 * ice_ptp_find_pin_idx - Find pin index in ptp_pin_desc

 * @pf: Board private structure