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

[Alexander Motin]

Author: mav
Date: Thu Dec  3 22:55:40 2015
New Revision: 291727
URL: https://svnweb.freebsd.org/changeset/base/291727

Log:
  Enable interrupt handshake for 16Gig chips.
  
  We don't support MSI-X so far, so it is always required.

Modified:
  head/sys/dev/isp/isp.c

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c	Thu Dec  3 22:40:42 2015	(r291726)
+++ head/sys/dev/isp/isp.c	Thu Dec  3 22:55:40 2015	(r291727)
@@ -2131,6 +2131,12 @@ isp_fibre_init_2400(ispsoftc_t *isp)
 		break;
 	}
 
+	if (IS_26XX(isp)) {
+		/* We don't support MSI-X yet, so set this unconditionally. */
+		icbp->icb_fwoptions2 |= ICB2400_OPT2_ENA_IHR;
+		icbp->icb_fwoptions2 |= ICB2400_OPT2_ENA_IHA;
+	}
+
 	if ((icbp->icb_fwoptions3 & ICB2400_OPT3_RSPSZ_MASK) == 0) {
 		icbp->icb_fwoptions3 |= ICB2400_OPT3_RSPSZ_24;
 	}
@@ -7613,6 +7619,8 @@ isp_setdfltfcparm(ispsoftc_t *isp, int c
 	fcp->isp_wwnn_nvram = DEFAULT_NODEWWN(isp, chan);
 	fcp->isp_wwpn_nvram = DEFAULT_PORTWWN(isp, chan);
 	fcp->isp_fwoptions = 0;
+	fcp->isp_xfwoptions = 0;
+	fcp->isp_zfwoptions = 0;
 	fcp->isp_lasthdl = NIL_HANDLE;
 
 	if (IS_24XX(isp)) {