diff options
author | np <np@FreeBSD.org> | 2013-04-11 22:49:29 +0000 |
---|---|---|
committer | np <np@FreeBSD.org> | 2013-04-11 22:49:29 +0000 |
commit | bdeb98927c27c3e66595a49e02219a6ad70e8449 (patch) | |
tree | 4f57a11bba4d353ef87bd2725a9579f4c805dc6d | |
parent | 35e58ff9d5078285d3d0f950beb80ddfc853515d (diff) | |
download | FreeBSD-src-bdeb98927c27c3e66595a49e02219a6ad70e8449.zip FreeBSD-src-bdeb98927c27c3e66595a49e02219a6ad70e8449.tar.gz |
Cosmetic change (s/wrwc/wcwr/;s/WRWC/WCWR/).
MFC after: 3 days.
-rw-r--r-- | sys/dev/cxgbe/adapter.h | 2 | ||||
-rw-r--r-- | sys/dev/cxgbe/t4_main.c | 12 | ||||
-rw-r--r-- | sys/dev/cxgbe/t4_sge.c | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 3563992..99ab38e 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -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. diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 5f75a88..3ae7ca9 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -397,7 +397,7 @@ static int sysctl_tcp_stats(SYSCTL_HANDLER_ARGS); 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; diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 05ccebf..84fb44e 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -2305,7 +2305,7 @@ alloc_eq(struct adapter *sc, struct port_info *pi, struct sge_eq *eq) 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_info *pi, struct sge_eq *eq) 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 sge_eq *eq) 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 sge_eq *eq) *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", |