svn commit: r368044 - head/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Thu Nov 26 02:14:52 2020
New Revision: 368044
URL: https://svnweb.freebsd.org/changeset/base/368044

Log:
  Some minor FCoE bits I had lying around.

Modified:
  head/sys/dev/isp/isp.c
  head/sys/dev/isp/isp_library.c
  head/sys/dev/isp/ispmbox.h

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c	Thu Nov 26 01:59:44 2020	(r368043)
+++ head/sys/dev/isp/isp.c	Thu Nov 26 02:14:52 2020	(r368044)
@@ -3696,12 +3696,24 @@ isp_intr_async(ispsoftc_t *isp, uint16_t mbox)
 		isp_prt(isp, ISP_LOGERR, "Temperature alert (subcode 0x%x)",
 		    ISP_READ(isp, OUTMAILBOX1));
 		break;
+	case ASYNC_INTER_DRIVER_COMP:
+		isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication complete");
+		break;
+	case ASYNC_INTER_DRIVER_NOTIFY:
+		isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication notification");
+		break;
+	case ASYNC_INTER_DRIVER_TIME_EXT:
+		isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication time extended");
+		break;
 	case ASYNC_TRANSCEIVER_INSERTION:
 		isp_prt(isp, ISP_LOGDEBUG0, "Transceiver insertion (0x%x)",
 		    ISP_READ(isp, OUTMAILBOX1));
 		break;
 	case ASYNC_TRANSCEIVER_REMOVAL:
 		isp_prt(isp, ISP_LOGDEBUG0, "Transceiver removal");
+		break;
+	case ASYNC_NIC_FW_STATE_CHANGE:
+		isp_prt(isp, ISP_LOGDEBUG0, "NIC Firmware State Change");
 		break;
 	case ASYNC_AUTOLOAD_FW_COMPLETE:
 		isp_prt(isp, ISP_LOGDEBUG0, "Autoload FW init complete");

Modified: head/sys/dev/isp/isp_library.c
==============================================================================
--- head/sys/dev/isp/isp_library.c	Thu Nov 26 01:59:44 2020	(r368043)
+++ head/sys/dev/isp/isp_library.c	Thu Nov 26 02:14:52 2020	(r368044)
@@ -782,8 +782,8 @@ isp_put_icb_2400(ispsoftc_t *isp, isp_icb_2400_t *src,
 	ISP_IOXPUT_16(isp, src->icb_qos, &dst->icb_qos);
 	for (i = 0; i < 3; i++)
 		ISP_IOXPUT_16(isp, src->icb_reserved2[i], &dst->icb_reserved2[i]);
-	for (i = 0; i < 3; i++)
-		ISP_IOXPUT_16(isp, src->icb_enodemac[i], &dst->icb_enodemac[i]);
+	for (i = 0; i < 6; i++)
+		ISP_IOXPUT_8(isp, src->icb_enodemac[i], &dst->icb_enodemac[i]);
 	ISP_IOXPUT_16(isp, src->icb_disctime, &dst->icb_disctime);
 	for (i = 0; i < 4; i++)
 		ISP_IOXPUT_16(isp, src->icb_reserved3[i], &dst->icb_reserved3[i]);

Modified: head/sys/dev/isp/ispmbox.h
==============================================================================
--- head/sys/dev/isp/ispmbox.h	Thu Nov 26 01:59:44 2020	(r368043)
+++ head/sys/dev/isp/ispmbox.h	Thu Nov 26 02:14:52 2020	(r368044)
@@ -805,7 +805,7 @@ typedef struct {
 	uint32_t	icb_fwoptions3;
 	uint16_t	icb_qos;
 	uint16_t	icb_reserved2[3];
-	uint16_t	icb_enodemac[3];
+	uint8_t		icb_enodemac[6];
 	uint16_t	icb_disctime;
 	uint16_t	icb_reserved3[4];
 } isp_icb_2400_t;