UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ice: Merge pin initialization of E810 and E810T adapters 

Remove separate function initializing pins for E810T-based adapters
and initialize pins based on feature bits.

Signed-off-by: Maciej Machnikowski <maciej.machnikowski@intel.com>
Signed-off-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Arkadiusz Kubalewski 2022-09-08 11:58:52 +02:00 committed by Tony Nguyen
parent 929a6cdfae
commit 43c4958a3d
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/net/ethernet/intel/ice/ice_ptp.c
View File

@ -2216,50 +2216,27 @@ ice_ptp_setup_sma_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info)
ice_ptp_disable_sma_pins_e810t(pf, info); ice_ptp_disable_sma_pins_e810t(pf, info);
} }
/**
* ice_ptp_setup_pins_e810t - Setup PTP pins in sysfs
* @pf: pointer to the PF instance
* @info: PTP clock capabilities
*/
static void
ice_ptp_setup_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info)
{
/* Check if SMA controller is in the netlist */
if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL) &&
!ice_is_pca9575_present(&pf->hw))
ice_clear_feature_support(pf, ICE_F_SMA_CTRL);
if (!ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
info->n_ext_ts = N_EXT_TS_E810_NO_SMA;
info->n_per_out = N_PER_OUT_E810T_NO_SMA;
return;
}
info->n_per_out = N_PER_OUT_E810T;
if (ice_is_feature_supported(pf, ICE_F_PTP_EXTTS)) {
info->n_ext_ts = N_EXT_TS_E810;
info->n_pins = NUM_PTP_PINS_E810T;
info->verify = ice_verify_pin_e810t;
}
/* Complete setup of the SMA pins */
ice_ptp_setup_sma_pins_e810t(pf, info);
}
/** /**
* ice_ptp_setup_pins_e810 - Setup PTP pins in sysfs * ice_ptp_setup_pins_e810 - Setup PTP pins in sysfs
* @pf: pointer to the PF instance * @pf: pointer to the PF instance
* @info: PTP clock capabilities * @info: PTP clock capabilities
*/ */
static void ice_ptp_setup_pins_e810(struct ice_pf *pf, struct ptp_clock_info *info) static void
ice_ptp_setup_pins_e810(struct ice_pf *pf, struct ptp_clock_info *info)
{ {
info->n_per_out = N_PER_OUT_E810; info->n_per_out = N_PER_OUT_E810;
if (!ice_is_feature_supported(pf, ICE_F_PTP_EXTTS)) if (ice_is_feature_supported(pf, ICE_F_PTP_EXTTS))
return;
info->n_ext_ts = N_EXT_TS_E810; info->n_ext_ts = N_EXT_TS_E810;
if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
info->n_ext_ts = N_EXT_TS_E810;
info->n_pins = NUM_PTP_PINS_E810T;
info->verify = ice_verify_pin_e810t;
/* Complete setup of the SMA pins */
ice_ptp_setup_sma_pins_e810t(pf, info);
}
} }
/** /**
@ -2296,10 +2273,6 @@ static void
ice_ptp_set_funcs_e810(struct ice_pf *pf, struct ptp_clock_info *info) ice_ptp_set_funcs_e810(struct ice_pf *pf, struct ptp_clock_info *info)
{ {
info->enable = ice_ptp_gpio_enable_e810; info->enable = ice_ptp_gpio_enable_e810;
if (ice_is_e810t(&pf->hw))
ice_ptp_setup_pins_e810t(pf, info);
else
ice_ptp_setup_pins_e810(pf, info); ice_ptp_setup_pins_e810(pf, info);
} }

4
drivers/net/ethernet/intel/ice/ice_ptp.h
View File

@ -235,8 +235,8 @@ struct ice_ptp {
#define N_EXT_TS_E810 3 #define N_EXT_TS_E810 3
#define N_PER_OUT_E810 4 #define N_PER_OUT_E810 4
#define N_PER_OUT_E810T 3 #define N_PER_OUT_E810T 3
#define N_PER_OUT_E810T_NO_SMA 2 #define N_PER_OUT_NO_SMA_E810T 2
#define N_EXT_TS_E810_NO_SMA 2 #define N_EXT_TS_NO_SMA_E810T 2
#define ETH_GLTSYN_ENA(_i) (0x03000348 + ((_i) * 4)) #define ETH_GLTSYN_ENA(_i) (0x03000348 + ((_i) * 4))
#if IS_ENABLED(CONFIG_PTP_1588_CLOCK) #if IS_ENABLED(CONFIG_PTP_1588_CLOCK)