Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 462f1188 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

igb: introduce ptp_flags variable and use it to replace IGB_FLAG_PTP 



Upcoming patches will introduce new PTP specific flags. To avoid
cluttering the normal flags variable, introduce PTP specific "ptp_flags"
variable for this purpose, and move IGB_FLAG_PTP to become
IGB_PTP_ENABLED.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 12746fd2

drivers/net/ethernet/intel/igb/igb.h

+4 −1
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ struct igb_adapter { 
	unsigned long ptp_tx_start;

	unsigned long last_rx_ptp_check;

	unsigned long last_rx_timestamp;

	unsigned int ptp_flags;

	spinlock_t tmreg_lock;

	struct cyclecounter cc;

	struct timecounter tc;
@@ -474,12 +475,14 @@ struct igb_adapter { 
	u16 eee_advert;

};



/* flags controlling PTP/1588 function */

#define IGB_PTP_ENABLED		BIT(0)



#define IGB_FLAG_HAS_MSI		BIT(0)

#define IGB_FLAG_DCA_ENABLED		BIT(1)

#define IGB_FLAG_QUAD_PORT_A		BIT(2)

#define IGB_FLAG_QUEUE_PAIRS		BIT(3)

#define IGB_FLAG_DMAC			BIT(4)

#define IGB_FLAG_PTP			BIT(5)

#define IGB_FLAG_RSS_FIELD_IPV4_UDP	BIT(6)

#define IGB_FLAG_RSS_FIELD_IPV6_UDP	BIT(7)

#define IGB_FLAG_WOL_SUPPORTED		BIT(8)

drivers/net/ethernet/intel/igb/igb_ptp.c

+4 −3
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ void igb_ptp_rx_hang(struct igb_adapter *adapter) 
	u32 tsyncrxctl = rd32(E1000_TSYNCRXCTL);

	unsigned long rx_event;



	/* Other hardware uses per-packet timestamps */

	if (hw->mac.type != e1000_82576)

		return;
@@ -1156,7 +1157,7 @@ void igb_ptp_init(struct igb_adapter *adapter) 
	} else {

		dev_info(&adapter->pdev->dev, "added PHC on %s\n",

			 adapter->netdev->name);

		adapter->flags |= IGB_FLAG_PTP;

		adapter->ptp_flags |= IGB_PTP_ENABLED;

	}

}
@@ -1194,7 +1195,7 @@ void igb_ptp_stop(struct igb_adapter *adapter) 
		ptp_clock_unregister(adapter->ptp_clock);

		dev_info(&adapter->pdev->dev, "removed PHC on %s\n",

			 adapter->netdev->name);

		adapter->flags &= ~IGB_FLAG_PTP;

		adapter->ptp_flags &= ~IGB_PTP_ENABLED;

	}

}
@@ -1209,7 +1210,7 @@ void igb_ptp_reset(struct igb_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	unsigned long flags;



	if (!(adapter->flags & IGB_FLAG_PTP))

	if (!(adapter->ptp_flags & IGB_PTP_ENABLED))

		return;



	/* reset the tstamp_config */