From owner-svn-src-user@FreeBSD.ORG Wed Jun 3 20:49:25 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82F5610656CD; Wed, 3 Jun 2009 20:49:25 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 71B658FC2B; Wed, 3 Jun 2009 20:49:25 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n53KnP3c065959; Wed, 3 Jun 2009 20:49:25 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n53KnPFS065958; Wed, 3 Jun 2009 20:49:25 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906032049.n53KnPFS065958@svn.freebsd.org> From: Kip Macy Date: Wed, 3 Jun 2009 20:49:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193397 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 20:49:25 -0000 Author: kmacy Date: Wed Jun 3 20:49:25 2009 New Revision: 193397 URL: http://svn.freebsd.org/changeset/base/193397 Log: move qset allocation out from underneat the port and adapter locks Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Wed Jun 3 20:25:13 2009 (r193396) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Wed Jun 3 20:49:25 2009 (r193397) @@ -1676,30 +1676,6 @@ cxgb_up(struct adapter *sc) { int err = 0; - if ((sc->flags & FULL_INIT_DONE) == 0) { - - if ((sc->flags & FW_UPTODATE) == 0) - if ((err = upgrade_fw(sc))) - goto out; - if ((sc->flags & TPS_UPTODATE) == 0) - if ((err = update_tpsram(sc))) - goto out; - err = t3_init_hw(sc, 0); - if (err) - goto out; - - t3_set_reg_field(sc, A_TP_PARA_REG5, 0, F_RXDDPOFFINIT); - t3_write_reg(sc, A_ULPRX_TDDP_PSZ, V_HPZ0(PAGE_SHIFT - 12)); - - err = setup_sge_qsets(sc); - if (err) - goto out; - - setup_rss(sc); - t3_add_configured_sysctls(sc); - sc->flags |= FULL_INIT_DONE; - } - t3_intr_clear(sc); /* If it's MSI or INTx, allocate a single interrupt for everything */ @@ -1863,12 +1839,47 @@ offload_close(struct t3cdev *tdev) return (0); } +static int +cxgb_first_init(struct adapter *sc) +{ + int err = 0; + + if ((sc->flags & FW_UPTODATE) == 0) + if ((err = upgrade_fw(sc))) + goto out; + if ((sc->flags & TPS_UPTODATE) == 0) + if ((err = update_tpsram(sc))) + goto out; + err = t3_init_hw(sc, 0); + if (err) + goto out; + + t3_set_reg_field(sc, A_TP_PARA_REG5, 0, F_RXDDPOFFINIT); + t3_write_reg(sc, A_ULPRX_TDDP_PSZ, V_HPZ0(PAGE_SHIFT - 12)); + + err = setup_sge_qsets(sc); + if (err) + goto out; + + ADAPTER_LOCK(sc); + setup_rss(sc); + t3_add_configured_sysctls(sc); + sc->flags |= FULL_INIT_DONE; + ADAPTER_UNLOCK(sc); +out: + return (err); +} static void cxgb_init(void *arg) { struct port_info *p = arg; - + struct adapter *sc = p->adapter; + + if (((sc->flags & FULL_INIT_DONE) == 0) && + (cxgb_first_init(sc))) + return; + PORT_LOCK(p); cxgb_init_locked(p); PORT_UNLOCK(p);