[PATCH 1/4] e100: Do suspend/shutdown like e1000

[PATCH 1/4] e100: Do suspend/shutdown like e1000

[Auke Kok]

This fixes a "trying to free already free IRQ" message and simplifies
the shutdown/suspend code by re-using already existing code when going
to suspend. The code is now symmetric with e100_resume.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/e100.c |   29 +++--------------------------
 1 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 36ba6dc..cdf3090 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2782,16 +2782,13 @@ static void __devexit e100_remove(struct pci_dev *pdev)
 	}
 }
 
-#ifdef CONFIG_PM
 static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct nic *nic = netdev_priv(netdev);
 
 	if (netif_running(netdev))
-		napi_disable(&nic->napi);
-	del_timer_sync(&nic->watchdog);
-	netif_carrier_off(nic->netdev);
+		e100_down(nic);
 	netif_device_detach(netdev);
 
 	pci_save_state(pdev);
@@ -2804,14 +2801,13 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 		pci_enable_wake(pdev, PCI_D3cold, 0);
 	}
 
-	free_irq(pdev->irq, netdev);
-
 	pci_disable_device(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;
 }
 
+#ifdef CONFIG_PM
 static int e100_resume(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2832,26 +2828,7 @@ static int e100_resume(struct pci_dev *pdev)
 
 static void e100_shutdown(struct pci_dev *pdev)
 {
-	struct net_device *netdev = pci_get_drvdata(pdev);
-	struct nic *nic = netdev_priv(netdev);
-
-	if (netif_running(netdev))
-		napi_disable(&nic->napi);
-	del_timer_sync(&nic->watchdog);
-	netif_carrier_off(nic->netdev);
-
-	if ((nic->flags & wol_magic) | e100_asf(nic)) {
-		pci_enable_wake(pdev, PCI_D3hot, 1);
-		pci_enable_wake(pdev, PCI_D3cold, 1);
-	} else {
-		pci_enable_wake(pdev, PCI_D3hot, 0);
-		pci_enable_wake(pdev, PCI_D3cold, 0);
-	}
-
-	free_irq(pdev->irq, netdev);
-
-	pci_disable_device(pdev);
-	pci_set_power_state(pdev, PCI_D3hot);
+	e100_suspend(pdev, PMSG_SUSPEND);
 }
 
 /* ------------------ PCI Error Recovery infrastructure  -------------- */

[PATCH 2/4] [RFC] e1000: make ioport free for supported devices

[Auke Kok]

From: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>

Most e1000 devices do not need ioport access to function properly.
This is desirable for a few massive homed systems where ioport
resources become constrained.

This patch is based on the code from Tomohiro Kusumi, heavily
modified to fit PCI API changes and e1000 driver changes.

Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/e1000/e1000.h      |    3 +
 drivers/net/e1000/e1000_main.c |   90 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 3b84028..47e153f 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -343,6 +343,9 @@ struct e1000_adapter {
 	boolean_t quad_port_a;
 	unsigned long flags;
 	uint32_t eeprom_wol;
+
+	int bars;
+	int need_ioport;
 };
 
 enum e1000_state_t {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 0991648..e8f51c4 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -909,6 +909,44 @@ static void e1000_dump_eeprom(struct e1000_adapter *adapter)
 }
 
 /**
+ * e1000_require_ioport - determine if adapter type requires ioport resources
+ * @pdev: PCI device struct
+ *
+ * returns true for devices that require IOport access to the PCI device.
+ **/
+static int e1000_require_ioport(struct pci_dev *pdev)
+{
+	switch (pdev->device) {
+	case E1000_DEV_ID_82540EM:
+	case E1000_DEV_ID_82540EM_LOM:
+	case E1000_DEV_ID_82540EP:
+	case E1000_DEV_ID_82540EP_LOM:
+	case E1000_DEV_ID_82540EP_LP:
+	case E1000_DEV_ID_82541EI:
+	case E1000_DEV_ID_82541EI_MOBILE:
+	case E1000_DEV_ID_82541ER_LOM:
+	case E1000_DEV_ID_82541ER:
+	case E1000_DEV_ID_82541GI:
+	case E1000_DEV_ID_82541GI_LF:
+	case E1000_DEV_ID_82541GI_MOBILE:
+	case E1000_DEV_ID_82544EI_COPPER:
+	case E1000_DEV_ID_82544EI_FIBER:
+	case E1000_DEV_ID_82544GC_COPPER:
+	case E1000_DEV_ID_82544GC_LOM:
+	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82545EM_FIBER:
+	case E1000_DEV_ID_82546EB_COPPER:
+	case E1000_DEV_ID_82546EB_FIBER:
+	case E1000_DEV_ID_82546EB_QUAD_COPPER:
+		return 1;
+		break;
+	default:
+		return 0;
+		break;
+	}
+}
+
+/**
  * e1000_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in e1000_pci_tbl
@@ -932,9 +970,20 @@ e1000_probe(struct pci_dev *pdev,
 	int i, err, pci_using_dac;
 	uint16_t eeprom_data = 0;
 	uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
+	int bars;
+	int need_ioport;
 	DECLARE_MAC_BUF(mac);
 
-	if ((err = pci_enable_device(pdev)))
+	/* do not allocate IOport bars when not needed */
+	need_ioport = e1000_require_ioport(pdev);
+	if (need_ioport) {
+		bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
+		err = pci_enable_device(pdev);
+	} else {
+		bars = pci_select_bars(pdev, IORESOURCE_MEM);
+		err = pci_enable_device_mem(pdev);
+	}
+	if (err)
 		return err;
 
 	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
@@ -949,7 +998,8 @@ e1000_probe(struct pci_dev *pdev,
 		pci_using_dac = 0;
 	}
 
-	if ((err = pci_request_regions(pdev, e1000_driver_name)))
+	err = pci_request_selected_regions(pdev, bars, e1000_driver_name);
+	if (err)
 		goto err_pci_reg;
 
 	pci_set_master(pdev);
@@ -963,6 +1013,8 @@ e1000_probe(struct pci_dev *pdev,
 
 	pci_set_drvdata(pdev, netdev);
 	adapter = netdev_priv(netdev);
+	adapter->bars = bars;
+	adapter->need_ioport = need_ioport;
 	adapter->netdev = netdev;
 	adapter->pdev = pdev;
 	adapter->hw.back = adapter;
@@ -974,12 +1026,15 @@ e1000_probe(struct pci_dev *pdev,
 	if (!adapter->hw.hw_addr)
 		goto err_ioremap;
 
-	for (i = BAR_1; i <= BAR_5; i++) {
-		if (pci_resource_len(pdev, i) == 0)
-			continue;
-		if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
-			adapter->hw.io_base = pci_resource_start(pdev, i);
-			break;
+	if (adapter->need_ioport) {
+		for (i = 1; i <= 5; i++) {
+			if (pci_resource_len(pdev, i) == 0)
+				continue;
+			if (pci_resource_flags(pdev, i) & IORESOURCE_IO) {
+				adapter->hw.io_base = pci_resource_start(pdev,
+									 i);
+				break;
+			}
 		}
 	}
 
@@ -1251,7 +1306,7 @@ err_sw_init:
 err_ioremap:
 	free_netdev(netdev);
 err_alloc_etherdev:
-	pci_release_regions(pdev);
+	pci_release_selected_regions(pdev, bars);
 err_pci_reg:
 err_dma:
 	pci_disable_device(pdev);
@@ -1304,7 +1359,7 @@ e1000_remove(struct pci_dev *pdev)
 	iounmap(adapter->hw.hw_addr);
 	if (adapter->hw.flash_address)
 		iounmap(adapter->hw.flash_address);
-	pci_release_regions(pdev);
+	pci_release_selected_regions(pdev, adapter->bars);
 
 	free_netdev(netdev);
 
@@ -5242,7 +5297,12 @@ e1000_resume(struct pci_dev *pdev)
 
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
-	if ((err = pci_enable_device(pdev))) {
+
+	if (adapter->need_ioport)
+		err = pci_enable_device(pdev);
+	else
+		err = pci_enable_device_mem(pdev);
+	if (err) {
 		printk(KERN_ERR "e1000: Cannot enable PCI device from suspend\n");
 		return err;
 	}
@@ -5337,8 +5397,14 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct e1000_adapter *adapter = netdev->priv;
+	int err;
 
-	if (pci_enable_device(pdev)) {
+	if (adapter->need_ioport)
+		err = pci_enable_device(pdev);
+	else
+		err = pci_enable_device_mem(pdev);
+
+	if (err) {
 		printk(KERN_ERR "e1000: Cannot re-enable PCI device after reset.\n");
 		return PCI_ERS_RESULT_DISCONNECT;
 	}

[PATCH 3/4] ixgbe: fix typo in speed mesage

[Auke Kok]

From: Emil Tantilov <emil.s.tantilov@intel.com>

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/ixgbe/ixgbe_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 23d0a4a..c2095ce 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2133,7 +2133,7 @@ static void ixgbe_watchdog(unsigned long data)
 				(link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
 				 "10 Gbps" :
 				 (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-				  "1 Gpbs" : "unknown speed")),
+				  "1 Gbps" : "unknown speed")),
 				((FLOW_RX && FLOW_TX) ? "RX/TX" :
 				 (FLOW_RX ? "RX" :
 				 (FLOW_TX ? "TX" : "None"))));

[PATCH 4/4] Intel ethernet adapter: Update MAINTAINERS

[Auke Kok]

Another team member unfortunately left: update MAINTAINERS.

Condense the 3 lists down to a single list for all our drivers.

Point to our new sourceforge index page which is slightly
better navigateable than the sf.net project page.

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 MAINTAINERS |   32 ++++----------------------------
 1 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2333255..a945724 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2033,43 +2033,19 @@ M:	kernel@wantstofly.org
 L:	netdev@vger.kernel.org
 S:	Maintained
 
-INTEL PRO/100 ETHERNET SUPPORT
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 P:	Auke Kok
 M:	auke-jan.h.kok@intel.com
 P:	Jesse Brandeburg
 M:	jesse.brandeburg@intel.com
 P:	Jeff Kirsher
 M:	jeffrey.t.kirsher@intel.com
+P:	Bruce Allan
+M:	bruce.w.allan@intel.com
 P:	John Ronciak
 M:	john.ronciak@intel.com
 L:	e1000-devel@lists.sourceforge.net
-W:	http://sourceforge.net/projects/e1000/
-S:	Supported
-
-INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:	Auke Kok
-M:	auke-jan.h.kok@intel.com
-P:	Jesse Brandeburg
-M:	jesse.brandeburg@intel.com
-P:	Jeff Kirsher
-M:	jeffrey.t.kirsher@intel.com
-P:	John Ronciak
-M:	john.ronciak@intel.com
-L:	e1000-devel@lists.sourceforge.net
-W:	http://sourceforge.net/projects/e1000/
-S:	Supported
-
-INTEL PRO/10GbE SUPPORT
-P:	Ayyappan Veeraiyan
-M:	ayyappan.veeraiyan@intel.com
-P:	Auke Kok
-M:	auke-jan.h.kok@intel.com
-P:	Jesse Brandeburg
-M:	jesse.brandeburg@intel.com
-P:	John Ronciak
-M:	john.ronciak@intel.com
-L:	e1000-devel@lists.sourceforge.net
-W:	http://sourceforge.net/projects/e1000/
+W:	http://e1000.sourceforge.net/
 S:	Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

Re: [E1000-devel] [PATCH 4/4] Intel ethernet adapter: Update MAINTAINERS

[Kok, Auke]

Auke Kok wrote:
> Another team member unfortunately left: update MAINTAINERS.
> 
> Condense the 3 lists down to a single list for all our drivers.
> 
> Point to our new sourceforge index page which is slightly
> better navigateable than the sf.net project page.
> 
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> ---
> 
>  MAINTAINERS |   32 ++++----------------------------
>  1 files changed, 4 insertions(+), 28 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2333255..a945724 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2033,43 +2033,19 @@ M:	kernel@wantstofly.org
>  L:	netdev@vger.kernel.org
>  S:	Maintained
>  
> -INTEL PRO/100 ETHERNET SUPPORT
> +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
>  P:	Auke Kok
>  M:	auke-jan.h.kok@intel.com
>  P:	Jesse Brandeburg
>  M:	jesse.brandeburg@intel.com
>  P:	Jeff Kirsher
>  M:	jeffrey.t.kirsher@intel.com
> +P:	Bruce Allan
> +M:	bruce.w.allan@intel.com
>  P:	John Ronciak
>  M:	john.ronciak@intel.com
>  L:	e1000-devel@lists.sourceforge.net
> -W:	http://sourceforge.net/projects/e1000/
> -S:	Supported
> -
> -INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
> -P:	Auke Kok
> -M:	auke-jan.h.kok@intel.com
> -P:	Jesse Brandeburg
> -M:	jesse.brandeburg@intel.com
> -P:	Jeff Kirsher
> -M:	jeffrey.t.kirsher@intel.com
> -P:	John Ronciak
> -M:	john.ronciak@intel.com
> -L:	e1000-devel@lists.sourceforge.net
> -W:	http://sourceforge.net/projects/e1000/
> -S:	Supported
> -
> -INTEL PRO/10GbE SUPPORT
> -P:	Ayyappan Veeraiyan
> -M:	ayyappan.veeraiyan@intel.com
> -P:	Auke Kok
> -M:	auke-jan.h.kok@intel.com
> -P:	Jesse Brandeburg
> -M:	jesse.brandeburg@intel.com
> -P:	John Ronciak
> -M:	john.ronciak@intel.com
> -L:	e1000-devel@lists.sourceforge.net
> -W:	http://sourceforge.net/projects/e1000/
> +W:	http://e1000.sourceforge.net/
>  S:	Supported
>  
>  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

ok, I should have reordered this.

patch 1, 2 and 4 are for upstream-fixes
patch #3 is for #upstream

thanks,

Auke

Re: [PATCH 2/4] [RFC] e1000: make ioport free for supported devices

[Jeff Garzik]

Auke Kok wrote:
> From: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
> 
> Most e1000 devices do not need ioport access to function properly.
> This is desirable for a few massive homed systems where ioport
> resources become constrained.
> 
> This patch is based on the code from Tomohiro Kusumi, heavily
> modified to fit PCI API changes and e1000 driver changes.
> 
> Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

I don't think you need pci_select_bars()?  It should just be 
pci_enable_device_mem() in both paths AFAICS...

Re: [PATCH 1/4] e100: Do suspend/shutdown like e1000

[Jeff Garzik]

Auke Kok wrote:
> This fixes a "trying to free already free IRQ" message and simplifies
> the shutdown/suspend code by re-using already existing code when going
> to suspend. The code is now symmetric with e100_resume.
> 
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

applied 1-4



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH 1/4] e100: Do suspend/shutdown like e1000

[Jeff Garzik]

Jeff Garzik wrote:
> Auke Kok wrote:
>> This fixes a "trying to free already free IRQ" message and simplifies
>> the shutdown/suspend code by re-using already existing code when going
>> to suspend. The code is now symmetric with e100_resume.
>>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> 
> applied 1-4

er, except for patch #2



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [E1000-devel] [PATCH 2/4] [RFC] e1000: make ioport free for supported devices

[Kok, Auke]

Jeff Garzik wrote:
> Auke Kok wrote:
>> From: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
>>
>> Most e1000 devices do not need ioport access to function properly.
>> This is desirable for a few massive homed systems where ioport
>> resources become constrained.
>>
>> This patch is based on the code from Tomohiro Kusumi, heavily
>> modified to fit PCI API changes and e1000 driver changes.
>>
>> Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
>> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
> 
> I don't think you need pci_select_bars()?  It should just be 
> pci_enable_device_mem() in both paths AFAICS...

honestly I don't know :) - I'll look into it. if that's the case then the patch
will change significantly.

thanks,

Auke