From 4d631a6612131e0a761dca9914c26fff341efae1 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 25 Jun 2015 07:24:47 +0000 Subject: [PATCH] MFC r284697: Add logging of executed mailbox command names. Previously those commands were logged only as part of register dump, that is not very readable. git-svn-id: svn://svn.freebsd.org/base/stable/10@284801 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/isp/isp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index dce666b23..94539035c 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -7344,6 +7344,7 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp) isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x", opcode); return; } + cname = fc_mbcmd_names[opcode]; ibits = ISP_FC_IBITS(opcode); obits = ISP_FC_OBITS(opcode); } else { @@ -7352,9 +7353,15 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp) isp_prt(isp, ISP_LOGERR, "Unknown Command 0x%x", opcode); return; } + cname = scsi_mbcmd_names[opcode]; ibits = ISP_SCSI_IBITS(opcode); obits = ISP_SCSI_OBITS(opcode); } + if (cname == NULL) { + cname = tname; + ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode); + } + isp_prt(isp, ISP_LOGDEBUG3, "Mailbox Command '%s'", cname); /* * Pick up any additional bits that the caller might have set. @@ -7440,11 +7447,6 @@ isp_mboxcmd(ispsoftc_t *isp, mbreg_t *mbp) if (mbp->logval == 0 || opcode == MBOX_EXEC_FIRMWARE) { return; } - cname = (IS_FC(isp))? fc_mbcmd_names[opcode] : scsi_mbcmd_names[opcode]; - if (cname == NULL) { - cname = tname; - ISP_SNPRINTF(tname, sizeof tname, "opcode %x", opcode); - } /* * Just to be chatty here... -- 2.45.0