Commit a2df8463 authored by Tom Rix's avatar Tom Rix Committed by Jakub Kicinski
Browse files

igc: return an error if the mac type is unknown in igc_ptp_systim_to_hwtstamp() 



clang static analysis reports
drivers/net/ethernet/intel/igc/igc_ptp.c:673:3: warning: The left operand of
  '+' is a garbage value [core.UndefinedBinaryOperatorResult]
   ktime_add_ns(shhwtstamps.hwtstamp, adjust);
   ^            ~~~~~~~~~~~~~~~~~~~~

igc_ptp_systim_to_hwtstamp() silently returns without setting the hwtstamp
if the mac type is unknown.  This should be treated as an error.

Fixes: 81b05520 ("igc: Add support for RX timestamping")
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Acked-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20230131215437.1528994-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9c6b9cba

drivers/net/ethernet/intel/igc/igc_ptp.c

+9 −5
Original line number Diff line number Diff line
@@ -417,8 +417,10 @@ static int igc_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin, 
 *

 * We need to convert the system time value stored in the RX/TXSTMP registers

 * into a hwtstamp which can be used by the upper level timestamping functions.

 *

 * Returns 0 on success.

 **/

static void igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter,

static int igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter,

				      struct skb_shared_hwtstamps *hwtstamps,

				      u64 systim)

{
@@ -430,8 +432,9 @@ static void igc_ptp_systim_to_hwtstamp(struct igc_adapter *adapter, 
						systim & 0xFFFFFFFF);

		break;

	default:

		break;

		return -EINVAL;

	}

	return 0;

}



/**
@@ -652,7 +655,8 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter) 


	regval = rd32(IGC_TXSTMPL);

	regval |= (u64)rd32(IGC_TXSTMPH) << 32;

	igc_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval);

	if (igc_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval))

		return;



	switch (adapter->link_speed) {

	case SPEED_10: