* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2011-09-17 2:15 Jeff Kirsher
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
` (10 more replies)
0 siblings, 11 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
The following series contains updates to ixgb and ixgbe. The ixgb patch
does the conversion to ndo_fix_features. The remaining patches are for
ixgbe to do the following:
- cleanup register reads, comments, memory allocations
- add SFP support for 82598 PHY and overheat sensor code
- fix register dump for X50
The following are changes since commit f78a5fda9116525809d088917638be912b85f838:
Revert "Scm: Remove unnecessary pid & credential references in Unix socket's send and receive path"
and are available in the git repository at:
git://github.com/Jkirsher/net-next.git
Alexander Duyck (7):
ixgbe: remove redundant configuration of tx_sample_rate
v2 ixgbe: Update packet buffer reservation to correct fdir headroom
size
ixgbe: make ixgbe_up and ixgbe_up_complete void functions
ixgbe: Add missing code for enabling overheat sensor interrupt
ixgbe: Add SFP support for missed 82598 PHY
ixgbe: drop adapter from ixgbe_fso call documentation
ixgbe: Make better use of memory allocations in one-buffer mode w/
RSC
Emil Tantilov (3):
ixgbe: cleanup some register reads
ixgbe: fix FCRTL/H register dump for X540
ixgbe: remove duplicate netif_tx_start_all_queues
Michał Mirosław (1):
ixgb: convert to ndo_fix_features
drivers/net/ethernet/intel/ixgb/ixgb.h | 2 +
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 59 +----------
drivers/net/ethernet/intel/ixgb/ixgb_main.c | 31 +++++-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 13 ++-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 126 ++++++++++++----------
7 files changed, 112 insertions(+), 123 deletions(-)
--
1.7.6
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:50 ` Joe Perches
2011-09-17 13:21 ` Michał Mirosław
2011-09-17 2:15 ` [net-next 02/11] ixgbe: remove redundant configuration of tx_sample_rate Jeff Kirsher
` (9 subsequent siblings)
10 siblings, 2 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Michał Mirosław, netdev, gospo, Jeff Kirsher
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Private rx_csum flags are now duplicate of netdev->features & NETIF_F_RXCSUM.
Removing this needs deeper surgery.
Things noticed:
- ixgb has RX csum disabled by default
- HW VLAN acceleration probably can be toggled, but it's left as is
- the resets on RX csum offload change can probably be avoided
- there is A LOT of copy-and-pasted code here
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgb/ixgb.h | 2 +
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 59 +-----------------------
drivers/net/ethernet/intel/ixgb/ixgb_main.c | 31 +++++++++++-
3 files changed, 31 insertions(+), 61 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb.h b/drivers/net/ethernet/intel/ixgb/ixgb.h
index 49e8408..cb23448 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb.h
@@ -204,6 +204,8 @@ extern void ixgb_set_ethtool_ops(struct net_device *netdev);
extern char ixgb_driver_name[];
extern const char ixgb_driver_version[];
+extern void ixgb_set_speed_duplex(struct net_device *netdev);
+
extern int ixgb_up(struct ixgb_adapter *adapter);
extern void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
extern void ixgb_reset(struct ixgb_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
index 6da890b..fdb30cc 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
@@ -115,7 +115,7 @@ ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
return 0;
}
-static void ixgb_set_speed_duplex(struct net_device *netdev)
+void ixgb_set_speed_duplex(struct net_device *netdev)
{
struct ixgb_adapter *adapter = netdev_priv(netdev);
/* be optimistic about our link, since we were up before */
@@ -195,57 +195,6 @@ ixgb_set_pauseparam(struct net_device *netdev,
}
static u32
-ixgb_get_rx_csum(struct net_device *netdev)
-{
- struct ixgb_adapter *adapter = netdev_priv(netdev);
-
- return adapter->rx_csum;
-}
-
-static int
-ixgb_set_rx_csum(struct net_device *netdev, u32 data)
-{
- struct ixgb_adapter *adapter = netdev_priv(netdev);
-
- adapter->rx_csum = data;
-
- if (netif_running(netdev)) {
- ixgb_down(adapter, true);
- ixgb_up(adapter);
- ixgb_set_speed_duplex(netdev);
- } else
- ixgb_reset(adapter);
- return 0;
-}
-
-static u32
-ixgb_get_tx_csum(struct net_device *netdev)
-{
- return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
-static int
-ixgb_set_tx_csum(struct net_device *netdev, u32 data)
-{
- if (data)
- netdev->features |= NETIF_F_HW_CSUM;
- else
- netdev->features &= ~NETIF_F_HW_CSUM;
-
- return 0;
-}
-
-static int
-ixgb_set_tso(struct net_device *netdev, u32 data)
-{
- if (data)
- netdev->features |= NETIF_F_TSO;
- else
- netdev->features &= ~NETIF_F_TSO;
- return 0;
-}
-
-static u32
ixgb_get_msglevel(struct net_device *netdev)
{
struct ixgb_adapter *adapter = netdev_priv(netdev);
@@ -736,14 +685,8 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
.set_ringparam = ixgb_set_ringparam,
.get_pauseparam = ixgb_get_pauseparam,
.set_pauseparam = ixgb_set_pauseparam,
- .get_rx_csum = ixgb_get_rx_csum,
- .set_rx_csum = ixgb_set_rx_csum,
- .get_tx_csum = ixgb_get_tx_csum,
- .set_tx_csum = ixgb_set_tx_csum,
- .set_sg = ethtool_op_set_sg,
.get_msglevel = ixgb_get_msglevel,
.set_msglevel = ixgb_set_msglevel,
- .set_tso = ixgb_set_tso,
.get_strings = ixgb_get_strings,
.set_phys_id = ixgb_set_phys_id,
.get_sset_count = ixgb_get_sset_count,
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index c8b9c90..b8fb163 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -325,6 +325,28 @@ ixgb_reset(struct ixgb_adapter *adapter)
}
}
+static int
+ixgb_set_features(struct net_device *netdev, u32 features)
+{
+ struct ixgb_adapter *adapter = netdev_priv(netdev);
+ u32 changed = features ^ netdev->features;
+
+ if (!(changed & NETIF_F_RXCSUM))
+ return 0;
+
+ adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
+
+ if (netif_running(netdev)) {
+ ixgb_down(adapter, true);
+ ixgb_up(adapter);
+ ixgb_set_speed_duplex(netdev);
+ } else
+ ixgb_reset(adapter);
+
+ return 0;
+}
+
+
static const struct net_device_ops ixgb_netdev_ops = {
.ndo_open = ixgb_open,
.ndo_stop = ixgb_close,
@@ -340,6 +362,7 @@ static const struct net_device_ops ixgb_netdev_ops = {
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ixgb_netpoll,
#endif
+ .ndo_set_features = ixgb_set_features,
};
/**
@@ -439,12 +462,14 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_sw_init;
- netdev->features = NETIF_F_SG |
- NETIF_F_HW_CSUM |
+ netdev->hw_features = NETIF_F_SG |
+ NETIF_F_TSO |
+ NETIF_F_HW_CSUM;
+ netdev->features = netdev->hw_features |
NETIF_F_HW_VLAN_TX |
NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
- netdev->features |= NETIF_F_TSO;
+ netdev->hw_features |= NETIF_F_RXCSUM;
if (pci_using_dac) {
netdev->features |= NETIF_F_HIGHDMA;
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
@ 2011-09-17 2:50 ` Joe Perches
2011-09-17 13:21 ` Michał Mirosław
1 sibling, 0 replies; 40+ messages in thread
From: Joe Perches @ 2011-09-17 2:50 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, Michał Mirosław, netdev, gospo
On Fri, 2011-09-16 at 19:15 -0700, Jeff Kirsher wrote:
> Private rx_csum flags are now duplicate of netdev->features & NETIF_F_RXCSUM.
> Removing this needs deeper surgery.
> diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
[]
> @@ -439,12 +462,14 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (err)
> goto err_sw_init;
>
> - netdev->features = NETIF_F_SG |
> - NETIF_F_HW_CSUM |
> + netdev->hw_features = NETIF_F_SG |
> + NETIF_F_TSO |
> + NETIF_F_HW_CSUM;
> + netdev->features = netdev->hw_features |
> NETIF_F_HW_VLAN_TX |
> NETIF_F_HW_VLAN_RX |
> NETIF_F_HW_VLAN_FILTER;
> - netdev->features |= NETIF_F_TSO;
> + netdev->hw_features |= NETIF_F_RXCSUM;
Is there any real reason to do this?
It looks overly complicated for no benefit.
Why not just use something like:
netdev->hw_features = foo;
netdev->features = bar;
or maybe use #defines like:
#define FEATURES_DEFAULT (NETIF_F_NETIF_F_SG | NETIF_F_TSO | NETIF_F_HW_CSUM)
#define FEATURES_HW_VLAN (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)
and
netdev->features = FEATURES_DEFAULT | FEATURES_HW_VLAN;
netdev->hw_features = FEATURES_DEFAULT | NETIF_F_RXCSUM;
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
2011-09-17 2:50 ` Joe Perches
@ 2011-09-17 13:21 ` Michał Mirosław
2011-09-20 0:02 ` Jeff Kirsher
1 sibling, 1 reply; 40+ messages in thread
From: Michał Mirosław @ 2011-09-17 13:21 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, gospo
On Fri, Sep 16, 2011 at 07:15:42PM -0700, Jeff Kirsher wrote:
> From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Private rx_csum flags are now duplicate of netdev->features & NETIF_F_RXCSUM.
> Removing this needs deeper surgery.
[...]
Hmm. Looks like this patch is not complete: part removing get/set_flags
from ethtool_ops is missing. I don't remember if this was included or not
in the patch I sent originally. I'm attaching it now, rebased on current
net-next (not tested).
Best Regards,
Michał Mirosław
---
Finish conversion to unified ethtool ops: convert get_flags.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
index fdb30cc..ab404e7 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c
@@ -634,43 +634,6 @@ ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
}
}
-static int ixgb_set_flags(struct net_device *netdev, u32 data)
-{
- struct ixgb_adapter *adapter = netdev_priv(netdev);
- bool need_reset;
- int rc;
-
- /*
- * Tx VLAN insertion does not work per HW design when Rx stripping is
- * disabled. Disable txvlan when rxvlan is turned off, and enable
- * rxvlan when txvlan is turned on.
- */
- if (!(data & ETH_FLAG_RXVLAN) &&
- (netdev->features & NETIF_F_HW_VLAN_TX))
- data &= ~ETH_FLAG_TXVLAN;
- else if (data & ETH_FLAG_TXVLAN)
- data |= ETH_FLAG_RXVLAN;
-
- need_reset = (data & ETH_FLAG_RXVLAN) !=
- (netdev->features & NETIF_F_HW_VLAN_RX);
-
- rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
- ETH_FLAG_TXVLAN);
- if (rc)
- return rc;
-
- if (need_reset) {
- if (netif_running(netdev)) {
- ixgb_down(adapter, true);
- ixgb_up(adapter);
- ixgb_set_speed_duplex(netdev);
- } else
- ixgb_reset(adapter);
- }
-
- return 0;
-}
-
static const struct ethtool_ops ixgb_ethtool_ops = {
.get_settings = ixgb_get_settings,
.set_settings = ixgb_set_settings,
@@ -691,8 +654,6 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
.set_phys_id = ixgb_set_phys_id,
.get_sset_count = ixgb_get_sset_count,
.get_ethtool_stats = ixgb_get_ethtool_stats,
- .get_flags = ethtool_op_get_flags,
- .set_flags = ixgb_set_flags,
};
void ixgb_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index b8fb163..1bb794c 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -325,13 +325,26 @@ ixgb_reset(struct ixgb_adapter *adapter)
}
}
+static u32
+ixgb_fix_features(struct net_device *netdev, u32 features)
+{
+ /*
+ * Tx VLAN insertion does not work per HW design when Rx stripping is
+ * disabled.
+ */
+ if (!(features & NETIF_F_HW_VLAN_RX))
+ features &= ~NETIF_F_HW_VLAN_TX;
+
+ return features;
+}
+
static int
ixgb_set_features(struct net_device *netdev, u32 features)
{
struct ixgb_adapter *adapter = netdev_priv(netdev);
u32 changed = features ^ netdev->features;
- if (!(changed & NETIF_F_RXCSUM))
+ if (!(changed & (NETIF_F_RXCSUM|NETIF_F_HW_VLAN_RX)))
return 0;
adapter->rx_csum = !!(features & NETIF_F_RXCSUM);
@@ -362,6 +375,7 @@ static const struct net_device_ops ixgb_netdev_ops = {
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ixgb_netpoll,
#endif
+ .ndo_fix_features = ixgb_fix_features,
.ndo_set_features = ixgb_set_features,
};
@@ -464,10 +478,10 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev->hw_features = NETIF_F_SG |
NETIF_F_TSO |
- NETIF_F_HW_CSUM;
- netdev->features = netdev->hw_features |
+ NETIF_F_HW_CSUM |
NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_RX |
+ NETIF_F_HW_VLAN_RX;
+ netdev->features = netdev->hw_features |
NETIF_F_HW_VLAN_FILTER;
netdev->hw_features |= NETIF_F_RXCSUM;
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-17 13:21 ` Michał Mirosław
@ 2011-09-20 0:02 ` Jeff Kirsher
2011-09-23 20:56 ` Michał Mirosław
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-20 0:02 UTC (permalink / raw)
To: Michał Mirosław; +Cc: davem, netdev, gospo
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
On Sat, 2011-09-17 at 06:21 -0700, Michał Mirosław wrote:
> On Fri, Sep 16, 2011 at 07:15:42PM -0700, Jeff Kirsher wrote:
> > From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> > Private rx_csum flags are now duplicate of netdev->features &
> NETIF_F_RXCSUM.
> > Removing this needs deeper surgery.
> [...]
>
> Hmm. Looks like this patch is not complete: part removing
> get/set_flags
> from ethtool_ops is missing. I don't remember if this was included or
> not
> in the patch I sent originally. I'm attaching it now, rebased on
> current
> net-next (not tested).
>
> Best Regards,
> Michał Mirosław
>
> ---
>
> Finish conversion to unified ethtool ops: convert get_flags.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Thanks Michal, I have added the patch to my queue.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-20 0:02 ` Jeff Kirsher
@ 2011-09-23 20:56 ` Michał Mirosław
2011-09-24 4:47 ` Jeff Kirsher
0 siblings, 1 reply; 40+ messages in thread
From: Michał Mirosław @ 2011-09-23 20:56 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: netdev
On Mon, Sep 19, 2011 at 05:02:47PM -0700, Jeff Kirsher wrote:
> On Sat, 2011-09-17 at 06:21 -0700, Michał Mirosław wrote:
>> [patch finishing ixgb conversion to hw_features]
> Thanks Michal, I have added the patch to my queue.
I see that only a single driver left: igbvf. What's the status
on its conversion?
Best Regards,
Michał Mirosław
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-23 20:56 ` Michał Mirosław
@ 2011-09-24 4:47 ` Jeff Kirsher
2011-10-07 20:47 ` Michał Mirosław
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-24 4:47 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
On Fri, 2011-09-23 at 13:56 -0700, Michał Mirosław wrote:
> On Mon, Sep 19, 2011 at 05:02:47PM -0700, Jeff Kirsher wrote:
> > On Sat, 2011-09-17 at 06:21 -0700, Michał Mirosław wrote:
> >> [patch finishing ixgb conversion to hw_features]
> > Thanks Michal, I have added the patch to my queue.
>
> I see that only a single driver left: igbvf. What's the status
> on its conversion?
>
> Best Regards,
> Michał Mirosław
Just waiting on validation at this point to verify the patch we have. I
will see if I can get this patch verified and pushed asap.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 01/11] ixgb: convert to ndo_fix_features
2011-09-24 4:47 ` Jeff Kirsher
@ 2011-10-07 20:47 ` Michał Mirosław
2011-10-08 2:04 ` Jeff Kirsher
0 siblings, 1 reply; 40+ messages in thread
From: Michał Mirosław @ 2011-10-07 20:47 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: netdev
On Fri, Sep 23, 2011 at 09:47:36PM -0700, Jeff Kirsher wrote:
> On Fri, 2011-09-23 at 13:56 -0700, Michał Mirosław wrote:
> > On Mon, Sep 19, 2011 at 05:02:47PM -0700, Jeff Kirsher wrote:
> > > On Sat, 2011-09-17 at 06:21 -0700, Michał Mirosław wrote:
> > >> [patch finishing ixgb conversion to hw_features]
> > > Thanks Michal, I have added the patch to my queue.
> > I see that only a single driver left: igbvf. What's the status
> > on its conversion?
> Just waiting on validation at this point to verify the patch we have. I
> will see if I can get this patch verified and pushed asap.
Ping?
Best Regards,
Michał Mirosław
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 02/11] ixgbe: remove redundant configuration of tx_sample_rate
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 03/11] v2 ixgbe: Update packet buffer reservation to correct fdir headroom size Jeff Kirsher
` (8 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This change fixes a minor redundancy in that tx_sample_rate was set twice.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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_main.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index bb069bc..fec49e6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3409,16 +3409,12 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
static void ixgbe_configure(struct ixgbe_adapter *adapter)
{
- struct net_device *netdev = adapter->netdev;
- struct ixgbe_hw *hw = &adapter->hw;
- int i;
-
ixgbe_configure_pb(adapter);
#ifdef CONFIG_IXGBE_DCB
ixgbe_configure_dcb(adapter);
#endif
- ixgbe_set_rx_mode(netdev);
+ ixgbe_set_rx_mode(adapter->netdev);
ixgbe_restore_vlan(adapter);
#ifdef IXGBE_FCOE
@@ -3427,15 +3423,14 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter)
#endif /* IXGBE_FCOE */
if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {
- for (i = 0; i < adapter->num_tx_queues; i++)
- adapter->tx_ring[i]->atr_sample_rate =
- adapter->atr_sample_rate;
- ixgbe_init_fdir_signature_82599(hw, adapter->fdir_pballoc);
+ ixgbe_init_fdir_signature_82599(&adapter->hw,
+ adapter->fdir_pballoc);
} else if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) {
ixgbe_init_fdir_perfect_82599(&adapter->hw,
adapter->fdir_pballoc);
ixgbe_fdir_filter_restore(adapter);
}
+
ixgbe_configure_virtualization(adapter);
ixgbe_configure_tx(adapter);
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 03/11] v2 ixgbe: Update packet buffer reservation to correct fdir headroom size
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
2011-09-17 2:15 ` [net-next 02/11] ixgbe: remove redundant configuration of tx_sample_rate Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 04/11] ixgbe: make ixgbe_up and ixgbe_up_complete void functions Jeff Kirsher
` (7 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This change fixes an issue in which the incorrect amount of headroom was
being reserved for flow director filters.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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_main.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index fec49e6..0283e12 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3372,15 +3372,17 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
static void ixgbe_configure_pb(struct ixgbe_adapter *adapter)
{
- int hdrm = 0;
- int num_tc = netdev_get_num_tc(adapter->netdev);
struct ixgbe_hw *hw = &adapter->hw;
+ int hdrm;
+ u8 tc = netdev_get_num_tc(adapter->netdev);
if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE ||
adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)
- hdrm = 64 << adapter->fdir_pballoc;
+ hdrm = 32 << adapter->fdir_pballoc;
+ else
+ hdrm = 0;
- hw->mac.ops.set_rxpba(&adapter->hw, num_tc, hdrm, PBA_STRATEGY_EQUAL);
+ hw->mac.ops.set_rxpba(hw, tc, hdrm, PBA_STRATEGY_EQUAL);
}
static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 04/11] ixgbe: make ixgbe_up and ixgbe_up_complete void functions
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2011-09-17 2:15 ` [net-next 03/11] v2 ixgbe: Update packet buffer reservation to correct fdir headroom size Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 05/11] ixgbe: Add missing code for enabling overheat sensor interrupt Jeff Kirsher
` (6 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
ixgbe_up and ixgbe_up_complete will always return 0. Since this doesn't
provide any useful information we might as well just make them both void
and save ourselves from having to return an unused value.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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.h | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 ++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index bfdd42b..209286c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -547,7 +547,7 @@ extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
extern char ixgbe_driver_name[];
extern const char ixgbe_driver_version[];
-extern int ixgbe_up(struct ixgbe_adapter *adapter);
+extern void ixgbe_up(struct ixgbe_adapter *adapter);
extern void ixgbe_down(struct ixgbe_adapter *adapter);
extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);
extern void ixgbe_reset(struct ixgbe_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 0283e12..df1ea20 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3555,7 +3555,7 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
}
-static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
+static void ixgbe_up_complete(struct ixgbe_adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
int err;
@@ -3614,8 +3614,6 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, ctrl_ext);
-
- return 0;
}
void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
@@ -3639,12 +3637,12 @@ void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
clear_bit(__IXGBE_RESETTING, &adapter->state);
}
-int ixgbe_up(struct ixgbe_adapter *adapter)
+void ixgbe_up(struct ixgbe_adapter *adapter)
{
/* hardware has been reset, we need to reload some things */
ixgbe_configure(adapter);
- return ixgbe_up_complete(adapter);
+ ixgbe_up_complete(adapter);
}
void ixgbe_reset(struct ixgbe_adapter *adapter)
@@ -5186,17 +5184,12 @@ static int ixgbe_open(struct net_device *netdev)
if (err)
goto err_req_irq;
- err = ixgbe_up_complete(adapter);
- if (err)
- goto err_up;
+ ixgbe_up_complete(adapter);
netif_tx_start_all_queues(netdev);
return 0;
-err_up:
- ixgbe_release_hw_control(adapter);
- ixgbe_free_irq(adapter);
err_req_irq:
err_setup_rx:
ixgbe_free_all_rx_resources(adapter);
@@ -7653,12 +7646,8 @@ static void ixgbe_io_resume(struct pci_dev *pdev)
struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;
- if (netif_running(netdev)) {
- if (ixgbe_up(adapter)) {
- e_info(probe, "ixgbe_up failed after reset\n");
- return;
- }
- }
+ if (netif_running(netdev))
+ ixgbe_up(adapter);
netif_device_attach(netdev);
}
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 05/11] ixgbe: Add missing code for enabling overheat sensor interrupt
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (3 preceding siblings ...)
2011-09-17 2:15 ` [net-next 04/11] ixgbe: make ixgbe_up and ixgbe_up_complete void functions Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 06/11] ixgbe: Add SFP support for missed 82598 PHY Jeff Kirsher
` (5 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This change adds a small bit of missing code for enabling the overheat sensor
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index df1ea20..0533bc4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3543,6 +3543,10 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter)
gpie |= IXGBE_GPIE_VTMODE_64;
}
+ /* Enable Thermal over heat sensor interrupt */
+ if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)
+ gpie |= IXGBE_SDP0_GPIEN;
+
/* Enable fan failure interrupt */
if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
gpie |= IXGBE_SDP1_GPIEN;
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 06/11] ixgbe: Add SFP support for missed 82598 PHY
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (4 preceding siblings ...)
2011-09-17 2:15 ` [net-next 05/11] ixgbe: Add missing code for enabling overheat sensor interrupt Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 07/11] ixgbe: drop adapter from ixgbe_fso call documentation Jeff Kirsher
` (4 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
One of the 82598 phys was not being correctly identified as being SFP.
This change corrects that.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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_main.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 0533bc4..ce59dc6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3451,6 +3451,9 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
case ixgbe_phy_sfp_active_unknown:
case ixgbe_phy_sfp_ftl_active:
return true;
+ case ixgbe_phy_nl:
+ if (hw->mac.type == ixgbe_mac_82598EB)
+ return true;
default:
return false;
}
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 07/11] ixgbe: drop adapter from ixgbe_fso call documentation
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (5 preceding siblings ...)
2011-09-17 2:15 ` [net-next 06/11] ixgbe: Add SFP support for missed 82598 PHY Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 08/11] ixgbe: Make better use of memory allocations in one-buffer mode w/ RSC Jeff Kirsher
` (3 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
The adapter structure was removed from the call so it can be dropped from
the ixgbe_fso documentation.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index e9b992f..cae766d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -440,7 +440,6 @@ ddp_out:
/**
* ixgbe_fso - ixgbe FCoE Sequence Offload (FSO)
- * @adapter: ixgbe adapter
* @tx_ring: tx desc ring
* @skb: associated skb
* @tx_flags: tx flags
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 08/11] ixgbe: Make better use of memory allocations in one-buffer mode w/ RSC
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (6 preceding siblings ...)
2011-09-17 2:15 ` [net-next 07/11] ixgbe: drop adapter from ixgbe_fso call documentation Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 09/11] ixgbe: cleanup some register reads Jeff Kirsher
` (2 subsequent siblings)
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This patch improves the memory utilization with RSC when in one-buffer
mode. This is accomplished by making the default buffer sizes match up
with the standard memory allocation sizes minus 1K for shared info and
padding overhead. By doing this CPU utilization when doing large receives
can be reduced by as much as 8%.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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.h | 11 ++++--
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 41 ++++++++++++++-------
3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 209286c..2c9fdf8 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -72,10 +72,13 @@
/* Supported Rx Buffer Sizes */
#define IXGBE_RXBUFFER_512 512 /* Used for packet split */
-#define IXGBE_RXBUFFER_2048 2048
-#define IXGBE_RXBUFFER_4096 4096
-#define IXGBE_RXBUFFER_8192 8192
-#define IXGBE_MAX_RXBUFFER 16384 /* largest size for a single descriptor */
+#define IXGBE_RXBUFFER_2K 2048
+#define IXGBE_RXBUFFER_3K 3072
+#define IXGBE_RXBUFFER_4K 4096
+#define IXGBE_RXBUFFER_7K 7168
+#define IXGBE_RXBUFFER_8K 8192
+#define IXGBE_RXBUFFER_15K 15360
+#define IXGBE_MAX_RXBUFFER 16384 /* largest size for a single descriptor */
/*
* NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN mans we
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index b8410bc..46f4ecf 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1539,7 +1539,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
rx_ring->dev = &adapter->pdev->dev;
rx_ring->netdev = adapter->netdev;
rx_ring->reg_idx = adapter->rx_ring[0]->reg_idx;
- rx_ring->rx_buf_len = IXGBE_RXBUFFER_2048;
+ rx_ring->rx_buf_len = IXGBE_RXBUFFER_2K;
rx_ring->numa_node = adapter->node;
err = ixgbe_setup_rx_resources(rx_ring);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ce59dc6..a4103ef 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -499,7 +499,7 @@ rx_ring_summary:
rx_ring->rx_buf_len, true);
if (rx_ring->rx_buf_len
- < IXGBE_RXBUFFER_2048)
+ < IXGBE_RXBUFFER_2K)
print_hex_dump(KERN_INFO, "",
DUMP_PREFIX_ADDRESS, 16, 1,
phys_to_virt(
@@ -2644,9 +2644,9 @@ static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
#endif
} else {
- if (rx_buf_len < IXGBE_RXBUFFER_4096)
+ if (rx_buf_len < IXGBE_RXBUFFER_4K)
rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
- else if (rx_buf_len < IXGBE_RXBUFFER_8192)
+ else if (rx_buf_len < IXGBE_RXBUFFER_8K)
rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
else
rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
@@ -2879,17 +2879,6 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
if (hw->mac.type == ixgbe_mac_82599EB)
adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
- /* Set the RX buffer length according to the mode */
- if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
- rx_buf_len = IXGBE_RX_HDR_SIZE;
- } else {
- if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
- (netdev->mtu <= ETH_DATA_LEN))
- rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
- else
- rx_buf_len = ALIGN(max_frame + VLAN_HLEN, 1024);
- }
-
#ifdef IXGBE_FCOE
/* adjust max frame to be able to do baby jumbo for FCoE */
if ((adapter->flags & IXGBE_FLAG_FCOE_ENABLED) &&
@@ -2905,6 +2894,30 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd);
}
+ /* MHADD will allow an extra 4 bytes past for vlan tagged frames */
+ max_frame += VLAN_HLEN;
+
+ /* Set the RX buffer length according to the mode */
+ if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
+ rx_buf_len = IXGBE_RX_HDR_SIZE;
+ } else {
+ if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) &&
+ (netdev->mtu <= ETH_DATA_LEN))
+ rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+ /*
+ * Make best use of allocation by using all but 1K of a
+ * power of 2 allocation that will be used for skb->head.
+ */
+ else if (max_frame <= IXGBE_RXBUFFER_3K)
+ rx_buf_len = IXGBE_RXBUFFER_3K;
+ else if (max_frame <= IXGBE_RXBUFFER_7K)
+ rx_buf_len = IXGBE_RXBUFFER_7K;
+ else if (max_frame <= IXGBE_RXBUFFER_15K)
+ rx_buf_len = IXGBE_RXBUFFER_15K;
+ else
+ rx_buf_len = IXGBE_MAX_RXBUFFER;
+ }
+
hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
/* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */
hlreg0 |= IXGBE_HLREG0_JUMBOEN;
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 09/11] ixgbe: cleanup some register reads
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (7 preceding siblings ...)
2011-09-17 2:15 ` [net-next 08/11] ixgbe: Make better use of memory allocations in one-buffer mode w/ RSC Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 10/11] ixgbe: fix FCRTL/H register dump for X540 Jeff Kirsher
2011-09-17 2:15 ` [net-next 11/11] ixgbe: remove duplicate netif_tx_start_all_queues Jeff Kirsher
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Emil Tantilov, netdev, gospo, Jonathan Lynch, Jeff Kirsher
From: Emil Tantilov <emil.s.tantilov@intel.com>
Remove duplicate inc of hwstats->ruc
Introduce separate loops for 8 and 16 register reads.
Consolidate mac checks under one case.
Make sure registers are cleared on read.
Reported-by: Jonathan Lynch <jonathan.lynch@thenowfactory.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
CC: Jonathan Lynch <jonathan.lynch@thenowfactory.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_main.c | 30 +++++++++++++++++-------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a4103ef..1e72c00 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -5463,20 +5463,21 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
netdev->stats.tx_packets = packets;
hwstats->crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
+
+ /* 8 register reads */
for (i = 0; i < 8; i++) {
/* for packet buffers not used, the register should read 0 */
mpc = IXGBE_READ_REG(hw, IXGBE_MPC(i));
missed_rx += mpc;
hwstats->mpc[i] += mpc;
total_mpc += hwstats->mpc[i];
- if (hw->mac.type == ixgbe_mac_82598EB)
- hwstats->rnbc[i] += IXGBE_READ_REG(hw, IXGBE_RNBC(i));
- hwstats->qptc[i] += IXGBE_READ_REG(hw, IXGBE_QPTC(i));
- hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC(i));
- hwstats->qprc[i] += IXGBE_READ_REG(hw, IXGBE_QPRC(i));
- hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC(i));
+ hwstats->pxontxc[i] += IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
+ hwstats->pxofftxc[i] += IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
switch (hw->mac.type) {
case ixgbe_mac_82598EB:
+ hwstats->rnbc[i] += IXGBE_READ_REG(hw, IXGBE_RNBC(i));
+ hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC(i));
+ hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC(i));
hwstats->pxonrxc[i] +=
IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
break;
@@ -5488,9 +5489,21 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
default:
break;
}
- hwstats->pxontxc[i] += IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
- hwstats->pxofftxc[i] += IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
}
+
+ /*16 register reads */
+ for (i = 0; i < 16; i++) {
+ hwstats->qptc[i] += IXGBE_READ_REG(hw, IXGBE_QPTC(i));
+ hwstats->qprc[i] += IXGBE_READ_REG(hw, IXGBE_QPRC(i));
+ if ((hw->mac.type == ixgbe_mac_82599EB) ||
+ (hw->mac.type == ixgbe_mac_X540)) {
+ hwstats->qbtc[i] += IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
+ IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)); /* to clear */
+ hwstats->qbrc[i] += IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));
+ IXGBE_READ_REG(hw, IXGBE_QBRC_H(i)); /* to clear */
+ }
+ }
+
hwstats->gprc += IXGBE_READ_REG(hw, IXGBE_GPRC);
/* work around hardware counting issue */
hwstats->gprc -= missed_rx;
@@ -5550,7 +5563,6 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
hwstats->lxontxc += lxon;
lxoff = IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
hwstats->lxofftxc += lxoff;
- hwstats->ruc += IXGBE_READ_REG(hw, IXGBE_RUC);
hwstats->gptc += IXGBE_READ_REG(hw, IXGBE_GPTC);
hwstats->mptc += IXGBE_READ_REG(hw, IXGBE_MPTC);
/*
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 10/11] ixgbe: fix FCRTL/H register dump for X540
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (8 preceding siblings ...)
2011-09-17 2:15 ` [net-next 09/11] ixgbe: cleanup some register reads Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 11/11] ixgbe: remove duplicate netif_tx_start_all_queues Jeff Kirsher
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Emil Tantilov, netdev, gospo, Jeff Kirsher
From: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@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_ethtool.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 46f4ecf..63cd2a1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -529,6 +529,7 @@ static void ixgbe_get_regs(struct net_device *netdev,
regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH(i));
break;
case ixgbe_mac_82599EB:
+ case ixgbe_mac_X540:
regs_buff[35 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTL_82599(i));
regs_buff[43 + i] = IXGBE_READ_REG(hw, IXGBE_FCRTH_82599(i));
break;
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 11/11] ixgbe: remove duplicate netif_tx_start_all_queues
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (9 preceding siblings ...)
2011-09-17 2:15 ` [net-next 10/11] ixgbe: fix FCRTL/H register dump for X540 Jeff Kirsher
@ 2011-09-17 2:15 ` Jeff Kirsher
10 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-17 2:15 UTC (permalink / raw)
To: davem; +Cc: Emil Tantilov, netdev, gospo, Jeff Kirsher
From: Emil Tantilov <emil.s.tantilov@intel.com>
netif_tx_start_all_queues() is already called in ixgbe_up_complete, no need
to do it twice.
Signed-off-by: Emil Tantilov <emil.s.tantilov@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_main.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 1e72c00..49e82de 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -5206,8 +5206,6 @@ static int ixgbe_open(struct net_device *netdev)
ixgbe_up_complete(adapter);
- netif_tx_start_all_queues(netdev);
-
return 0;
err_req_irq:
--
1.7.6
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2014-05-14 8:54 Jeff Kirsher
0 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2014-05-14 8:54 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb, igbvf, ixgbe, i40e and i40evf.
Emil provides a ixgbe patch to fix the detection of SFP+ capable interfaces
by identifying 82599 based NICs with no PHY type set as SFP capable which
allows the driver to detect the SFP module when the interface is brought
up.
Jacob provides eight patches to cleanup the ixgbe driver to resolve various
checkpatch.pl warnings/errors as well as minor coding style issues.
Stephen Hemminger and I provide simple cleanups of void functions which
had useless return statements at the end of the function which are not
needed.
The following are changes since commit 86b5d251d5ac4dda51a022b34cb29b4ce65a8cd5:
sh_eth: replace devm_kzalloc() with devm_kmalloc_array()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Emil Tantilov (1):
ixgbe: fix detection of SFP+ capable interfaces
Jacob Keller (8):
ixgbe: clean up checkpatch warnings about CODE_INDENT and
LEADING_SPACE
ixgbe: fix function-like macro, remove semicolon
ixgbe: fix checkpatch style of blank line after declaration
ixgbe: fix several concatenated strings to single line
ixgbe: add braces around else block
ixgbe: don't check NULL for debugfs_remove_recursive
ixgbe: add space between operands to &
ixgbe: add /* fallthrough */ comment to case statements
Jeff Kirsher (1):
igb/ixgbe: remove return statements for void functions
Stephen Hemminger (1):
i40e,igb,ixgbe: remove usless return statements
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 -
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 -
drivers/net/ethernet/intel/igb/e1000_nvm.c | 1 -
drivers/net/ethernet/intel/igb/igb_main.c | 1 -
drivers/net/ethernet/intel/igbvf/ethtool.c | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 62 ++++++++-------
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 85 ++++++++++----------
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 45 +++++------
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 16 ++--
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 24 +++---
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 28 +++----
drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 90 ++++++++++------------
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 10 +--
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 6 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 68 ++++++++--------
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 32 ++++----
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 60 +++++++--------
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 15 ++--
24 files changed, 275 insertions(+), 301 deletions(-)
--
1.9.0
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2013-10-29 12:02 Jeff Kirsher
2013-10-29 22:58 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2013-10-29 12:02 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to vxlan, net, ixgbe, ixgbevf, and i40e.
Joseph provides a single patch against vxlan which removes the burden
from the NIC drivers to check if the vxlan driver is enabled in the
kernel and also makes available the vxlan headrooms to the drivers.
Jacob provides majority of the patches, with patches against net, ixgbe
and ixgbevf. His net patch adds might_sleep() call to napi_disable so
that every use of napi_disable during atomic context will be visible.
Then Jacob provides a patch to fix qv_lock_napi call in
ixgbe_napi_disable_all. The other ixgbe patches cleanup
ixgbe_check_minimum_link function to correctly show that there are some
minor loss of encoding, even though we don't calculate it and remove
unnecessary duplication of PCIe bandwidth display. Lastly, Jacob
provides 4 patches against ixgbevf to add ixgbevf_rx_skb in line with
how ixgbe handles the variations on how packets can be received, adds
support in order to track how many packets were cleaned during busy poll
as part of the extended statistics.
Wei Yongjun provides a fix for i40e to return -ENOMEN in the memory
allocation error handling case instead of returning 0, as done
elsewhere in this function.
The following are changes since commit cdfb97bc010d9e9d994eb68f2cbac3a8ada26104:
net, mc: fix the incorrect comments in two mc-related functions
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Don Skidmore (1):
ixgbevf: Add zero_base handler to network statistics
Jacob Keller (8):
net: add might_sleep() call to napi_disable
ixgbe: fix qv_lock_napi call in ixgbe_napi_disable_all
ixgbe: show <2% for encoding loss on PCIe Gen3
ixgbe: remove unnecessary duplication of PCIe bandwidth display
ixgbevf: add ixgbevf_rx_skb
ixgbevf: have clean_rx_irq return total_rx_packets cleaned
ixgbevf: implement CONFIG_NET_RX_BUSY_POLL
ixgbevf: add BP_EXTENDED_STATS for CONFIG_NET_RX_BUSY_POLL
Joseph Gasparakis (1):
vxlan: Have the NIC drivers do less work for offloads
Wei Yongjun (1):
i40e: fix error return code in i40e_probe()
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 48 ++++++--
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 46 +++-----
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 98 +++++++++++-----
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 132 +++++++++++++++++++++-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 103 +++++++++++++++--
drivers/net/vxlan.c | 4 -
include/linux/netdevice.h | 1 +
include/net/vxlan.h | 11 ++
9 files changed, 366 insertions(+), 81 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2013-10-24 15:27 Jeff Kirsher
2013-10-26 4:30 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2013-10-24 15:27 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to igb, igbvf, i40e, ixgbe and ixgbevf.
Dan Carpenter provides a patch for igbvf to fix a bug found by a static
checker. If the new MTU is very large, then "new_mtu + ETH_HLEN +
ETH_FCS_LEN" can wrap and the check on the next line can underflow.
Wei Yongjun provides 2 patches, the first against igbvf adds a missing
iounmap() before the return from igbvf_probe(). The second against
i40e, removes the include <linux/version.h> because it is not needed.
Carolyn provides a patch for igb to fix a call to set the master/slave
mode for all m88 generation 2 PHY's and removes the call for I210
devices which do not need it.
Stefan Assmann provides a patch for igb to fix an issue which was broke
by:
commit fa44f2f185f7f9da19d331929bb1b56c1ccd1d93
Author: Greg Rose <gregory.v.rose@intel.com>
Date: Thu Jan 17 01:03:06 2013 -0800
igb: Enable SR-IOV configuration via PCI sysfs interface
which breaks the reloading of igb when VFs are assigned to a guest, in
several ways.
Jacob provides a patch for ixgbe and ixgbevf. First, against ixgbe,
cleans up ixgbe_enumerate_functions to reduce code complexity. The
second, against ixgbevf, adds support for ethtool's get_coalesce and
set_coalesce command for the ixgbevf driver.
Yijing Wang provides a patch for ixgbe to use pcie_capability_read_word()
to simplify the code.
Emil provides a ixgbe patch to fix an issue where the logic used to
detect changes in rx-usecs was incorrect and was masked by the call to
ixgbe_update_rsc().
Don provides 2 patches for ixgbevf. First creates a new function to set
PSRTYPE. The second bumps the ixgbevf driver version.
The following are changes since commit b45bd46decd947eaa3497699d450e0851d247534:
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Carolyn Wyborny (1):
igb: Fix master/slave mode for all m88 i354 PHY's
Dan Carpenter (1):
igbvf: integer wrapping bug setting the mtu
Don Skidmore (2):
ixgbevf: Adds function to set PSRTYPE register
ixgbevf: bump driver version
Emil Tantilov (1):
ixgbe: fix rx-usecs range checks for BQL
Jacob Keller (2):
ixgbe: cleanup ixgbe_enumerate_functions
ixgbevf: implement ethtool get/set coalesce
Stefan Assmann (1):
igb: fix driver reload with VF assigned to guest
Wei Yongjun (2):
igbvf: add missing iounmap() on error in igbvf_probe()
i40e: remove unused including <linux/version.h>
Yijing Wang (1):
ixgbe: use pcie_capability_read_word() to simplify code
drivers/net/ethernet/intel/i40e/i40e.h | 1 -
drivers/net/ethernet/intel/igb/e1000_phy.c | 8 +--
drivers/net/ethernet/intel/igb/igb_main.c | 37 +++++------
drivers/net/ethernet/intel/igbvf/netdev.c | 8 +--
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 ++----
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 81 +++++++++++++++++++++++
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 22 ++++--
9 files changed, 134 insertions(+), 50 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2013-04-12 11:24 Jeff Kirsher
0 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2013-04-12 11:24 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ixgbe only.
My previous pull request had a mix of ixgbe and igb patches, and
while Akeem works on the changes requested on the igb patches, I
going ahead and re-submitting the originally submitted ixgbe patches
with several other ixgbe patches.
Alex provides a performance improvement with the enabling the use of
build_skb for instances where jumbo frames are disabled. In addition,
Alex provides a fix where we were incorrectly checking the entire frag_off
field when we only wanted the fragment offset. Lastly, he cleans up
the check for PAGE_SIZE, since the default configuration allocates 32K
for all buffers.
Emil provides a change to the calculation of eerd so that it is consistent
between the read and write functions by using | instead of +.
Jacob adds support for displaying PCIe Gen3 link speed, which was
previously missing from the ixgbe driver. He also provides a patch
to clean up ixgbe_get_bus_info_generic to call some conversion
functions, which are used also in another patch provided by Jacob.
Jacob modifies the driver to enable certain devices (which have an
internal switch) to read from the physical slot rather than reading
data from the internal switch. Lastly, Jacob adds a function which
enables the ixgbe driver to walk up the PCI bus for the device and
query the PCI config space for the bus width at each point.
Don provides a couple of fixes (which are more appropriate for net-next),
one of which resolves an issue where ixgbe was only turning on the laser
when the adapter was up which caused issues for those who wanted to
access the MNG firmware while the port was in a down state. The other
fix is for WoL when currently linked at 1G. Lastly Don bumps the driver
version keep the in-kernel driver up to date with the current functionality.
The following are changes since commit 6c6779856a294649dbb468ef46e893e80b0d72ad:
Revert "netprio_cgroup: make local table static"
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (3):
ixgbe: Support using build_skb in the case that jumbo frames are
disabled
ixgbe: Mask off check of frag_off as we only want fragment offset
ixgbe: Drop check for PAGE_SIZE from ixgbe_xmit_frame_ring
Don Skidmore (3):
ixgbe: fix MNG FW support when adapter not up
ixgbe: Fix 1G link WoL
ixgbe: bump version number
Emil Tantilov (1):
ixgbe: don't do arithmetic operations on bitmasks
Jacob Keller (4):
ixgbe: Enable support for recognizing PCI-e Gen3 link speed
ixgbe: create conversion functions from link_status to bus/speed
ixgbe: enable devices with internal switch to read pci parent
ixgbe: walk pci-e bus to find minimum width
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 51 ++++-
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 63 +++---
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 289 ++++++++++++++++++++----
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 13 ++
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 +
8 files changed, 343 insertions(+), 84 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2012-11-13 14:03 Jeff Kirsher
2012-11-13 19:19 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2012-11-13 14:03 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ixgbe, ixgbevf and igb.
The following are changes since commit 9fafd65ad407d4e0c96919a325f568dd95d032af:
ipv6 ndisc: Use pre-defined in6addr_linklocal_allnodes.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Akeem G. Abodunrin (2):
igb: Support for modifying UDP RSS flow hashing
igb: Ethtool support to enable and disable EEE
Alexander Duyck (4):
ixgbe: Do not use DCA to prefetch the entire packet into the cache
igb: Make TSO check for CHECKSUM_PARTIAL to avoid skb_is_gso check
igb: Update igb Tx flags to improve code efficiency
igb: Improve performance and reduce size of igb_tx_map
Carolyn Wyborny (1):
igb: Clear Go Link Disconnect for 82580 and later devices
Emil Tantilov (1):
ixgbevf: fix possible use of uninitialized variable
Greg Rose (2):
ixgbevf: Add flag to indicate when rx is in net poll
ixgbevf: Reduce size of maximum rx buffer
Jakub Kicinski (1):
ixgbevf: make sure probe fails on MSI-X enable error
drivers/net/ethernet/intel/igb/e1000_82575.c | 8 +
drivers/net/ethernet/intel/igb/e1000_defines.h | 1 +
drivers/net/ethernet/intel/igb/e1000_phy.h | 1 +
drivers/net/ethernet/intel/igb/igb.h | 31 ++-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 281 ++++++++++++++++++++++
drivers/net/ethernet/intel/igb/igb_main.c | 124 +++++-----
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 -
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 9 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 54 +++--
9 files changed, 412 insertions(+), 98 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2012-11-13 14:03 Jeff Kirsher
@ 2012-11-13 19:19 ` David Miller
0 siblings, 0 replies; 40+ messages in thread
From: David Miller @ 2012-11-13 19:19 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 13 Nov 2012 06:03:14 -0800
> This series contains updates to ixgbe, ixgbevf and igb.
>
> The following are changes since commit 9fafd65ad407d4e0c96919a325f568dd95d032af:
> ipv6 ndisc: Use pre-defined in6addr_linklocal_allnodes.
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, but I have some long term feedback to give on one of the
patches, thanks.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2012-02-25 5:49 Jeff Kirsher
2012-02-26 1:31 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2012-02-25 5:49 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains cleanups of the e1000e driver.
The following are changes since commit 5d74f1757001f5b9a7739c2a9053435e16ce516b:
Staging: wlags49_h2: print MAC via printk format specifier
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (11):
e1000e: cleanup: rename e1000e_id_led_init() and call as function
pointer
e1000e: cleanup: rename e1000e_setup_link() and call as function
pointer
e1000e: cleanup use of check_mng_mode function pointer
e1000e: cleanup use of check_reset_block function pointer
e1000e: cleanup calls to setup_physical_interface function pointer
e1000e: comment correction in
e1000e_set_kmrn_lock_loss_workaround_ich8lan
e1000e: rename e1000e_config_collision_dist() and call as function
pointer
e1000e: cleanup comment in e1000_hash_mc_addr()
e1000e: use true/false for boolean send_xon, do not assume always
true
e1000e: cleanup - remove unnecessary variable
e1000e: rename e1000e_reload_nvm() and call as function pointer
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 12 +++++---
drivers/net/ethernet/intel/e1000e/82571.c | 10 ++++---
drivers/net/ethernet/intel/e1000e/e1000.h | 18 +++----------
drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +++-
drivers/net/ethernet/intel/e1000e/hw.h | 2 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 32 ++++++++++++----------
drivers/net/ethernet/intel/e1000e/mac.c | 31 ++++++++++-----------
drivers/net/ethernet/intel/e1000e/manage.c | 4 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 8 +++---
drivers/net/ethernet/intel/e1000e/nvm.c | 4 +-
drivers/net/ethernet/intel/e1000e/phy.c | 6 ++--
11 files changed, 66 insertions(+), 67 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2012-02-25 5:49 Jeff Kirsher
@ 2012-02-26 1:31 ` David Miller
0 siblings, 0 replies; 40+ messages in thread
From: David Miller @ 2012-02-26 1:31 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 24 Feb 2012 21:49:49 -0800
> This series of patches contains cleanups of the e1000e driver.
>
> The following are changes since commit 5d74f1757001f5b9a7739c2a9053435e16ce516b:
> Staging: wlags49_h2: print MAC via printk format specifier
> 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] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2012-02-07 12:33 Jeff Kirsher
2012-02-07 17:27 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2012-02-07 12:33 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000, igbvf and e1000e.
Majority of the updates are to e1000e and do the following:
- cleanup 82571 and 80003es2lan code
- fix checkpatch and sparse warnings
- fix whitespace/indentation
- add missing initializers
The following are changes since commit 59d74026fa4b5df72a268f1e9578af500154ad07:
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
Bruce Allan (9):
e1000e: add missing initializers reported when compiling with W=1
e1000e: cleanup - check return values consistently
e1000e: cleanup e1000_init_mac_params_80003es2lan()
e1000e: cleanup e1000_init_mac_params_82571()
e1000e: cleanup e1000_set_phys_id
e1000e: cleanup - use braces in both branches of a conditional
statement
e1000e: fix checkpatch warning from MINMAX test
e1000e: fix sparse warnings with -D__CHECK_ENDIAN__
e1000e: minor whitespace and indentation cleanup
Mitch A Williams (1):
igbvf: refactor Interrupt Throttle Rate code
Tushar Dave (1):
e1000: Adding e1000_dump function
drivers/net/ethernet/intel/e1000/e1000.h | 1 +
drivers/net/ethernet/intel/e1000/e1000_hw.h | 10 +
drivers/net/ethernet/intel/e1000/e1000_main.c | 224 +++++++++++++++++++++++
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 28 +--
drivers/net/ethernet/intel/e1000e/82571.c | 72 +++-----
drivers/net/ethernet/intel/e1000e/ethtool.c | 8 +-
drivers/net/ethernet/intel/e1000e/ich8lan.c | 12 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 104 ++++++-----
drivers/net/ethernet/intel/igbvf/ethtool.c | 19 +-
drivers/net/ethernet/intel/igbvf/igbvf.h | 27 ++--
drivers/net/ethernet/intel/igbvf/netdev.c | 131 ++++++++------
11 files changed, 438 insertions(+), 198 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2012-02-07 12:33 Jeff Kirsher
@ 2012-02-07 17:27 ` David Miller
0 siblings, 0 replies; 40+ messages in thread
From: David Miller @ 2012-02-07 17:27 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 7 Feb 2012 04:33:47 -0800
> The following series contains updates to e1000, igbvf and e1000e.
> Majority of the updates are to e1000e and do the following:
> - cleanup 82571 and 80003es2lan code
> - fix checkpatch and sparse warnings
> - fix whitespace/indentation
> - add missing initializers
>
> The following are changes since commit 59d74026fa4b5df72a268f1e9578af500154ad07:
> 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
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2012-01-27 3:08 Jeff Kirsher
2012-01-28 1:47 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2012-01-27 3:08 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000e only. This is the
second batch of e1000e patches and these changes contain
fixups/cleanups/conversions. Most notably is the split up of lib.c
into mac.c, manage.c and nvm.c.
The following are changes since commit a7563f342db6490e66dbf2c8a50577a72a158c9a:
ipv6: Use ipv6_addr_any()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (11):
e1000e: disable Early Receive DMA on ICH LOMs
e1000e: update workaround for 82579 intermittently disabled during
S0->Sx
e1000e: ICHx/PCHx LOMs should use LPLU setting in NVM when going to
Sx
e1000e: increase Rx PBA to prevent dropping received packets on
82566/82567
e1000e: conditionally restart autoneg on 82577/8/9 when setting LPLU
state
e1000e: concatenate long debug strings which span multiple lines
e1000e: convert final strncpy() to strlcpy()
e1000e: increase version number
e1000e: call er16flash() instead of __er16flash()
e1000e: split lib.c into three more-appropriate files
e1000e: update copyright year
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 5 +-
drivers/net/ethernet/intel/e1000e/82571.c | 2 +-
drivers/net/ethernet/intel/e1000e/Makefile | 5 +-
drivers/net/ethernet/intel/e1000e/defines.h | 2 +-
drivers/net/ethernet/intel/e1000e/e1000.h | 4 +-
drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +-
drivers/net/ethernet/intel/e1000e/hw.h | 2 +-
drivers/net/ethernet/intel/e1000e/ich8lan.c | 141 ++--
drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} | 1041 +-------------------
drivers/net/ethernet/intel/e1000e/manage.c | 377 +++++++
drivers/net/ethernet/intel/e1000e/netdev.c | 72 +-
drivers/net/ethernet/intel/e1000e/nvm.c | 647 ++++++++++++
drivers/net/ethernet/intel/e1000e/param.c | 2 +-
drivers/net/ethernet/intel/e1000e/phy.c | 5 +-
14 files changed, 1168 insertions(+), 1139 deletions(-)
rename drivers/net/ethernet/intel/e1000e/{lib.c => mac.c} (64%)
create mode 100644 drivers/net/ethernet/intel/e1000e/manage.c
create mode 100644 drivers/net/ethernet/intel/e1000e/nvm.c
--
1.7.7.6
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2012-01-27 3:08 Jeff Kirsher
@ 2012-01-28 1:47 ` David Miller
0 siblings, 0 replies; 40+ messages in thread
From: David Miller @ 2012-01-28 1:47 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 26 Jan 2012 19:08:38 -0800
> The following series contains updates to e1000e only. This is the
> second batch of e1000e patches and these changes contain
> fixups/cleanups/conversions. Most notably is the split up of lib.c
> into mac.c, manage.c and nvm.c.
>
> The following are changes since commit a7563f342db6490e66dbf2c8a50577a72a158c9a:
> ipv6: Use ipv6_addr_any()
> 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] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2012-01-03 19:19 Jeff Kirsher
0 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2012-01-03 19:19 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000, e1000e, igb and
netdev/ixgbe. There are 2 fixes and the remaining patches are
either add support or cleanup.
Here is a list of the new support added:
- igb adds support for byte queue limits and basic runtime PM
- e1000e adds Receive Packet Steering (RPS)
- FCoE adds ndo_get_fcoe_hbainfo() call
The following are changes since commit fa0f5aa74316c636427ac92dad0bc5714c34ca17:
net_sched: qdisc_alloc_handle() can be too slow
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (5):
e1000e: cleanup Rx checksum offload code
e1000e: add Receive Packet Steering (RPS) support
e1000e: re-enable alternate MAC address for all devices which support
it
e1000e: convert head, tail and itr_register offsets to __iomem
pointers
e1000e: pass pointer to ring struct instead of adapter struct
Eric Dumazet (1):
igb: Add support for byte queue limits.
Jesse Brandeburg (1):
e1000: fix lockdep splat in shutdown handler
Koki Sanagi (1):
igb: reset PHY after recovering from PHY power down
Neerav Parikh (2):
netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call
ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call
Yan, Zheng (1):
igb: add basic runtime PM support
drivers/net/ethernet/intel/e1000/e1000_main.c | 8 +-
drivers/net/ethernet/intel/e1000e/defines.h | 7 +
drivers/net/ethernet/intel/e1000e/e1000.h | 27 +-
drivers/net/ethernet/intel/e1000e/ethtool.c | 10 +-
drivers/net/ethernet/intel/e1000e/hw.h | 9 +-
drivers/net/ethernet/intel/e1000e/lib.c | 7 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 397 +++++++++++++++----------
drivers/net/ethernet/intel/igb/igb.h | 5 +
drivers/net/ethernet/intel/igb/igb_ethtool.c | 16 +
drivers/net/ethernet/intel/igb/igb_main.c | 142 ++++++++--
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 +
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 83 +++++
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +-
include/linux/netdevice.h | 26 ++
14 files changed, 541 insertions(+), 204 deletions(-)
--
1.7.7.4
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2011-10-08 6:47 Jeff Kirsher
2011-10-08 6:52 ` Jeff Kirsher
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2011-10-08 6:47 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to igb only. They are a
continuation of the cleanups and refactoring that Alex has done.
After this series there are 4-5 more patches to complete the work
that Alex has done on igb.
The following are changes since commit 1d0861acfb24d0ca0661ff5a156b992b2c589458:
Add ethtool -g support to 8139cp
and are available in the git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
or
git://github.com/Jkirsher/net-next.git
Alexander Duyck (11):
igb: push data into first igb_tx_buffer sooner to reduce stack usage
igb: Use node specific allocations for the q_vectors and rings
igb: avoid unnecessary conversions from u16 to int
igb: Consolidate all of the ring feature flags into a single value
igb: Move ITR related data into work container within the q_vector
igb: cleanup IVAR configuration
igb: retire the RX_CSUM flag and use the netdev flag instead
igb: leave staterr in place and instead us a helper function to check
bits
igb: fix recent VLAN changes that would leave VLANs disabled after
reset
igb: move TX hang check flag into ring->flags
igb: add support for NETIF_F_RXHASH
drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +
drivers/net/ethernet/intel/igb/igb.h | 53 ++-
drivers/net/ethernet/intel/igb/igb_ethtool.c | 14 +-
drivers/net/ethernet/intel/igb/igb_main.c | 675 +++++++++++++-----------
4 files changed, 411 insertions(+), 334 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2011-09-30 5:24 Jeff Kirsher
2011-09-30 18:35 ` Jeff Kirsher
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-30 5:24 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
The following series contains updates to e1000e and ixgbe. The one
patch for e1000e makes function tables const, thanks to Stephen
Hemminger for reporting this. The remaining patches are for ixgbe,
and the contain the following:
- minor cleanups
- add support for 82599 device and ethtool -E support
- removal of a PHY which is not used in production silicon
The following are changes since commit 56fd49e399ce1d82200fad5b8924d4e35a587809:
bna: Driver Version changed to 3.0.2.2
and are available in the git repository at
git://github.com/Jkirsher/net-next.git
Emil Tantilov (8):
ixgbe: prevent link checks while resetting
ixgbe: clear the data field in ixgbe_read_i2c_byte_generic
ixgbe: remove return code for functions that always return 0
ixgbe: add support for new 82599 device
ixgbe: send MFLCN to ethtool
ixgbe: do not disable flow control in ixgbe_check_mac_link
ixgbe: remove instances of ixgbe_phy_aq for 82598 and 82599
ixgbe: allow eeprom writes via ethtool
Jacob Keller (1):
ixgbe: fix driver version initialization in firmware
Jeff Kirsher (1):
e1000e: make function tables const
Mika Lansirinne (1):
ixgbe: get pauseparam autoneg
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 8 +-
drivers/net/ethernet/intel/e1000e/82571.c | 20 +++---
drivers/net/ethernet/intel/e1000e/e1000.h | 28 ++++----
drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++---
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 8 +--
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +--
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 6 --
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 74 +++++++++++++++++++---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 +++-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++-------
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 +
12 files changed, 125 insertions(+), 89 deletions(-)
--
1.7.6.2
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2011-09-30 5:24 Jeff Kirsher
@ 2011-09-30 18:35 ` Jeff Kirsher
0 siblings, 0 replies; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-30 18:35 UTC (permalink / raw)
To: davem; +Cc: netdev, gospo
[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]
On Thu, 2011-09-29 at 22:24 -0700, Kirsher, Jeffrey T wrote:
> The following series contains updates to e1000e and ixgbe. The one
> patch for e1000e makes function tables const, thanks to Stephen
> Hemminger for reporting this. The remaining patches are for ixgbe,
> and the contain the following:
>
> - minor cleanups
> - add support for 82599 device and ethtool -E support
> - removal of a PHY which is not used in production silicon
>
> The following are changes since commit 56fd49e399ce1d82200fad5b8924d4e35a587809:
> bna: Driver Version changed to 3.0.2.2
> and are available in the git repository at
> git://github.com/Jkirsher/net-next.git
>
> Emil Tantilov (8):
> ixgbe: prevent link checks while resetting
> ixgbe: clear the data field in ixgbe_read_i2c_byte_generic
> ixgbe: remove return code for functions that always return 0
> ixgbe: add support for new 82599 device
> ixgbe: send MFLCN to ethtool
> ixgbe: do not disable flow control in ixgbe_check_mac_link
> ixgbe: remove instances of ixgbe_phy_aq for 82598 and 82599
> ixgbe: allow eeprom writes via ethtool
>
> Jacob Keller (1):
> ixgbe: fix driver version initialization in firmware
>
> Jeff Kirsher (1):
> e1000e: make function tables const
>
> Mika Lansirinne (1):
> ixgbe: get pauseparam autoneg
>
> drivers/net/ethernet/intel/e1000e/80003es2lan.c | 8 +-
> drivers/net/ethernet/intel/e1000e/82571.c | 20 +++---
> drivers/net/ethernet/intel/e1000e/e1000.h | 28 ++++----
> drivers/net/ethernet/intel/e1000e/ich8lan.c | 16 +++---
> drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 8 +--
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +--
> drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 6 --
> drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 74 +++++++++++++++++++---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 +++-
> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 33 +++-------
> drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
> drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 +
> 12 files changed, 125 insertions(+), 89 deletions(-)
>
Currently there is only 1 small change that needs to be made to patch 11
of the series, based on Ben's comments.
I will wait a bit longer before fixing up patch 11, to ensure that there
are no other changes needed.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* [net-next 00/11][pull request] Intel Wired LAN Driver Updates
@ 2011-09-16 4:42 Jeff Kirsher
2011-09-16 19:20 ` David Miller
0 siblings, 1 reply; 40+ messages in thread
From: Jeff Kirsher @ 2011-09-16 4:42 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo
The following series contains updates to ixgbe only. These are primarily
cleanups of the ixgbe driver. The first two patches of the series:
ixgbe: Change default Tx work limit size to 256 buffers
ixgbe: consolidate all MSI-X ring interrupts and poll routines into one
are re-worked based on previous community feedback (Dave and Ben).
The following are changes since commit 4bc71cb983fd2844e603bf633df2bb53385182d2:
net: consolidate and fix ethtool_ops->get_settings calling
and are available in the git repository at:
git://github.com/Jkirsher/net-next.git
Alexander Duyck (11):
ixgbe: Change default Tx work limit size to 256 buffers
v2 ixgbe: consolidate all MSI-X ring interrupts and poll routines
into one
ixgbe: cleanup allocation and freeing of IRQ affinity hint
ixgbe: Use ring->dev instead of adapter->pdev->dev when updating DCA
ixgbe: commonize ixgbe_map_rings_to_vectors to work for all interrupt
types
ixgbe: Drop unnecessary adapter->hw dereference in loopback test
setup
ixgbe: combine PCI_VDEVICE and board declaration to same line
ixgbe: Update TXDCTL configuration to correctly handle WTHRESH
ixgbe: cleanup reset paths
ixgbe: cleanup configuration of EITRSEL and VF reset path
ixgbe: Correctly name and handle MSI-X other interrupt
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 13 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 40 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 18 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 775 ++++++++--------------
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 72 +--
7 files changed, 341 insertions(+), 580 deletions(-)
--
1.7.6
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [net-next 00/11][pull request] Intel Wired LAN Driver Updates
2011-09-16 4:42 Jeff Kirsher
@ 2011-09-16 19:20 ` David Miller
0 siblings, 0 replies; 40+ messages in thread
From: David Miller @ 2011-09-16 19:20 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 15 Sep 2011 21:42:42 -0700
> The following series contains updates to ixgbe only. These are primarily
> cleanups of the ixgbe driver. The first two patches of the series:
>
> ixgbe: Change default Tx work limit size to 256 buffers
> ixgbe: consolidate all MSI-X ring interrupts and poll routines into one
>
> are re-worked based on previous community feedback (Dave and Ben).
>
> The following are changes since commit 4bc71cb983fd2844e603bf633df2bb53385182d2:
> net: consolidate and fix ethtool_ops->get_settings calling
> and are available in the git repository at:
> git://github.com/Jkirsher/net-next.git
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2014-05-14 8:54 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-17 2:15 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2011-09-17 2:15 ` [net-next 01/11] ixgb: convert to ndo_fix_features Jeff Kirsher
2011-09-17 2:50 ` Joe Perches
2011-09-17 13:21 ` Michał Mirosław
2011-09-20 0:02 ` Jeff Kirsher
2011-09-23 20:56 ` Michał Mirosław
2011-09-24 4:47 ` Jeff Kirsher
2011-10-07 20:47 ` Michał Mirosław
2011-10-08 2:04 ` Jeff Kirsher
2011-09-17 2:15 ` [net-next 02/11] ixgbe: remove redundant configuration of tx_sample_rate Jeff Kirsher
2011-09-17 2:15 ` [net-next 03/11] v2 ixgbe: Update packet buffer reservation to correct fdir headroom size Jeff Kirsher
2011-09-17 2:15 ` [net-next 04/11] ixgbe: make ixgbe_up and ixgbe_up_complete void functions Jeff Kirsher
2011-09-17 2:15 ` [net-next 05/11] ixgbe: Add missing code for enabling overheat sensor interrupt Jeff Kirsher
2011-09-17 2:15 ` [net-next 06/11] ixgbe: Add SFP support for missed 82598 PHY Jeff Kirsher
2011-09-17 2:15 ` [net-next 07/11] ixgbe: drop adapter from ixgbe_fso call documentation Jeff Kirsher
2011-09-17 2:15 ` [net-next 08/11] ixgbe: Make better use of memory allocations in one-buffer mode w/ RSC Jeff Kirsher
2011-09-17 2:15 ` [net-next 09/11] ixgbe: cleanup some register reads Jeff Kirsher
2011-09-17 2:15 ` [net-next 10/11] ixgbe: fix FCRTL/H register dump for X540 Jeff Kirsher
2011-09-17 2:15 ` [net-next 11/11] ixgbe: remove duplicate netif_tx_start_all_queues Jeff Kirsher
-- strict thread matches above, loose matches on Subject: below --
2014-05-14 8:54 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-10-29 12:02 Jeff Kirsher
2013-10-29 22:58 ` David Miller
2013-10-24 15:27 Jeff Kirsher
2013-10-26 4:30 ` David Miller
2013-04-12 11:24 Jeff Kirsher
2012-11-13 14:03 Jeff Kirsher
2012-11-13 19:19 ` David Miller
2012-02-25 5:49 Jeff Kirsher
2012-02-26 1:31 ` David Miller
2012-02-07 12:33 Jeff Kirsher
2012-02-07 17:27 ` David Miller
2012-01-27 3:08 Jeff Kirsher
2012-01-28 1:47 ` David Miller
2012-01-03 19:19 Jeff Kirsher
2011-10-08 6:47 Jeff Kirsher
2011-10-08 6:52 ` Jeff Kirsher
2011-09-30 5:24 Jeff Kirsher
2011-09-30 18:35 ` Jeff Kirsher
2011-09-16 4:42 Jeff Kirsher
2011-09-16 19:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).