Commit dfdc771d authored by David S. Miller's avatar David S. Miller

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

Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2016-09-27

This series contains updates to igb and igbvf.

Wei Yongjun makes a function static to shut up sparse.

Todd bumps the igb and igbvf version, which is long overdue.

Jake fixes an issue where the PPS SYS_WRAP interrupt was not re-enabled
after a reset, which resulted in disabling of the PPS signaling.

v2: dropped patch 5 of the original series, since the PCI quirk patch
    needs to be reworked by Alex and Sasha to address issues that Bjorn
    Helgaas and Alex Williamson brought up.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3796c3cb ac28b41a
...@@ -489,6 +489,7 @@ struct igb_adapter { ...@@ -489,6 +489,7 @@ struct igb_adapter {
struct timecounter tc; struct timecounter tc;
u32 tx_hwtstamp_timeouts; u32 tx_hwtstamp_timeouts;
u32 rx_hwtstamp_cleared; u32 rx_hwtstamp_cleared;
bool pps_sys_wrap_on;
struct ptp_pin_desc sdp_config[IGB_N_SDP]; struct ptp_pin_desc sdp_config[IGB_N_SDP];
struct { struct {
......
...@@ -2704,7 +2704,7 @@ static int igb_rxnfc_write_etype_filter(struct igb_adapter *adapter, ...@@ -2704,7 +2704,7 @@ static int igb_rxnfc_write_etype_filter(struct igb_adapter *adapter,
return 0; return 0;
} }
int igb_rxnfc_write_vlan_prio_filter(struct igb_adapter *adapter, static int igb_rxnfc_write_vlan_prio_filter(struct igb_adapter *adapter,
struct igb_nfc_filter *input) struct igb_nfc_filter *input)
{ {
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
#include "igb.h" #include "igb.h"
#define MAJ 5 #define MAJ 5
#define MIN 3 #define MIN 4
#define BUILD 0 #define BUILD 0
#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \ #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
__stringify(BUILD) "-k" __stringify(BUILD) "-k"
......
...@@ -591,6 +591,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, ...@@ -591,6 +591,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp,
tsim |= TSINTR_SYS_WRAP; tsim |= TSINTR_SYS_WRAP;
else else
tsim &= ~TSINTR_SYS_WRAP; tsim &= ~TSINTR_SYS_WRAP;
igb->pps_sys_wrap_on = !!on;
wr32(E1000_TSIM, tsim); wr32(E1000_TSIM, tsim);
spin_unlock_irqrestore(&igb->tmreg_lock, flags); spin_unlock_irqrestore(&igb->tmreg_lock, flags);
return 0; return 0;
...@@ -1235,7 +1236,9 @@ void igb_ptp_reset(struct igb_adapter *adapter) ...@@ -1235,7 +1236,9 @@ void igb_ptp_reset(struct igb_adapter *adapter)
case e1000_i211: case e1000_i211:
wr32(E1000_TSAUXC, 0x0); wr32(E1000_TSAUXC, 0x0);
wr32(E1000_TSSDP, 0x0); wr32(E1000_TSSDP, 0x0);
wr32(E1000_TSIM, TSYNC_INTERRUPTS); wr32(E1000_TSIM,
TSYNC_INTERRUPTS |
(adapter->pps_sys_wrap_on ? TSINTR_SYS_WRAP : 0));
wr32(E1000_IMS, E1000_IMS_TS); wr32(E1000_IMS, E1000_IMS_TS);
break; break;
default: default:
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "igbvf.h" #include "igbvf.h"
#define DRV_VERSION "2.0.2-k" #define DRV_VERSION "2.4.0-k"
char igbvf_driver_name[] = "igbvf"; char igbvf_driver_name[] = "igbvf";
const char igbvf_driver_version[] = DRV_VERSION; const char igbvf_driver_version[] = DRV_VERSION;
static const char igbvf_driver_string[] = static const char igbvf_driver_string[] =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment