From owner-svn-src-head@FreeBSD.ORG Thu Apr 11 22:49:30 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 578D115A; Thu, 11 Apr 2013 22:49:30 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 49F7196; Thu, 11 Apr 2013 22:49:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3BMnTO7046000; Thu, 11 Apr 2013 22:49:29 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3BMnTBh045996; Thu, 11 Apr 2013 22:49:29 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201304112249.r3BMnTBh045996@svn.freebsd.org> From: Navdeep Parhar Date: Thu, 11 Apr 2013 22:49:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249392 - head/sys/dev/cxgbe X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Apr 2013 22:49:30 -0000 Author: np Date: Thu Apr 11 22:49:29 2013 New Revision: 249392 URL: http://svnweb.freebsd.org/changeset/base/249392 Log: Cosmetic change (s/wrwc/wcwr/;s/WRWC/WCWR/). MFC after: 3 days. Modified: head/sys/dev/cxgbe/adapter.h head/sys/dev/cxgbe/t4_main.c head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/adapter.h ============================================================================== --- head/sys/dev/cxgbe/adapter.h Thu Apr 11 22:46:39 2013 (r249391) +++ head/sys/dev/cxgbe/adapter.h Thu Apr 11 22:49:29 2013 (r249392) @@ -319,7 +319,7 @@ enum { }; /* Listed in order of preference. Update t4_sysctls too if you change these */ -enum {DOORBELL_UDB, DOORBELL_WRWC, DOORBELL_UDBWC, DOORBELL_KDB}; +enum {DOORBELL_UDB, DOORBELL_WCWR, DOORBELL_UDBWC, DOORBELL_KDB}; /* * Egress Queue: driver is producer, T4 is consumer. Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Thu Apr 11 22:46:39 2013 (r249391) +++ head/sys/dev/cxgbe/t4_main.c Thu Apr 11 22:49:29 2013 (r249392) @@ -397,7 +397,7 @@ static int sysctl_tcp_stats(SYSCTL_HANDL static int sysctl_tids(SYSCTL_HANDLER_ARGS); static int sysctl_tp_err_stats(SYSCTL_HANDLER_ARGS); static int sysctl_tx_rate(SYSCTL_HANDLER_ARGS); -static int sysctl_wrwc_stats(SYSCTL_HANDLER_ARGS); +static int sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS); #endif static inline void txq_start(struct ifnet *, struct sge_txq *); static uint32_t fconf_to_mode(uint32_t); @@ -1413,7 +1413,7 @@ map_bar_2(struct adapter *sc) rman_get_size(sc->udbs_res), PAT_WRITE_COMBINING); if (rc == 0) { clrbit(&sc->doorbells, DOORBELL_UDB); - setbit(&sc->doorbells, DOORBELL_WRWC); + setbit(&sc->doorbells, DOORBELL_WCWR); setbit(&sc->doorbells, DOORBELL_UDBWC); } else { device_printf(sc->dev, @@ -4054,7 +4054,7 @@ t4_sysctls(struct adapter *sc) "\5INITIATOR_SSNOFLD\6TARGET_SSNOFLD", "\20\1INITIATOR\2TARGET\3CTRL_OFLD" /* caps[5] fcoecaps */ }; - static char *doorbells = {"\20\1UDB\2WRWC\3UDBWC\4KDB"}; + static char *doorbells = {"\20\1UDB\2WCWR\3UDBWC\4KDB"}; ctx = device_get_sysctl_ctx(sc->dev); @@ -4260,9 +4260,9 @@ t4_sysctls(struct adapter *sc) sysctl_tx_rate, "A", "Tx rate"); if (is_t5(sc)) { - SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "wrwc_stats", + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "wcwr_stats", CTLTYPE_STRING | CTLFLAG_RD, sc, 0, - sysctl_wrwc_stats, "A", "work request (WC) statistics"); + sysctl_wcwr_stats, "A", "write combined work requests"); } #endif @@ -5743,7 +5743,7 @@ sysctl_tx_rate(SYSCTL_HANDLER_ARGS) } static int -sysctl_wrwc_stats(SYSCTL_HANDLER_ARGS) +sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS) { struct adapter *sc = arg1; struct sbuf *sb; Modified: head/sys/dev/cxgbe/t4_sge.c ============================================================================== --- head/sys/dev/cxgbe/t4_sge.c Thu Apr 11 22:46:39 2013 (r249391) +++ head/sys/dev/cxgbe/t4_sge.c Thu Apr 11 22:49:29 2013 (r249392) @@ -2305,7 +2305,7 @@ alloc_eq(struct adapter *sc, struct port if (isset(&eq->doorbells, DOORBELL_UDB) || isset(&eq->doorbells, DOORBELL_UDBWC) || - isset(&eq->doorbells, DOORBELL_WRWC)) { + isset(&eq->doorbells, DOORBELL_WCWR)) { uint32_t s_qpp = sc->sge.s_qpp; uint32_t mask = (1 << s_qpp) - 1; volatile uint8_t *udb; @@ -2314,7 +2314,7 @@ alloc_eq(struct adapter *sc, struct port udb += (eq->cntxt_id >> s_qpp) << PAGE_SHIFT; /* pg offset */ eq->udb_qid = eq->cntxt_id & mask; /* id in page */ if (eq->udb_qid > PAGE_SIZE / UDBS_SEG_SIZE) - clrbit(&eq->doorbells, DOORBELL_WRWC); + clrbit(&eq->doorbells, DOORBELL_WCWR); else { udb += eq->udb_qid << UDBS_SEG_SHIFT; /* seg offset */ eq->udb_qid = 0; @@ -3451,7 +3451,7 @@ ring_eq_db(struct adapter *sc, struct sg db = eq->doorbells; pending = eq->pending; if (pending > 1) - clrbit(&db, DOORBELL_WRWC); + clrbit(&db, DOORBELL_WCWR); eq->pending = 0; wmb(); @@ -3460,14 +3460,14 @@ ring_eq_db(struct adapter *sc, struct sg *eq->udb = htole32(V_QID(eq->udb_qid) | V_PIDX(pending)); return; - case DOORBELL_WRWC: { + case DOORBELL_WCWR: { volatile uint64_t *dst, *src; int i; /* * Queues whose 128B doorbell segment fits in the page do not * use relative qid (udb_qid is always 0). Only queues with - * doorbell segments can do WRWC. + * doorbell segments can do WCWR. */ KASSERT(eq->udb_qid == 0 && pending == 1, ("%s: inappropriate doorbell (0x%x, %d, %d) for eq %p",