* [net-next v2 1/4] igb: fix non static symbol warning
2016-09-28 2:04 [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 Jeff Kirsher
@ 2016-09-28 2:04 ` Jeff Kirsher
2016-09-28 2:04 ` [net-next v2 2/4] igbvf: bump version to igbvf-2.4.0 Jeff Kirsher
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2016-09-28 2:04 UTC (permalink / raw)
To: davem
Cc: Wei Yongjun, netdev, nhorman, sassmann, jogreene, guru.anbalagane,
Jeff Kirsher
From: Wei Yongjun <weiyongjun1@huawei.com>
Fixes the following sparse warning:
drivers/net/ethernet/intel/igb/igb_ethtool.c:2707:5: warning:
symbol 'igb_rxnfc_write_vlan_prio_filter' was not declared. Should it be static?
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 0c33eca..737b664 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2704,8 +2704,8 @@ static int igb_rxnfc_write_etype_filter(struct igb_adapter *adapter,
return 0;
}
-int igb_rxnfc_write_vlan_prio_filter(struct igb_adapter *adapter,
- struct igb_nfc_filter *input)
+static int igb_rxnfc_write_vlan_prio_filter(struct igb_adapter *adapter,
+ struct igb_nfc_filter *input)
{
struct e1000_hw *hw = &adapter->hw;
u8 vlan_priority;
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net-next v2 2/4] igbvf: bump version to igbvf-2.4.0
2016-09-28 2:04 [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 Jeff Kirsher
2016-09-28 2:04 ` [net-next v2 1/4] igb: fix non static symbol warning Jeff Kirsher
@ 2016-09-28 2:04 ` Jeff Kirsher
2016-09-28 2:05 ` [net-next v2 3/4] igb: bump version to igb-5.4.0 Jeff Kirsher
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2016-09-28 2:04 UTC (permalink / raw)
To: davem
Cc: Todd Fujinaka, netdev, nhorman, sassmann, jogreene,
guru.anbalagane, Jeff Kirsher
From: Todd Fujinaka <todd.fujinaka@intel.com>
Bump version to match other igbvf drivers.
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index b0778ba..12bb877 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -47,7 +47,7 @@
#include "igbvf.h"
-#define DRV_VERSION "2.0.2-k"
+#define DRV_VERSION "2.4.0-k"
char igbvf_driver_name[] = "igbvf";
const char igbvf_driver_version[] = DRV_VERSION;
static const char igbvf_driver_string[] =
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net-next v2 3/4] igb: bump version to igb-5.4.0
2016-09-28 2:04 [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 Jeff Kirsher
2016-09-28 2:04 ` [net-next v2 1/4] igb: fix non static symbol warning Jeff Kirsher
2016-09-28 2:04 ` [net-next v2 2/4] igbvf: bump version to igbvf-2.4.0 Jeff Kirsher
@ 2016-09-28 2:05 ` Jeff Kirsher
2016-09-28 2:05 ` [net-next v2 4/4] igb: restore PPS signal on igb_ptp_reset Jeff Kirsher
2016-09-28 3:22 ` [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2016-09-28 2:05 UTC (permalink / raw)
To: davem
Cc: Todd Fujinaka, netdev, nhorman, sassmann, jogreene,
guru.anbalagane, Jeff Kirsher
From: Todd Fujinaka <todd.fujinaka@intel.com>
Bump igb version to match other igb drivers.
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index a83aa13..edc9a6a 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -58,7 +58,7 @@
#include "igb.h"
#define MAJ 5
-#define MIN 3
+#define MIN 4
#define BUILD 0
#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
__stringify(BUILD) "-k"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net-next v2 4/4] igb: restore PPS signal on igb_ptp_reset
2016-09-28 2:04 [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 Jeff Kirsher
` (2 preceding siblings ...)
2016-09-28 2:05 ` [net-next v2 3/4] igb: bump version to igb-5.4.0 Jeff Kirsher
@ 2016-09-28 2:05 ` Jeff Kirsher
2016-09-28 3:22 ` [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2016-09-28 2:05 UTC (permalink / raw)
To: davem
Cc: Jacob Keller, netdev, nhorman, sassmann, jogreene,
guru.anbalagane, Jeff Kirsher
From: Jacob Keller <jacob.e.keller@intel.com>
When a reset occurs, the PPS SYS_WRAP interrupt was not re-enabled which
resulted in disabling of the PPS signaling. Fix this by recording when
the interrupt is on and ensuring that we re-enable it every time we
reset.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb.h | 1 +
drivers/net/ethernet/intel/igb/igb_ptp.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 03fbe4b..d11093d 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -489,6 +489,7 @@ struct igb_adapter {
struct timecounter tc;
u32 tx_hwtstamp_timeouts;
u32 rx_hwtstamp_cleared;
+ bool pps_sys_wrap_on;
struct ptp_pin_desc sdp_config[IGB_N_SDP];
struct {
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index 1dd14e1..a7895c4 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -591,6 +591,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp,
tsim |= TSINTR_SYS_WRAP;
else
tsim &= ~TSINTR_SYS_WRAP;
+ igb->pps_sys_wrap_on = !!on;
wr32(E1000_TSIM, tsim);
spin_unlock_irqrestore(&igb->tmreg_lock, flags);
return 0;
@@ -1235,7 +1236,9 @@ void igb_ptp_reset(struct igb_adapter *adapter)
case e1000_i211:
wr32(E1000_TSAUXC, 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);
break;
default:
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27
2016-09-28 2:04 [net-next v2 0/4][pull request] 1GbE Intel Wired LAN Driver Updates 2016-09-27 Jeff Kirsher
` (3 preceding siblings ...)
2016-09-28 2:05 ` [net-next v2 4/4] igb: restore PPS signal on igb_ptp_reset Jeff Kirsher
@ 2016-09-28 3:22 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-09-28 3:22 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, nhorman, sassmann, jogreene, guru.anbalagane
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 27 Sep 2016 19:04:57 -0700
> This series contains updates to igb and igbvf.
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 6+ messages in thread