From patchwork Thu Sep 2 23:07:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Leedom X-Patchwork-Id: 63576 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 2B22DB7193 for ; Fri, 3 Sep 2010 09:07:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756760Ab0IBXHj (ORCPT ); Thu, 2 Sep 2010 19:07:39 -0400 Received: from stargate.chelsio.com ([67.207.112.58]:1606 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756722Ab0IBXHi (ORCPT ); Thu, 2 Sep 2010 19:07:38 -0400 Received: from okham.asicdesigners.com (okham.asicdesigners.com [10.192.164.4]) by stargate.chelsio.com (8.13.1/8.13.1) with ESMTP id o82N7bum001961; Thu, 2 Sep 2010 16:07:37 -0700 Received: from leedom by okham.asicdesigners.com with local (Exim 4.71) (envelope-from ) id 1OrIsb-0000o8-Eh; Thu, 02 Sep 2010 16:07:37 -0700 From: Casey Leedom To: netdev@vger.kernel.org Cc: Casey Leedom , Dimitris Michailidis Subject: [PATCH net-next 3/4] cxgb3: Leave interrupts for fatal errors asserted in common code. Date: Thu, 2 Sep 2010 16:07:31 -0700 Message-Id: <1283468852-1010-3-git-send-email-leedom@chelsio.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <241D2F16-4F92-48DD-A904-832771B2F4B4@chelsio.com> References: <241D2F16-4F92-48DD-A904-832771B2F4B4@chelsio.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Platform code needs to deal with them now. Signed-off-by: Dimitris Michailidis Signed-off-by: Casey Leedom --- drivers/net/cxgb3/t3_hw.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 14a5664..d307c9d 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c @@ -1408,6 +1408,7 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg, fatal++; CH_ALERT(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); + status &= ~acts->mask; } else if (acts->msg) CH_WARN(adapter, "%s (0x%x)\n", acts->msg, status & acts->mask); @@ -1843,11 +1844,10 @@ static int mac_intr_handler(struct adapter *adap, unsigned int idx) t3_os_link_fault_handler(adap, idx); } - t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); - if (cause & XGM_INTR_FATAL) t3_fatal_err(adap); + t3_write_reg(adap, A_XGM_INT_CAUSE + mac->offset, cause); return cause != 0; }