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",
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
