* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-04-14 9:16 Jeff Kirsher
2012-04-14 9:16 ` [net-next 1/6] e100: Support the get_ts_info ethtool method Jeff Kirsher
` (6 more replies)
0 siblings, 7 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e100, e1000e, igb and
ixgbe. The e100 patches from Richard Cochran complete the
time stamping support for e100.
The following are changes since commit 64d683c5825003ffb3b127057a165e6bfc26691e:
bonding: Fixup get_tx_queue() op second arg type.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (2):
e1000e: cleanup remaining strings split across multiple lines
e1000e: cleanup boolean logic
Carolyn Wyborny (1):
igb: Update version to 3.4.7.
Don Skidmore (1):
ixgbe: add I2C clock stretching
Richard Cochran (2):
e100: Support the get_ts_info ethtool method.
e100: enable transmit time stamping.
drivers/net/ethernet/intel/e100.c | 2 +
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 4 +--
drivers/net/ethernet/intel/e1000e/82571.c | 9 +++----
drivers/net/ethernet/intel/e1000e/ethtool.c | 19 +++++++---------
drivers/net/ethernet/intel/e1000e/ich8lan.c | 26 +++++++++++-----------
drivers/net/ethernet/intel/e1000e/mac.c | 2 +-
drivers/net/ethernet/intel/e1000e/manage.c | 2 +-
drivers/net/ethernet/intel/e1000e/param.c | 8 +++---
drivers/net/ethernet/intel/e1000e/phy.c | 23 +++++++++----------
drivers/net/ethernet/intel/igb/igb_main.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 20 ++++++++++++-----
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
12 files changed, 62 insertions(+), 58 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 36+ messages in thread* [net-next 1/6] e100: Support the get_ts_info ethtool method.
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 9:16 ` [net-next 2/6] e100: enable transmit time stamping Jeff Kirsher
` (5 subsequent siblings)
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Richard Cochran, netdev, gospo, sassmann, Jeff Kirsher
From: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e100.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index e498eff..e4d4c17 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2733,6 +2733,7 @@ static const struct ethtool_ops e100_ethtool_ops = {
.set_phys_id = e100_set_phys_id,
.get_ethtool_stats = e100_get_ethtool_stats,
.get_sset_count = e100_get_sset_count,
+ .get_ts_info = ethtool_op_get_ts_info,
};
static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* [net-next 2/6] e100: enable transmit time stamping.
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-14 9:16 ` [net-next 1/6] e100: Support the get_ts_info ethtool method Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 9:16 ` [net-next 3/6] e1000e: cleanup remaining strings split across multiple lines Jeff Kirsher
` (4 subsequent siblings)
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Richard Cochran, netdev, gospo, sassmann, Jeff Kirsher
From: Richard Cochran <richardcochran@gmail.com>
This patch enables software (and phy device) transmit time stamping.
Tested on an old PIII laptop with built in NIC.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e100.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index e4d4c17..ada720b 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -1759,6 +1759,7 @@ static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
skb->data, skb->len, PCI_DMA_TODEVICE));
/* check for mapping failure? */
cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
+ skb_tx_timestamp(skb);
}
static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* [net-next 3/6] e1000e: cleanup remaining strings split across multiple lines
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-14 9:16 ` [net-next 1/6] e100: Support the get_ts_info ethtool method Jeff Kirsher
2012-04-14 9:16 ` [net-next 2/6] e100: enable transmit time stamping Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 9:16 ` [net-next 4/6] e1000e: cleanup boolean logic Jeff Kirsher
` (3 subsequent siblings)
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
Now that split strings generate checkpatch warnings (per Chapter 2 of
Documentation/CodingStyle to make it easier to grep the code for the
string) cleanup the remaining instances of them in the driver.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/ethtool.c | 19 ++++++++-----------
drivers/net/ethernet/intel/e1000e/param.c | 8 ++++----
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 6302b10..4f1edd9 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev,
* cannot be changed
*/
if (hw->phy.ops.check_reset_block(hw)) {
- e_err("Cannot change link characteristics when SoL/IDER is "
- "active.\n");
+ e_err("Cannot change link characteristics when SoL/IDER is active.\n");
return -EINVAL;
}
@@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
(test[pat] & write));
val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
if (val != (test[pat] & write & mask)) {
- e_err("pattern test reg %04X failed: got 0x%08X "
- "expected 0x%08X\n", reg + offset, val,
- (test[pat] & write & mask));
+ e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
+ reg + offset, val, (test[pat] & write & mask));
*data = reg;
return 1;
}
@@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
__ew32(&adapter->hw, reg, write & mask);
val = __er32(&adapter->hw, reg);
if ((write & mask) != (val & mask)) {
- e_err("set/check reg %04X test failed: got 0x%08X "
- "expected 0x%08X\n", reg, (val & mask), (write & mask));
+ e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
+ reg, (val & mask), (write & mask));
*data = reg;
return 1;
}
@@ -797,8 +795,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
ew32(STATUS, toggle);
after = er32(STATUS) & toggle;
if (value != after) {
- e_err("failed STATUS register test got: 0x%08X expected: "
- "0x%08X\n", after, value);
+ e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
+ after, value);
*data = 1;
return 1;
}
@@ -1791,8 +1789,7 @@ static void e1000_get_wol(struct net_device *netdev,
wol->supported &= ~WAKE_UCAST;
if (adapter->wol & E1000_WUFC_EX)
- e_err("Interface does not support directed (unicast) "
- "frame wake-up packets\n");
+ e_err("Interface does not support directed (unicast) frame wake-up packets\n");
}
if (adapter->wol & E1000_WUFC_EX)
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index ff796e4..feb6eeb 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -166,8 +166,8 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
*
* Default Value: 1 (enabled)
*/
-E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
- "the CRC");
+E1000_PARAM(CrcStripping,
+ "Enable CRC Stripping, disable if your BMC needs the CRC");
struct e1000_option {
enum { enable_option, range_option, list_option } type;
@@ -360,8 +360,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
adapter->itr = 20000;
break;
case 4:
- e_info("%s set to simplified (2000-8000 ints) "
- "mode\n", opt.name);
+ e_info("%s set to simplified (2000-8000 ints) mode\n",
+ opt.name);
adapter->itr_setting = 4;
break;
default:
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* [net-next 4/6] e1000e: cleanup boolean logic
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2012-04-14 9:16 ` [net-next 3/6] e1000e: cleanup remaining strings split across multiple lines Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 9:16 ` [net-next 5/6] igb: Update version to 3.4.7 Jeff Kirsher
` (2 subsequent siblings)
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
Replace occurrences of 'if (<bool expr> == <1|0>)' with
'if ([!]<bool expr>)'
Replace occurrences of '<bool var> = (<non-bool expr>) ? true : false'
with '<bool var> = <non-bool expr>'.
Replace occurrence of '<bool var> = <non-bool expr>' with
'<bool var> = !!<non-bool expr>'
While the latter replacement is not really necessary, it is done here for
consistency and clarity. No functional changes.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/80003es2lan.c | 4 +--
drivers/net/ethernet/intel/e1000e/82571.c | 9 +++----
drivers/net/ethernet/intel/e1000e/ich8lan.c | 26 +++++++++++-----------
drivers/net/ethernet/intel/e1000e/mac.c | 2 +-
drivers/net/ethernet/intel/e1000e/manage.c | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 23 +++++++++----------
6 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index bac9dda..fbc84d4 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -228,9 +228,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
/* FWSM register */
mac->has_fwsm = true;
/* ARC supported; valid only if manageability features are enabled. */
- mac->arc_subsystem_valid =
- (er32(FWSM) & E1000_FWSM_MODE_MASK)
- ? true : false;
+ mac->arc_subsystem_valid = !!(er32(FWSM) & E1000_FWSM_MODE_MASK);
/* Adaptive IFS not supported */
mac->adaptive_ifs = false;
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index b3fdc69..609c18c 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -295,9 +295,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
* ARC supported; valid only if manageability features are
* enabled.
*/
- mac->arc_subsystem_valid =
- (er32(FWSM) & E1000_FWSM_MODE_MASK)
- ? true : false;
+ mac->arc_subsystem_valid = !!(er32(FWSM) &
+ E1000_FWSM_MODE_MASK);
break;
case e1000_82574:
case e1000_82583:
@@ -798,7 +797,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
/* Check for pending operations. */
for (i = 0; i < E1000_FLASH_UPDATES; i++) {
usleep_range(1000, 2000);
- if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+ if (!(er32(EECD) & E1000_EECD_FLUPD))
break;
}
@@ -822,7 +821,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
for (i = 0; i < E1000_FLASH_UPDATES; i++) {
usleep_range(1000, 2000);
- if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
+ if (!(er32(EECD) & E1000_EECD_FLUPD))
break;
}
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 64c7644..0f158a9 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -2212,7 +2212,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
/* Check if the flash descriptor is valid */
- if (hsfsts.hsf_status.fldesvalid == 0) {
+ if (!hsfsts.hsf_status.fldesvalid) {
e_dbg("Flash descriptor invalid. SW Sequencing must be used.\n");
return -E1000_ERR_NVM;
}
@@ -2232,7 +2232,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
* completed.
*/
- if (hsfsts.hsf_status.flcinprog == 0) {
+ if (!hsfsts.hsf_status.flcinprog) {
/*
* There is no cycle running at present,
* so we can start a cycle.
@@ -2250,7 +2250,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
*/
for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
- if (hsfsts.hsf_status.flcinprog == 0) {
+ if (!hsfsts.hsf_status.flcinprog) {
ret_val = 0;
break;
}
@@ -2292,12 +2292,12 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
/* wait till FDONE bit is set to 1 */
do {
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
- if (hsfsts.hsf_status.flcdone == 1)
+ if (hsfsts.hsf_status.flcdone)
break;
udelay(1);
} while (i++ < timeout);
- if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0)
+ if (hsfsts.hsf_status.flcdone && !hsfsts.hsf_status.flcerr)
return 0;
return -E1000_ERR_NVM;
@@ -2408,10 +2408,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
* ICH_FLASH_CYCLE_REPEAT_COUNT times.
*/
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
- if (hsfsts.hsf_status.flcerr == 1) {
+ if (hsfsts.hsf_status.flcerr) {
/* Repeat for some time before giving up. */
continue;
- } else if (hsfsts.hsf_status.flcdone == 0) {
+ } else if (!hsfsts.hsf_status.flcdone) {
e_dbg("Timeout error - flash cycle did not complete.\n");
break;
}
@@ -2641,7 +2641,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- if ((data & 0x40) == 0) {
+ if (!(data & 0x40)) {
data |= 0x40;
ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
if (ret_val)
@@ -2759,10 +2759,10 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
* try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
*/
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
- if (hsfsts.hsf_status.flcerr == 1)
+ if (hsfsts.hsf_status.flcerr)
/* Repeat for some time before giving up. */
continue;
- if (hsfsts.hsf_status.flcdone == 0) {
+ if (!hsfsts.hsf_status.flcdone) {
e_dbg("Timeout error - flash cycle did not complete.\n");
break;
}
@@ -2914,10 +2914,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
* a few more times else Done
*/
hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
- if (hsfsts.hsf_status.flcerr == 1)
+ if (hsfsts.hsf_status.flcerr)
/* repeat for some time before giving up */
continue;
- else if (hsfsts.hsf_status.flcdone == 0)
+ else if (!hsfsts.hsf_status.flcdone)
return ret_val;
} while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
}
@@ -3916,7 +3916,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)
/* If EEPROM is not marked present, init the IGP 3 PHY manually */
if (hw->mac.type <= e1000_ich9lan) {
- if (((er32(EECD) & E1000_EECD_PRES) == 0) &&
+ if (!(er32(EECD) & E1000_EECD_PRES) &&
(hw->phy.type == e1000_phy_igp_3)) {
e1000e_phy_init_script_igp3(hw);
}
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index decad98..d832749 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -681,7 +681,7 @@ static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
return ret_val;
}
- if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == 0)
+ if (!(nvm_data & NVM_WORD0F_PAUSE_MASK))
hw->fc.requested_mode = e1000_fc_none;
else if ((nvm_data & NVM_WORD0F_PAUSE_MASK) == NVM_WORD0F_ASM_DIR)
hw->fc.requested_mode = e1000_fc_tx_pause;
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c
index 473f8e7..bacc950 100644
--- a/drivers/net/ethernet/intel/e1000e/manage.c
+++ b/drivers/net/ethernet/intel/e1000e/manage.c
@@ -85,7 +85,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
/* Check that the host interface is enabled. */
hicr = er32(HICR);
- if ((hicr & E1000_HICR_EN) == 0) {
+ if (!(hicr & E1000_HICR_EN)) {
e_dbg("E1000_HOST_EN bit disabled.\n");
return -E1000_ERR_HOST_INTERFACE_COMMAND;
}
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 35b4557..bd5ef64 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -718,7 +718,7 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
* 1 - Enabled
*/
phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
- if (phy->disable_polarity_correction == 1)
+ if (phy->disable_polarity_correction)
phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
/* Enable downshift on BM (disabled by default) */
@@ -1090,7 +1090,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw)
* If autoneg_advertised is zero, we assume it was not defaulted
* by the calling code so we set to advertise full capability.
*/
- if (phy->autoneg_advertised == 0)
+ if (!phy->autoneg_advertised)
phy->autoneg_advertised = phy->autoneg_mask;
e_dbg("Reconfiguring auto-neg advertisement params\n");
@@ -1596,7 +1596,7 @@ s32 e1000e_check_downshift(struct e1000_hw *hw)
ret_val = e1e_rphy(hw, offset, &phy_data);
if (!ret_val)
- phy->speed_downgraded = (phy_data & mask);
+ phy->speed_downgraded = !!(phy_data & mask);
return ret_val;
}
@@ -1925,8 +1925,8 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- phy->polarity_correction = (phy_data &
- M88E1000_PSCR_POLARITY_REVERSAL);
+ phy->polarity_correction = !!(phy_data &
+ M88E1000_PSCR_POLARITY_REVERSAL);
ret_val = e1000_check_polarity_m88(hw);
if (ret_val)
@@ -1936,7 +1936,7 @@ s32 e1000e_get_phy_info_m88(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- phy->is_mdix = (phy_data & M88E1000_PSSR_MDIX);
+ phy->is_mdix = !!(phy_data & M88E1000_PSSR_MDIX);
if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {
ret_val = e1000_get_cable_length(hw);
@@ -1999,7 +1999,7 @@ s32 e1000e_get_phy_info_igp(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- phy->is_mdix = (data & IGP01E1000_PSSR_MDIX);
+ phy->is_mdix = !!(data & IGP01E1000_PSSR_MDIX);
if ((data & IGP01E1000_PSSR_SPEED_MASK) ==
IGP01E1000_PSSR_SPEED_1000MBPS) {
@@ -2052,8 +2052,7 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
ret_val = e1e_rphy(hw, IFE_PHY_SPECIAL_CONTROL, &data);
if (ret_val)
return ret_val;
- phy->polarity_correction = (data & IFE_PSC_AUTO_POLARITY_DISABLE)
- ? false : true;
+ phy->polarity_correction = !(data & IFE_PSC_AUTO_POLARITY_DISABLE);
if (phy->polarity_correction) {
ret_val = e1000_check_polarity_ife(hw);
@@ -2070,7 +2069,7 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- phy->is_mdix = (data & IFE_PMC_MDIX_STATUS) ? true : false;
+ phy->is_mdix = !!(data & IFE_PMC_MDIX_STATUS);
/* The following parameters are undefined for 10/100 operation. */
phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
@@ -2979,7 +2978,7 @@ static s32 __e1000_write_phy_reg_hv(struct e1000_hw *hw, u32 offset, u16 data,
if ((hw->phy.type == e1000_phy_82578) &&
(hw->phy.revision >= 1) &&
(hw->phy.addr == 2) &&
- ((MAX_PHY_REG_ADDRESS & reg) == 0) && (data & (1 << 11))) {
+ !(MAX_PHY_REG_ADDRESS & reg) && (data & (1 << 11))) {
u16 data2 = 0x7EFF;
ret_val = e1000_access_phy_debug_regs_hv(hw,
(1 << 6) | 0x3,
@@ -3265,7 +3264,7 @@ s32 e1000_get_phy_info_82577(struct e1000_hw *hw)
if (ret_val)
return ret_val;
- phy->is_mdix = (data & I82577_PHY_STATUS2_MDIX) ? true : false;
+ phy->is_mdix = !!(data & I82577_PHY_STATUS2_MDIX);
if ((data & I82577_PHY_STATUS2_SPEED_MASK) ==
I82577_PHY_STATUS2_SPEED_1000MBPS) {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* [net-next 5/6] igb: Update version to 3.4.7.
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (3 preceding siblings ...)
2012-04-14 9:16 ` [net-next 4/6] e1000e: cleanup boolean logic Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 9:16 ` [net-next 6/6] ixgbe: add I2C clock stretching Jeff Kirsher
2012-04-14 19:18 ` [net-next 0/6][pull request] Intel Wired LAN Driver Updates David Miller
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Carolyn Wyborny, netdev, gospo, sassmann, Jeff Kirsher
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index f022ff7..28a37bb 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -60,8 +60,8 @@
#include "igb.h"
#define MAJ 3
-#define MIN 2
-#define BUILD 10
+#define MIN 4
+#define BUILD 7
#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
__stringify(BUILD) "-k"
char igb_driver_name[] = "igb";
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* [net-next 6/6] ixgbe: add I2C clock stretching
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (4 preceding siblings ...)
2012-04-14 9:16 ` [net-next 5/6] igb: Update version to 3.4.7 Jeff Kirsher
@ 2012-04-14 9:16 ` Jeff Kirsher
2012-04-14 19:18 ` [net-next 0/6][pull request] Intel Wired LAN Driver Updates David Miller
6 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-14 9:16 UTC (permalink / raw)
To: davem; +Cc: Don Skidmore, netdev, gospo, sassmann, Jeff Kirsher
From: Don Skidmore <donald.c.skidmore@intel.com>
This patch adds support for I2C clock stretching which is required per
SFF-8636. Customers with passive DA cables implement clock stretching
would fail without this patch.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 20 ++++++++++++++------
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index bf9f82f..2411770 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -1582,13 +1582,21 @@ static s32 ixgbe_clock_out_i2c_bit(struct ixgbe_hw *hw, bool data)
**/
static void ixgbe_raise_i2c_clk(struct ixgbe_hw *hw, u32 *i2cctl)
{
- *i2cctl |= IXGBE_I2C_CLK_OUT;
-
- IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
- IXGBE_WRITE_FLUSH(hw);
+ u32 i = 0;
+ u32 timeout = IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT;
+ u32 i2cctl_r = 0;
- /* SCL rise time (1000ns) */
- udelay(IXGBE_I2C_T_RISE);
+ for (i = 0; i < timeout; i++) {
+ *i2cctl |= IXGBE_I2C_CLK_OUT;
+ IXGBE_WRITE_REG(hw, IXGBE_I2CCTL, *i2cctl);
+ IXGBE_WRITE_FLUSH(hw);
+ /* SCL rise time (1000ns) */
+ udelay(IXGBE_I2C_T_RISE);
+
+ i2cctl_r = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
+ if (i2cctl_r & IXGBE_I2C_CLK_IN)
+ break;
+ }
}
/**
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index ffa6679..4acd9e6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -110,6 +110,7 @@
#define IXGBE_I2C_CLK_OUT 0x00000002
#define IXGBE_I2C_DATA_IN 0x00000004
#define IXGBE_I2C_DATA_OUT 0x00000008
+#define IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT 500
/* Interrupt Registers */
#define IXGBE_EICR 0x00800
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (5 preceding siblings ...)
2012-04-14 9:16 ` [net-next 6/6] ixgbe: add I2C clock stretching Jeff Kirsher
@ 2012-04-14 19:18 ` David Miller
6 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-04-14 19:18 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sat, 14 Apr 2012 02:16:25 -0700
> This series of patches contains updates for e100, e1000e, igb and
> ixgbe. The e100 patches from Richard Cochran complete the
> time stamping support for e100.
>
> The following are changes since commit 64d683c5825003ffb3b127057a165e6bfc26691e:
> bonding: Fixup get_tx_queue() op second arg type.
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Also pulled, thanks a lot.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2013-11-01 13:56 Jeff Kirsher
2013-11-02 5:17 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2013-11-01 13:56 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to e1000, igb, ixgbe and ixgbevf.
Hong Zhiguo provides a fix for e1000 where tx_ring and adapter->tx_ring
are already of type "struct e1000_tx_ring" so no need to divide by
e1000_tx_ring size in the idx calculation.
Emil provides a fix for ixgbevf to remove a redundant workaround related
to header split and a fix for ixgbe to resolve an issue where the MTA table
can be cleared when the interface is reset while in promisc mode.
Todd provides a fix for igb to prevent ethtool from writing to the iNVM
in i210/i211 devices. This issue was reported by Marek Vasut <marex@denx.de>.
Anton Blanchard provides a fix for ixgbe to reduce memory consumption
with larger page sizes, seen on PPC.
Don provides a cleanup in ixgbe to replace the IXGBE_DESC_UNUSED macro with
the inline function ixgbevf_desc_unused() to make the logic a bit more
readable.
The following are changes since commit ba4865027c11d7ac8e5a33e0624dd415caab2027:
ipv6: remove the unnecessary statement in find_match()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Anton Blanchard (1):
ixgbe: Reduce memory consumption with larger page sizes
Don Skidmore (1):
ixgbe: cleanup IXGBE_DESC_UNUSED
Emil Tantilov (2):
ixgbevf: remove redundant workaround
ixgbe: fix inconsistent clearing of the multicast table
Fujinaka, Todd (1):
igb: Don't let ethtool try to write to iNVM in i210/i211
Hong Zhiguo (1):
e1000: fix wrong queue idx calculation
drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +--
drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +++-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 ++++
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +++++++--------
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 10 +++++++---
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 19 +++++--------------
6 files changed, 27 insertions(+), 28 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2013-11-01 13:56 Jeff Kirsher
@ 2013-11-02 5:17 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2013-11-02 5:17 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 1 Nov 2013 06:56:44 -0700
> This series contains updates to e1000, igb, ixgbe and ixgbevf.
>
> Hong Zhiguo provides a fix for e1000 where tx_ring and adapter->tx_ring
> are already of type "struct e1000_tx_ring" so no need to divide by
> e1000_tx_ring size in the idx calculation.
>
> Emil provides a fix for ixgbevf to remove a redundant workaround related
> to header split and a fix for ixgbe to resolve an issue where the MTA table
> can be cleared when the interface is reset while in promisc mode.
>
> Todd provides a fix for igb to prevent ethtool from writing to the iNVM
> in i210/i211 devices. This issue was reported by Marek Vasut <marex@denx.de>.
>
> Anton Blanchard provides a fix for ixgbe to reduce memory consumption
> with larger page sizes, seen on PPC.
>
> Don provides a cleanup in ixgbe to replace the IXGBE_DESC_UNUSED macro with
> the inline function ixgbevf_desc_unused() to make the logic a bit more
> readable.
Pulled, thanks a lot Jeff.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-11-01 10:44 Jeff Kirsher
2012-11-01 15:16 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-11-01 10:44 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb, ixgbe and e1000.
The following are changes since commit 810b6d7638a288216f99bd190470d67061c8bd88:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Carolyn Wyborny (3):
igb: Remove workaround for EEE configuration on i210/I211
igb: Add function to read i211's invm version
igb: Fix EEPROM writes via ethtool on i210
Emil Tantilov (1):
ixgbe: fix default setting of TXDCTL.WTHRESH
Jacob Keller (1):
ixgbe: fix uninitialized event.type in ixgbe_ptp_check_pps_event
Maxime Bizon (1):
e1000: fix concurrent accesses to PHY from watchdog and ethtool
drivers/net/ethernet/intel/e1000/e1000_hw.c | 17 ++++-
drivers/net/ethernet/intel/igb/e1000_82575.c | 20 +++---
drivers/net/ethernet/intel/igb/e1000_i210.c | 94 +++++++++++++++++++++++++++
drivers/net/ethernet/intel/igb/e1000_i210.h | 11 ++++
drivers/net/ethernet/intel/igb/e1000_mac.h | 1 +
drivers/net/ethernet/intel/igb/e1000_nvm.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 15 +++++
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 20 ------
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 9 +++
9 files changed, 155 insertions(+), 33 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-11-01 10:44 Jeff Kirsher
@ 2012-11-01 15:16 ` David Miller
2012-11-01 20:45 ` Jeff Kirsher
0 siblings, 1 reply; 36+ messages in thread
From: David Miller @ 2012-11-01 15:16 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 1 Nov 2012 03:44:21 -0700
> This series contains updates to igb, ixgbe and e1000.
>
> The following are changes since commit 810b6d7638a288216f99bd190470d67061c8bd88:
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Nothing there:
[davem@tempietto net-next]$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>From git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
* branch master -> FETCH_HEAD
Already up-to-date.
[davem@tempietto net-next]$
Now is AN EXTREMELY bad period to waste my time like this.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-11-01 15:16 ` David Miller
@ 2012-11-01 20:45 ` Jeff Kirsher
2012-11-02 22:46 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-11-01 20:45 UTC (permalink / raw)
To: David Miller; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 999 bytes --]
On Thu, 2012-11-01 at 11:16 -0400, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu, 1 Nov 2012 03:44:21 -0700
>
> > This series contains updates to igb, ixgbe and e1000.
> >
> > The following are changes since commit 810b6d7638a288216f99bd190470d67061c8bd88:
> > Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> > and are available in the git repository at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Nothing there:
>
> [davem@tempietto net-next]$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
> From git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> * branch master -> FETCH_HEAD
> Already up-to-date.
> [davem@tempietto net-next]$
>
> Now is AN EXTREMELY bad period to waste my time like this.
REALLY Sorry, I forgot to push the patches up to kernel.org. I have
pushed them up now.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-09-24 9:00 Jeff Kirsher
2012-09-24 17:48 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-09-24 9:00 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ixgbe and ixgbevf (mainly ixgbevf).
The following are changes since commit c9d2ea96ca3bbc85264803ff6bd66eb3bbefdb77:
netlink: Rearrange netlink_kernel_cfg to save space on 64-bit.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (3):
ixgbevf: Fix code for handling timeout
ixgbevf: Add fix to VF to handle multi-descriptor buffers
ixgbevf: Return error on failure to enable VLAN
Greg Rose (2):
ixgbe: Do not read the spoofed packets counter when not in IOV mode
ixgbevf: Fix AIM (Adaptive Interrupt Moderation)
Narendra K (1):
ixgbevf - Remove unused parameter in ixgbevf_receive_skb
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 5 ++
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 89 +++++++++++------------
drivers/net/ethernet/intel/ixgbevf/mbx.c | 15 +++-
drivers/net/ethernet/intel/ixgbevf/vf.c | 69 ++++++++++++++----
5 files changed, 117 insertions(+), 66 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-24 9:00 Jeff Kirsher
@ 2012-09-24 17:48 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-09-24 17:48 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 24 Sep 2012 02:00:01 -0700
> This series contains updates to ixgbe and ixgbevf (mainly ixgbevf).
>
> The following are changes since commit c9d2ea96ca3bbc85264803ff6bd66eb3bbefdb77:
> netlink: Rearrange netlink_kernel_cfg to save space on 64-bit.
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Alexander Duyck (3):
> ixgbevf: Fix code for handling timeout
> ixgbevf: Add fix to VF to handle multi-descriptor buffers
> ixgbevf: Return error on failure to enable VLAN
>
> Greg Rose (2):
> ixgbe: Do not read the spoofed packets counter when not in IOV mode
> ixgbevf: Fix AIM (Adaptive Interrupt Moderation)
>
> Narendra K (1):
> ixgbevf - Remove unused parameter in ixgbevf_receive_skb
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-09-17 9:21 Jeff Kirsher
2012-09-17 16:44 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-09-17 9:21 UTC (permalink / raw)
To: davem, matthew.vick; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb, specifically the PTP code.
There have been no changes since the last pull request other than
the update to the git tree to the latest net-next.
There was discussion on patch 4 of the series which resulted in
a suggested change to the PTP core. Once these get accepted,
Matthew Vick will continue on with the suggested changes made by
Richard Cochran, Ben Hutchings and Jacob Keller.
The following are changes since commit ba01dfe18241bf89b058fd8a60218b218ad2bb30:
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Matthew Vick (6):
igb: Tidy up wrapping for CONFIG_IGB_PTP.
igb: Update PTP function names/variables and locations.
igb: Correct PTP support query from ethtool.
igb: Store the MAC address in the name in the PTP struct.
igb: Prevent dropped Tx timestamps via work items and interrupts.
igb: Add 1588 support to I210/I211.
drivers/net/ethernet/intel/igb/e1000_defines.h | 8 +
drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +
drivers/net/ethernet/intel/igb/igb.h | 29 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 84 +--
drivers/net/ethernet/intel/igb/igb_main.c | 329 +++---------
drivers/net/ethernet/intel/igb/igb_ptp.c | 676 ++++++++++++++++++++-----
6 files changed, 708 insertions(+), 420 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-17 9:21 Jeff Kirsher
@ 2012-09-17 16:44 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-09-17 16:44 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: matthew.vick, netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 17 Sep 2012 02:21:43 -0700
> The following are changes since commit ba01dfe18241bf89b058fd8a60218b218ad2bb30:
> Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Matthew Vick (6):
> igb: Tidy up wrapping for CONFIG_IGB_PTP.
> igb: Update PTP function names/variables and locations.
> igb: Correct PTP support query from ethtool.
> igb: Store the MAC address in the name in the PTP struct.
> igb: Prevent dropped Tx timestamps via work items and interrupts.
> igb: Add 1588 support to I210/I211.
Pulled, thanks for fixing this up.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-09-05 23:35 Jeff Kirsher
2012-09-06 8:13 ` Richard Cochran
2012-09-13 21:05 ` Jeff Kirsher
0 siblings, 2 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-09-05 23:35 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb (specifically PTP code).
The following are changes since commit f6fe569fe056388166575af1cfaed0bcbc688305:
Revert "usbnet: drop unneeded check for NULL"
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Matthew Vick (6):
igb: Tidy up wrapping for CONFIG_IGB_PTP.
igb: Update PTP function names/variables and locations.
igb: Correct PTP support query from ethtool.
igb: Store the MAC address in the name in the PTP struct.
igb: Prevent dropped Tx timestamps via work items and interrupts.
igb: Add 1588 support to I210/I211.
drivers/net/ethernet/intel/igb/e1000_defines.h | 8 +
drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +
drivers/net/ethernet/intel/igb/igb.h | 29 +-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 84 +--
drivers/net/ethernet/intel/igb/igb_main.c | 329 +++---------
drivers/net/ethernet/intel/igb/igb_ptp.c | 676 ++++++++++++++++++++-----
6 files changed, 708 insertions(+), 420 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-05 23:35 Jeff Kirsher
@ 2012-09-06 8:13 ` Richard Cochran
2012-09-10 22:58 ` Vick, Matthew
2012-09-13 21:05 ` Jeff Kirsher
1 sibling, 1 reply; 36+ messages in thread
From: Richard Cochran @ 2012-09-06 8:13 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, gospo, sassmann
On Wed, Sep 05, 2012 at 04:35:00PM -0700, Jeff Kirsher wrote:
>
> Matthew Vick (6):
> igb: Tidy up wrapping for CONFIG_IGB_PTP.
> igb: Update PTP function names/variables and locations.
> igb: Correct PTP support query from ethtool.
> igb: Store the MAC address in the name in the PTP struct.
These four still look like unnecessary churn to me, and possibly the
wrong direction WRT time stamping in the 82580.
> igb: Prevent dropped Tx timestamps via work items and interrupts.
> igb: Add 1588 support to I210/I211.
But these two look important, so I don't know what to say.
Sorry,
Richard
^ permalink raw reply [flat|nested] 36+ messages in thread
* RE: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-06 8:13 ` Richard Cochran
@ 2012-09-10 22:58 ` Vick, Matthew
0 siblings, 0 replies; 36+ messages in thread
From: Vick, Matthew @ 2012-09-10 22:58 UTC (permalink / raw)
To: Richard Cochran, Kirsher, Jeffrey T; +Cc: davem, netdev, gospo, sassmann
> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Richard Cochran
> Sent: Thursday, September 06, 2012 1:13 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; netdev@vger.kernel.org; gospo@redhat.com;
> sassmann@redhat.com
> Subject: Re: [net-next 0/6][pull request] Intel Wired LAN Driver
> Updates
>
> On Wed, Sep 05, 2012 at 04:35:00PM -0700, Jeff Kirsher wrote:
> >
> > Matthew Vick (6):
> > igb: Tidy up wrapping for CONFIG_IGB_PTP.
> > igb: Update PTP function names/variables and locations.
> > igb: Correct PTP support query from ethtool.
> > igb: Store the MAC address in the name in the PTP struct.
>
> These four still look like unnecessary churn to me, and possibly the
> wrong direction WRT time stamping in the 82580.
(I apologize for the delayed response--I was out of the office. I've read through the discussions and will respond here in the interest of brevity.)
I still fail to see how they're churn. I'm making the code make sense for what is actually supported today. I understand that, theoretically, some of this work may be reverted if/when we pull out hardware timestamping as a separate feature from the PTP support in the driver, but I don't think we should leave it general because someone someday might get around to doing something with it. It's confusing and more difficult to maintain for no benefit. It should be part of the development effort to generalize and consolidate where possible when adding a feature.
> > igb: Prevent dropped Tx timestamps via work items and interrupts.
> > igb: Add 1588 support to I210/I211.
>
> But these two look important, so I don't know what to say.
>
> Sorry,
> Richard
Those two are definitely important. :)
Cheers,
Matthew
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-05 23:35 Jeff Kirsher
2012-09-06 8:13 ` Richard Cochran
@ 2012-09-13 21:05 ` Jeff Kirsher
2012-09-17 4:53 ` David Miller
1 sibling, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-09-13 21:05 UTC (permalink / raw)
To: davem
Cc: netdev, gospo, sassmann, Vick, Matthew, Ben Hutchings, Keller,
Jacob E, Richard Cochran
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
On Wed, 2012-09-05 at 16:35 -0700, Kirsher, Jeffrey T wrote:
> This series contains updates to igb (specifically PTP code).
>
> The following are changes since commit f6fe569fe056388166575af1cfaed0bcbc688305:
> Revert "usbnet: drop unneeded check for NULL"
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Matthew Vick (6):
> igb: Tidy up wrapping for CONFIG_IGB_PTP.
> igb: Update PTP function names/variables and locations.
> igb: Correct PTP support query from ethtool.
> igb: Store the MAC address in the name in the PTP struct.
> igb: Prevent dropped Tx timestamps via work items and interrupts.
> igb: Add 1588 support to I210/I211.
>
> drivers/net/ethernet/intel/igb/e1000_defines.h | 8 +
> drivers/net/ethernet/intel/igb/e1000_regs.h | 2 +
> drivers/net/ethernet/intel/igb/igb.h | 29 +-
> drivers/net/ethernet/intel/igb/igb_ethtool.c | 84 +--
> drivers/net/ethernet/intel/igb/igb_main.c | 329 +++---------
> drivers/net/ethernet/intel/igb/igb_ptp.c | 676 ++++++++++++++++++++-----
> 6 files changed, 708 insertions(+), 420 deletions(-)
>
> --
Dave-
I see you have set this series to "Changes Requested" in patchworks, and
I am assuming that is from the discussion that occurred on patch 04 of
the series. That discussion came to the conclusion that changes should
happen in the PTP core, and that the patch is fine as is currently.
If there was something else you want changed, let me/Matthew know so
that we can make the necessary changes.
Cheers,
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-09-13 21:05 ` Jeff Kirsher
@ 2012-09-17 4:53 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-09-17 4:53 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: netdev, gospo, sassmann, matthew.vick, bhutchings,
jacob.e.keller, richardcochran
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 13 Sep 2012 14:05:59 -0700
> On Wed, 2012-09-05 at 16:35 -0700, Kirsher, Jeffrey T wrote:
>> This series contains updates to igb (specifically PTP code).
>>
>> The following are changes since commit f6fe569fe056388166575af1cfaed0bcbc688305:
>> Revert "usbnet: drop unneeded check for NULL"
>> and are available in the git repository at:
>> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>>
>> Matthew Vick (6):
>> igb: Tidy up wrapping for CONFIG_IGB_PTP.
>> igb: Update PTP function names/variables and locations.
>> igb: Correct PTP support query from ethtool.
>> igb: Store the MAC address in the name in the PTP struct.
>> igb: Prevent dropped Tx timestamps via work items and interrupts.
>> igb: Add 1588 support to I210/I211.
...
> I see you have set this series to "Changes Requested" in patchworks, and
> I am assuming that is from the discussion that occurred on patch 04 of
> the series. That discussion came to the conclusion that changes should
> happen in the PTP core, and that the patch is fine as is currently.
>
> If there was something else you want changed, let me/Matthew know so
> that we can make the necessary changes.
Thanks for updating me on this, pulled and pushed out.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-08-21 8:37 Jeff Kirsher
2012-08-22 21:24 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-08-21 8:37 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ethtool.h, e1000, e1000e, and igb to
implement MDI/MDIx control.
The following are changes since commit 1d76efe1577b4323609b1bcbfafa8b731eda071a:
team: add support for non-ethernet devices
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce W Allan (1):
e1000e: implement 82577/579 MDI setting support
Jesse Brandeburg (5):
ethtool.h: MDI setting support
igb: implement 580 MDI setting support
e1000: configure and read MDI settings
e1000e: implement MDI/MDI-X control
igb: update to allow reading/setting MDI state
drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 39 ++++++++++++++++++++++
drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +++
drivers/net/ethernet/intel/e1000e/ethtool.c | 41 +++++++++++++++++++++--
drivers/net/ethernet/intel/e1000e/phy.c | 31 +++++++++++++++--
drivers/net/ethernet/intel/igb/e1000_phy.c | 29 ++++++++++++++--
drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +--
drivers/net/ethernet/intel/igb/igb_ethtool.c | 42 ++++++++++++++++++++++++
drivers/net/ethernet/intel/igb/igb_main.c | 4 +++
include/linux/ethtool.h | 17 ++++++----
9 files changed, 198 insertions(+), 14 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-08-21 8:37 Jeff Kirsher
@ 2012-08-22 21:24 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-08-22 21:24 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 21 Aug 2012 01:37:49 -0700
> This series contains updates to ethtool.h, e1000, e1000e, and igb to
> implement MDI/MDIx control.
>
> The following are changes since commit 1d76efe1577b4323609b1bcbfafa8b731eda071a:
> team: add support for non-ethernet devices
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-07-20 21:43 Jeff Kirsher
2012-07-21 17:37 ` Jeff Kirsher
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-07-20 21:43 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ethtool, e1000, e1000e and igb with
regards to the new MDI ethtool support patches submitted earlier.
The following are changes since commit fa0afcd10951afad2022dda09777d2bf70cdab3d:
atl1c: fix issue of io access mode for AR8152 v2.1
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce W Allan (1):
e1000e: implement 82577/579 MDI setting support
Jesse Brandeburg (5):
ethtool.h: MDI setting support
igb: implement 580 MDI setting support
e1000: configure and read MDI settings
e1000e: implement MDI/MDI-X control
igb: update to allow reading/setting MDI state
drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 34 +++++++++++++++++++
drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +++
drivers/net/ethernet/intel/e1000e/ethtool.c | 39 +++++++++++++++++++---
drivers/net/ethernet/intel/e1000e/phy.c | 31 +++++++++++++++--
drivers/net/ethernet/intel/igb/e1000_phy.c | 29 ++++++++++++++--
drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +--
drivers/net/ethernet/intel/igb/igb_ethtool.c | 37 ++++++++++++++++++++
drivers/net/ethernet/intel/igb/igb_main.c | 4 +++
include/linux/ethtool.h | 17 ++++++----
9 files changed, 184 insertions(+), 16 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-07-20 21:43 Jeff Kirsher
@ 2012-07-21 17:37 ` Jeff Kirsher
0 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2012-07-21 17:37 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]
On Fri, 2012-07-20 at 14:43 -0700, Kirsher, Jeffrey T wrote:
> This series contains updates to ethtool, e1000, e1000e and igb with
> regards to the new MDI ethtool support patches submitted earlier.
>
> The following are changes since commit fa0afcd10951afad2022dda09777d2bf70cdab3d:
> atl1c: fix issue of io access mode for AR8152 v2.1
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Bruce W Allan (1):
> e1000e: implement 82577/579 MDI setting support
>
> Jesse Brandeburg (5):
> ethtool.h: MDI setting support
> igb: implement 580 MDI setting support
> e1000: configure and read MDI settings
> e1000e: implement MDI/MDI-X control
> igb: update to allow reading/setting MDI state
>
> drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 34 +++++++++++++++++++
> drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +++
> drivers/net/ethernet/intel/e1000e/ethtool.c | 39 +++++++++++++++++++---
> drivers/net/ethernet/intel/e1000e/phy.c | 31 +++++++++++++++--
> drivers/net/ethernet/intel/igb/e1000_phy.c | 29 ++++++++++++++--
> drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +--
> drivers/net/ethernet/intel/igb/igb_ethtool.c | 37 ++++++++++++++++++++
> drivers/net/ethernet/intel/igb/igb_main.c | 4 +++
> include/linux/ethtool.h | 17 ++++++----
> 9 files changed, 184 insertions(+), 16 deletions(-)
>
> --
> 1.7.10.4
>
Since there some changes that are needed in this patch set, I will drop
this series from my tree so that I can continue pushing additional
ixgbe/ixgbevf patches.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-07-18 2:20 Jeff Kirsher
2012-07-18 16:21 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-07-18 2:20 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ixgbe & ixgbevf.
The following are changes since commit 5abf7f7e0f6bdbfcac737f636497d7016d9507eb:
ipv4: fix rcu splat
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (6):
ixgbe: Ping the VFs on link status change to trigger link change
ixgbe: Handle failures in the ixgbe_setup_rx/tx_resources calls
ixgbe: Move configuration of set_real_num_rx/tx_queues into open
ixgbe: Update the logic for ixgbe_cache_ring_dcb and DCB RSS
configuration
ixgbe: Cleanup logic for MRQC and MTQC configuration
ixgbevf: Update descriptor macros to accept pointers and drop _ADV
suffix
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 138 ++++++---------
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 190 +++++++++++++--------
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 12 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 18 +-
4 files changed, 183 insertions(+), 175 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-07-18 2:20 Jeff Kirsher
@ 2012-07-18 16:21 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-07-18 16:21 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 17 Jul 2012 19:20:39 -0700
> This series contains updates to ixgbe & ixgbevf.
>
> The following are changes since commit 5abf7f7e0f6bdbfcac737f636497d7016d9507eb:
> ipv4: fix rcu splat
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-06-14 10:18 Jeff Kirsher
2012-06-15 22:38 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-06-14 10:18 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to e1000 and ixgbe.
The following are changes since commit 0450243096de90ff51c3a6c605410c5e28d79f8d:
bonding: drop_monitor aware
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (1):
e1000e: use more informative logging macros when netdev not yet
registered
Emil Tantilov (1):
ixgbe: do not compile ixgbe_sysfs.c when CONFIG_IXGBE_HWMON is not
set
Jacob Keller (3):
ixgbe: ptp code cleanup
ixgbe: PTP Fix hwtstamp mode settings
ixgbe: Check PTP Rx timestamps via BPF filter
John Fastabend (1):
ixgbe: align flow control DV macros with datasheet
drivers/net/ethernet/intel/e1000e/netdev.c | 11 +-
drivers/net/ethernet/intel/e1000e/param.c | 43 ++++---
drivers/net/ethernet/intel/ixgbe/Makefile | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 149 ++++++++++++++++++------
drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 2 -
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 37 +++---
8 files changed, 180 insertions(+), 79 deletions(-)
--
1.7.10.2
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-06-14 10:18 Jeff Kirsher
@ 2012-06-15 22:38 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-06-15 22:38 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 14 Jun 2012 03:18:03 -0700
> This series contains updates to e1000 and ixgbe.
>
> The following are changes since commit 0450243096de90ff51c3a6c605410c5e28d79f8d:
> bonding: drop_monitor aware
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2012-04-27 9:36 Jeff Kirsher
2012-04-29 2:08 ` David Miller
0 siblings, 1 reply; 36+ messages in thread
From: Jeff Kirsher @ 2012-04-27 9:36 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e1000e, igb and
ixgbe.
The following are changes since commit 82981930125abfd39d7c8378a9cfdf5e1be2002b:
net: cleanups in sock_setsockopt()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (2):
e1000e: 82579 packet drop workaround
e1000e: 82579 potential system hang on stress when ME enabled
Jacob Keller (1):
ixgbe: check for WoL support in single function
Matthew Vick (3):
e1000e: Disable Far-End LoopBack following reset on 80003ES2LAN.
e1000e: Enable DMA Burst Mode on 82574 by default.
igb: Force flow control off during reset when forcing speed.
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 8 ++
drivers/net/ethernet/intel/e1000e/82571.c | 3 +-
drivers/net/ethernet/intel/e1000e/e1000.h | 37 +++++++++
drivers/net/ethernet/intel/e1000e/hw.h | 10 ---
drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 +++
drivers/net/ethernet/intel/e1000e/netdev.c | 51 ++++---------
drivers/net/ethernet/intel/igb/igb_main.c | 7 ++
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 51 +-----------
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 88 ++++++++++++++--------
10 files changed, 143 insertions(+), 125 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
2012-04-27 9:36 Jeff Kirsher
@ 2012-04-29 2:08 ` David Miller
0 siblings, 0 replies; 36+ messages in thread
From: David Miller @ 2012-04-29 2:08 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 27 Apr 2012 02:36:47 -0700
> This series of patches contains updates for e1000e, igb and
> ixgbe.
>
> The following are changes since commit 82981930125abfd39d7c8378a9cfdf5e1be2002b:
> net: cleanups in sock_setsockopt()
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled.
I super appreciate the descriptive commit messages, especialy
wrt. hardware workarounds.
Thanks.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2011-12-03 11:44 Jeff Kirsher
0 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2011-12-03 11:44 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000e, igb and ixgbe. 5 of
the patches are bug fixes and one patch is to cleanup a function
prototype of a non-existent function.
The following are changes since commit 340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8:
atm: clip: Remove code commented out since eternity.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (1):
e1000e: hitting BUG_ON() from napi_enable
Greg Rose (1):
ixgbe: Remove function prototype for non-existent function
John Fastabend (2):
ixgbe: DCBnl set_all, order of operations fix
ixgbe: DCB: IEEE transitions may fail to reprogram hardware.
Matthew Vick (1):
igb: Update DMA Coalescing threshold calculation.
Michael Wang (1):
e1000e: Avoid wrong check on TX hang
drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
drivers/net/ethernet/intel/e1000e/netdev.c | 27 +++++-
drivers/net/ethernet/intel/igb/igb_main.c | 26 +++++--
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 96 +++++++++--------------
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 -
5 files changed, 80 insertions(+), 71 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2011-10-17 11:32 Jeff Kirsher
0 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2011-10-17 11:32 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to ixgbe, igbvf and igb.
This version of the series contains the following changes:
- igb fix/add check if subordinate VFs are assigned to VM's
- igbvf fix for trunk VLAN
- ixgbe 2 fixes for ethtool and 1 endianess fix
The following are changes since commit fd38f734cb8200529e281338514945fcbff2364b:
igbvf: convert to ndo_fix_features
and are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
Emil Tantilov (3):
ixgbe: fix endianess when writing driver version to firmware
ixgbe: allow eeprom writes via ethtool
ixgbe: change the eeprom version reported by ethtool
Greg Rose (2):
igbvf: Fix trunk vlan
igb: Check if subordinate VFs are assigned to virtual machines
Jacob Keller (1):
ixgbe: add hardware timestamping support
drivers/net/ethernet/intel/igb/igb.h | 3 +
drivers/net/ethernet/intel/igb/igb_main.c | 176 +++++++--
drivers/net/ethernet/intel/igbvf/netdev.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 24 ++-
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 16 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 84 ++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 452 +++++++++++++++++++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 32 ++
9 files changed, 742 insertions(+), 51 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 36+ messages in thread
* [net-next 0/6][pull request] Intel Wired LAN Driver Updates
@ 2011-10-14 6:21 Jeff Kirsher
0 siblings, 0 replies; 36+ messages in thread
From: Jeff Kirsher @ 2011-10-14 6:21 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000e, if_link, ixgbe, igbvf
and igb. This version of the series contains the following changes:
- e1000e not sure what happened in the pull on Tuesday which has this fix
so re-posting this fix
- igb fix for timecompare_update and enable L4 timestamping
- igbvf final conversion to ndo_fix_features
- if_link/ixgbe add spoof checking feature
The following are changes since commit 7ae60b3f3b297b7f04025c93f1cb2275c3a1dfcd:
sky2: fix skb truesize underestimation
and are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
Bruce Allan (1):
e1000e: locking bug introduced by commit 67fd4fcb
Greg Rose (2):
if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
ixgbe: Add new netdev op to turn spoof checking on or off per VF
Jacob Keller (2):
igb: enable l4 timestamping for v2 event packets
igb: fix timecompare_upate race condition
Michał Mirosław (1):
igbvf: convert to ndo_fix_features
drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 21 +++++---
drivers/net/ethernet/intel/igb/igb_main.c | 11 ++++-
drivers/net/ethernet/intel/igbvf/ethtool.c | 57 ------------------------
drivers/net/ethernet/intel/igbvf/netdev.c | 25 ++++++++--
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +++-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 48 +++++++++++++++++---
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 +
include/linux/if_link.h | 10 ++++
include/linux/netdevice.h | 3 +
net/core/rtnetlink.c | 33 ++++++++++++-
12 files changed, 139 insertions(+), 84 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2013-11-02 5:17 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-14 9:16 [net-next 0/6][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-04-14 9:16 ` [net-next 1/6] e100: Support the get_ts_info ethtool method Jeff Kirsher
2012-04-14 9:16 ` [net-next 2/6] e100: enable transmit time stamping Jeff Kirsher
2012-04-14 9:16 ` [net-next 3/6] e1000e: cleanup remaining strings split across multiple lines Jeff Kirsher
2012-04-14 9:16 ` [net-next 4/6] e1000e: cleanup boolean logic Jeff Kirsher
2012-04-14 9:16 ` [net-next 5/6] igb: Update version to 3.4.7 Jeff Kirsher
2012-04-14 9:16 ` [net-next 6/6] ixgbe: add I2C clock stretching Jeff Kirsher
2012-04-14 19:18 ` [net-next 0/6][pull request] Intel Wired LAN Driver Updates David Miller
-- strict thread matches above, loose matches on Subject: below --
2013-11-01 13:56 Jeff Kirsher
2013-11-02 5:17 ` David Miller
2012-11-01 10:44 Jeff Kirsher
2012-11-01 15:16 ` David Miller
2012-11-01 20:45 ` Jeff Kirsher
2012-11-02 22:46 ` David Miller
2012-09-24 9:00 Jeff Kirsher
2012-09-24 17:48 ` David Miller
2012-09-17 9:21 Jeff Kirsher
2012-09-17 16:44 ` David Miller
2012-09-05 23:35 Jeff Kirsher
2012-09-06 8:13 ` Richard Cochran
2012-09-10 22:58 ` Vick, Matthew
2012-09-13 21:05 ` Jeff Kirsher
2012-09-17 4:53 ` David Miller
2012-08-21 8:37 Jeff Kirsher
2012-08-22 21:24 ` David Miller
2012-07-20 21:43 Jeff Kirsher
2012-07-21 17:37 ` Jeff Kirsher
2012-07-18 2:20 Jeff Kirsher
2012-07-18 16:21 ` David Miller
2012-06-14 10:18 Jeff Kirsher
2012-06-15 22:38 ` David Miller
2012-04-27 9:36 Jeff Kirsher
2012-04-29 2:08 ` David Miller
2011-12-03 11:44 Jeff Kirsher
2011-10-17 11:32 Jeff Kirsher
2011-10-14 6:21 Jeff Kirsher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.