From patchwork Tue Mar 24 10:01:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Goglin X-Patchwork-Id: 24948 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 91A51DDE19 for ; Tue, 24 Mar 2009 21:37:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759348AbZCXKhA (ORCPT ); Tue, 24 Mar 2009 06:37:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759317AbZCXKg7 (ORCPT ); Tue, 24 Mar 2009 06:36:59 -0400 Received: from mailbox2.myri.com ([64.172.73.26]:1787 "EHLO myri.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759321AbZCXKg6 (ORCPT ); Tue, 24 Mar 2009 06:36:58 -0400 X-Greylist: delayed 2120 seconds by postgrey-1.27 at vger.kernel.org; Tue, 24 Mar 2009 06:36:58 EDT Received: from [172.31.134.203] (brice-ovpn.sw.myri.com [172.31.134.203]) by myri.com (8.13.7+Sun/8.13.7) with ESMTP id n2OA1UJg004294; Tue, 24 Mar 2009 03:01:31 -0700 (PDT) Message-ID: <49C8AF7E.9000903@myri.com> Date: Tue, 24 Mar 2009 11:01:34 +0100 From: Brice Goglin User-Agent: Mozilla-Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: "David S. Miller" CC: Linux Network Development list Subject: [PATCH] myri10ge: update firmware headers to 1.4.41 X-Enigmail-Version: 0.95.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update myri10ge firmware headers to firmware version 1.4.41. Signed-off-by: Brice Goglin --- 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 --- 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__ */