Patchwork myri10ge: update firmware headers to 1.4.41

login
register
mail settings
Submitter Brice Goglin
Date March 24, 2009, 10:01 a.m.
Message ID <49C8AF7E.9000903@myri.com>
Download mbox | patch
Permalink /patch/24948/
State Accepted
Delegated to: David Miller
Headers show

Comments

Brice Goglin - March 24, 2009, 10:01 a.m.
Update myri10ge firmware headers to firmware version 1.4.41.

Signed-off-by: Brice Goglin <brice@myri.com>



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - March 24, 2009, 11:31 p.m.
From: Brice Goglin <brice@myri.com>
Date: Tue, 24 Mar 2009 11:01:34 +0100

> Update myri10ge firmware headers to firmware version 1.4.41.
> 
> Signed-off-by: Brice Goglin <brice@myri.com>

I'll apply this, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- net-next-2.6/drivers/net/myri10ge/myri10ge_mcp_gen_header.h	2009-01-22 08:05:56.000000000 +0100
+++ linux-tmp/drivers/net/myri10ge/myri10ge_mcp_gen_header.h	2009-03-24 10:50:10.000000000 +0100
@@ -9,6 +9,7 @@ 
 #define MCP_TYPE_ETH 0x45544820	/* "ETH " */
 #define MCP_TYPE_MCP0 0x4d435030	/* "MCP0" */
 #define MCP_TYPE_DFLT 0x20202020	/* "    " */
+#define MCP_TYPE_ETHZ 0x4554485a	/* "ETHZ" */
 
 struct mcp_gen_header {
 	/* the first 4 fields are filled at compile time */
@@ -43,7 +44,15 @@ 
 	unsigned msix_table_addr;	/* start address of msix table in firmware */
 	unsigned bss_addr;	/* start of bss */
 	unsigned features;
+	unsigned ee_hdr_addr;
 	/* 8 */
 };
 
+struct zmcp_info {
+	unsigned info_len;
+	unsigned zmcp_addr;
+	unsigned zmcp_len;
+	unsigned mcp_edata;
+};
+
 #endif				/* __MYRI10GE_MCP_GEN_HEADER_H__ */