svn commit: r282530 - head/sys/dev/mrsas

[Kashyap D Desai]

Author: kadesai
Date: Wed May  6 10:44:08 2015
New Revision: 282530
URL: https://svnweb.freebsd.org/changeset/base/282530

Log:
  Bug fixes found internally as detailed below:
  1. While disabling interrupt the FW disables interrupts for only 16 vectors.
  In case of Invader which supports 96 MSI-x vectors, some spurious interrupts
  may come on other vectors even after interrupt disable. So, driver uses a flag
  and ignores the spurious interrupts.
  2. Reply queue depth is made double the number of commands supported by FW.
  3. Misplaced interrupt enable code is now moved down in the OCR path.
  4. Updated error handling code in OCR path.
  5. Removed un-necessary print.
  
  Reviewed by:	ambrisko
  MFC after:	2 weeks
  Sponsored by:	AVAGO Technologies

Modified:
  head/sys/dev/mrsas/mrsas.c
  head/sys/dev/mrsas/mrsas.h
  head/sys/dev/mrsas/mrsas_fp.c

Modified: head/sys/dev/mrsas/mrsas.c
==============================================================================
--- head/sys/dev/mrsas/mrsas.c	Wed May  6 10:43:19 2015	(r282529)
+++ head/sys/dev/mrsas/mrsas.c	Wed May  6 10:44:08 2015	(r282530)
@@ -274,6 +274,7 @@ mrsas_disable_intr(struct mrsas_softc *s
 	u_int32_t mask = 0xFFFFFFFF;
 	u_int32_t status;
 
+	sc->mask_interrupts=1;
 	mrsas_write_reg(sc, offsetof(mrsas_reg_set, outbound_intr_mask), mask);
 	/* Dummy read to force pci flush */
 	status = mrsas_read_reg(sc, offsetof(mrsas_reg_set, outbound_intr_mask));
@@ -285,6 +286,7 @@ mrsas_enable_intr(struct mrsas_softc *sc
 	u_int32_t mask = MFI_FUSION_ENABLE_INTERRUPT_MASK;
 	u_int32_t status;
 
+	sc->mask_interrupts=0;
 	mrsas_write_reg(sc, offsetof(mrsas_reg_set, outbound_intr_status), ~0);
 	status = mrsas_read_reg(sc, offsetof(mrsas_reg_set, outbound_intr_status));
 
@@ -1442,6 +1444,9 @@ mrsas_isr(void *arg)
 	struct mrsas_softc *sc = irq_context->sc;
 	int status = 0;
 
+	if (sc->mask_interrupts)
+		return;
+
 	if (!sc->msix_vectors) {
 		status = mrsas_clear_intr(sc);
 		if (!status)
@@ -2154,7 +2159,7 @@ mrsas_init_adapter(struct mrsas_softc *s
 	max_cmd = sc->max_fw_cmds;
 
 	/* Determine allocation size of command frames */
-	sc->reply_q_depth = ((max_cmd + 1 + 15) / 16 * 16);
+	sc->reply_q_depth = ((max_cmd + 1 + 15) / 16 * 16) * 2;
 	sc->request_alloc_sz = sizeof(MRSAS_REQUEST_DESCRIPTOR_UNION) * max_cmd;
 	sc->reply_alloc_sz = sizeof(MPI2_REPLY_DESCRIPTORS_UNION) * (sc->reply_q_depth);
 	sc->io_frames_alloc_sz = MRSAS_MPI2_RAID_DEFAULT_IO_FRAME_SIZE + (MRSAS_MPI2_RAID_DEFAULT_IO_FRAME_SIZE * (max_cmd + 1));
@@ -2807,9 +2812,6 @@ mrsas_reset_ctrl(struct mrsas_softc *sc)
 				mrsas_dprint(sc, MRSAS_OCR, "mrsas_ioc_init() failed!\n");
 				continue;
 			}
-			mrsas_clear_bit(MRSAS_FUSION_IN_RESET, &sc->reset_flags);
-			mrsas_enable_intr(sc);
-			sc->adprecovery = MRSAS_HBA_OPERATIONAL;
 
 			/* Re-fire management commands */
 			for (j = 0; j < sc->max_fw_cmds; j++) {
@@ -2842,12 +2844,17 @@ mrsas_reset_ctrl(struct mrsas_softc *sc)
 
 			if (mrsas_get_ctrl_info(sc)) {
 				mrsas_kill_hba(sc);
-				retval = -1;
+				retval = FAIL;
+				goto out;
 			}
 
 			if (!mrsas_get_map_info(sc))
 				mrsas_sync_map_info(sc);
 
+			mrsas_clear_bit(MRSAS_FUSION_IN_RESET, &sc->reset_flags);
+			mrsas_enable_intr(sc);
+			sc->adprecovery = MRSAS_HBA_OPERATIONAL;
+
 			/* Adapter reset completed successfully */
 			device_printf(sc->mrsas_dev, "Reset successful\n");
 			retval = SUCCESS;

Modified: head/sys/dev/mrsas/mrsas.h
==============================================================================
--- head/sys/dev/mrsas/mrsas.h	Wed May  6 10:43:19 2015	(r282529)
+++ head/sys/dev/mrsas/mrsas.h	Wed May  6 10:44:08 2015	(r282530)
@@ -2667,6 +2667,7 @@ struct mrsas_softc {
 	int	msix_vectors;
 	int	msix_enable;
 	uint32_t msix_reg_offset[16];
+	uint8_t mask_interrupts;
 	struct mrsas_mpt_cmd **mpt_cmd_list;
 	struct mrsas_mfi_cmd **mfi_cmd_list;
 	TAILQ_HEAD(, mrsas_mpt_cmd) mrsas_mpt_cmd_list_head;

Modified: head/sys/dev/mrsas/mrsas_fp.c
==============================================================================
--- head/sys/dev/mrsas/mrsas_fp.c	Wed May  6 10:43:19 2015	(r282529)
+++ head/sys/dev/mrsas/mrsas_fp.c	Wed May  6 10:44:08 2015	(r282530)
@@ -375,7 +375,6 @@ MR_ValidateMapInfo(struct mrsas_softc *s
 		return 1;
 	}
 	if (sc->UnevenSpanSupport) {
-		printf("Updating span set\n\n");
 		mr_update_span_set(drv_map, ldSpanInfo);
 	}
 	mrsas_update_load_balance_params(sc, drv_map, sc->load_balance_info);