ptp: Enable clock drivers along with associated net/PHY drivers
Where a PTP clock driver is associated with a net or PHY driver, it should be enabled automatically whenever that driver is enabled. Therefore: - Make PTP clock drivers select rather than depending on PTP_1588_CLOCK - Remove separate boolean options for PTP clock drivers that are built as part of net driver modules. (This also fixes cases where the PTP subsystem is wrongly forced to be built-in.) - Set 'default y' for PTP clock drivers that depend on specific net drivers but are built separately Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
42a7ccef0a
commit
a24006ed12
@@ -93,6 +93,7 @@ config E1000E
|
||||
config IGB
|
||||
tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
|
||||
depends on PCI
|
||||
select PTP_1588_CLOCK
|
||||
---help---
|
||||
This driver supports Intel(R) 82575/82576 gigabit ethernet family of
|
||||
adapters. For more information on how to identify your adapter, go
|
||||
@@ -120,18 +121,6 @@ config IGB_DCA
|
||||
driver. DCA is a method for warming the CPU cache before data
|
||||
is used, with the intent of lessening the impact of cache misses.
|
||||
|
||||
config IGB_PTP
|
||||
bool "PTP Hardware Clock (PHC)"
|
||||
default n
|
||||
depends on IGB
|
||||
select PTP_1588_CLOCK
|
||||
---help---
|
||||
Say Y here if you want to use PTP Hardware Clock (PHC) in the
|
||||
driver. Only the basic clock operations have been implemented.
|
||||
|
||||
Every timestamp and clock read operations must consult the
|
||||
overflow counter to form a correct time value.
|
||||
|
||||
config IGBVF
|
||||
tristate "Intel(R) 82576 Virtual Function Ethernet support"
|
||||
depends on PCI
|
||||
@@ -179,6 +168,7 @@ config IXGBE
|
||||
tristate "Intel(R) 10GbE PCI Express adapters support"
|
||||
depends on PCI && INET
|
||||
select MDIO
|
||||
select PTP_1588_CLOCK
|
||||
---help---
|
||||
This driver supports Intel(R) 10GbE PCI Express family of
|
||||
adapters. For more information on how to identify your adapter, go
|
||||
@@ -221,18 +211,6 @@ config IXGBE_DCB
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config IXGBE_PTP
|
||||
bool "PTP Clock Support"
|
||||
default n
|
||||
depends on IXGBE
|
||||
select PTP_1588_CLOCK
|
||||
---help---
|
||||
Say Y here if you want support for 1588 Timestamping with a
|
||||
PHC device, using the PTP 1588 Clock support. This is
|
||||
required to enable timestamping support for the device.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config IXGBEVF
|
||||
tristate "Intel(R) 82599 Virtual Function Ethernet support"
|
||||
depends on PCI_MSI
|
||||
|
@@ -34,6 +34,4 @@ obj-$(CONFIG_IGB) += igb.o
|
||||
|
||||
igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
|
||||
e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
|
||||
e1000_i210.o
|
||||
|
||||
igb-$(CONFIG_IGB_PTP) += igb_ptp.o
|
||||
e1000_i210.o igb_ptp.o
|
||||
|
@@ -34,11 +34,9 @@
|
||||
#include "e1000_mac.h"
|
||||
#include "e1000_82575.h"
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
#include <linux/clocksource.h>
|
||||
#include <linux/net_tstamp.h>
|
||||
#include <linux/ptp_clock_kernel.h>
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/if_vlan.h>
|
||||
|
||||
@@ -376,7 +374,6 @@ struct igb_adapter {
|
||||
u32 wvbr;
|
||||
u32 *shadow_vfta;
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
struct ptp_clock *ptp_clock;
|
||||
struct ptp_clock_info ptp_caps;
|
||||
struct delayed_work ptp_overflow_work;
|
||||
@@ -385,7 +382,6 @@ struct igb_adapter {
|
||||
spinlock_t tmreg_lock;
|
||||
struct cyclecounter cc;
|
||||
struct timecounter tc;
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
char fw_version[32];
|
||||
};
|
||||
@@ -439,7 +435,6 @@ extern bool igb_has_link(struct igb_adapter *adapter);
|
||||
extern void igb_set_ethtool_ops(struct net_device *);
|
||||
extern void igb_power_up_link(struct igb_adapter *);
|
||||
extern void igb_set_fw_version(struct igb_adapter *);
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
extern void igb_ptp_init(struct igb_adapter *adapter);
|
||||
extern void igb_ptp_stop(struct igb_adapter *adapter);
|
||||
extern void igb_ptp_reset(struct igb_adapter *adapter);
|
||||
@@ -461,7 +456,6 @@ static inline void igb_ptp_rx_hwtstamp(struct igb_q_vector *q_vector,
|
||||
|
||||
extern int igb_ptp_hwtstamp_ioctl(struct net_device *netdev,
|
||||
struct ifreq *ifr, int cmd);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
static inline s32 igb_reset_phy(struct e1000_hw *hw)
|
||||
{
|
||||
|
@@ -2310,7 +2310,6 @@ static int igb_get_ts_info(struct net_device *dev,
|
||||
struct igb_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
switch (adapter->hw.mac.type) {
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
case e1000_82576:
|
||||
case e1000_82580:
|
||||
case e1000_i350:
|
||||
@@ -2346,7 +2345,6 @@ static int igb_get_ts_info(struct net_device *dev,
|
||||
(1 << HWTSTAMP_FILTER_PTP_V2_EVENT);
|
||||
|
||||
return 0;
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
@@ -1708,10 +1708,8 @@ void igb_reset(struct igb_adapter *adapter)
|
||||
/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
|
||||
wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE);
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
/* Re-enable PTP, where applicable. */
|
||||
igb_ptp_reset(adapter);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
igb_get_phy_info(hw);
|
||||
}
|
||||
@@ -2119,10 +2117,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
/* do hw tstamp init after resetting */
|
||||
igb_ptp_init(adapter);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
|
||||
/* print bus type/speed/width info */
|
||||
@@ -2197,9 +2193,7 @@ static void __devexit igb_remove(struct pci_dev *pdev)
|
||||
struct e1000_hw *hw = &adapter->hw;
|
||||
|
||||
pm_runtime_get_noresume(&pdev->dev);
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
igb_ptp_stop(adapter);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
/*
|
||||
* The watchdog timer may be rescheduled, so explicitly
|
||||
@@ -3095,10 +3089,8 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,
|
||||
srrctl = IGB_RX_HDR_LEN << E1000_SRRCTL_BSIZEHDRSIZE_SHIFT;
|
||||
srrctl |= IGB_RX_BUFSZ >> E1000_SRRCTL_BSIZEPKT_SHIFT;
|
||||
srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (hw->mac.type >= e1000_82580)
|
||||
srrctl |= E1000_SRRCTL_TIMESTAMP;
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
/* Only set Drop Enable if we are supporting multiple queues */
|
||||
if (adapter->vfs_allocated_count || adapter->num_rx_queues > 1)
|
||||
srrctl |= E1000_SRRCTL_DROP_EN;
|
||||
@@ -4134,11 +4126,9 @@ static __le32 igb_tx_cmd_type(u32 tx_flags)
|
||||
if (tx_flags & IGB_TX_FLAGS_VLAN)
|
||||
cmd_type |= cpu_to_le32(E1000_ADVTXD_DCMD_VLE);
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
/* set timestamp bit if present */
|
||||
if (unlikely(tx_flags & IGB_TX_FLAGS_TSTAMP))
|
||||
cmd_type |= cpu_to_le32(E1000_ADVTXD_MAC_TSTAMP);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
/* set segmentation bits for TSO */
|
||||
if (tx_flags & IGB_TX_FLAGS_TSO)
|
||||
@@ -4347,9 +4337,7 @@ static inline int igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
|
||||
netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
|
||||
struct igb_ring *tx_ring)
|
||||
{
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
struct igb_tx_buffer *first;
|
||||
int tso;
|
||||
u32 tx_flags = 0;
|
||||
@@ -4372,7 +4360,6 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
|
||||
first->bytecount = skb->len;
|
||||
first->gso_segs = 1;
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
|
||||
!(adapter->ptp_tx_skb))) {
|
||||
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
||||
@@ -4382,7 +4369,6 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
|
||||
if (adapter->hw.mac.type == e1000_82576)
|
||||
schedule_work(&adapter->ptp_tx_work);
|
||||
}
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
if (vlan_tx_tag_present(skb)) {
|
||||
tx_flags |= IGB_TX_FLAGS_VLAN;
|
||||
@@ -4776,7 +4762,6 @@ static irqreturn_t igb_msix_other(int irq, void *data)
|
||||
mod_timer(&adapter->watchdog_timer, jiffies + 1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (icr & E1000_ICR_TS) {
|
||||
u32 tsicr = rd32(E1000_TSICR);
|
||||
|
||||
@@ -4787,7 +4772,6 @@ static irqreturn_t igb_msix_other(int irq, void *data)
|
||||
schedule_work(&adapter->ptp_tx_work);
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
wr32(E1000_EIMS, adapter->eims_other);
|
||||
|
||||
@@ -5539,7 +5523,6 @@ static irqreturn_t igb_intr_msi(int irq, void *data)
|
||||
mod_timer(&adapter->watchdog_timer, jiffies + 1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (icr & E1000_ICR_TS) {
|
||||
u32 tsicr = rd32(E1000_TSICR);
|
||||
|
||||
@@ -5550,7 +5533,6 @@ static irqreturn_t igb_intr_msi(int irq, void *data)
|
||||
schedule_work(&adapter->ptp_tx_work);
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
napi_schedule(&q_vector->napi);
|
||||
|
||||
@@ -5593,7 +5575,6 @@ static irqreturn_t igb_intr(int irq, void *data)
|
||||
mod_timer(&adapter->watchdog_timer, jiffies + 1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (icr & E1000_ICR_TS) {
|
||||
u32 tsicr = rd32(E1000_TSICR);
|
||||
|
||||
@@ -5604,7 +5585,6 @@ static irqreturn_t igb_intr(int irq, void *data)
|
||||
schedule_work(&adapter->ptp_tx_work);
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
napi_schedule(&q_vector->napi);
|
||||
|
||||
@@ -5889,14 +5869,12 @@ static bool igb_add_rx_frag(struct igb_ring *rx_ring,
|
||||
if ((size <= IGB_RX_HDR_LEN) && !skb_is_nonlinear(skb)) {
|
||||
unsigned char *va = page_address(page) + rx_buffer->page_offset;
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) {
|
||||
igb_ptp_rx_pktstamp(rx_ring->q_vector, va, skb);
|
||||
va += IGB_TS_HDR_LEN;
|
||||
size -= IGB_TS_HDR_LEN;
|
||||
}
|
||||
|
||||
#endif
|
||||
memcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long)));
|
||||
|
||||
/* we can reuse buffer as-is, just make sure it is local */
|
||||
@@ -6221,7 +6199,6 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
|
||||
*/
|
||||
va = skb_frag_address(frag);
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) {
|
||||
/* retrieve timestamp from buffer */
|
||||
igb_ptp_rx_pktstamp(rx_ring->q_vector, va, skb);
|
||||
@@ -6236,7 +6213,6 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
|
||||
va += IGB_TS_HDR_LEN;
|
||||
}
|
||||
|
||||
#endif
|
||||
/*
|
||||
* we need the header to contain the greater of either ETH_HLEN or
|
||||
* 60 bytes if the skb->len is less than 60 for skb_pad.
|
||||
@@ -6317,9 +6293,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring,
|
||||
|
||||
igb_rx_checksum(rx_ring, rx_desc, skb);
|
||||
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
igb_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
|
||||
if ((dev->features & NETIF_F_HW_VLAN_RX) &&
|
||||
igb_test_staterr(rx_desc, E1000_RXD_STAT_VP)) {
|
||||
@@ -6553,10 +6527,8 @@ static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
|
||||
case SIOCGMIIREG:
|
||||
case SIOCSMIIREG:
|
||||
return igb_mii_ioctl(netdev, ifr, cmd);
|
||||
#ifdef CONFIG_IGB_PTP
|
||||
case SIOCSHWTSTAMP:
|
||||
return igb_ptp_hwtstamp_ioctl(netdev, ifr, cmd);
|
||||
#endif /* CONFIG_IGB_PTP */
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
@@ -34,11 +34,10 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
|
||||
|
||||
ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o ixgbe_debugfs.o\
|
||||
ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
|
||||
ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o
|
||||
ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o
|
||||
|
||||
ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \
|
||||
ixgbe_dcb_82599.o ixgbe_dcb_nl.o
|
||||
|
||||
ixgbe-$(CONFIG_IXGBE_PTP) += ixgbe_ptp.o
|
||||
ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
|
||||
ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
|
||||
|
@@ -36,11 +36,9 @@
|
||||
#include <linux/aer.h>
|
||||
#include <linux/if_vlan.h>
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
#include <linux/clocksource.h>
|
||||
#include <linux/net_tstamp.h>
|
||||
#include <linux/ptp_clock_kernel.h>
|
||||
#endif /* CONFIG_IXGBE_PTP */
|
||||
|
||||
#include "ixgbe_type.h"
|
||||
#include "ixgbe_common.h"
|
||||
@@ -572,7 +570,6 @@ struct ixgbe_adapter {
|
||||
u32 interrupt_event;
|
||||
u32 led_reg;
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
struct ptp_clock *ptp_clock;
|
||||
struct ptp_clock_info ptp_caps;
|
||||
unsigned long last_overflow_check;
|
||||
@@ -581,7 +578,6 @@ struct ixgbe_adapter {
|
||||
struct timecounter tc;
|
||||
int rx_hwtstamp_filter;
|
||||
u32 base_incval;
|
||||
#endif /* CONFIG_IXGBE_PTP */
|
||||
|
||||
/* SR-IOV */
|
||||
DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
|
||||
@@ -742,7 +738,6 @@ static inline struct netdev_queue *txring_txq(const struct ixgbe_ring *ring)
|
||||
return netdev_get_tx_queue(ring->netdev, ring->queue_index);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
extern void ixgbe_ptp_init(struct ixgbe_adapter *adapter);
|
||||
extern void ixgbe_ptp_stop(struct ixgbe_adapter *adapter);
|
||||
extern void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);
|
||||
@@ -756,6 +751,5 @@ extern int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
|
||||
extern void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter);
|
||||
extern void ixgbe_ptp_reset(struct ixgbe_adapter *adapter);
|
||||
extern void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr);
|
||||
#endif /* CONFIG_IXGBE_PTP */
|
||||
|
||||
#endif /* _IXGBE_H_ */
|
||||
|
@@ -2667,7 +2667,6 @@ static int ixgbe_get_ts_info(struct net_device *dev,
|
||||
struct ixgbe_adapter *adapter = netdev_priv(dev);
|
||||
|
||||
switch (adapter->hw.mac.type) {
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
case ixgbe_mac_X540:
|
||||
case ixgbe_mac_82599EB:
|
||||
info->so_timestamping =
|
||||
@@ -2690,7 +2689,6 @@ static int ixgbe_get_ts_info(struct net_device *dev,
|
||||
(1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
|
||||
(1 << HWTSTAMP_FILTER_PTP_V2_EVENT);
|
||||
break;
|
||||
#endif /* CONFIG_IXGBE_PTP */
|
||||
default:
|
||||
return ethtool_op_get_ts_info(dev, info);
|
||||
break;
|
||||
|
@@ -841,10 +841,8 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
|
||||
total_bytes += tx_buffer->bytecount;
|
||||
total_packets += tx_buffer->gso_segs;
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (unlikely(tx_buffer->tx_flags & IXGBE_TX_FLAGS_TSTAMP))
|
||||
ixgbe_ptp_tx_hwtstamp(q_vector, tx_buffer->skb);
|
||||
#endif
|
||||
|
||||
/* free the skb */
|
||||
dev_kfree_skb_any(tx_buffer->skb);
|
||||
@@ -1432,9 +1430,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
|
||||
|
||||
ixgbe_rx_checksum(rx_ring, rx_desc, skb);
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector, rx_desc, skb);
|
||||
#endif
|
||||
|
||||
if ((dev->features & NETIF_F_HW_VLAN_RX) &&
|
||||
ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
|
||||
@@ -2386,10 +2382,8 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (adapter->hw.mac.type == ixgbe_mac_X540)
|
||||
mask |= IXGBE_EIMS_TIMESYNC;
|
||||
#endif
|
||||
|
||||
if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) &&
|
||||
!(adapter->flags2 & IXGBE_FLAG2_FDIR_REQUIRES_REINIT))
|
||||
@@ -2455,10 +2449,8 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)
|
||||
|
||||
ixgbe_check_fan_failure(adapter, eicr);
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (unlikely(eicr & IXGBE_EICR_TIMESYNC))
|
||||
ixgbe_ptp_check_pps_event(adapter, eicr);
|
||||
#endif
|
||||
|
||||
/* re-enable the original interrupt state, no lsc, no queues */
|
||||
if (!test_bit(__IXGBE_DOWN, &adapter->state))
|
||||
@@ -2650,10 +2642,8 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
|
||||
}
|
||||
|
||||
ixgbe_check_fan_failure(adapter, eicr);
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (unlikely(eicr & IXGBE_EICR_TIMESYNC))
|
||||
ixgbe_ptp_check_pps_event(adapter, eicr);
|
||||
#endif
|
||||
|
||||
/* would disable interrupts here but EIAM disabled it */
|
||||
napi_schedule(&q_vector->napi);
|
||||
@@ -4251,10 +4241,8 @@ void ixgbe_reset(struct ixgbe_adapter *adapter)
|
||||
if (hw->mac.san_mac_rar_index)
|
||||
hw->mac.ops.set_vmdq_san_mac(hw, VMDQ_P(0));
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
|
||||
ixgbe_ptp_reset(adapter);
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -4961,9 +4949,7 @@ static int ixgbe_open(struct net_device *netdev)
|
||||
if (err)
|
||||
goto err_set_queues;
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
ixgbe_ptp_init(adapter);
|
||||
#endif /* CONFIG_IXGBE_PTP*/
|
||||
|
||||
ixgbe_up_complete(adapter);
|
||||
|
||||
@@ -4996,9 +4982,7 @@ static int ixgbe_close(struct net_device *netdev)
|
||||
{
|
||||
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
ixgbe_ptp_stop(adapter);
|
||||
#endif
|
||||
|
||||
ixgbe_down(adapter);
|
||||
ixgbe_free_irq(adapter);
|
||||
@@ -5561,10 +5545,8 @@ static void ixgbe_watchdog_link_is_up(struct ixgbe_adapter *adapter)
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
|
||||
ixgbe_ptp_start_cyclecounter(adapter);
|
||||
#endif
|
||||
|
||||
e_info(drv, "NIC Link is Up %s, Flow Control: %s\n",
|
||||
(link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
|
||||
@@ -5609,10 +5591,8 @@ static void ixgbe_watchdog_link_is_down(struct ixgbe_adapter *adapter)
|
||||
if (ixgbe_is_sfp(hw) && hw->mac.type == ixgbe_mac_82598EB)
|
||||
adapter->flags2 |= IXGBE_FLAG2_SEARCH_FOR_SFP;
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED)
|
||||
ixgbe_ptp_start_cyclecounter(adapter);
|
||||
#endif
|
||||
|
||||
e_info(drv, "NIC Link is Down\n");
|
||||
netif_carrier_off(netdev);
|
||||
@@ -5917,9 +5897,7 @@ static void ixgbe_service_task(struct work_struct *work)
|
||||
ixgbe_watchdog_subtask(adapter);
|
||||
ixgbe_fdir_reinit_subtask(adapter);
|
||||
ixgbe_check_hang_subtask(adapter);
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
ixgbe_ptp_overflow_check(adapter);
|
||||
#endif
|
||||
|
||||
ixgbe_service_event_complete(adapter);
|
||||
}
|
||||
@@ -6072,10 +6050,8 @@ static __le32 ixgbe_tx_cmd_type(u32 tx_flags)
|
||||
if (tx_flags & IXGBE_TX_FLAGS_HW_VLAN)
|
||||
cmd_type |= cpu_to_le32(IXGBE_ADVTXD_DCMD_VLE);
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (tx_flags & IXGBE_TX_FLAGS_TSTAMP)
|
||||
cmd_type |= cpu_to_le32(IXGBE_ADVTXD_MAC_TSTAMP);
|
||||
#endif
|
||||
|
||||
/* set segmentation enable bits for TSO/FSO */
|
||||
#ifdef IXGBE_FCOE
|
||||
@@ -6477,12 +6453,10 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
|
||||
|
||||
skb_tx_timestamp(skb);
|
||||
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
|
||||
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
||||
tx_flags |= IXGBE_TX_FLAGS_TSTAMP;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PCI_IOV
|
||||
/*
|
||||
@@ -6632,10 +6606,8 @@ static int ixgbe_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)
|
||||
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
||||
|
||||
switch (cmd) {
|
||||
#ifdef CONFIG_IXGBE_PTP
|
||||
case SIOCSHWTSTAMP:
|
||||
return ixgbe_ptp_hwtstamp_ioctl(adapter, req, cmd);
|
||||
#endif
|
||||
default:
|
||||
return mdio_mii_ioctl(&adapter->hw.phy.mdio, if_mii(req), cmd);
|
||||
}
|
||||
|
Reference in New Issue
Block a user