Home » Mailing list archives » linux-netdev » 2008 » August » 5

[PATCH 1/4] e1000e: convert ndev_ printks to something smaller

Previous thread: [PATCH] atl1: deal with hardware rx checksum bug by Jay Cliburn on Monday, August 4, 2008 - 8:05 pm. (2 messages)

Next thread: Realtek 8111C transmit timed out by John P Poet on Monday, August 4, 2008 - 9:12 pm. (17 messages)
[view original message]
From: Jeff Kirsher <jeffrey.t.kirsher@...>
To: <jeff@...>
Cc: <davem@...>, <netdev@...>, <akpm@...>, Jeff Kirsher <jeffrey.t.kirsher@...>, Auke Kok <auke-jan.h.kok@...>
Subject: [PATCH 1/4] e1000e: convert ndev_ printks to something smaller
Date: Monday, August 4, 2008 - 8:20 pm

The ndev_* printk's are too lenghty and we don't need to specify

the adapter/netdev struct at all, making this a lot more readable.


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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

---


 drivers/net/e1000e/e1000.h   |   27 ++++---

 drivers/net/e1000e/ethtool.c |   44 +++++-------

 drivers/net/e1000e/netdev.c  |  154 +++++++++++++++++++-----------------------

 drivers/net/e1000e/param.c   |   31 +++-----

 4 files changed, 112 insertions(+), 144 deletions(-)


diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h

index 4a4f62e..d3ed1ed 100644

--- a/drivers/net/e1000e/e1000.h

+++ b/drivers/net/e1000e/e1000.h

@@ -41,24 +41,25 @@


 struct e1000_info;


-#define ndev_printk(level, netdev, format, arg...) \

