* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-08-31 5:16 Jeff Kirsher
2012-08-31 5:16 ` [net-next 1/8] e1000e: use correct type for read of 32-bit register Jeff Kirsher
` (8 more replies)
0 siblings, 9 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to e1000e and ixgbevf.
The following are changes since commit 761743ebc92df72053e736fce953a5d2e90099d5:
net/fsl_pq_mdio: add support for the Fman 1G MDIO controller
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (2):
ixgbevf: Add suspend and resume support to the VF
ixgbevf: Cleanup handling of configuration for jumbo frames
Bruce Allan (6):
e1000e: use correct type for read of 32-bit register
e1000e: cleanup strict checkpatch MEMORY_BARRIER checks
e1000e: cleanup strict checkpatch check
e1000e: cleanup - remove inapplicable comment
e1000e: cleanup - remove unnecessary variable
e1000e: update driver version number
drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
drivers/net/ethernet/intel/e1000e/ethtool.c | 3 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 19 ++-
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 160 +++++++++++++++++-----
drivers/net/ethernet/intel/ixgbevf/vf.c | 14 ++
drivers/net/ethernet/intel/ixgbevf/vf.h | 1 +
7 files changed, 164 insertions(+), 41 deletions(-)
--
1.7.11.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 1/8] e1000e: use correct type for read of 32-bit register
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 2/8] e1000e: cleanup strict checkpatch MEMORY_BARRIER checks Jeff Kirsher
` (7 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
The POEMB register is 32 bits, not 16.
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/82571.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 080c890..c985864 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -653,7 +653,7 @@ static void e1000_put_hw_semaphore_82574(struct e1000_hw *hw)
**/
static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
{
- u16 data = er32(POEMB);
+ u32 data = er32(POEMB);
if (active)
data |= E1000_PHY_CTRL_D0A_LPLU;
@@ -677,7 +677,7 @@ static s32 e1000_set_d0_lplu_state_82574(struct e1000_hw *hw, bool active)
**/
static s32 e1000_set_d3_lplu_state_82574(struct e1000_hw *hw, bool active)
{
- u16 data = er32(POEMB);
+ u32 data = er32(POEMB);
if (!active) {
data &= ~E1000_PHY_CTRL_NOND0A_LPLU;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 2/8] e1000e: cleanup strict checkpatch MEMORY_BARRIER checks
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-08-31 5:16 ` [net-next 1/8] e1000e: use correct type for read of 32-bit register Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 3/8] e1000e: cleanup strict checkpatch check Jeff Kirsher
` (6 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
Add comments to memory barriers per strict checkpatch.
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/netdev.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 46c3b1f..fb6c813 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3746,6 +3746,10 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data)
e_dbg("icr is %08X\n", icr);
if (icr & E1000_ICR_RXSEQ) {
adapter->flags &= ~FLAG_MSI_TEST_FAILED;
+ /*
+ * Force memory writes to complete before acknowledging the
+ * interrupt is handled.
+ */
wmb();
}
@@ -3787,6 +3791,10 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
goto msi_test_failed;
}
+ /*
+ * Force memory writes to complete before enabling and firing an
+ * interrupt.
+ */
wmb();
e1000_irq_enable(adapter);
@@ -3798,7 +3806,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
e1000_irq_disable(adapter);
- rmb();
+ rmb(); /* read flags after interrupt has been fired */
if (adapter->flags & FLAG_MSI_TEST_FAILED) {
adapter->int_mode = E1000E_INT_MODE_LEGACY;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 3/8] e1000e: cleanup strict checkpatch check
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-08-31 5:16 ` [net-next 1/8] e1000e: use correct type for read of 32-bit register Jeff Kirsher
2012-08-31 5:16 ` [net-next 2/8] e1000e: cleanup strict checkpatch MEMORY_BARRIER checks Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 4/8] e1000e: cleanup - remove inapplicable comment Jeff Kirsher
` (5 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
CHECK: multiple assignments should be avoided
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 2e76f06..c11ac27 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1942,7 +1942,8 @@ static int e1000_set_coalesce(struct net_device *netdev,
return -EINVAL;
if (ec->rx_coalesce_usecs == 4) {
- adapter->itr = adapter->itr_setting = 4;
+ adapter->itr_setting = 4;
+ adapter->itr = adapter->itr_setting;
} else if (ec->rx_coalesce_usecs <= 3) {
adapter->itr = 20000;
adapter->itr_setting = ec->rx_coalesce_usecs;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 4/8] e1000e: cleanup - remove inapplicable comment
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (2 preceding siblings ...)
2012-08-31 5:16 ` [net-next 3/8] e1000e: cleanup strict checkpatch check Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 5/8] e1000e: cleanup - remove unnecessary variable Jeff Kirsher
` (4 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
Early Receive has been disabled in the driver so this comment is no longer
applicable.
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/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index fb6c813..c35d354 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3446,7 +3446,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
/*
* if short on Rx space, Rx wins and must trump Tx
- * adjustment or use Early Receive if available
+ * adjustment
*/
if (pba < min_rx_space)
pba = min_rx_space;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 5/8] e1000e: cleanup - remove unnecessary variable
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (3 preceding siblings ...)
2012-08-31 5:16 ` [net-next 4/8] e1000e: cleanup - remove inapplicable comment Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 6/8] e1000e: update driver version number Jeff Kirsher
` (3 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
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/netdev.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index c35d354..c0815ce 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4669,7 +4669,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
struct e1000_buffer *buffer_info;
unsigned int i;
u32 cmd_length = 0;
- u16 ipcse = 0, tucse, mss;
+ u16 ipcse = 0, mss;
u8 ipcss, ipcso, tucss, tucso, hdr_len;
if (!skb_is_gso(skb))
@@ -4703,7 +4703,6 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
tucss = skb_transport_offset(skb);
tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
- tucse = 0;
cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
@@ -4717,7 +4716,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
context_desc->lower_setup.ip_fields.ipcse = cpu_to_le16(ipcse);
context_desc->upper_setup.tcp_fields.tucss = tucss;
context_desc->upper_setup.tcp_fields.tucso = tucso;
- context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse);
+ context_desc->upper_setup.tcp_fields.tucse = 0;
context_desc->tcp_seg_setup.fields.mss = cpu_to_le16(mss);
context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
context_desc->cmd_and_length = cpu_to_le32(cmd_length);
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 6/8] e1000e: update driver version number
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (4 preceding siblings ...)
2012-08-31 5:16 ` [net-next 5/8] e1000e: cleanup - remove unnecessary variable Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 7/8] ixgbevf: Add suspend and resume support to the VF Jeff Kirsher
` (2 subsequent siblings)
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Bruce Allan, netdev, gospo, sassmann, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
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/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index c0815ce..095a6be 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -56,7 +56,7 @@
#define DRV_EXTRAVERSION "-k"
-#define DRV_VERSION "2.0.0" DRV_EXTRAVERSION
+#define DRV_VERSION "2.1.4" DRV_EXTRAVERSION
char e1000e_driver_name[] = "e1000e";
const char e1000e_driver_version[] = DRV_VERSION;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 7/8] ixgbevf: Add suspend and resume support to the VF
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (5 preceding siblings ...)
2012-08-31 5:16 ` [net-next 6/8] e1000e: update driver version number Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 5:16 ` [net-next 8/8] ixgbevf: Cleanup handling of configuration for jumbo frames Jeff Kirsher
2012-08-31 20:03 ` [net-next 0/8][pull request] Intel Wired LAN Driver Updates David Miller
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, sassmann, Greg Rose, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This change adds PCI suspend and resume support to ixgbevf.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 93 ++++++++++++++++++++++-
1 file changed, 89 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 60ef645..87f87d8 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1867,6 +1867,22 @@ err_set_interrupt:
}
/**
+ * ixgbevf_clear_interrupt_scheme - Clear the current interrupt scheme settings
+ * @adapter: board private structure to clear interrupt scheme on
+ *
+ * We go through and clear interrupt specific resources and reset the structure
+ * to pre-load conditions
+ **/
+static void ixgbevf_clear_interrupt_scheme(struct ixgbevf_adapter *adapter)
+{
+ adapter->num_tx_queues = 0;
+ adapter->num_rx_queues = 0;
+
+ ixgbevf_free_q_vectors(adapter);
+ ixgbevf_reset_interrupt_capability(adapter);
+}
+
+/**
* ixgbevf_sw_init - Initialize general software structures
* (struct ixgbevf_adapter)
* @adapter: board private structure to initialize
@@ -2889,23 +2905,85 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
return 0;
}
-static void ixgbevf_shutdown(struct pci_dev *pdev)
+static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+#ifdef CONFIG_PM
+ int retval = 0;
+#endif
netif_device_detach(netdev);
if (netif_running(netdev)) {
+ rtnl_lock();
ixgbevf_down(adapter);
ixgbevf_free_irq(adapter);
ixgbevf_free_all_tx_resources(adapter);
ixgbevf_free_all_rx_resources(adapter);
+ rtnl_unlock();
}
- pci_save_state(pdev);
+ ixgbevf_clear_interrupt_scheme(adapter);
+
+#ifdef CONFIG_PM
+ retval = pci_save_state(pdev);
+ if (retval)
+ return retval;
+#endif
pci_disable_device(pdev);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int ixgbevf_resume(struct pci_dev *pdev)
+{
+ struct ixgbevf_adapter *adapter = pci_get_drvdata(pdev);
+ struct net_device *netdev = adapter->netdev;
+ u32 err;
+
+ pci_set_power_state(pdev, PCI_D0);
+ pci_restore_state(pdev);
+ /*
+ * pci_restore_state clears dev->state_saved so call
+ * pci_save_state to restore it.
+ */
+ pci_save_state(pdev);
+
+ err = pci_enable_device_mem(pdev);
+ if (err) {
+ dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
+ return err;
+ }
+ pci_set_master(pdev);
+
+ rtnl_lock();
+ err = ixgbevf_init_interrupt_scheme(adapter);
+ rtnl_unlock();
+ if (err) {
+ dev_err(&pdev->dev, "Cannot initialize interrupts\n");
+ return err;
+ }
+
+ ixgbevf_reset(adapter);
+
+ if (netif_running(netdev)) {
+ err = ixgbevf_open(netdev);
+ if (err)
+ return err;
+ }
+
+ netif_device_attach(netdev);
+
+ return err;
+}
+
+#endif /* CONFIG_PM */
+static void ixgbevf_shutdown(struct pci_dev *pdev)
+{
+ ixgbevf_suspend(pdev, PMSG_SUSPEND);
}
static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
@@ -2946,7 +3024,7 @@ static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
return stats;
}
-static const struct net_device_ops ixgbe_netdev_ops = {
+static const struct net_device_ops ixgbevf_netdev_ops = {
.ndo_open = ixgbevf_open,
.ndo_stop = ixgbevf_close,
.ndo_start_xmit = ixgbevf_xmit_frame,
@@ -2962,7 +3040,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
static void ixgbevf_assign_netdev_ops(struct net_device *dev)
{
- dev->netdev_ops = &ixgbe_netdev_ops;
+ dev->netdev_ops = &ixgbevf_netdev_ops;
ixgbevf_set_ethtool_ops(dev);
dev->watchdog_timeo = 5 * HZ;
}
@@ -3131,6 +3209,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
return 0;
err_register:
+ ixgbevf_clear_interrupt_scheme(adapter);
err_sw_init:
ixgbevf_reset_interrupt_capability(adapter);
iounmap(hw->hw_addr);
@@ -3168,6 +3247,7 @@ static void __devexit ixgbevf_remove(struct pci_dev *pdev)
if (netdev->reg_state == NETREG_REGISTERED)
unregister_netdev(netdev);
+ ixgbevf_clear_interrupt_scheme(adapter);
ixgbevf_reset_interrupt_capability(adapter);
iounmap(adapter->hw.hw_addr);
@@ -3267,6 +3347,11 @@ static struct pci_driver ixgbevf_driver = {
.id_table = ixgbevf_pci_tbl,
.probe = ixgbevf_probe,
.remove = __devexit_p(ixgbevf_remove),
+#ifdef CONFIG_PM
+ /* Power Management Hooks */
+ .suspend = ixgbevf_suspend,
+ .resume = ixgbevf_resume,
+#endif
.shutdown = ixgbevf_shutdown,
.err_handler = &ixgbevf_err_handler
};
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [net-next 8/8] ixgbevf: Cleanup handling of configuration for jumbo frames
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (6 preceding siblings ...)
2012-08-31 5:16 ` [net-next 7/8] ixgbevf: Add suspend and resume support to the VF Jeff Kirsher
@ 2012-08-31 5:16 ` Jeff Kirsher
2012-08-31 20:03 ` [net-next 0/8][pull request] Intel Wired LAN Driver Updates David Miller
8 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-08-31 5:16 UTC (permalink / raw)
To: davem; +Cc: Alexander Duyck, netdev, gospo, sassmann, Jeff Kirsher
From: Alexander Duyck <alexander.h.duyck@intel.com>
This change moves the code for notifying the PF of the VF maximum packet
size into the vf.c file. The main motivation behind this is that the vf.c
file is supposed to contain all of the messages used when communicating
with the PF.
In addition it creates a separate function for setting the Rx buffer size
so that we have on centralized area to review what buffer sizes will be
requested by the VF.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 67 ++++++++++++++---------
drivers/net/ethernet/intel/ixgbevf/vf.c | 14 +++++
drivers/net/ethernet/intel/ixgbevf/vf.h | 1 +
4 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 98cadb0..eb26fda 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -101,7 +101,9 @@ struct ixgbevf_ring {
/* Supported Rx Buffer Sizes */
#define IXGBEVF_RXBUFFER_256 256 /* Used for packet split */
-#define IXGBEVF_RXBUFFER_2048 2048
+#define IXGBEVF_RXBUFFER_3K 3072
+#define IXGBEVF_RXBUFFER_7K 7168
+#define IXGBEVF_RXBUFFER_15K 15360
#define IXGBEVF_MAX_RXBUFFER 16384 /* largest size for single descriptor */
#define IXGBEVF_RX_HDR_SIZE IXGBEVF_RXBUFFER_256
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 87f87d8..a5d9cc5 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1057,15 +1057,46 @@ static void ixgbevf_configure_srrctl(struct ixgbevf_adapter *adapter, int index)
srrctl |= IXGBE_SRRCTL_DESCTYPE_ADV_ONEBUF;
- if (rx_ring->rx_buf_len == MAXIMUM_ETHERNET_VLAN_SIZE)
- srrctl |= IXGBEVF_RXBUFFER_2048 >>
- IXGBE_SRRCTL_BSIZEPKT_SHIFT;
- else
- srrctl |= rx_ring->rx_buf_len >>
- IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+ srrctl |= ALIGN(rx_ring->rx_buf_len, 1024) >>
+ IXGBE_SRRCTL_BSIZEPKT_SHIFT;
+
IXGBE_WRITE_REG(hw, IXGBE_VFSRRCTL(index), srrctl);
}
+static void ixgbevf_set_rx_buffer_len(struct ixgbevf_adapter *adapter)
+{
+ struct ixgbe_hw *hw = &adapter->hw;
+ struct net_device *netdev = adapter->netdev;
+ int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+ int i;
+ u16 rx_buf_len;
+
+ /* notify the PF of our intent to use this size of frame */
+ ixgbevf_rlpml_set_vf(hw, max_frame);
+
+ /* PF will allow an extra 4 bytes past for vlan tagged frames */
+ max_frame += VLAN_HLEN;
+
+ /*
+ * Make best use of allocation by using all but 1K of a
+ * power of 2 allocation that will be used for skb->head.
+ */
+ if ((hw->mac.type == ixgbe_mac_X540_vf) &&
+ (max_frame <= MAXIMUM_ETHERNET_VLAN_SIZE))
+ rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
+ else if (max_frame <= IXGBEVF_RXBUFFER_3K)
+ rx_buf_len = IXGBEVF_RXBUFFER_3K;
+ else if (max_frame <= IXGBEVF_RXBUFFER_7K)
+ rx_buf_len = IXGBEVF_RXBUFFER_7K;
+ else if (max_frame <= IXGBEVF_RXBUFFER_15K)
+ rx_buf_len = IXGBEVF_RXBUFFER_15K;
+ else
+ rx_buf_len = IXGBEVF_MAX_RXBUFFER;
+
+ for (i = 0; i < adapter->num_rx_queues; i++)
+ adapter->rx_ring[i].rx_buf_len = rx_buf_len;
+}
+
/**
* ixgbevf_configure_rx - Configure 82599 VF Receive Unit after Reset
* @adapter: board private structure
@@ -1076,18 +1107,14 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
{
u64 rdba;
struct ixgbe_hw *hw = &adapter->hw;
- struct net_device *netdev = adapter->netdev;
- int max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
int i, j;
u32 rdlen;
- int rx_buf_len;
/* PSRTYPE must be initialized in 82599 */
IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, 0);
- if (netdev->mtu <= ETH_DATA_LEN)
- rx_buf_len = MAXIMUM_ETHERNET_VLAN_SIZE;
- else
- rx_buf_len = ALIGN(max_frame, 1024);
+
+ /* set_rx_buffer_len must be called before ring initialization */
+ ixgbevf_set_rx_buffer_len(adapter);
rdlen = adapter->rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc);
/* Setup the HW Rx Head and Tail Descriptor Pointers and
@@ -1103,7 +1130,6 @@ static void ixgbevf_configure_rx(struct ixgbevf_adapter *adapter)
IXGBE_WRITE_REG(hw, IXGBE_VFRDT(j), 0);
adapter->rx_ring[i].head = IXGBE_VFRDH(j);
adapter->rx_ring[i].tail = IXGBE_VFRDT(j);
- adapter->rx_ring[i].rx_buf_len = rx_buf_len;
ixgbevf_configure_srrctl(adapter, j);
}
@@ -1315,7 +1341,6 @@ static void ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
int i, j = 0;
int num_rx_rings = adapter->num_rx_queues;
u32 txdctl, rxdctl;
- u32 msg[2];
for (i = 0; i < adapter->num_tx_queues; i++) {
j = adapter->tx_ring[i].reg_idx;
@@ -1356,10 +1381,6 @@ static void ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
hw->mac.ops.set_rar(hw, 0, hw->mac.perm_addr, 0);
}
- msg[0] = IXGBE_VF_SET_LPE;
- msg[1] = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
- hw->mbx.ops.write_posted(hw, msg, 2);
-
spin_unlock(&adapter->mbx_lock);
clear_bit(__IXGBEVF_DOWN, &adapter->state);
@@ -2876,10 +2897,8 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
{
struct ixgbevf_adapter *adapter = netdev_priv(netdev);
- struct ixgbe_hw *hw = &adapter->hw;
int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
int max_possible_frame = MAXIMUM_ETHERNET_VLAN_SIZE;
- u32 msg[2];
if (adapter->hw.mac.type == ixgbe_mac_X540_vf)
max_possible_frame = IXGBE_MAX_JUMBO_FRAME_SIZE;
@@ -2893,12 +2912,6 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
/* must set new MTU before calling down or up */
netdev->mtu = new_mtu;
- if (!netif_running(netdev)) {
- msg[0] = IXGBE_VF_SET_LPE;
- msg[1] = max_frame;
- hw->mbx.ops.write_posted(hw, msg, 2);
- }
-
if (netif_running(netdev))
ixgbevf_reinit_locked(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index ec89b86..3d555a1 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -419,6 +419,20 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
return 0;
}
+/**
+ * ixgbevf_rlpml_set_vf - Set the maximum receive packet length
+ * @hw: pointer to the HW structure
+ * @max_size: value to assign to max frame size
+ **/
+void ixgbevf_rlpml_set_vf(struct ixgbe_hw *hw, u16 max_size)
+{
+ u32 msgbuf[2];
+
+ msgbuf[0] = IXGBE_VF_SET_LPE;
+ msgbuf[1] = max_size;
+ ixgbevf_write_msg_read_ack(hw, msgbuf, 2);
+}
+
static const struct ixgbe_mac_operations ixgbevf_mac_ops = {
.init_hw = ixgbevf_init_hw_vf,
.reset_hw = ixgbevf_reset_hw_vf,
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 25c951d..07fd876 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
@@ -170,5 +170,6 @@ struct ixgbevf_info {
const struct ixgbe_mac_operations *mac_ops;
};
+void ixgbevf_rlpml_set_vf(struct ixgbe_hw *hw, u16 max_size);
#endif /* __IXGBE_VF_H__ */
--
1.7.11.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
` (7 preceding siblings ...)
2012-08-31 5:16 ` [net-next 8/8] ixgbevf: Cleanup handling of configuration for jumbo frames Jeff Kirsher
@ 2012-08-31 20:03 ` David Miller
8 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2012-08-31 20:03 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 30 Aug 2012 22:16:06 -0700
> This series contains updates to e1000e and ixgbevf.
>
> The following are changes since commit 761743ebc92df72053e736fce953a5d2e90099d5:
> net/fsl_pq_mdio: add support for the Fman 1G MDIO controller
> 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] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2014-01-01 0:53 Jeff Kirsher
2014-01-02 4:01 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2014-01-01 0:53 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series implements the Linux Virtual Function (VF) driver for
the Intel Ethernet Controller XL710 family.
The following are changes since commit 21eb218989523b7bee28900aaec9f9296b70fa27:
net, sch: fix the typo in register_qdisc()
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Greg Rose (8):
i40evf: main driver core
i40evf: transmit and receive functionality
i40evf: core ethtool functionality
i40evf: virtual channel interface
i40evf: driver core headers
i40evf: init code and hardware support
i40evf: add driver to kernel build system
i40evf: A0 silicon specific
Documentation/networking/i40evf.txt | 47 +
MAINTAINERS | 4 +-
drivers/net/ethernet/intel/Kconfig | 19 +
drivers/net/ethernet/intel/Makefile | 1 +
drivers/net/ethernet/intel/i40evf/Makefile | 33 +
drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 927 ++++
drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 106 +
.../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2153 +++++++++
drivers/net/ethernet/intel/i40evf/i40e_alloc.h | 55 +
drivers/net/ethernet/intel/i40evf/i40e_common.c | 254 ++
drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 238 +
drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 165 +
drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 72 +
drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 84 +
drivers/net/ethernet/intel/i40evf/i40e_register.h | 4667 ++++++++++++++++++++
drivers/net/ethernet/intel/i40evf/i40e_status.h | 97 +
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1573 +++++++
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 296 ++
drivers/net/ethernet/intel/i40evf/i40e_type.h | 1152 +++++
drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 364 ++
drivers/net/ethernet/intel/i40evf/i40evf.h | 321 ++
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 390 ++
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2353 ++++++++++
.../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 772 ++++
24 files changed, 16142 insertions(+), 1 deletion(-)
create mode 100644 Documentation/networking/i40evf.txt
create mode 100644 drivers/net/ethernet/intel/i40evf/Makefile
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq.c
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_alloc.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_common.c
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_osdep.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_prototype.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_register.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_status.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_txrx.c
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_txrx.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_type.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf.h
create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_main.c
create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
--
1.8.3.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2014-01-01 0:53 Jeff Kirsher
@ 2014-01-02 4:01 ` David Miller
0 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2014-01-02 4:01 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 31 Dec 2013 16:53:05 -0800
> This series implements the Linux Virtual Function (VF) driver for
> the Intel Ethernet Controller XL710 family.
>
> The following are changes since commit 21eb218989523b7bee28900aaec9f9296b70fa27:
> net, sch: fix the typo in register_qdisc()
> 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] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2013-09-06 5:43 Jeff Kirsher
2013-09-06 5:58 ` Jeff Kirsher
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2013-09-06 5:43 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, gospo, sassmann, jesse.brandeburg,
shannon.nelson, peter.p.waskiewicz.jr, e1000-devel
This series implements the new i40e driver for Intel's upcoming
Intel(R) Ethernet Controller XL710 Family of devices.
V1: initial send
V2: each patch has individual comments, in general, feedback from the
list was applied and addressed. Many changes due to internal review
and coding as well.
V3: many more individual comments addressed, thanks reviewers! Many
other changes due to internal review and development.
V4: addresses remaining community comments, mostly trivial edits.
major sparse based cleanup of possible endian issues
removal of most of __func__ references
sizeof(*var) instead of sizeof(struct ...)
change 'NULL ==' tests to !NULL
implement xps
use kernel bitshift macros (upper_32_bits, etc)
V5: remove sysfs support from this set, will rearchitect
changes from community comments
Let me start by saying thanks and we appreciate any time spent by
those of you who review and comment on this new driver, and we will
attempt to address and respond to all issues brought to our attention.
Jesse tried to break the patches up to ease review, but the series should
apply and still be bisectable, as the last patch adds the driver to
the kernel compile with CONFIG_I40E.
This driver is for a brand new bit of silicon that has a different
design than other Intel Ethernet silicon, and therefore needed a new
driver.
The hardware has quite a bit of capability and this driver is only
meant to provide basic functionality at first. Future patches will
continue to add functionality and bug fixes.
This initial release is very early in the product cycle with the intent
of getting initial support into the kernel before users have the
hardware available to purchase. A software development manual is not
ready yet but will be available when the hardware ships.
To be clear, the driver development model and interaction with
community submitted patches *will not be any different* than what
we are currently doing today.
This driver *does* use some code (as our previous drivers do) that is
meant to be shared to different OS drivers. One of the following
patches has the majority of this code in it, and is clearly called out
in the commit message.
An associated i40evf driver has been posted for review.
List of tools we ran in preparation:
way more sparse clean
make W=1, W=2 clean
checkpatch (almost) clean
total: 1 errors, 4 warnings, 30595 lines checked
NOTE: Ignored message types: LONG_LINE
- issues have been addressed and the remainders
are noise.
codespell clean
smatch (almost) clean with a couple minor warnings
coccicheck clean
namespacecheck clean
allmodconfig clean
ppc64 build clean (unable to test yet)
This driver is a team effort, thank you to Joseph Gasparakis,
Shannon Nelson, Anjali Singhai-Jain, Mitch Williams, Neerav
Parikh, Vasu Dev, Kavindya Deegala, Yi Zou, and PJ Waskiewicz.
TODO (known issues)
BQL implementation
finish rtnl_stat64 locking (we have a patch but debugging it)
The following are changes since commit 2e032852245b3dcfe5461d7353e34eb6da095ccf:
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Jesse Brandeburg (8):
i40e: main driver core
i40e: transmit, receive, and NAPI
i40e: driver ethtool core
i40e: driver core headers
i40e: implement virtual device interface
i40e: init code and hardware support
i40e: debugfs interface
i40e: include i40e in kernel proper
Documentation/networking/00-INDEX | 2 +
Documentation/networking/i40e.txt | 115 +
MAINTAINERS | 3 +-
drivers/net/ethernet/intel/Kconfig | 18 +
drivers/net/ethernet/intel/Makefile | 1 +
drivers/net/ethernet/intel/i40e/Kbuild | 44 +
drivers/net/ethernet/intel/i40e/i40e.h | 566 ++
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 994 +++
drivers/net/ethernet/intel/i40e/i40e_adminq.h | 112 +
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2077 ++++++
drivers/net/ethernet/intel/i40e/i40e_alloc.h | 59 +
drivers/net/ethernet/intel/i40e/i40e_common.c | 2048 ++++++
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2083 ++++++
drivers/net/ethernet/intel/i40e/i40e_diag.c | 133 +
drivers/net/ethernet/intel/i40e/i40e_diag.h | 52 +
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1452 ++++
drivers/net/ethernet/intel/i40e/i40e_hmc.c | 370 +
drivers/net/ethernet/intel/i40e/i40e_hmc.h | 245 +
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 1007 +++
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 169 +
drivers/net/ethernet/intel/i40e/i40e_main.c | 7386 ++++++++++++++++++++
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 391 ++
drivers/net/ethernet/intel/i40e/i40e_osdep.h | 86 +
drivers/net/ethernet/intel/i40e/i40e_prototype.h | 239 +
drivers/net/ethernet/intel/i40e/i40e_register.h | 4688 +++++++++++++
drivers/net/ethernet/intel/i40e/i40e_status.h | 101 +
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1817 +++++
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 259 +
drivers/net/ethernet/intel/i40e/i40e_type.h | 1154 +++
drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 368 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2408 +++++++
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 121 +
32 files changed, 30567 insertions(+), 1 deletion(-)
create mode 100644 Documentation/networking/i40e.txt
create mode 100644 drivers/net/ethernet/intel/i40e/Kbuild
create mode 100644 drivers/net/ethernet/intel/i40e/i40e.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_alloc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_common.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_debugfs.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_diag.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_diag.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_ethtool.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_hmc.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_main.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_nvm.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_osdep.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_prototype.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_register.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_status.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_txrx.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_txrx.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_type.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
--
1.8.3.1
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2013-09-06 5:43 Jeff Kirsher
@ 2013-09-06 5:58 ` Jeff Kirsher
0 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2013-09-06 5:58 UTC (permalink / raw)
To: davem; +Cc: e1000-devel, netdev, jesse.brandeburg, gospo, sassmann
[-- Attachment #1.1: Type: text/plain, Size: 4024 bytes --]
On Thu, 2013-09-05 at 22:43 -0700, Jeff Kirsher wrote:
> This series implements the new i40e driver for Intel's upcoming
> Intel(R) Ethernet Controller XL710 Family of devices.
>
> V1: initial send
> V2: each patch has individual comments, in general, feedback from the
> list was applied and addressed. Many changes due to internal
> review
> and coding as well.
> V3: many more individual comments addressed, thanks reviewers! Many
> other changes due to internal review and development.
> V4: addresses remaining community comments, mostly trivial edits.
> major sparse based cleanup of possible endian issues
> removal of most of __func__ references
> sizeof(*var) instead of sizeof(struct ...)
> change 'NULL ==' tests to !NULL
> implement xps
> use kernel bitshift macros (upper_32_bits, etc)
> V5: remove sysfs support from this set, will rearchitect
> changes from community comments
>
> Let me start by saying thanks and we appreciate any time spent by
> those of you who review and comment on this new driver, and we will
> attempt to address and respond to all issues brought to our attention.
>
> Jesse tried to break the patches up to ease review, but the series
> should
> apply and still be bisectable, as the last patch adds the driver to
> the kernel compile with CONFIG_I40E.
>
> This driver is for a brand new bit of silicon that has a different
> design than other Intel Ethernet silicon, and therefore needed a new
> driver.
>
> The hardware has quite a bit of capability and this driver is only
> meant to provide basic functionality at first. Future patches will
> continue to add functionality and bug fixes.
>
> This initial release is very early in the product cycle with the
> intent
> of getting initial support into the kernel before users have the
> hardware available to purchase. A software development manual is not
> ready yet but will be available when the hardware ships.
>
> To be clear, the driver development model and interaction with
> community submitted patches *will not be any different* than what
> we are currently doing today.
>
> This driver *does* use some code (as our previous drivers do) that is
> meant to be shared to different OS drivers. One of the following
> patches has the majority of this code in it, and is clearly called out
> in the commit message.
>
> An associated i40evf driver has been posted for review.
>
> List of tools we ran in preparation:
> way more sparse clean
> make W=1, W=2 clean
> checkpatch (almost) clean
> total: 1 errors, 4 warnings, 30595 lines checked
> NOTE: Ignored message types: LONG_LINE
> - issues have been addressed and the remainders
> are noise.
> codespell clean
> smatch (almost) clean with a couple minor warnings
> coccicheck clean
> namespacecheck clean
> allmodconfig clean
> ppc64 build clean (unable to test yet)
>
> This driver is a team effort, thank you to Joseph Gasparakis,
> Shannon Nelson, Anjali Singhai-Jain, Mitch Williams, Neerav
> Parikh, Vasu Dev, Kavindya Deegala, Yi Zou, and PJ Waskiewicz.
>
> TODO (known issues)
> BQL implementation
> finish rtnl_stat64 locking (we have a patch but debugging it)
>
> The following are changes since commit
> 2e032852245b3dcfe5461d7353e34eb6da095ccf:
> Merge branch 'for-linus' of
> git://git.linaro.org/people/rmk/linux-arm
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> master
>
> Jesse Brandeburg (8):
> i40e: main driver core
> i40e: transmit, receive, and NAPI
> i40e: driver ethtool core
> i40e: driver core headers
> i40e: implement virtual device interface
> i40e: init code and hardware support
> i40e: debugfs interface
> i40e: include i40e in kernel proper
Grrr... I sent v5 out and forgot to note it in the title. Sorry for the
spam, I will resend with the proper titles. :-(
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 433 bytes --]
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
[-- Attachment #3: Type: text/plain, Size: 257 bytes --]
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2013-06-14 3:55 Jeff Kirsher
0 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2013-06-14 3:55 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series implements the new i40e driver for Intel's upcoming
Intel(R) Ethernet Controller XL710 Family of devices.
Jesse tried to break the patches up to ease review and still be
bisectable, as the last patch adds the driver to the kernel compile
with CONFIG_I40E.
This driver is for a brand new bit of silicon that has a different
design than other Intel Ethernet silicon, and therefore needed a new
driver.
The hardware has quite a bit of capability and this driver is only
meant to provide basic functionality at first. Future patches will
continue to add functionality and bug fixes.
This initial release is very early in the product cycle with the intent
of getting initial support into the kernel before users have the
hardware available to purchase. A software development manual is not
ready yet but will be available when the hardware ships.
This driver *does* use some code (as our previous drivers do) that is
meant to be shared to different OS drivers. One of the following
patches has the majority of this code in it, and is clearly called out
in the commit message.
An associated i40evf driver will follow in the future.
List of tools we ran in preparation:
sparse clean
make W=1, W=2 clean
checkpatch (almost) clean
- total: 1 errors, 5 warnings, 30444 lines checked
- NOTE: Ignored message types: LONG_LINE
- 5 warnings/1 error are bogus
- long lines that remain are #defines best on one line
codespell clean
smatch (almost) clean with a couple minor warnings
coccicheck clean
namespacecheck clean
allmodconfig clean
ppc64 build clean (unable to test yet)
This driver is a team effort, thank you to Joseph Gasparakis,
Shannon Nelson, Anjali Singhai-Jain, Mitch Williams, Neerav
Parikh, Vasu Dev, Yi Zou, and PJ Waskiewicz.
TODO (known issues)
get_stats64
BQL implementation
use 40000_* defines from kernel
some possible indentation issues on function parameters
The following are changes since commit 948e306d7d645af80ea331b60495710fe4fe12bb:
net/mlx4: Add VF link state support
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Jesse Brandeburg (8):
i40e: main driver core
i40e: transmit, receive, and napi
i40e: driver ethtool core
i40e: driver core headers
i40e: implement virtual device interface
i40e: init code and hardware support
i40e: sysfs and debugfs interfaces
i40e: include i40e in kernel proper
Documentation/networking/00-INDEX | 2 +
Documentation/networking/i40e.txt | 115 +
MAINTAINERS | 3 +-
drivers/net/ethernet/intel/Kconfig | 18 +
drivers/net/ethernet/intel/Makefile | 1 +
drivers/net/ethernet/intel/i40e/Kbuild | 45 +
drivers/net/ethernet/intel/i40e/i40e.h | 526 ++
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 935 +++
drivers/net/ethernet/intel/i40e/i40e_adminq.h | 112 +
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 1929 ++++++
drivers/net/ethernet/intel/i40e/i40e_alloc.h | 59 +
drivers/net/ethernet/intel/i40e/i40e_common.c | 1947 ++++++
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2205 ++++++
drivers/net/ethernet/intel/i40e/i40e_diag.c | 133 +
drivers/net/ethernet/intel/i40e/i40e_diag.h | 55 +
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1198 ++++
drivers/net/ethernet/intel/i40e/i40e_hmc.c | 370 +
drivers/net/ethernet/intel/i40e/i40e_hmc.h | 246 +
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 1004 +++
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 170 +
drivers/net/ethernet/intel/i40e/i40e_main.c | 7258 ++++++++++++++++++++
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 330 +
drivers/net/ethernet/intel/i40e/i40e_osdep.h | 78 +
drivers/net/ethernet/intel/i40e/i40e_prototype.h | 244 +
drivers/net/ethernet/intel/i40e/i40e_register.h | 4688 +++++++++++++
drivers/net/ethernet/intel/i40e/i40e_status.h | 101 +
drivers/net/ethernet/intel/i40e/i40e_sysfs.c | 627 ++
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1838 +++++
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 260 +
drivers/net/ethernet/intel/i40e/i40e_type.h | 1143 +++
drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 369 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2279 ++++++
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 121 +
33 files changed, 30408 insertions(+), 1 deletion(-)
create mode 100644 Documentation/networking/i40e.txt
create mode 100644 drivers/net/ethernet/intel/i40e/Kbuild
create mode 100644 drivers/net/ethernet/intel/i40e/i40e.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_alloc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_common.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_debugfs.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_diag.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_diag.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_ethtool.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_hmc.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_main.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_nvm.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_osdep.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_prototype.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_register.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_status.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_sysfs.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_txrx.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_txrx.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_type.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
create mode 100644 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
--
1.7.11.7
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2013-04-26 4:57 Jeff Kirsher
2013-04-27 3:34 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2013-04-26 4:57 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, bhutchings, stable
This series contains updates to e1000e, igb and ixgbe.
There are 2 patches in this series which could be applied to net,
but since Linus is so very close to releasing 3.9, I do not think
it prudent to try and push these into net at this time. I have CC'd
stable on these patches so that they can queue them up as soon as
3.9 gets released.
The 2 patches are:
e1000e: fix numeric overflow in phc settime method
ixgbe: fix EICR write in ixgbe_msix_other
Richard provides a fix for e1000e by using a helper function from time.h
to resolve a unintended overflow in the PTP settime function.
Bruce provides a fix to wait for NAPI to be done with the current context
after disabling interrupts and then disable NAPI when the interface
is going down. This fixes a possible "unable to handle kernel paging
request" panic in net-next.
Andi Kleen provides a patch for igb to use mdelay instead of udelay
when we needed 100000us.
Jacob provides a fix for ixgbe to simply mask the lower 16bits off so that
ixgbe_msix_other does not write them in the EICR, which causes them to
remain high and be properly handled by the clean_rings interrupt routine
as normal.
Emil cleans up the logic in ixgbe_setup_loopback_test() to only access
registers applicable to the MAC type. In addition, removes majority
of the AUTOC register reads by using a cached value instead to avoid
writing corrupted values to AUTOC due to bad FW. Emil also add support
for disabling link during boot time. Lastly, he provides a patch which
adds the MAC type to the version in ethtool_regs which will make it
easier to check the MAC type when dumping registers with ethtool.
There is a separate ethtool tool patch which is dependent upon Emil's
last patch of the series to add the MAC type to the version in
ethtool_regs, which will be sent separately.
The following are changes since commit 3a4e0d6a95b2b6f7b22eb7c7361a0fc4289478eb:
openvswitch: Use parallel_ops genl.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Andi Kleen (1):
igb: limit udelay for phy changes to 10000us
Bruce Allan (1):
e1000e: panic caused by Rx traffic arriving while interface going
down
Emil Tantilov (4):
ixgbe: fix register access during ethtool loopback test
ixgbe: cache AUTOC reads
ixgbe: add support for disabling link at boot time on 82599
ixgbe: add mac type to the version in ethtool_regs
Jacob Keller (1):
ixgbe: fix EICR write in ixgbe_msix_other
Richard Cochran (1):
e1000e: fix numeric overflow in phc settime method
drivers/net/ethernet/intel/e1000e/netdev.c | 7 ++-
drivers/net/ethernet/intel/e1000e/ptp.c | 3 +-
drivers/net/ethernet/intel/igb/e1000_phy.c | 6 +--
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 61 +++++++++++++++++-------
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 29 ++++++-----
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 ++++
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 +
7 files changed, 80 insertions(+), 38 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-10-23 10:24 Jeff Kirsher
2012-10-23 17:28 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2012-10-23 10:24 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to e1000e, igb, ixgbevf and MAINTAINERS.
The following are changes since commit 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0:
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 (2):
igb: Update get cable length function for i210/i211
igb: Update version
Greg Rose (2):
ixgbevf: Check for error on dma_map_single call
ixgbevf: Update version string
Jesse Brandeburg (1):
maintainers: update with official intel support link, new maintainer
John Fastabend (2):
ixgbevf: make netif_napi_add and netif_napi_del symmetric
ixgbevf: fix softirq-safe to unsafe splat on internal mbx_lock
Tushar Dave (1):
e1000e: Minimum packet size must be 17 bytes
MAINTAINERS | 2 +
drivers/net/ethernet/intel/e1000e/netdev.c | 11 +++++
drivers/net/ethernet/intel/igb/e1000_phy.c | 20 ++++++++
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 59 ++++++++++++-----------
5 files changed, 64 insertions(+), 30 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-10-23 10:24 Jeff Kirsher
@ 2012-10-23 17:28 ` David Miller
0 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2012-10-23 17:28 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 23 Oct 2012 03:24:39 -0700
> This series contains updates to e1000e, igb, ixgbevf and MAINTAINERS.
>
> The following are changes since commit 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0:
> 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
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-09-17 4:15 Jeff Kirsher
2012-09-17 4:56 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2012-09-17 4:15 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to e1000 and ixgbe. Most notably is
the added debugfs support in ixgbe.
The following are changes since commit 7f2e6a5d8608d0353b017a0fe15502307593734e:
drivers/isdn/gigaset/common.c: Remove useless kfree
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (2):
ixgbe: Fix ordering of things so that PF correctly configures its
VLANs
ixgbe: Fix VF rate limiting to correctly account for more queues per
VF
Catherine Sullivan (3):
ixgbe: add debugfs support
ixgbe: added netdev_ops file to debugfs
ixgbe: added reg_ops file to debugfs
Emil Tantilov (1):
ixgbe: fix reporting of spoofed packets
Mark Rustad (1):
ixgbe: Improve statistics accuracy for DDP traffic
Otto Estuardo Solares Cabrera (1):
e1000: add byte queue limits
drivers/net/ethernet/intel/e1000/e1000_main.c | 10 +
drivers/net/ethernet/intel/ixgbe/Makefile | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 10 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 300 +++++++++++++++++++++++
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 60 +++--
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 105 ++++----
6 files changed, 423 insertions(+), 64 deletions(-)
create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
--
1.7.11.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-09-17 4:15 Jeff Kirsher
@ 2012-09-17 4:56 ` David Miller
2012-09-17 8:15 ` Jeff Kirsher
0 siblings, 1 reply; 31+ messages in thread
From: David Miller @ 2012-09-17 4:56 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Sun, 16 Sep 2012 21:15:34 -0700
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Sigh...
You changed this tree.
It originally had the IGB PTP changes, which you asked me to
reconsider.
So I went to pull them in and now it had these new changes in
it, which I accidently pushed out to net-next instead of the
IGB stuff.
Never do this. If you wanted me to consider to sets of
changes seperatedly, put them in seperate branches for me
to pull from.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-09-17 4:56 ` David Miller
@ 2012-09-17 8:15 ` Jeff Kirsher
0 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-09-17 8:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, gospo, sassmann
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
On Mon, 2012-09-17 at 00:56 -0400, David Miller wrote:
>
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun, 16 Sep 2012 21:15:34 -0700
>
> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
> master
>
> Sigh...
>
> You changed this tree.
>
> It originally had the IGB PTP changes, which you asked me to
> reconsider.
>
> So I went to pull them in and now it had these new changes in
> it, which I accidently pushed out to net-next instead of the
> IGB stuff.
>
> Never do this. If you wanted me to consider to sets of
> changes seperatedly, put them in seperate branches for me
> to pull from.
Sorry, I had not heard anything after several days, and since there had
been a number of changes to the tree since I last sent out the push
message I was going to re-sbumbit them against an updated tree.
I will put together a branch with the igb patches now.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-07-17 10:09 Jeff Kirsher
2012-07-17 10:22 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2012-07-17 10:09 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series contains updates to ixgbevf.
The following are changes since commit 282f23c6ee343126156dd41218b22ece96d747e3:
tcp: implement RFC 5961 3.2
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Alexander Duyck (8):
ixgbevf: Drop all dead or unnecessary code
ixgbevf: Drop netdev_registered value since that is already stored in
netdev
ixgbevf: Make use of NETIF_F_RXCSUM instead of keeping our own flag
ixgbevf: Drop use of eitr_low and eitr_high for hard coded values
ixgbevf: Cleanup accounting for space needed at start of xmit_frame
ixgbevf: Update q_vector to contain ring pointers instead of bitmaps
ixgbevf: Move Tx clean-up into NAPI context
ixgbevf: Use igb style interrupt masks instead of ixgbe style
drivers/net/ethernet/intel/ixgbevf/defines.h | 27 +-
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 13 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 99 +--
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 820 ++++++---------------
4 files changed, 276 insertions(+), 683 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-07-17 10:09 Jeff Kirsher
@ 2012-07-17 10:22 ` David Miller
0 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2012-07-17 10:22 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 17 Jul 2012 03:09:11 -0700
> This series contains updates to ixgbevf.
>
> The following are changes since commit 282f23c6ee343126156dd41218b22ece96d747e3:
> tcp: implement RFC 5961 3.2
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
>
> Alexander Duyck (8):
> ixgbevf: Drop all dead or unnecessary code
> ixgbevf: Drop netdev_registered value since that is already stored in
> netdev
> ixgbevf: Make use of NETIF_F_RXCSUM instead of keeping our own flag
> ixgbevf: Drop use of eitr_low and eitr_high for hard coded values
> ixgbevf: Cleanup accounting for space needed at start of xmit_frame
> ixgbevf: Update q_vector to contain ring pointers instead of bitmaps
> ixgbevf: Move Tx clean-up into NAPI context
> ixgbevf: Use igb style interrupt masks instead of ixgbe style
Pulled, thanks Jeff.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-05-04 10:35 Jeff Kirsher
2012-05-04 15:49 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2012-05-04 10:35 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
This series of patches contains updates for e1000e and ixgbe.
The e1000e updates the version number and adds support for i217
silicon. The ixgbe patches are cleanups/re-organizations to
the driver.
The following are changes since commit f19250883fe09dd2b6b5f818d84874837948c546:
net/niu: remove one superfluous dma mask check
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: Track instances of buffer available but no DMA resources
present
ixgbe: Reorder the ring to q_vector mapping to improve performance
ixgbe: Make ixgbe_fc_autoneg return void and always set current_mode
ixgbe: Use __free_pages instead of put_page to release pages
ixgbe: Reorder link flow control functions in ixgbe_common.c
ixgbe: Update link flow control to correctly handle multiple packet
buffer DCB
Bruce Allan (1):
e1000e: initial support for i217
Matthew Vick (1):
e1000e: Update driver version number
drivers/net/ethernet/intel/e1000e/defines.h | 8 +
drivers/net/ethernet/intel/e1000e/e1000.h | 2 +
drivers/net/ethernet/intel/e1000e/ethtool.c | 17 +-
drivers/net/ethernet/intel/e1000e/hw.h | 9 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 370 +++++++++++-
drivers/net/ethernet/intel/e1000e/netdev.c | 19 +-
drivers/net/ethernet/intel/e1000e/phy.c | 3 +
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 65 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 631 +++++++++-----------
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 13 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 35 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 27 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 +-
14 files changed, 751 insertions(+), 457 deletions(-)
--
1.7.7.6
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2012-05-04 10:35 Jeff Kirsher
@ 2012-05-04 15:49 ` David Miller
0 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2012-05-04 15:49 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 4 May 2012 03:35:08 -0700
> This series of patches contains updates for e1000e and ixgbe.
> The e1000e updates the version number and adds support for i217
> silicon. The ixgbe patches are cleanups/re-organizations to
> the driver.
>
> The following are changes since commit f19250883fe09dd2b6b5f818d84874837948c546:
> net/niu: remove one superfluous dma mask check
> 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] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2012-05-01 8:51 Jeff Kirsher
0 siblings, 0 replies; 31+ messages in thread
From: Jeff Kirsher @ 2012-05-01 8:51 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann, bhutchings
This series of patches contains updates for e1000e and ixgbe.
Special note that this series contains the v2 of the ixgbe
thermal data patches (patches 4-6), which have been revised based on
feedback from the community (Ben Hutchings).
The following are changes since commit 80bcb4238dd858d8ae460b62aac2f4165db58c3c:
atl1c: remove PHY polling from atl1c_change_mtu
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Bruce Allan (3):
e1000e: workaround EEPROM configuration change on 82579
e1000e: PHY initialization flow changes for 82577/8/9
e1000e: fix .ndo_set_rx_mode for 82579
Don Skidmore (3):
ixgbe: add support functions to access thermal data
ixgbe: add hwmon interface to export thermal data
ixgbe: add syfs interface for to export read only driver information
Greg Rose (2):
ixgbe: Deny MACVLAN requests from VFs with admin set MAC
ixgbe: Reset max_vfs to zero when user request is out of range
drivers/net/ethernet/intel/Kconfig | 8 +
drivers/net/ethernet/intel/e1000e/80003es2lan.c | 1 +
drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
drivers/net/ethernet/intel/e1000e/hw.h | 6 +
drivers/net/ethernet/intel/e1000e/ich8lan.c | 339 +++++++++----
drivers/net/ethernet/intel/e1000e/mac.c | 10 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 12 +-
drivers/net/ethernet/intel/ixgbe/Makefile | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe.h | 26 +
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 169 +++++++
drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 13 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 6 +
drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 583 +++++++++++++++++++++++
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 40 ++
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 +
19 files changed, 1120 insertions(+), 120 deletions(-)
create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
--
1.7.7.6
^ permalink raw reply [flat|nested] 31+ messages in thread
* [net-next 0/8][pull request] Intel Wired LAN Driver Updates
@ 2011-11-16 12:51 Jeff Kirsher
2011-11-16 23:12 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2011-11-16 12:51 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, gospo, sassmann
The following series contains updates to e1000, e1000e, igb, igbvf,
ixgbe and ixgbevf. There is one fix for LED blink logic for ixgbe,
the remaining patches are conversions of printk's to pr_<level>.
The following are changes since commit 229a66e3bec97563aa92e25dfe0bc60b0d468619:
IPv6: Removing unnecessary NULL checks.
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize master
Emil Tantilov (1):
ixgbe: fix LED blink logic to check for link
Jeff Kirsher (4):
e1000e: Convert printks to pr_<level>
igbvf: Convert printks to pr_<level>
ixgbevf: Convert printks to pr_<level>
igb: Convert printks to pr_<level>
Jesse Brandeburg (1):
e1000e: convert to real ndo_set_rx_mode
Joe Perches (2):
igb: Convert bare printk to pr_notice
intel: Convert <FOO>_LENGTH_OF_ADDRESS to ETH_ALEN
drivers/net/ethernet/intel/e1000/e1000_hw.h | 1 -
drivers/net/ethernet/intel/e1000e/netdev.c | 388 ++++++++++++---------
drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +-
drivers/net/ethernet/intel/igb/igb_main.c | 165 +++++-----
drivers/net/ethernet/intel/igbvf/netdev.c | 14 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 8 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 18 +-
drivers/net/ethernet/intel/ixgbevf/defines.h | 1 -
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 6 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 27 +-
drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +-
12 files changed, 340 insertions(+), 299 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2011-11-16 12:51 Jeff Kirsher
@ 2011-11-16 23:12 ` David Miller
2011-11-16 23:21 ` Jeff Kirsher
0 siblings, 1 reply; 31+ messages in thread
From: David Miller @ 2011-11-16 23:12 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 16 Nov 2011 04:51:24 -0800
> The following are changes since commit 229a66e3bec97563aa92e25dfe0bc60b0d468619:
> IPv6: Removing unnecessary NULL checks.
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize master
This tree doesn't exist.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2011-11-16 23:12 ` David Miller
@ 2011-11-16 23:21 ` Jeff Kirsher
2011-11-16 23:32 ` David Miller
0 siblings, 1 reply; 31+ messages in thread
From: Jeff Kirsher @ 2011-11-16 23:21 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
On Wed, 2011-11-16 at 15:12 -0800, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed, 16 Nov 2011 04:51:24 -0800
>
> > The following are changes since commit 229a66e3bec97563aa92e25dfe0bc60b0d468619:
> > IPv6: Removing unnecessary NULL checks.
> > and are available in the git repository at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize master
>
> This tree doesn't exist.
That was supposed to be
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
sorry Dave.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [net-next 0/8][pull request] Intel Wired LAN Driver Updates
2011-11-16 23:21 ` Jeff Kirsher
@ 2011-11-16 23:32 ` David Miller
0 siblings, 0 replies; 31+ messages in thread
From: David Miller @ 2011-11-16 23:32 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 16 Nov 2011 15:21:22 -0800
> On Wed, 2011-11-16 at 15:12 -0800, David Miller wrote:
>> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Wed, 16 Nov 2011 04:51:24 -0800
>>
>> > The following are changes since commit 229a66e3bec97563aa92e25dfe0bc60b0d468619:
>> > IPv6: Removing unnecessary NULL checks.
>> > and are available in the git repository at:
>> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize master
>>
>> This tree doesn't exist.
>
> That was supposed to be
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
That works better, pulled, thanks!
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2014-01-02 4:01 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-31 5:16 [net-next 0/8][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-08-31 5:16 ` [net-next 1/8] e1000e: use correct type for read of 32-bit register Jeff Kirsher
2012-08-31 5:16 ` [net-next 2/8] e1000e: cleanup strict checkpatch MEMORY_BARRIER checks Jeff Kirsher
2012-08-31 5:16 ` [net-next 3/8] e1000e: cleanup strict checkpatch check Jeff Kirsher
2012-08-31 5:16 ` [net-next 4/8] e1000e: cleanup - remove inapplicable comment Jeff Kirsher
2012-08-31 5:16 ` [net-next 5/8] e1000e: cleanup - remove unnecessary variable Jeff Kirsher
2012-08-31 5:16 ` [net-next 6/8] e1000e: update driver version number Jeff Kirsher
2012-08-31 5:16 ` [net-next 7/8] ixgbevf: Add suspend and resume support to the VF Jeff Kirsher
2012-08-31 5:16 ` [net-next 8/8] ixgbevf: Cleanup handling of configuration for jumbo frames Jeff Kirsher
2012-08-31 20:03 ` [net-next 0/8][pull request] Intel Wired LAN Driver Updates David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-01-01 0:53 Jeff Kirsher
2014-01-02 4:01 ` David Miller
2013-09-06 5:43 Jeff Kirsher
2013-09-06 5:58 ` Jeff Kirsher
2013-06-14 3:55 Jeff Kirsher
2013-04-26 4:57 Jeff Kirsher
2013-04-27 3:34 ` David Miller
2012-10-23 10:24 Jeff Kirsher
2012-10-23 17:28 ` David Miller
2012-09-17 4:15 Jeff Kirsher
2012-09-17 4:56 ` David Miller
2012-09-17 8:15 ` Jeff Kirsher
2012-07-17 10:09 Jeff Kirsher
2012-07-17 10:22 ` David Miller
2012-05-04 10:35 Jeff Kirsher
2012-05-04 15:49 ` David Miller
2012-05-01 8:51 Jeff Kirsher
2011-11-16 12:51 Jeff Kirsher
2011-11-16 23:12 ` David Miller
2011-11-16 23:21 ` Jeff Kirsher
2011-11-16 23:32 ` 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).