From patchwork Thu Jun 18 15:46:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dhananjay Phadke X-Patchwork-Id: 28878 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id DAE33B7295 for ; Fri, 19 Jun 2009 01:49:22 +1000 (EST) Received: by ozlabs.org (Postfix) id CC6D1DDDA1; Fri, 19 Jun 2009 01:49:22 +1000 (EST) 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 60ECADDDA0 for ; Fri, 19 Jun 2009 01:49:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752930AbZFRPtO (ORCPT ); Thu, 18 Jun 2009 11:49:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751961AbZFRPtN (ORCPT ); Thu, 18 Jun 2009 11:49:13 -0400 Received: from avexch1.qlogic.com ([198.70.193.115]:25315 "EHLO avexch1.qlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750945AbZFRPtM convert rfc822-to-8bit (ORCPT ); Thu, 18 Jun 2009 11:49:12 -0400 Received: from avexcashub1.qlogic.org ([10.1.4.112]) by avexch1.qlogic.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 18 Jun 2009 08:48:21 -0700 Received: from avexmb1.qlogic.org ([fe80::9526:ffe6:33fc:cbe3]) by avexcashub1.qlogic.org ([::1]) with mapi; Thu, 18 Jun 2009 08:48:21 -0700 From: Dhananjay Phadke To: "davem@davemloft.net" CC: "netdev@vger.kernel.org" Date: Thu, 18 Jun 2009 08:46:18 -0700 Subject: RE: [PATCH 1/2] netxen: fix detection of cut-thru firmware mode Thread-Topic: [PATCH 1/2] netxen: fix detection of cut-thru firmware mode Thread-Index: AcnwKTjZr14M5dj4QjO+BHvkUPRzcAAArK7P Message-ID: <7608421F3572AB4292BB2532AE89D5658187610BDB@AVEXMB1.qlogic.org> References: <1245338871-27112-1-git-send-email-dhananjay@qlogic.com> In-Reply-To: <1245338871-27112-1-git-send-email-dhananjay@qlogic.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-OriginalArrivalTime: 18 Jun 2009 15:48:21.0458 (UTC) FILETIME=[34F6B320:01C9F02C] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Dave, Sorry, these patches were accidentally sent again. You have already applied both. -Dhananjay diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h index 7f0ddbf..3cc0478 100644 --- a/drivers/net/netxen/netxen_nic_hdr.h +++ b/drivers/net/netxen/netxen_nic_hdr.h @@ -355,6 +355,7 @@ enum { #define NETXEN_HW_CRB_HUB_AGT_ADR_LPC \ ((NETXEN_HW_H6_CH_HUB_ADR << 7) | NETXEN_HW_LPC_CRB_AGT_ADR) +#define NETXEN_SRE_MISC (NETXEN_CRB_SRE + 0x0002c) #define NETXEN_SRE_INT_STATUS (NETXEN_CRB_SRE + 0x00034) #define NETXEN_SRE_PBI_ACTIVE_STATUS (NETXEN_CRB_SRE + 0x01014) #define NETXEN_SRE_L1RE_CTL (NETXEN_CRB_SRE + 0x03000) diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 42ffb82..9702509 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c @@ -2041,8 +2041,8 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter) fw_major, fw_minor, fw_build); if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) { - i = NXRD32(adapter, NETXEN_MIU_MN_CONTROL); - adapter->ahw.cut_through = (i & 0x4) ? 1 : 0; + i = NXRD32(adapter, NETXEN_SRE_MISC); + adapter->ahw.cut_through = (i & 0x8000) ? 1 : 0; dev_info(&pdev->dev, "firmware running in %s mode\n", adapter->ahw.cut_through ? "cut-through" : "legacy"); }