-	printk(level "%s: " format, (netdev)->name, ## arg)

+#define e_printk(level, adapter, format, arg...) \

+	printk(level "%s: %s: " format, pci_name(adapter->pdev), \

+	       adapter->netdev->name, ## arg)


 #ifdef DEBUG

-#define ndev_dbg(netdev, format, arg...) \

-	ndev_printk(KERN_DEBUG , netdev, format, ## arg)

+#define e_dbg(format, arg...) \

+	e_printk(KERN_DEBUG , adapter, format, ## arg)

 #else

-#define ndev_dbg(netdev, format, arg...) do { (void)(netdev); } while (0)

+#define e_dbg(format, arg...) do { (void)(adapter); } while (0)

 #endif


-#define ndev_err(netdev, format, arg...) \

-	ndev_printk(KERN_ERR , netdev, format, ## arg)

-#define ndev_info(netdev, format, arg...) \

-	ndev_printk(KERN_INFO , netdev, format, ## arg)

-#define ndev_warn(netdev, format, arg...) \

-	ndev_printk(KERN_WARNING , netdev, format, ## arg)

-#define ndev_notice(netdev, format, arg...) \

-	ndev_printk(KERN_NOTICE , netdev, format, ## arg)

+#define e_err(format, arg...) \

+	e_printk(KERN_ERR, adapter, format, ## arg)

+#define e_info(format, arg...) \

+	e_printk(KERN_INFO, adapter, format, ## arg)

+#define e_warn(format, arg...) \

+	e_printk(KERN_WARNING, adapter, format, ## arg)

+...
[ message continues ]
[view original message]
From: Jeff Kirsher <jeffrey.t.kirsher@...>
To: <jeff@...>
Cc: <davem@...>, <netdev@...>, <akpm@...>, Bruce Allan <bruce.w.allan@...>, Jeff Kirsher <jeffrey.t.kirsher@...>
Subject: [PATCH 4/4] e1000e: remove inapplicable test for ioport
Date: Monday, August 4, 2008 - 8:21 pm

From: Bruce Allan <bruce.w.allan@intel.com>


There are currently no devices supported by the e1000e driver which need

ioport resources, remove the test for it and all unnecessary code

associated with it (struct e1000_adapter elements, local variables, etc.)


Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

---


 drivers/net/e1000e/e1000.h  |    4 ----

 drivers/net/e1000e/netdev.c |   48 +++++++++----------------------------------

 2 files changed, 10 insertions(+), 42 deletions(-)


diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h

index d3ed1ed..cf57050 100644

--- a/drivers/net/e1000e/e1000.h

+++ b/drivers/net/e1000e/e1000.h

@@ -284,10 +284,6 @@ struct e1000_adapter {

 	unsigned long led_status;


 	unsigned int flags;

-

-	/* for ioport free */

-	int bars;

-	int need_ioport;

 };


 struct e1000_info {

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c

index 18f076c..05b0b2f 100644

--- a/drivers/net/e1000e/netdev.c

+++ b/drivers/net/e1000e/netdev.c

@@ -3991,10 +3991,7 @@ static int e1000_resume(struct pci_dev *pdev)

 	pci_restore_state(pdev);

 	e1000e_disable_l1aspm(pdev);


-	if (adapter->need_ioport)

-		err = pci_enable_device(pdev);

-	else

-		err = pci_enable_device_mem(pdev);

+	err = pci_enable_device_mem(pdev);

 	if (err) {

 		dev_err(&pdev->dev,

 			"Cannot enable PCI device from suspend\n");

@@ -4096,10 +4093,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)

 	int err;


 	e1000e_disable_l1aspm(pdev);

-	if (adapter->need_ioport)

-		err = pci_enable_device(pdev);

-	else

-		err = pci_enable_device_mem(pdev);

+	err = pci_enable_device_mem(pdev);

 	if (err) {

 		dev_err(&pdev->dev,

 			"Cannot re-enable PCI device after reset.\n");

@@ -4197,21 +4191,6 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)

 }


 /**

- * e1000e_is_need_ioport - determine if an adapter needs ioport reso...
[ message continues ]
[view original message]
From: Jeff Garzik <jeff@...>
To: Jeff Kirsher <jeffrey.t.kirsher@...>
Cc: <davem@...>, <netdev@...>, <akpm@...>, Bruce Allan <bruce.w.allan@...>
Subject: Re: [PATCH 4/4] e1000e: remove inapplicable test for ioport
Date: Thursday, August 7, 2008 - 1:56 am

applied 1-4


--
[view original message]
From: Jeff Kirsher <jeffrey.t.kirsher@...>
To: <jeff@...>
Cc: <davem@...>, <netdev@...>, <akpm@...>, Jesse Brandeburg <jesse.brandeburg@...>, Jeff Kirsher <jeffrey.t.kirsher@...>
Subject: [PATCH 3/4] e1000e: fix drv load issues
Date: Monday, August 4, 2008 - 8:21 pm

From: Jesse Brandeburg <jesse.brandeburg@intel.com>


a few people seem to have problems maintaining gigabit link

and it was root caused to an interaction between the managability

firmware on the host and the driver, not communicating.


The form of communication they use is the drv_load bit.


Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

---


 drivers/net/e1000e/netdev.c |   28 ++++++++++++----------------

 1 files changed, 12 insertions(+), 16 deletions(-)


diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c

index 589e542..18f076c 100644

--- a/drivers/net/e1000e/netdev.c

+++ b/drivers/net/e1000e/netdev.c

@@ -2444,7 +2444,7 @@ void e1000e_reset(struct e1000_adapter *adapter)

 	 * For parts with AMT enabled, let the firmware know

 	 * that the network interface is in control

 	 */

-	if ((adapter->flags & FLAG_HAS_AMT) && e1000e_check_mng_mode(hw))

+	if (adapter->flags & FLAG_HAS_AMT)

 		e1000_get_hw_control(adapter);


 	ew32(WUC, 0);

@@ -2634,8 +2634,7 @@ static int e1000_open(struct net_device *netdev)

 	 * If AMT is enabled, let the firmware know that the network

 	 * interface is now open

 	 */

-	if ((adapter->flags & FLAG_HAS_AMT) &&

-	    e1000e_check_mng_mode(&adapter->hw))

+	if (adapter->flags & FLAG_HAS_AMT)

 		e1000_get_hw_control(adapter);


 	/*

@@ -2713,8 +2712,7 @@ static int e1000_close(struct net_device *netdev)

 	 * If AMT is enabled, let the firmware know that the network

 	 * interface is now closed

 	 */

-	if ((adapter->flags & FLAG_HAS_AMT) &&

-	    e1000e_check_mng_mode(&adapter->hw))

+	if (adapter->flags & FLAG_HAS_AMT)

 		e1000_release_hw_control(adapter);


 	return 0;

@@ -4030,7 +4028,7 @@ static int e1000_resume(struct pci_dev *pdev)

 	 * is up.  For all other cases, let the f/w know that the h/w is now

 	 * under the control of the driver.

 	 */

-	if...
[ message continues ]
[view original message]
From: Jeff Kirsher <jeffrey.t.kirsher@...>
To: <jeff@...>
Cc: <davem@...>, <netdev@...>, <akpm@...>, Auke Kok <auke-jan.h.kok@...>, Jeff Kirsher <jeffrey.t.kirsher@...>
Subject: [PATCH 2/4] e1000e: perform basic 82573 EEPROM checks for known issues
Date: Monday, August 4, 2008 - 8:21 pm

From: Auke Kok <auke-jan.h.kok@intel.com>


82573 EEPROMs have been shipped out with known issues. While most

people will never see the issues some people do and we know

how to address them. Warn the user if we find one of these

EEPROM issues.


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

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

---


 drivers/net/e1000e/netdev.c |   24 ++++++++++++++++++++++++

 1 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c

index 378335f..589e542 100644

--- a/drivers/net/e1000e/netdev.c

+++ b/drivers/net/e1000e/netdev.c

@@ -4177,6 +4177,28 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)

 	       hw->mac.type, hw->phy.type, (pba_num >> 8), (pba_num & 0xff));

 }


+static void e1000_eeprom_checks(struct e1000_adapter *adapter)

+{

+	struct e1000_hw *hw = &adapter->hw;

+	int ret_val;

+	u16 buf = 0;

+

+	if (hw->mac.type != e1000_82573)

+		return;

+

+	ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);

+	if (!(le16_to_cpu(buf) & (1 << 0))) {

+		/* Deep Smart Power Down (DSPD) */

+		e_warn("Warning: detected DSPD enabled in EEPROM\n");

+	}

+

+	ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &buf);

+	if (le16_to_cpu(buf) & (3 << 2)) {

+		/* ASPM enable */

+		e_warn("Warning: detected ASPM enabled in EEPROM\n");

+	}

+}

+

 /**

  * e1000e_is_need_ioport - determine if an adapter needs ioport resources or not

  * @pdev: PCI device information struct

@@ -4400,6 +4422,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,

 		}

 	}


+	e1000_eeprom_checks(adapter);

+

 	/* copy the MAC address out of the NVM */

 	if (e1000e_read_mac_addr(&adapter->hw))

 		e_err("NVM Read Error while reading MAC address\n");


--
Previous thread: [PATCH] atl1: deal with hardware rx checksum bug by Jay Cliburn on Monday, August 4, 2008 - 8:05 pm. (2 messages)

Next thread: Realtek 8111C transmit timed out by John P Poet on Monday, August 4, 2008 - 9:12 pm. (17 messages)