50c50
< __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp.c 291499 2015-11-30 21:29:38Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/isp/isp.c 291500 2015-11-30 21:30:18Z mav $");
2565c2565,2566
< MBSINIT(&mbs, MBOX_GET_PORT_DB, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR, 250000);
---
> MBSINIT(&mbs, MBOX_GET_PORT_DB,
> MBLOGALL & ~MBLOGMASK(MBOX_COMMAND_PARAM_ERROR), 250000);
2635c2636
< MBSINIT(&mbs, MBOX_GET_ID_LIST, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR, 250000);
---
> MBSINIT(&mbs, MBOX_GET_ID_LIST, MBLOGALL, 250000);
2729c2730,2731
< MBSINIT(&mbs, MBOX_GET_PORT_NAME, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR, 500000);
---
> MBSINIT(&mbs, MBOX_GET_PORT_NAME,
> MBLOGALL & ~MBLOGMASK(MBOX_COMMAND_PARAM_ERROR), 500000);
4923c4925,4926
< MBSINIT(&mbs, MBOX_ABORT, MBLOGALL & ~MBOX_COMMAND_ERROR, 0);
---
> MBSINIT(&mbs, MBOX_ABORT,
> MBLOGALL & ~MBLOGMASK(MBOX_COMMAND_ERROR), 0);
7434c7437
< const char *cname, *xname;
---
> const char *cname, *xname, *sname;
7544,7545c7547,7548
< out:
< if (mbp->logval == 0 || opcode == MBOX_EXEC_FIRMWARE) {
---
> out:
> if (mbp->logval == 0 || mbp->param[0] == MBOX_COMMAND_COMPLETE)
7547d7549
< }
7549,7551c7551,7554
< /*
< * Just to be chatty here...
< */
---
> if ((mbp->param[0] & 0xbfe0) == 0 &&
> (mbp->logval & MBLOGMASK(mbp->param[0])) == 0)
> return;
>
7552a7556
> sname = "";
7554,7555d7557
< case MBOX_COMMAND_COMPLETE:
< break;
7557,7559c7559
< if (mbp->logval & MBLOGMASK(MBOX_COMMAND_COMPLETE)) {
< xname = "INVALID COMMAND";
< }
---
> xname = "INVALID COMMAND";
7562,7564c7562
< if (mbp->logval & MBLOGMASK(MBOX_HOST_INTERFACE_ERROR)) {
< xname = "HOST INTERFACE ERROR";
< }
---
> xname = "HOST INTERFACE ERROR";
7567,7569c7565
< if (mbp->logval & MBLOGMASK(MBOX_TEST_FAILED)) {
< xname = "TEST FAILED";
< }
---
> xname = "TEST FAILED";
7572,7574c7568,7571
< if (mbp->logval & MBLOGMASK(MBOX_COMMAND_ERROR)) {
< xname = "COMMAND ERROR";
< }
---
> xname = "COMMAND ERROR";
> ISP_SNPRINTF(mname, sizeof(mname), " subcode 0x%x",
> mbp->param[1]);
> sname = mname;
7577,7579c7574
< if (mbp->logval & MBLOGMASK(MBOX_COMMAND_PARAM_ERROR)) {
< xname = "COMMAND PARAMETER ERROR";
< }
---
> xname = "COMMAND PARAMETER ERROR";
7581,7585d7575
< case MBOX_LOOP_ID_USED:
< if (mbp->logval & MBLOGMASK(MBOX_LOOP_ID_USED)) {
< xname = "LOOP ID ALREADY IN USE";
< }
< break;
7587,7589c7577
< if (mbp->logval & MBLOGMASK(MBOX_PORT_ID_USED)) {
< xname = "PORT ID ALREADY IN USE";
< }
---
> xname = "PORT ID ALREADY IN USE";
7590a7579,7581
> case MBOX_LOOP_ID_USED:
> xname = "LOOP ID ALREADY IN USE";
> break;
7592,7594c7583
< if (mbp->logval & MBLOGMASK(MBOX_ALL_IDS_USED)) {
< xname = "ALL LOOP IDS IN USE";
< }
---
> xname = "ALL LOOP IDS IN USE";
7595a7585,7599
> case MBOX_NOT_LOGGED_IN:
> xname = "NOT LOGGED IN";
> break;
> case MBOX_LINK_DOWN_ERROR:
> xname = "LINK DOWN ERROR";
> break;
> case MBOX_LOOPBACK_ERROR:
> xname = "LOOPBACK ERROR";
> break;
> case MBOX_CHECKSUM_ERROR:
> xname = "CHECKSUM ERROR";
> break;
> case MBOX_INVALID_PRODUCT_KEY:
> xname = "INVALID PRODUCT KEY";
> break;
7608,7609c7612,7613
< isp_prt(isp, ISP_LOGALL, "Mailbox Command '%s' failed (%s)",
< cname, xname);
---
> isp_prt(isp, ISP_LOGALL, "Mailbox Command '%s' failed (%s%s)",
> cname, xname, sname);