Commit e22c8879 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2022-07-15

This series contains updates to ice driver only.

Ani updates feature restriction for devices that don't support external
time stamping.

Zhuo Chen removes unnecessary call to pci_aer_clear_nonfatal_status().

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: Remove pci_aer_clear_nonfatal_status() call
  ice: Add EXTTS feature to the feature bitmap
====================

Link: https://lore.kernel.org/r/20220715214642.2968799-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6ee49d62 ca415ea1

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

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 


enum ice_feature {

	ICE_F_DSCP,

	ICE_F_PTP_EXTTS,

	ICE_F_SMA_CTRL,

	ICE_F_GNSS,

	ICE_F_MAX

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

+1 −0
Original line number Diff line number Diff line
@@ -4182,6 +4182,7 @@ void ice_init_feature_support(struct ice_pf *pf) 
	case ICE_DEV_ID_E810C_QSFP:

	case ICE_DEV_ID_E810C_SFP:

		ice_set_feature_support(pf, ICE_F_DSCP);

		ice_set_feature_support(pf, ICE_F_PTP_EXTTS);

		if (ice_is_e810t(&pf->hw)) {

			ice_set_feature_support(pf, ICE_F_SMA_CTRL);

			if (ice_gnss_is_gps_present(&pf->hw))

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

+0 −6
Original line number Diff line number Diff line
@@ -5313,12 +5313,6 @@ static pci_ers_result_t ice_pci_err_slot_reset(struct pci_dev *pdev) 
			result = PCI_ERS_RESULT_DISCONNECT;

	}



	err = pci_aer_clear_nonfatal_status(pdev);

	if (err)

		dev_dbg(&pdev->dev, "pci_aer_clear_nonfatal_status() failed, error %d\n",

			err);

		/* non-fatal, continue */



	return result;

}

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

+13 −5
Original line number Diff line number Diff line
@@ -1900,9 +1900,12 @@ ice_ptp_setup_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info) 
	}



	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);
@@ -1910,11 +1913,16 @@ ice_ptp_setup_pins_e810t(struct ice_pf *pf, struct ptp_clock_info *info) 


/**

 * ice_ptp_setup_pins_e810 - Setup PTP pins in sysfs

 * @pf: pointer to the PF instance

 * @info: PTP clock capabilities

 */

static void ice_ptp_setup_pins_e810(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;



	if (!ice_is_feature_supported(pf, ICE_F_PTP_EXTTS))

		return;



	info->n_ext_ts = N_EXT_TS_E810;

}
@@ -1956,7 +1964,7 @@ ice_ptp_set_funcs_e810(struct ice_pf *pf, struct ptp_clock_info *info) 
	if (ice_is_e810t(&pf->hw))

		ice_ptp_setup_pins_e810t(pf, info);

	else

		ice_ptp_setup_pins_e810(info);

		ice_ptp_setup_pins_e810(pf, info);

}



/**