diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2020-11-26 02:14:52 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2020-11-26 02:14:52 +0000 |
| commit | b05f17a12fc58914e0a5b17f90331627b600432d (patch) | |
| tree | 4e140f98c8fde18c1603c12f70ca319a42fad4aa /sys/dev/isp | |
| parent | 8cb0d414a8bc7f4114d208fefdf614cd3647086c (diff) | |
| download | src-b05f17a12fc58914e0a5b17f90331627b600432d.tar.gz src-b05f17a12fc58914e0a5b17f90331627b600432d.zip | |
Some minor FCoE bits I had lying around.
Notes
Notes:
svn path=/head/; revision=368044
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp.c | 12 | ||||
| -rw-r--r-- | sys/dev/isp/isp_library.c | 4 | ||||
| -rw-r--r-- | sys/dev/isp/ispmbox.h | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index b68b5c15486a..9fc77263186f 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3696,6 +3696,15 @@ 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)); @@ -3703,6 +3712,9 @@ isp_intr_async(ispsoftc_t *isp, uint16_t mbox) 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"); break; diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c index f6320eb7bfc2..46a344dbb27c 100644 --- a/sys/dev/isp/isp_library.c +++ b/sys/dev/isp/isp_library.c @@ -782,8 +782,8 @@ isp_put_icb_2400(ispsoftc_t *isp, isp_icb_2400_t *src, isp_icb_2400_t *dst) 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]); diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h index 1af6ba13a1fc..aec365e2560b 100644 --- a/sys/dev/isp/ispmbox.h +++ b/sys/dev/isp/ispmbox.h @@ -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; |