MFC
This commit is contained in:
attilio
parent
3b39b1682d
commit
9f19c1c64d
@ -1,3 +1,11 @@
|
||||
. ${srcdir}/emulparams/elf32bmipn32-defs.sh
|
||||
COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
|
||||
INITIAL_READONLY_SECTIONS=".MIPS.options : { *(.MIPS.options) }"
|
||||
|
||||
# elf32bmipn32-defs.sh use .reginfo, n64 ABI should use .MIPS.options,
|
||||
# override INITIAL_READONLY_SECTIONS to do this.
|
||||
INITIAL_READONLY_SECTIONS=
|
||||
if test -z "${CREATE_SHLIB}"; then
|
||||
INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
|
||||
fi
|
||||
INITIAL_READONLY_SECTIONS="${INITIAL_READONLY_SECTIONS}
|
||||
.MIPS.options ${RELOCATING-0} : { *(.MIPS.options) }"
|
||||
|
||||
@ -271,6 +271,7 @@ static void setup_memwin(struct adapter *);
|
||||
static int cfg_itype_and_nqueues(struct adapter *, int, int,
|
||||
struct intrs_and_queues *);
|
||||
static int prep_firmware(struct adapter *);
|
||||
static int get_devlog_params(struct adapter *, struct devlog_params *);
|
||||
static int get_capabilities(struct adapter *, struct fw_caps_config_cmd *);
|
||||
static int get_params(struct adapter *, struct fw_caps_config_cmd *);
|
||||
static void t4_set_desc(struct adapter *);
|
||||
@ -297,12 +298,14 @@ static int sysctl_holdoff_pktc_idx(SYSCTL_HANDLER_ARGS);
|
||||
static int sysctl_qsize_rxq(SYSCTL_HANDLER_ARGS);
|
||||
static int sysctl_qsize_txq(SYSCTL_HANDLER_ARGS);
|
||||
static int sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS);
|
||||
static int sysctl_devlog(SYSCTL_HANDLER_ARGS);
|
||||
static inline void txq_start(struct ifnet *, struct sge_txq *);
|
||||
static uint32_t fconf_to_mode(uint32_t);
|
||||
static uint32_t mode_to_fconf(uint32_t);
|
||||
static uint32_t fspec_to_fconf(struct t4_filter_specification *);
|
||||
static int get_filter_mode(struct adapter *, uint32_t *);
|
||||
static int set_filter_mode(struct adapter *, uint32_t);
|
||||
static inline uint64_t get_filter_hits(struct adapter *, uint32_t);
|
||||
static int get_filter(struct adapter *, struct t4_filter *);
|
||||
static int set_filter(struct adapter *, struct t4_filter *);
|
||||
static int del_filter(struct adapter *, struct t4_filter *);
|
||||
@ -402,6 +405,9 @@ t4_attach(device_t dev)
|
||||
if (rc != 0)
|
||||
goto done; /* error message displayed already */
|
||||
|
||||
/* Read firmware devlog parameters */
|
||||
(void) get_devlog_params(sc, &sc->params.devlog);
|
||||
|
||||
/* Get device capabilities and select which ones we'll use */
|
||||
rc = get_capabilities(sc, &caps);
|
||||
if (rc != 0) {
|
||||
@ -1419,6 +1425,34 @@ prep_firmware(struct adapter *sc)
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
get_devlog_params(struct adapter *sc, struct devlog_params *dlog)
|
||||
{
|
||||
struct fw_devlog_cmd devlog_cmd;
|
||||
uint32_t meminfo;
|
||||
int rc;
|
||||
|
||||
bzero(&devlog_cmd, sizeof(devlog_cmd));
|
||||
devlog_cmd.op_to_write = htobe32(V_FW_CMD_OP(FW_DEVLOG_CMD) |
|
||||
F_FW_CMD_REQUEST | F_FW_CMD_READ);
|
||||
devlog_cmd.retval_len16 = htobe32(FW_LEN16(devlog_cmd));
|
||||
rc = -t4_wr_mbox(sc, sc->mbox, &devlog_cmd, sizeof(devlog_cmd),
|
||||
&devlog_cmd);
|
||||
if (rc != 0) {
|
||||
device_printf(sc->dev,
|
||||
"failed to get devlog parameters: %d.\n", rc);
|
||||
bzero(dlog, sizeof (*dlog));
|
||||
return (rc);
|
||||
}
|
||||
|
||||
meminfo = be32toh(devlog_cmd.memtype_devlog_memaddr16_devlog);
|
||||
dlog->memtype = G_FW_DEVLOG_CMD_MEMTYPE_DEVLOG(meminfo);
|
||||
dlog->start = G_FW_DEVLOG_CMD_MEMADDR16_DEVLOG(meminfo) << 4;
|
||||
dlog->size = be32toh(devlog_cmd.memsize_devlog);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
get_capabilities(struct adapter *sc, struct fw_caps_config_cmd *caps)
|
||||
{
|
||||
@ -2387,6 +2421,10 @@ t4_sysctls(struct adapter *sc)
|
||||
CTLTYPE_STRING | CTLFLAG_RD, &intr_pktcount, sizeof(intr_pktcount),
|
||||
sysctl_int_array, "A", "interrupt holdoff packet counter values");
|
||||
|
||||
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "devlog",
|
||||
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
|
||||
sysctl_devlog, "A", "device log");
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -2730,6 +2768,120 @@ sysctl_handle_t4_reg64(SYSCTL_HANDLER_ARGS)
|
||||
return (sysctl_handle_64(oidp, &val, 0, req));
|
||||
}
|
||||
|
||||
const char *devlog_level_strings[] = {
|
||||
[FW_DEVLOG_LEVEL_EMERG] = "EMERG",
|
||||
[FW_DEVLOG_LEVEL_CRIT] = "CRIT",
|
||||
[FW_DEVLOG_LEVEL_ERR] = "ERR",
|
||||
[FW_DEVLOG_LEVEL_NOTICE] = "NOTICE",
|
||||
[FW_DEVLOG_LEVEL_INFO] = "INFO",
|
||||
[FW_DEVLOG_LEVEL_DEBUG] = "DEBUG"
|
||||
};
|
||||
|
||||
const char *devlog_facility_strings[] = {
|
||||
[FW_DEVLOG_FACILITY_CORE] = "CORE",
|
||||
[FW_DEVLOG_FACILITY_SCHED] = "SCHED",
|
||||
[FW_DEVLOG_FACILITY_TIMER] = "TIMER",
|
||||
[FW_DEVLOG_FACILITY_RES] = "RES",
|
||||
[FW_DEVLOG_FACILITY_HW] = "HW",
|
||||
[FW_DEVLOG_FACILITY_FLR] = "FLR",
|
||||
[FW_DEVLOG_FACILITY_DMAQ] = "DMAQ",
|
||||
[FW_DEVLOG_FACILITY_PHY] = "PHY",
|
||||
[FW_DEVLOG_FACILITY_MAC] = "MAC",
|
||||
[FW_DEVLOG_FACILITY_PORT] = "PORT",
|
||||
[FW_DEVLOG_FACILITY_VI] = "VI",
|
||||
[FW_DEVLOG_FACILITY_FILTER] = "FILTER",
|
||||
[FW_DEVLOG_FACILITY_ACL] = "ACL",
|
||||
[FW_DEVLOG_FACILITY_TM] = "TM",
|
||||
[FW_DEVLOG_FACILITY_QFC] = "QFC",
|
||||
[FW_DEVLOG_FACILITY_DCB] = "DCB",
|
||||
[FW_DEVLOG_FACILITY_ETH] = "ETH",
|
||||
[FW_DEVLOG_FACILITY_OFLD] = "OFLD",
|
||||
[FW_DEVLOG_FACILITY_RI] = "RI",
|
||||
[FW_DEVLOG_FACILITY_ISCSI] = "ISCSI",
|
||||
[FW_DEVLOG_FACILITY_FCOE] = "FCOE",
|
||||
[FW_DEVLOG_FACILITY_FOISCSI] = "FOISCSI",
|
||||
[FW_DEVLOG_FACILITY_FOFCOE] = "FOFCOE"
|
||||
};
|
||||
|
||||
static int
|
||||
sysctl_devlog(SYSCTL_HANDLER_ARGS)
|
||||
{
|
||||
struct adapter *sc = arg1;
|
||||
struct devlog_params *dparams = &sc->params.devlog;
|
||||
struct fw_devlog_e *buf, *e;
|
||||
int i, j, rc, nentries, first = 0;
|
||||
struct sbuf *sb;
|
||||
uint64_t ftstamp = UINT64_MAX;
|
||||
|
||||
if (dparams->start == 0)
|
||||
return (ENXIO);
|
||||
|
||||
nentries = dparams->size / sizeof(struct fw_devlog_e);
|
||||
|
||||
buf = malloc(dparams->size, M_CXGBE, M_NOWAIT);
|
||||
if (buf == NULL)
|
||||
return (ENOMEM);
|
||||
|
||||
rc = -t4_mem_read(sc, dparams->memtype, dparams->start, dparams->size,
|
||||
(void *)buf);
|
||||
if (rc != 0)
|
||||
goto done;
|
||||
|
||||
for (i = 0; i < nentries; i++) {
|
||||
e = &buf[i];
|
||||
|
||||
if (e->timestamp == 0)
|
||||
break; /* end */
|
||||
|
||||
e->timestamp = be64toh(e->timestamp);
|
||||
e->seqno = be32toh(e->seqno);
|
||||
for (j = 0; j < 8; j++)
|
||||
e->params[j] = be32toh(e->params[j]);
|
||||
|
||||
if (e->timestamp < ftstamp) {
|
||||
ftstamp = e->timestamp;
|
||||
first = i;
|
||||
}
|
||||
}
|
||||
|
||||
if (buf[first].timestamp == 0)
|
||||
goto done; /* nothing in the log */
|
||||
|
||||
rc = sysctl_wire_old_buffer(req, 0);
|
||||
if (rc != 0)
|
||||
goto done;
|
||||
|
||||
sb = sbuf_new_for_sysctl(NULL, NULL, 4096, req);
|
||||
sbuf_printf(sb, "\n%10s %15s %8s %8s %s\n",
|
||||
"Seq#", "Tstamp", "Level", "Facility", "Message");
|
||||
|
||||
i = first;
|
||||
do {
|
||||
e = &buf[i];
|
||||
if (e->timestamp == 0)
|
||||
break; /* end */
|
||||
|
||||
sbuf_printf(sb, "%10d %15ju %8s %8s ",
|
||||
e->seqno, e->timestamp,
|
||||
(e->level < ARRAY_SIZE(devlog_level_strings) ?
|
||||
devlog_level_strings[e->level] : "UNKNOWN"),
|
||||
(e->facility < ARRAY_SIZE(devlog_facility_strings) ?
|
||||
devlog_facility_strings[e->facility] : "UNKNOWN"));
|
||||
sbuf_printf(sb, e->fmt, e->params[0], e->params[1],
|
||||
e->params[2], e->params[3], e->params[4],
|
||||
e->params[5], e->params[6], e->params[7]);
|
||||
|
||||
if (++i == nentries)
|
||||
i = 0;
|
||||
} while (i != first);
|
||||
|
||||
rc = sbuf_finish(sb);
|
||||
sbuf_delete(sb);
|
||||
done:
|
||||
free(buf, M_CXGBE);
|
||||
return (rc);
|
||||
}
|
||||
|
||||
static inline void
|
||||
txq_start(struct ifnet *ifp, struct sge_txq *txq)
|
||||
{
|
||||
@ -2913,6 +3065,20 @@ set_filter_mode(struct adapter *sc, uint32_t mode)
|
||||
return (rc);
|
||||
}
|
||||
|
||||
static inline uint64_t
|
||||
get_filter_hits(struct adapter *sc, uint32_t fid)
|
||||
{
|
||||
uint32_t tcb_base = t4_read_reg(sc, A_TP_CMM_TCB_BASE);
|
||||
uint64_t hits;
|
||||
|
||||
t4_write_reg(sc, PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, 0),
|
||||
tcb_base + (fid + sc->tids.ftid_base) * TCB_SIZE);
|
||||
t4_read_reg(sc, PCIE_MEM_ACCESS_REG(A_PCIE_MEM_ACCESS_OFFSET, 0));
|
||||
hits = t4_read_reg64(sc, MEMWIN0_BASE + 16);
|
||||
|
||||
return (be64toh(hits));
|
||||
}
|
||||
|
||||
static int
|
||||
get_filter(struct adapter *sc, struct t4_filter *t)
|
||||
{
|
||||
@ -2936,7 +3102,10 @@ get_filter(struct adapter *sc, struct t4_filter *t)
|
||||
t->idx = i;
|
||||
t->l2tidx = f->l2t ? f->l2t->idx : 0;
|
||||
t->smtidx = f->smtidx;
|
||||
t->hits = 0; /* XXX implement */
|
||||
if (f->fs.hitcnts)
|
||||
t->hits = get_filter_hits(sc, t->idx);
|
||||
else
|
||||
t->hits = UINT64_MAX;
|
||||
t->fs = f->fs;
|
||||
|
||||
return (0);
|
||||
|
||||
@ -61,6 +61,7 @@ msgbuf_init(struct msgbuf *mbp, void *ptr, int size)
|
||||
mbp->msg_magic = MSG_MAGIC;
|
||||
mbp->msg_lastpri = -1;
|
||||
mbp->msg_needsnl = 0;
|
||||
bzero(&mbp->msg_lock, sizeof(mbp->msg_lock));
|
||||
mtx_init(&mbp->msg_lock, "msgbuf", NULL, MTX_SPIN);
|
||||
}
|
||||
|
||||
@ -95,6 +96,7 @@ msgbuf_reinit(struct msgbuf *mbp, void *ptr, int size)
|
||||
mbp->msg_lastpri = -1;
|
||||
/* Assume that the old message buffer didn't end in a newline. */
|
||||
mbp->msg_needsnl = 1;
|
||||
bzero(&mbp->msg_lock, sizeof(mbp->msg_lock));
|
||||
mtx_init(&mbp->msg_lock, "msgbuf", NULL, MTX_SPIN);
|
||||
}
|
||||
|
||||
|
||||
@ -1045,7 +1045,7 @@ config_red(struct dn_fsk *fs)
|
||||
|
||||
fs->w_q = fs->fs.w_q;
|
||||
fs->max_p = fs->fs.max_p;
|
||||
D("called");
|
||||
ND("called");
|
||||
/* Doing stuff that was in userland */
|
||||
i = fs->sched->link.bandwidth;
|
||||
s = (i <= 0) ? 0 :
|
||||
@ -1109,7 +1109,7 @@ config_red(struct dn_fsk *fs)
|
||||
if (dn_cfg.red_max_pkt_size < 1)
|
||||
dn_cfg.red_max_pkt_size = 1500;
|
||||
fs->max_pkt_size = dn_cfg.red_max_pkt_size;
|
||||
D("exit");
|
||||
ND("exit");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2176,7 +2176,7 @@ ip_dn_destroy(int last)
|
||||
|
||||
DN_BH_WLOCK();
|
||||
if (last) {
|
||||
printf("%s removing last instance\n", __FUNCTION__);
|
||||
ND("removing last instance\n");
|
||||
ip_dn_ctl_ptr = NULL;
|
||||
ip_dn_io_ptr = NULL;
|
||||
}
|
||||
@ -2256,13 +2256,13 @@ unload_dn_sched(struct dn_alg *s)
|
||||
struct dn_alg *tmp, *r;
|
||||
int err = EINVAL;
|
||||
|
||||
D("called for %s", s->name);
|
||||
ND("called for %s", s->name);
|
||||
|
||||
DN_BH_WLOCK();
|
||||
SLIST_FOREACH_SAFE(r, &dn_cfg.schedlist, next, tmp) {
|
||||
if (strcmp(s->name, r->name) != 0)
|
||||
continue;
|
||||
D("ref_count = %d", r->ref_count);
|
||||
ND("ref_count = %d", r->ref_count);
|
||||
err = (r->ref_count != 0) ? EBUSY : 0;
|
||||
if (err == 0)
|
||||
SLIST_REMOVE(&dn_cfg.schedlist, r, dn_alg, next);
|
||||
|
||||
@ -753,11 +753,12 @@ ipfw_install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
|
||||
q = lookup_dyn_rule_locked(&args->f_id, NULL, NULL);
|
||||
|
||||
if (q != NULL) { /* should never occur */
|
||||
DEB(
|
||||
if (last_log != time_uptime) {
|
||||
last_log = time_uptime;
|
||||
printf("ipfw: %s: entry already present, done\n",
|
||||
__func__);
|
||||
}
|
||||
})
|
||||
IPFW_DYN_UNLOCK();
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -226,10 +226,10 @@ get_font(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
} else
|
||||
fprintf(stderr, "Could not open %s for reading\n", sysconfig);
|
||||
|
||||
fclose(fp);
|
||||
return fnt;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user