* [PATCH 0/3] myri10ge updates for 2.6.21
@ 2007-03-18 20:33 Brice Goglin
2007-03-18 20:34 ` [PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100 Brice Goglin
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-18 20:33 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Hi Jeff,
Here's 3 minor updates for myri10ge in 2.6.21:
1. use regular firmware on Serverworks HT2100
2. update wcfifo and intr_coal_delay default values
3. update driver version to 1.3.0-1.225
Please apply.
Thanks,
Brice
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100
2007-03-18 20:33 [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
@ 2007-03-18 20:34 ` Brice Goglin
2007-03-18 20:35 ` [PATCH 2/3] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-18 20:34 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
[PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100
Use the regular firmware on Serverworks HT2100 PCIe ports since this
chipset provides aligned PCIe completions.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:01:42.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:12.000000000 +0100
@@ -2483,6 +2483,8 @@
#define PCI_DEVICE_ID_INTEL_E5000_PCIE23 0x25f7
#define PCI_DEVICE_ID_INTEL_E5000_PCIE47 0x25fa
+#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST 0x140
+#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST 0x142
static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
{
@@ -2514,6 +2516,12 @@
((bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
&& bridge->device ==
PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE)
+ /* ServerWorks HT2100 */
+ || (bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
+ && bridge->device >=
+ PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST
+ && bridge->device <=
+ PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST)
/* All Intel E5000 PCIE ports */
|| (bridge->vendor == PCI_VENDOR_ID_INTEL
&& bridge->device >=
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] myri10ge: update wcfifo and intr_coal_delay default values
2007-03-18 20:33 [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-18 20:34 ` [PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100 Brice Goglin
@ 2007-03-18 20:35 ` Brice Goglin
2007-03-18 20:35 ` [PATCH 3/3] myri10ge: update driver version to 1.3.0-1.225 Brice Goglin
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-18 20:35 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Update the default value of 2 module parameters:
* wcfifo disabled
* intr_coal_delay 75us
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:12.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:21.000000000 +0100
@@ -234,7 +234,7 @@
module_param(myri10ge_msi, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts\n");
-static int myri10ge_intr_coal_delay = 25;
+static int myri10ge_intr_coal_delay = 75;
module_param(myri10ge_intr_coal_delay, int, S_IRUGO);
MODULE_PARM_DESC(myri10ge_intr_coal_delay, "Interrupt coalescing delay\n");
@@ -279,7 +279,7 @@
module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n");
-static int myri10ge_wcfifo = 1;
+static int myri10ge_wcfifo = 0;
module_param(myri10ge_wcfifo, int, S_IRUGO);
MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] myri10ge: update driver version to 1.3.0-1.225
2007-03-18 20:33 [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-18 20:34 ` [PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100 Brice Goglin
2007-03-18 20:35 ` [PATCH 2/3] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
@ 2007-03-18 20:35 ` Brice Goglin
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-18 20:35 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Driver version is now 1.3.0-1.225.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:21.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:23.000000000 +0100
@@ -71,7 +71,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.2.0"
+#define MYRI10GE_VERSION_STR "1.3.0-1.225"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
^ permalink raw reply [flat|nested] 10+ messages in thread
* [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21
2007-03-18 20:33 [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
` (2 preceding siblings ...)
2007-03-18 20:35 ` [PATCH 3/3] myri10ge: update driver version to 1.3.0-1.225 Brice Goglin
@ 2007-03-21 18:43 ` Brice Goglin
2007-03-21 18:45 ` [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion Brice Goglin
` (3 more replies)
3 siblings, 4 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-21 18:43 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Brice Goglin wrote:
> Hi Jeff,
>
> Here's 3 minor updates for myri10ge in 2.6.21:
> 1. use regular firmware on Serverworks HT2100
> 2. update wcfifo and intr_coal_delay default values
> 3. update driver version to 1.3.0-1.225
>
> Please apply.
>
> Thanks,
> Brice
>
I just got a last minute fix (management of allocated pages was wrong on
architectures with page size != 4kB. Please drop this serie, I am going
to resend all the patches.
Thanks,
Brice
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
@ 2007-03-21 18:45 ` Brice Goglin
2007-03-23 5:50 ` Jeff Garzik
2007-03-21 18:45 ` [PATCH 2/4] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Brice Goglin @ 2007-03-21 18:45 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
[PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion
Use the regular firmware on Serverworks HT2100 PCIe ports since this
chipset provides aligned PCIe completion.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:01:42.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:12.000000000 +0100
@@ -2483,6 +2483,8 @@
#define PCI_DEVICE_ID_INTEL_E5000_PCIE23 0x25f7
#define PCI_DEVICE_ID_INTEL_E5000_PCIE47 0x25fa
+#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST 0x140
+#define PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST 0x142
static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
{
@@ -2514,6 +2516,12 @@
((bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
&& bridge->device ==
PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE)
+ /* ServerWorks HT2100 */
+ || (bridge->vendor == PCI_VENDOR_ID_SERVERWORKS
+ && bridge->device >=
+ PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_FIRST
+ && bridge->device <=
+ PCI_DEVICE_ID_SERVERWORKS_HT2100_PCIE_LAST)
/* All Intel E5000 PCIE ports */
|| (bridge->vendor == PCI_VENDOR_ID_INTEL
&& bridge->device >=
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] myri10ge: update wcfifo and intr_coal_delay default values
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-21 18:45 ` [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion Brice Goglin
@ 2007-03-21 18:45 ` Brice Goglin
2007-03-21 18:46 ` [PATCH 3/4] myri10ge: fix management of >4kB allocated pages Brice Goglin
2007-03-21 18:47 ` [PATCH 4/4] myri10ge: update driver version to 1.3.0-1.226 Brice Goglin
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-21 18:45 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Update the default value of 2 module parameters:
* wcfifo disabled
* intr_coal_delay 75us
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:12.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:21.000000000 +0100
@@ -234,7 +234,7 @@
module_param(myri10ge_msi, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(myri10ge_msi, "Enable Message Signalled Interrupts\n");
-static int myri10ge_intr_coal_delay = 25;
+static int myri10ge_intr_coal_delay = 75;
module_param(myri10ge_intr_coal_delay, int, S_IRUGO);
MODULE_PARM_DESC(myri10ge_intr_coal_delay, "Interrupt coalescing delay\n");
@@ -279,7 +279,7 @@
module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n");
-static int myri10ge_wcfifo = 1;
+static int myri10ge_wcfifo = 0;
module_param(myri10ge_wcfifo, int, S_IRUGO);
MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/4] myri10ge: fix management of >4kB allocated pages
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-21 18:45 ` [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion Brice Goglin
2007-03-21 18:45 ` [PATCH 2/4] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
@ 2007-03-21 18:46 ` Brice Goglin
2007-03-21 18:47 ` [PATCH 4/4] myri10ge: update driver version to 1.3.0-1.226 Brice Goglin
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-21 18:46 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Fix management of allocated physical pages when the architecture
page size is not 4kB since the firmware cannot cross 4K boundary.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:23.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-21 19:30:38.000000000 +0100
@@ -905,6 +905,14 @@
(rx->page_offset + bytes <= MYRI10GE_ALLOC_SIZE)) {
/* we can use part of previous page */
get_page(rx->page);
+#if MYRI10GE_ALLOC_SIZE > 4096
+ /* Firmware cannot cross 4K boundary.. */
+ if ((rx->page_offset >> 12) !=
+ ((rx->page_offset + bytes - 1) >> 12)) {
+ rx->page_offset =
+ (rx->page_offset + bytes) & ~4095;
+ }
+#endif
} else {
/* we need a new page */
page =
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] myri10ge: update driver version to 1.3.0-1.226
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
` (2 preceding siblings ...)
2007-03-21 18:46 ` [PATCH 3/4] myri10ge: fix management of >4kB allocated pages Brice Goglin
@ 2007-03-21 18:47 ` Brice Goglin
3 siblings, 0 replies; 10+ messages in thread
From: Brice Goglin @ 2007-03-21 18:47 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Driver version is now 1.3.0-1.226.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:21.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-18 21:14:23.000000000 +0100
@@ -71,7 +71,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.2.0"
+#define MYRI10GE_VERSION_STR "1.3.0-1.226"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion
2007-03-21 18:45 ` [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion Brice Goglin
@ 2007-03-23 5:50 ` Jeff Garzik
0 siblings, 0 replies; 10+ messages in thread
From: Jeff Garzik @ 2007-03-23 5:50 UTC (permalink / raw)
To: Brice Goglin; +Cc: netdev
Brice Goglin wrote:
> [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion
>
> Use the regular firmware on Serverworks HT2100 PCIe ports since this
> chipset provides aligned PCIe completion.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
> drivers/net/myri10ge/myri10ge.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
applied 1-4
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-03-23 5:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-18 20:33 [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-18 20:34 ` [PATCH 1/3] myri10ge: use regular firmware on Serverworks HT2100 Brice Goglin
2007-03-18 20:35 ` [PATCH 2/3] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
2007-03-18 20:35 ` [PATCH 3/3] myri10ge: update driver version to 1.3.0-1.225 Brice Goglin
2007-03-21 18:43 ` [RESEND 0/4] was: [PATCH 0/3] myri10ge updates for 2.6.21 Brice Goglin
2007-03-21 18:45 ` [PATCH 1/4] myri10ge: Serverworks HT2100 provides aligned PCIe completion Brice Goglin
2007-03-23 5:50 ` Jeff Garzik
2007-03-21 18:45 ` [PATCH 2/4] myri10ge: update wcfifo and intr_coal_delay default values Brice Goglin
2007-03-21 18:46 ` [PATCH 3/4] myri10ge: fix management of >4kB allocated pages Brice Goglin
2007-03-21 18:47 ` [PATCH 4/4] myri10ge: update driver version to 1.3.0-1.226 Brice Goglin
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).