From owner-svn-src-all@FreeBSD.ORG Thu Mar 24 01:13:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 888C71065670; Thu, 24 Mar 2011 01:13:28 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 785078FC19; Thu, 24 Mar 2011 01:13:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2O1DSbY012918; Thu, 24 Mar 2011 01:13:28 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2O1DSX9012916; Thu, 24 Mar 2011 01:13:28 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201103240113.p2O1DSX9012916@svn.freebsd.org> From: Navdeep Parhar Date: Thu, 24 Mar 2011 01:13:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219945 - head/sys/dev/cxgb/common X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2011 01:13:28 -0000 Author: np Date: Thu Mar 24 01:13:28 2011 New Revision: 219945 URL: http://svn.freebsd.org/changeset/base/219945 Log: T3C initialization should setup the parity fence too. MFC after: 1 week Modified: head/sys/dev/cxgb/common/cxgb_t3_hw.c Modified: head/sys/dev/cxgb/common/cxgb_t3_hw.c ============================================================================== --- head/sys/dev/cxgb/common/cxgb_t3_hw.c Thu Mar 24 01:03:01 2011 (r219944) +++ head/sys/dev/cxgb/common/cxgb_t3_hw.c Thu Mar 24 01:13:28 2011 (r219945) @@ -1750,6 +1750,7 @@ static int t3_handle_intr_status(adapter 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); @@ -2189,11 +2190,10 @@ static int mac_intr_handler(adapter_t *a t3_os_link_intr(pi); } - 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; } @@ -4189,6 +4189,7 @@ int t3_init_hw(adapter_t *adapter, u32 f t3_write_reg(adapter, A_PM1_TX_MODE, 0); chan_init_hw(adapter, adapter->params.chan_map); t3_sge_init(adapter, &adapter->params.sge); + t3_set_reg_field(adapter, A_PL_RST, 0, F_FATALPERREN); t3_write_reg(adapter, A_T3DBG_GPIO_ACT_LOW, calc_gpio_intr(adapter));