Author: jhb
Date: Fri Nov 4 20:30:15 2016
New Revision: 308311
URL: https://svnweb.freebsd.org/changeset/base/308311
Log:
MFC 296018,296640,296641,296689,296735,296949: Fixes for sysctl handlers.
296018:
cxgbe(4): Add a sysctl to retrieve the maximum speed/bandwidth supported by a
port.
dev.cxgbe.<n>.max_speed
dev.cxl.<n>.max_speed
296640:
cxgbe(4): Add a sysctl for the event capture mask of the TP block's
logic analyzer.
dev.t5nex.<n>.misc.tp_la_mask
dev.t4nex.<n>.misc.tp_la_mask
296641:
cxgbe(4): Add sysctls to display the TP microcode version and the
expansion rom version (if there's one).
trantor:~# sysctl dev.t4nex dev.t5nex | grep _version
dev.t4nex.0.firmware_version: 1.15.28.0
dev.t4nex.0.tp_version: 0.1.9.4
dev.t5nex.0.firmware_version: 1.15.28.0
dev.t5nex.0.exprom_version: 1.0.0.68
dev.t5nex.0.tp_version: 0.1.4.9
296689:
cxgbe(4): sysctls to display the TOE's TCP timers.
cask:~# sysctl -d dev.t5nex.0.toe
dev.t5nex.0.toe.finwait2_timer: FINWAIT2 timer (us)
dev.t5nex.0.toe.initial_srtt: Initial SRTT (us)
dev.t5nex.0.toe.keepalive_intvl: Keepidle interval (us)
dev.t5nex.0.toe.keepalive_idle: Keepidle idle timer (us)
dev.t5nex.0.toe.persist_max: Persist timer max (us)
dev.t5nex.0.toe.persist_min: Persist timer min (us)
dev.t5nex.0.toe.rexmt_max: Retransmit max (us)
dev.t5nex.0.toe.rexmt_min: Retransmit min (us)
dev.t5nex.0.toe.dack_timer: DACK timer (us)
dev.t5nex.0.toe.dack_tick: DACK tick (us)
dev.t5nex.0.toe.timestamp_tick: TCP timestamp tick (us)
dev.t5nex.0.toe.timer_tick: TP timer tick (us)
...
cask:~# sysctl dev.t5nex.0.toe
dev.t5nex.0.toe.finwait2_timer: 9765440
dev.t5nex.0.toe.initial_srtt: 244128
dev.t5nex.0.toe.keepalive_intvl: 73240800
dev.t5nex.0.toe.keepalive_idle: 7031116800
dev.t5nex.0.toe.persist_max: 9765440
dev.t5nex.0.toe.persist_min: 976544
dev.t5nex.0.toe.rexmt_max: 9765440
dev.t5nex.0.toe.rexmt_min: 244128
dev.t5nex.0.toe.dack_timer: 19520
dev.t5nex.0.toe.dack_tick: 32.768
dev.t5nex.0.toe.timestamp_tick: 1048.576
dev.t5nex.0.toe.timer_tick: 32.768
...
296735:
Fix the following gcc warnings on sparc64, when TCP_OFFLOAD is not
defined:
sys/dev/cxgbe/t4_main.c:7474: warning: 'sysctl_tp_tick' defined but not
used
sys/dev/cxgbe/t4_main.c:7505: warning: 'sysctl_tp_dack_timer' defined but
not used
sys/dev/cxgbe/t4_main.c:7519: warning: 'sysctl_tp_timer' defined but not
used
This just adds a bunch of #ifdef TCP_OFFLOAD in the right places.
296949:
cxgbe(4): Remove a couple of pointless assignments in sysctl_meminfo.
Do not display range if start = stop (this is a workaround for some
unused regions).
Sponsored by: Chelsio Communications
Modified:
stable/10/sys/dev/cxgbe/adapter.h
stable/10/sys/dev/cxgbe/common/common.h
stable/10/sys/dev/cxgbe/t4_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/10/sys/dev/cxgbe/adapter.h Fri Nov 4 20:06:32 2016
(r308310)
+++ stable/10/sys/dev/cxgbe/adapter.h Fri Nov 4 20:30:15 2016
(r308311)
@@ -787,7 +787,9 @@ struct adapter {
int tracer_valid; /* bitmap of valid tracers */
int tracer_enabled; /* bitmap of enabled tracers */
- char fw_version[32];
+ char fw_version[16];
+ char tp_version[16];
+ char exprom_version[16];
char cfg_file[32];
u_int cfcsum;
struct adapter_params params;
@@ -1015,6 +1017,22 @@ is_40G_port(const struct port_info *pi)
}
static inline int
+port_top_speed(const struct port_info *pi)
+{
+
+ if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100G)
+ return (100);
+ if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_40G)
+ return (40);
+ if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_10G)
+ return (10);
+ if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_1G)
+ return (1);
+
+ return (0);
+}
+
+static inline int
tx_resume_threshold(struct sge_eq *eq)
{
Modified: stable/10/sys/dev/cxgbe/common/common.h
==============================================================================
--- stable/10/sys/dev/cxgbe/common/common.h Fri Nov 4 20:06:32 2016
(r308310)
+++ stable/10/sys/dev/cxgbe/common/common.h Fri Nov 4 20:30:15 2016
(r308311)
@@ -290,6 +290,7 @@ struct adapter_params {
unsigned int fw_vers;
unsigned int tp_vers;
+ unsigned int exprom_vers;
unsigned short mtus[NMTUS];
unsigned short a_wnd[NCCTRL_WIN];
Modified: stable/10/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/10/sys/dev/cxgbe/t4_main.c Fri Nov 4 20:06:32 2016
(r308310)
+++ stable/10/sys/dev/cxgbe/t4_main.c Fri Nov 4 20:30:15 2016
(r308311)
@@ -494,11 +494,17 @@ static int sysctl_rdma_stats(SYSCTL_HAND
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_tp_la_mask(SYSCTL_HANDLER_ARGS);
static int sysctl_tp_la(SYSCTL_HANDLER_ARGS);
static int sysctl_tx_rate(SYSCTL_HANDLER_ARGS);
static int sysctl_ulprx_la(SYSCTL_HANDLER_ARGS);
static int sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS);
#endif
+#ifdef TCP_OFFLOAD
+static int sysctl_tp_tick(SYSCTL_HANDLER_ARGS);
+static int sysctl_tp_dack_timer(SYSCTL_HANDLER_ARGS);
+static int sysctl_tp_timer(SYSCTL_HANDLER_ARGS);
+#endif
static uint32_t fconf_iconf_to_mode(uint32_t, uint32_t);
static uint32_t mode_to_fconf(uint32_t);
static uint32_t mode_to_iconf(uint32_t);
@@ -2711,7 +2717,24 @@ prep_firmware(struct adapter *sc)
G_FW_HDR_FW_VER_MINOR(sc->params.fw_vers),
G_FW_HDR_FW_VER_MICRO(sc->params.fw_vers),
G_FW_HDR_FW_VER_BUILD(sc->params.fw_vers));
+
t4_get_tp_version(sc, &sc->params.tp_vers);
+ snprintf(sc->tp_version, sizeof(sc->tp_version), "%u.%u.%u.%u",
+ G_FW_HDR_FW_VER_MAJOR(sc->params.tp_vers),
+ G_FW_HDR_FW_VER_MINOR(sc->params.tp_vers),
+ G_FW_HDR_FW_VER_MICRO(sc->params.tp_vers),
+ G_FW_HDR_FW_VER_BUILD(sc->params.tp_vers));
+
+ if (t4_get_exprom_version(sc, &sc->params.exprom_vers) != 0)
+ sc->params.exprom_vers = 0;
+ else {
+ snprintf(sc->exprom_version, sizeof(sc->exprom_version),
+ "%u.%u.%u.%u",
+ G_FW_HDR_FW_VER_MAJOR(sc->params.exprom_vers),
+ G_FW_HDR_FW_VER_MINOR(sc->params.exprom_vers),
+ G_FW_HDR_FW_VER_MICRO(sc->params.exprom_vers),
+ G_FW_HDR_FW_VER_BUILD(sc->params.exprom_vers));
+ }
/* Reset device */
if (need_fw_reset &&
@@ -4529,6 +4552,14 @@ t4_sysctls(struct adapter *sc)
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "hw_revision", CTLFLAG_RD,
NULL, chip_rev(sc), "chip hardware revision");
+ SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "tp_version",
+ CTLFLAG_RD, sc->tp_version, 0, "TP microcode version");
+
+ if (sc->params.exprom_vers != 0) {
+ SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "exprom_version",
+ CTLFLAG_RD, sc->exprom_version, 0, "expansion ROM version");
+ }
+
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "firmware_version",
CTLFLAG_RD, sc->fw_version, 0, "firmware version");
@@ -4736,6 +4767,10 @@ t4_sysctls(struct adapter *sc)
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_tp_err_stats, "A", "TP error statistics");
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tp_la_mask",
+ CTLTYPE_INT | CTLFLAG_RW, sc, 0, sysctl_tp_la_mask, "I",
+ "TP logic analyzer event capture mask");
+
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tp_la",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_tp_la, "A", "TP logic analyzer");
@@ -4788,6 +4823,54 @@ t4_sysctls(struct adapter *sc)
sc->tt.tx_align = 1;
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "tx_align",
CTLFLAG_RW, &sc->tt.tx_align, 0, "chop and align payload");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "timer_tick",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0, sysctl_tp_tick, "A",
+ "TP timer tick (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "timestamp_tick",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 1, sysctl_tp_tick, "A",
+ "TCP timestamp tick (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "dack_tick",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 2, sysctl_tp_tick, "A",
+ "DACK tick (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "dack_timer",
+ CTLTYPE_UINT | CTLFLAG_RD, sc, 0, sysctl_tp_dack_timer,
+ "IU", "DACK timer (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "rexmt_min",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_RXT_MIN,
+ sysctl_tp_timer, "LU", "Retransmit min (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "rexmt_max",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_RXT_MAX,
+ sysctl_tp_timer, "LU", "Retransmit max (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "persist_min",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_PERS_MIN,
+ sysctl_tp_timer, "LU", "Persist timer min (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "persist_max",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_PERS_MAX,
+ sysctl_tp_timer, "LU", "Persist timer max (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "keepalive_idle",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_KEEP_IDLE,
+ sysctl_tp_timer, "LU", "Keepidle idle timer (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "keepalive_intvl",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_KEEP_INTVL,
+ sysctl_tp_timer, "LU", "Keepidle interval (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "initial_srtt",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_INIT_SRTT,
+ sysctl_tp_timer, "LU", "Initial SRTT (us)");
+
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "finwait2_timer",
+ CTLTYPE_ULONG | CTLFLAG_RD, sc, A_TP_FINWAIT2_TIMER,
+ sysctl_tp_timer, "LU", "FINWAIT2 timer (us)");
}
#endif
}
@@ -4901,6 +4984,9 @@ cxgbe_sysctls(struct port_info *pi)
CTLTYPE_STRING | CTLFLAG_RW, pi, PAUSE_TX, sysctl_pause_settings,
"A", "PAUSE settings (bit 0 = rx_pause, bit 1 = tx_pause)");
+ SYSCTL_ADD_INT(ctx, children, OID_AUTO, "max_speed", CTLFLAG_RD, NULL,
+ port_top_speed(pi), "max speed (in Gbps)");
+
/*
* dev.cxgbe.X.stats.
*/
@@ -6127,6 +6213,9 @@ mem_region_show(struct sbuf *sb, const c
{
unsigned int size;
+ if (from == to)
+ return;
+
size = to - from + 1;
if (size == 0)
return;
@@ -6230,13 +6319,10 @@ sysctl_meminfo(SYSCTL_HANDLER_ARGS)
md++;
if (t4_read_reg(sc, A_LE_DB_CONFIG) & F_HASHEN) {
- if (chip_id(sc) <= CHELSIO_T5) {
- hi = t4_read_reg(sc, A_LE_DB_TID_HASHBASE) / 4;
+ if (chip_id(sc) <= CHELSIO_T5)
md->base = t4_read_reg(sc, A_LE_DB_HASH_TID_BASE);
- } else {
- hi = t4_read_reg(sc, A_LE_DB_HASH_TID_BASE);
+ else
md->base = t4_read_reg(sc, A_LE_DB_HASH_TBL_BASE_ADDR);
- }
md->limit = 0;
} else {
md->base = 0;
@@ -6933,6 +7019,26 @@ sysctl_tp_err_stats(SYSCTL_HANDLER_ARGS)
return (rc);
}
+static int
+sysctl_tp_la_mask(SYSCTL_HANDLER_ARGS)
+{
+ struct adapter *sc = arg1;
+ struct tp_params *tpp = &sc->params.tp;
+ u_int mask;
+ int rc;
+
+ mask = tpp->la_mask >> 16;
+ rc = sysctl_handle_int(oidp, &mask, 0, req);
+ if (rc != 0 || req->newptr == NULL)
+ return (rc);
+ if (mask > 0xffff)
+ return (EINVAL);
+ tpp->la_mask = mask << 16;
+ t4_set_reg_field(sc, A_TP_DBG_LA_CONFIG, 0xffff0000U, tpp->la_mask);
+
+ return (0);
+}
+
struct field_desc {
const char *name;
u_int start;
@@ -7277,6 +7383,92 @@ sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS)
}
#endif
+#ifdef TCP_OFFLOAD
+static void
+unit_conv(char *buf, size_t len, u_int val, u_int factor)
+{
+ u_int rem = val % factor;
+
+ if (rem == 0)
+ snprintf(buf, len, "%u", val / factor);
+ else {
+ while (rem % 10 == 0)
+ rem /= 10;
+ snprintf(buf, len, "%u.%u", val / factor, rem);
+ }
+}
+
+static int
+sysctl_tp_tick(SYSCTL_HANDLER_ARGS)
+{
+ struct adapter *sc = arg1;
+ char buf[16];
+ u_int res, re;
+ u_int cclk_ps = 1000000000 / sc->params.vpd.cclk;
+
+ res = t4_read_reg(sc, A_TP_TIMER_RESOLUTION);
+ switch (arg2) {
+ case 0:
+ /* timer_tick */
+ re = G_TIMERRESOLUTION(res);
+ break;
+ case 1:
+ /* TCP timestamp tick */
+ re = G_TIMESTAMPRESOLUTION(res);
+ break;
+ case 2:
+ /* DACK tick */
+ re = G_DELAYEDACKRESOLUTION(res);
+ break;
+ default:
+ return (EDOOFUS);
+ }
+
+ unit_conv(buf, sizeof(buf), (cclk_ps << re), 1000000);
+
+ return (sysctl_handle_string(oidp, buf, sizeof(buf), req));
+}
+
+static int
+sysctl_tp_dack_timer(SYSCTL_HANDLER_ARGS)
+{
+ struct adapter *sc = arg1;
+ u_int res, dack_re, v;
+ u_int cclk_ps = 1000000000 / sc->params.vpd.cclk;
+
+ res = t4_read_reg(sc, A_TP_TIMER_RESOLUTION);
+ dack_re = G_DELAYEDACKRESOLUTION(res);
+ v = ((cclk_ps << dack_re) / 1000000) * t4_read_reg(sc, A_TP_DACK_TIMER);
+
+ return (sysctl_handle_int(oidp, &v, 0, req));
+}
+
+static int
+sysctl_tp_timer(SYSCTL_HANDLER_ARGS)
+{
+ struct adapter *sc = arg1;
+ int reg = arg2;
+ u_int tre;
+ u_long tp_tick_us, v;
+ u_int cclk_ps = 1000000000 / sc->params.vpd.cclk;
+
+ MPASS(reg == A_TP_RXT_MIN || reg == A_TP_RXT_MAX ||
+ reg == A_TP_PERS_MIN || reg == A_TP_PERS_MAX ||
+ reg == A_TP_KEEP_IDLE || A_TP_KEEP_INTVL || reg == A_TP_INIT_SRTT ||
+ reg == A_TP_FINWAIT2_TIMER);
+
+ tre = G_TIMERRESOLUTION(t4_read_reg(sc, A_TP_TIMER_RESOLUTION));
+ tp_tick_us = (cclk_ps << tre) / 1000000;
+
+ if (reg == A_TP_INIT_SRTT)
+ v = tp_tick_us * G_INITSRTT(t4_read_reg(sc, reg));
+ else
+ v = tp_tick_us * t4_read_reg(sc, reg);
+
+ return (sysctl_handle_long(oidp, &v, 0, req));
+}
+#endif
+
static uint32_t
fconf_iconf_to_mode(uint32_t fconf, uint32_t iconf)
{
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
