Commit 5a4f45c4 authored by Sergey Temerkhanov's avatar Sergey Temerkhanov Committed by Tony Nguyen
Browse files

ice: Enable 1PPS out from CGU for E825C products 



Implement configuring 1PPS signal output from CGU. Use maximal amplitude
because Linux PTP pin API does not have any way for user to set signal
level.

This change is necessary for E825C products to properly output any
signal from 1PPS pin.

Reviewed-by: default avatarArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Signed-off-by: default avatarSergey Temerkhanov <sergey.temerkhanov@intel.com>
Co-developed-by: default avatarKarol Kolacinski <karol.kolacinski@intel.com>
Signed-off-by: default avatarKarol Kolacinski <karol.kolacinski@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 ebb2693f

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

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "ice.h"

#include "ice_lib.h"

#include "ice_trace.h"

#include "ice_cgu_regs.h"



static const char ice_pin_names[][64] = {

	"SDP0",
@@ -1699,6 +1700,15 @@ static int ice_ptp_write_perout(struct ice_hw *hw, unsigned int chan, 
	/* 0. Reset mode & out_en in AUX_OUT */

	wr32(hw, GLTSYN_AUX_OUT(chan, tmr_idx), 0);



	if (ice_is_e825c(hw)) {

		int err;



		/* Enable/disable CGU 1PPS output for E825C */

		err = ice_cgu_cfg_pps_out(hw, !!period);

		if (err)

			return err;

	}



	/* 1. Write perout with half of required period value.

	 * HW toggles output when source clock hits the TGT and then adds

	 * GLTSYN_CLKO value to the target, so it ends up with 50% duty cycle.

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

+23 −0
Original line number Diff line number Diff line
@@ -661,6 +661,29 @@ static int ice_cfg_cgu_pll_e825c(struct ice_hw *hw, 
	return 0;

}



#define ICE_ONE_PPS_OUT_AMP_MAX 3



/**

 * ice_cgu_cfg_pps_out - Configure 1PPS output from CGU

 * @hw: pointer to the HW struct

 * @enable: true to enable 1PPS output, false to disable it

 *

 * Return: 0 on success, other negative error code when CGU read/write failed

 */

int ice_cgu_cfg_pps_out(struct ice_hw *hw, bool enable)

{

	union nac_cgu_dword9 dw9;

	int err;



	err = ice_read_cgu_reg_e82x(hw, NAC_CGU_DWORD9, &dw9.val);

	if (err)

		return err;



	dw9.one_pps_out_en = enable;

	dw9.one_pps_out_amp = enable * ICE_ONE_PPS_OUT_AMP_MAX;

	return ice_write_cgu_reg_e82x(hw, NAC_CGU_DWORD9, dw9.val);

}



/**

 * ice_cfg_cgu_pll_dis_sticky_bits_e82x - disable TS PLL sticky bits

 * @hw: pointer to the HW struct

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

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ extern const struct ice_vernier_info_e82x e822_vernier[NUM_ICE_PTP_LNK_SPD]; 


/* Device agnostic functions */

u8 ice_get_ptp_src_clock_index(struct ice_hw *hw);

int ice_cgu_cfg_pps_out(struct ice_hw *hw, bool enable);

bool ice_ptp_lock(struct ice_hw *hw);

void ice_ptp_unlock(struct ice_hw *hw);

void ice_ptp_src_cmd(struct ice_hw *hw, enum ice_ptp_tmr_cmd cmd);