[patch 0/4] myri10ge minor updates

[patch 0/4] myri10ge minor updates

[brice]

Hi,

the following patches bring some minor updates for the myri10ge driver:
1) Drop unused pm_state
2) Drop ununsed nvidia chipset id
3) Use dev_info() when printing parameters after probe
4) Export more parameters to ethtool

Please apply.

thanks,
Brice

[patch 1/4] myri10ge - Drop unused pm_state

[brice]

[-- Attachment #1: myri10ge1-drop_pm_state.patch --]
[-- Type: text/plain, Size: 634 bytes --]

The pm_state field in the myri10ge_priv structure is unused. Drop it.

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    1 -
 1 file changed, 1 deletion(-)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:00:22.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:00:27.000000000 -0400
@@ -188,7 +188,6 @@
 	int vendor_specific_offset;
 	u32 devctl;
 	u16 msi_flags;
-	u32 pm_state[16];
 	u32 read_dma;
 	u32 write_dma;
 	u32 read_write_dma;

[patch 2/4] myri10ge - Drop ununsed nvidia chipset id

[brice]

[-- Attachment #1: myri10ge2-drop_ck804_pci_id.patch --]
[-- Type: text/plain, Size: 801 bytes --]

The workaround for the AER capability of the nVidia chipset has been
removed, we don't need this PCI id anymore. Drop it.

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:01:33.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:01:39.000000000 -0400
@@ -2196,8 +2196,6 @@
  * any other device, except if forced with myri10ge_ecrc_enable > 1.
  */
 
-#define PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE	0x005d
-
 static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
 {
 	struct pci_dev *bridge = mgp->pdev->bus->self;

[patch 3/4] myri10ge - Use dev_info() when printing parameters after probe

[brice]

[-- Attachment #1: myri10ge3-do_not_print_interface_name_at_the_end_of_probe.patch --]
[-- Type: text/plain, Size: 3020 bytes --]

Displaying the interface name when listing the device parameters
at the end of myri10ge_probe is not a good idea since udev might
rename the interface soon afterwards.
Print the bus id instead, using dev_info().

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:02:52.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:15.000000000 -0400
@@ -2734,11 +2734,10 @@
 		dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
 		goto abort_with_irq;
 	}
-
-	printk(KERN_INFO "myri10ge: %s: %s IRQ %d, tx bndry %d, fw %s, WC %s\n",
-	       netdev->name, (mgp->msi_enabled ? "MSI" : "xPIC"),
-	       pdev->irq, mgp->tx.boundary, mgp->fw_name,
-	       (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
+	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
+		 (mgp->msi_enabled ? "MSI" : "xPIC"),
+		 pdev->irq, mgp->tx.boundary, mgp->fw_name,
+		 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
 
 	return 0;
 
>From bgoglin@loulous.org Mon Jul  3 18:05:17 2006
Message-Id: <20060703220517.426089000@loulous.org>
References: <20060703220230.606593000@myri.com>
User-Agent: quilt/0.45-1
Date: Mon, 03 Jul 2006 18:02:34 -0400
From: brice@myri.com
To: netdev@vger.kernel.org
Cc: Brice Goglin <brice@myri.com>
Subject: [patch 4/4] myri10ge - Export more parameters to ethtool.
Content-Disposition: inline; filename=myri10ge4-export_more_parameters_to_ethtool.patch

Add the IRQ line, the tx_boundary, and whether Write-combining and MSI
are enabled to the list of parameters that are exported to ethtool.

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:47.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:39:29.000000000 -0400
@@ -1288,6 +1288,7 @@
 	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
 	"tx_heartbeat_errors", "tx_window_errors",
 	/* device-specific stats */
+	"tx_boundary", "WC", "irq", "MSI",
 	"read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
 	"serial_number", "tx_pkt_start", "tx_pkt_done",
 	"tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
@@ -1326,6 +1327,10 @@
 	for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++)
 		data[i] = ((unsigned long *)&mgp->stats)[i];
 
+	data[i++] = (unsigned int)mgp->tx.boundary;
+	data[i++] = (unsigned int)(mgp->mtrr >= 0);
+	data[i++] = (unsigned int)mgp->pdev->irq;
+	data[i++] = (unsigned int)mgp->msi_enabled;
 	data[i++] = (unsigned int)mgp->read_dma;
 	data[i++] = (unsigned int)mgp->write_dma;
 	data[i++] = (unsigned int)mgp->read_write_dma;

Re: [patch 3/4] myri10ge - Use dev_info() when printing parameters after probe

[Brice Goglin]

Please forget this one, something went wrong, it contains both #3 and
#4. I have resent #3 and #4 separately.

Brice



brice@myri.com wrote:
> Displaying the interface name when listing the device parameters
> at the end of myri10ge_probe is not a good idea since udev might
> rename the interface soon afterwards.
> Print the bus id instead, using dev_info().
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
>  drivers/net/myri10ge/myri10ge.c |    9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> Index: linux-mm/drivers/net/myri10ge/myri10ge.c
> ===================================================================
> --- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:02:52.000000000 -0400
> +++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:15.000000000 -0400
> @@ -2734,11 +2734,10 @@
>  		dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
>  		goto abort_with_irq;
>  	}
> -
> -	printk(KERN_INFO "myri10ge: %s: %s IRQ %d, tx bndry %d, fw %s, WC %s\n",
> -	       netdev->name, (mgp->msi_enabled ? "MSI" : "xPIC"),
> -	       pdev->irq, mgp->tx.boundary, mgp->fw_name,
> -	       (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
> +	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
> +		 (mgp->msi_enabled ? "MSI" : "xPIC"),
> +		 pdev->irq, mgp->tx.boundary, mgp->fw_name,
> +		 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
>  
>  	return 0;
>  
> >From bgoglin@loulous.org Mon Jul  3 18:05:17 2006
> Message-Id: <20060703220517.426089000@loulous.org>
> References: <20060703220230.606593000@myri.com>
> User-Agent: quilt/0.45-1
> Date: Mon, 03 Jul 2006 18:02:34 -0400
> From: brice@myri.com
> To: netdev@vger.kernel.org
> Cc: Brice Goglin <brice@myri.com>
> Subject: [patch 4/4] myri10ge - Export more parameters to ethtool.
> Content-Disposition: inline; filename=myri10ge4-export_more_parameters_to_ethtool.patch
>
> Add the IRQ line, the tx_boundary, and whether Write-combining and MSI
> are enabled to the list of parameters that are exported to ethtool.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
>  drivers/net/myri10ge/myri10ge.c |    5 +++++
>  1 file changed, 5 insertions(+)
>
> Index: linux-mm/drivers/net/myri10ge/myri10ge.c
> ===================================================================
> --- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:47.000000000 -0400
> +++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:39:29.000000000 -0400
> @@ -1288,6 +1288,7 @@
>  	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
>  	"tx_heartbeat_errors", "tx_window_errors",
>  	/* device-specific stats */
> +	"tx_boundary", "WC", "irq", "MSI",
>  	"read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
>  	"serial_number", "tx_pkt_start", "tx_pkt_done",
>  	"tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
> @@ -1326,6 +1327,10 @@
>  	for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++)
>  		data[i] = ((unsigned long *)&mgp->stats)[i];
>  
> +	data[i++] = (unsigned int)mgp->tx.boundary;
> +	data[i++] = (unsigned int)(mgp->mtrr >= 0);
> +	data[i++] = (unsigned int)mgp->pdev->irq;
> +	data[i++] = (unsigned int)mgp->msi_enabled;
>  	data[i++] = (unsigned int)mgp->read_dma;
>  	data[i++] = (unsigned int)mgp->write_dma;
>  	data[i++] = (unsigned int)mgp->read_write_dma;
>
>   

[patch 4/4] myri10ge - Export more parameters to ethtool

[Brice Goglin]

Add the IRQ line, the tx_boundary, and whether Write-combining and MSI
are enabled to the list of parameters that are exported to ethtool.

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:47.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:39:29.000000000 -0400
@@ -1288,6 +1288,7 @@
 	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
 	"tx_heartbeat_errors", "tx_window_errors",
 	/* device-specific stats */
+	"tx_boundary", "WC", "irq", "MSI",
 	"read_dma_bw_MBs", "write_dma_bw_MBs", "read_write_dma_bw_MBs",
 	"serial_number", "tx_pkt_start", "tx_pkt_done",
 	"tx_req", "tx_done", "rx_small_cnt", "rx_big_cnt",
@@ -1326,6 +1327,10 @@
 	for (i = 0; i < MYRI10GE_NET_STATS_LEN; i++)
 		data[i] = ((unsigned long *)&mgp->stats)[i];
 
+	data[i++] = (unsigned int)mgp->tx.boundary;
+	data[i++] = (unsigned int)(mgp->mtrr >= 0);
+	data[i++] = (unsigned int)mgp->pdev->irq;
+	data[i++] = (unsigned int)mgp->msi_enabled;
 	data[i++] = (unsigned int)mgp->read_dma;
 	data[i++] = (unsigned int)mgp->write_dma;
 	data[i++] = (unsigned int)mgp->read_write_dma;

[patch 3/4] myri10ge - Use dev_info() when printing parameters after probe

[Brice Goglin]

Displaying the interface name when listing the device parameters
at the end of myri10ge_probe is not a good idea since udev might
rename the interface soon afterwards.
Print the bus id instead, using dev_info().

Signed-off-by: Brice Goglin <brice@myri.com>
---
 drivers/net/myri10ge/myri10ge.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: linux-mm/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-mm.orig/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:02:52.000000000 -0400
+++ linux-mm/drivers/net/myri10ge/myri10ge.c	2006-07-03 16:04:15.000000000 -0400
@@ -2734,11 +2734,10 @@
 		dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
 		goto abort_with_irq;
 	}
-
-	printk(KERN_INFO "myri10ge: %s: %s IRQ %d, tx bndry %d, fw %s, WC %s\n",
-	       netdev->name, (mgp->msi_enabled ? "MSI" : "xPIC"),
-	       pdev->irq, mgp->tx.boundary, mgp->fw_name,
-	       (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
+	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
+		 (mgp->msi_enabled ? "MSI" : "xPIC"),
+		 pdev->irq, mgp->tx.boundary, mgp->fw_name,
+		 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
 
 	return 0;
 

[PATCH 0/4] myri10ge minor updates

[Brice Goglin]

Hi Jeff,

4 small updates of myri10ge for 2.6.21 will follow this mail:
1) fix error checking and return value in myri10ge_allocate_rings
2) use pci_map_page to prepare the dmatest buffer
3) prevent 4k rdma on SGI TIOCE chipset
4) add a wc_enabled flag to myri10ge_priv

Thanks,

Brice