Site Navigation

Date:      Mon, 6 Jun 2016 07:10:38 +0000 (UTC)
From:      Kashyap D Desai <kadesai@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r301486 - stable/10/sys/dev/mrsas
Message-ID:  <201606060710.u567Ackh002797@repo.freebsd.org>

---

next in thread | raw e-mail | index | archive | help

---

Author: kadesai
Date: Mon Jun  6 07:10:38 2016
New Revision: 301486
URL: https://svnweb.freebsd.org/changeset/base/301486

Log:
  MFC r301203
  
  r301203: Added support for Avago/Broadcom Cutlass(12 Gbps- 16 port count) controllers.
  
  Sponsored by:   AVAGO Technologies/Broadcom Limited

Modified:
  stable/10/sys/dev/mrsas/mrsas.c
  stable/10/sys/dev/mrsas/mrsas.h
  stable/10/sys/dev/mrsas/mrsas_cam.c
  stable/10/sys/dev/mrsas/mrsas_fp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mrsas/mrsas.c
==============================================================================
--- stable/10/sys/dev/mrsas/mrsas.c	Mon Jun  6 07:09:02 2016	(r301485)
+++ stable/10/sys/dev/mrsas/mrsas.c	Mon Jun  6 07:10:38 2016	(r301486)
@@ -188,6 +188,8 @@ MRSAS_CTLR_ID device_table[] = {
 	{0x1000, MRSAS_FURY, 0xffff, 0xffff, "AVAGO Fury SAS Controller"},
 	{0x1000, MRSAS_INTRUDER, 0xffff, 0xffff, "AVAGO Intruder SAS Controller"},
 	{0x1000, MRSAS_INTRUDER_24, 0xffff, 0xffff, "AVAGO Intruder_24 SAS Controller"},
+	{0x1000, MRSAS_CUTLASS_52, 0xffff, 0xffff, "AVAGO Cutlass_52 SAS Controller"},
+	{0x1000, MRSAS_CUTLASS_53, 0xffff, 0xffff, "AVAGO Cutlass_53 SAS Controller"},
 	{0, 0, 0, 0, NULL}
 };
 
@@ -1629,7 +1631,9 @@ mrsas_complete_cmd(struct mrsas_softc *s
 				if ((sc->device_id == MRSAS_INVADER) ||
 				    (sc->device_id == MRSAS_FURY) ||
 				    (sc->device_id == MRSAS_INTRUDER) ||
-				    (sc->device_id == MRSAS_INTRUDER_24))
+				    (sc->device_id == MRSAS_INTRUDER_24) ||
+				    (sc->device_id == MRSAS_CUTLASS_52) ||
+				    (sc->device_id == MRSAS_CUTLASS_53))
 					mrsas_write_reg(sc, sc->msix_reg_offset[MSIxIndex / 8],
 					    ((MSIxIndex & 0x7) << 24) |
 					    sc->last_reply_idx[MSIxIndex]);
@@ -1653,7 +1657,9 @@ mrsas_complete_cmd(struct mrsas_softc *s
 		if ((sc->device_id == MRSAS_INVADER) ||
 		    (sc->device_id == MRSAS_FURY) ||
 		    (sc->device_id == MRSAS_INTRUDER) ||
-		    (sc->device_id == MRSAS_INTRUDER_24)) {
+		    (sc->device_id == MRSAS_INTRUDER_24) ||
+		    (sc->device_id == MRSAS_CUTLASS_52) ||
+		    (sc->device_id == MRSAS_CUTLASS_53)) {
 			mrsas_write_reg(sc, sc->msix_reg_offset[MSIxIndex / 8],
 			    ((MSIxIndex & 0x7) << 24) |
 			    sc->last_reply_idx[MSIxIndex]);
@@ -2454,7 +2460,9 @@ mrsas_ioc_init(struct mrsas_softc *sc)
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24)) {
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53)) {
 		init_frame->driver_operations.
 		    mfi_capabilities.support_additional_msix = 1;
 	}
@@ -3490,7 +3498,9 @@ mrsas_build_mptmfi_passthru(struct mrsas
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24)) {
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53)) {
 		pMpi25IeeeSgeChain64_t sgl_ptr_end = (pMpi25IeeeSgeChain64_t)&io_req->SGL;
 
 		sgl_ptr_end += sc->max_sge_in_main_msg - 1;

Modified: stable/10/sys/dev/mrsas/mrsas.h
==============================================================================
--- stable/10/sys/dev/mrsas/mrsas.h	Mon Jun  6 07:09:02 2016	(r301485)
+++ stable/10/sys/dev/mrsas/mrsas.h	Mon Jun  6 07:10:38 2016	(r301486)
@@ -82,6 +82,8 @@ __FBSDID("$FreeBSD$");
 #define	MRSAS_FURY			0x005f
 #define	MRSAS_INTRUDER		0x00ce
 #define	MRSAS_INTRUDER_24	0x00cf
+#define	MRSAS_CUTLASS_52	0x0052
+#define	MRSAS_CUTLASS_53	0x0053
 #define	MRSAS_PCI_BAR0		0x10
 #define	MRSAS_PCI_BAR1		0x14
 #define	MRSAS_PCI_BAR2		0x1C

Modified: stable/10/sys/dev/mrsas/mrsas_cam.c
==============================================================================
--- stable/10/sys/dev/mrsas/mrsas_cam.c	Mon Jun  6 07:09:02 2016	(r301485)
+++ stable/10/sys/dev/mrsas/mrsas_cam.c	Mon Jun  6 07:10:38 2016	(r301486)
@@ -880,7 +880,9 @@ mrsas_setup_io(struct mrsas_softc *sc, s
 		if ((sc->device_id == MRSAS_INVADER) ||
 		    (sc->device_id == MRSAS_FURY) ||
 		    (sc->device_id == MRSAS_INTRUDER) ||
-		    (sc->device_id == MRSAS_INTRUDER_24)) {
+		    (sc->device_id == MRSAS_INTRUDER_24) ||
+		    (sc->device_id == MRSAS_CUTLASS_52) ||
+		    (sc->device_id == MRSAS_CUTLASS_53)) {
 			if (io_request->RaidContext.regLockFlags == REGION_TYPE_UNUSED)
 				cmd->request_desc->SCSIIO.RequestFlags =
 				    (MRSAS_REQ_DESCRIPT_FLAGS_NO_LOCK <<
@@ -912,7 +914,9 @@ mrsas_setup_io(struct mrsas_softc *sc, s
 		if ((sc->device_id == MRSAS_INVADER) ||
 		    (sc->device_id == MRSAS_FURY) ||
 		    (sc->device_id == MRSAS_INTRUDER) ||
-		    (sc->device_id == MRSAS_INTRUDER_24)) {
+		    (sc->device_id == MRSAS_INTRUDER_24) ||
+		    (sc->device_id == MRSAS_CUTLASS_52) ||
+		    (sc->device_id == MRSAS_CUTLASS_53)) {
 			if (io_request->RaidContext.regLockFlags == REGION_TYPE_UNUSED)
 				cmd->request_desc->SCSIIO.RequestFlags =
 				    (MRSAS_REQ_DESCRIPT_FLAGS_NO_LOCK <<
@@ -1191,7 +1195,9 @@ mrsas_data_load_cb(void *arg, bus_dma_se
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24)) {
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53)) {
 		pMpi25IeeeSgeChain64_t sgl_ptr_end = sgl_ptr;
 
 		sgl_ptr_end += sc->max_sge_in_main_msg - 1;
@@ -1205,7 +1211,9 @@ mrsas_data_load_cb(void *arg, bus_dma_se
 			if ((sc->device_id == MRSAS_INVADER) ||
 			    (sc->device_id == MRSAS_FURY) ||
 			    (sc->device_id == MRSAS_INTRUDER) ||
-			    (sc->device_id == MRSAS_INTRUDER_24)) {
+			    (sc->device_id == MRSAS_INTRUDER_24) ||
+			    (sc->device_id == MRSAS_CUTLASS_52) ||
+			    (sc->device_id == MRSAS_CUTLASS_53)) {
 				if (i == nseg - 1)
 					sgl_ptr->Flags = IEEE_SGE_FLAGS_END_OF_LIST;
 			}
@@ -1218,7 +1226,9 @@ mrsas_data_load_cb(void *arg, bus_dma_se
 				if ((sc->device_id == MRSAS_INVADER) ||
 				    (sc->device_id == MRSAS_FURY) ||
 				    (sc->device_id == MRSAS_INTRUDER) ||
-				    (sc->device_id == MRSAS_INTRUDER_24)) {
+				    (sc->device_id == MRSAS_INTRUDER_24) ||
+				    (sc->device_id == MRSAS_CUTLASS_52) ||
+				    (sc->device_id == MRSAS_CUTLASS_53)) {
 					if ((cmd->io_request->IoFlags & MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH)
 					    != MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH)
 						cmd->io_request->ChainOffset = sc->chain_offset_io_request;
@@ -1230,7 +1240,9 @@ mrsas_data_load_cb(void *arg, bus_dma_se
 				if ((sc->device_id == MRSAS_INVADER) ||
 				    (sc->device_id == MRSAS_FURY) ||
 				    (sc->device_id == MRSAS_INTRUDER) ||
-				    (sc->device_id == MRSAS_INTRUDER_24))
+				    (sc->device_id == MRSAS_INTRUDER_24) ||
+				    (sc->device_id == MRSAS_CUTLASS_52) ||
+				    (sc->device_id == MRSAS_CUTLASS_53))
 					sg_chain->Flags = IEEE_SGE_FLAGS_CHAIN_ELEMENT;
 				else
 					sg_chain->Flags = (IEEE_SGE_FLAGS_CHAIN_ELEMENT | MPI2_IEEE_SGE_FLAGS_IOCPLBNTA_ADDR);

Modified: stable/10/sys/dev/mrsas/mrsas_fp.c
==============================================================================
--- stable/10/sys/dev/mrsas/mrsas_fp.c	Mon Jun  6 07:09:02 2016	(r301485)
+++ stable/10/sys/dev/mrsas/mrsas_fp.c	Mon Jun  6 07:10:38 2016	(r301486)
@@ -752,7 +752,9 @@ mr_spanset_get_phy_params(struct mrsas_s
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24))
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53))
 		do_invader = 1;
 
 	/* Get row and span from io_info for Uneven Span IO. */
@@ -966,7 +968,9 @@ MR_BuildRaidContext(struct mrsas_softc *
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24))
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53))
 		pRAID_Context->regLockFlags = (isRead) ? raid->regTypeReqOnRead : raid->regTypeReqOnWrite;
 	else
 		pRAID_Context->regLockFlags = (isRead) ? REGION_TYPE_SHARED_READ : raid->regTypeReqOnWrite;
@@ -1454,7 +1458,9 @@ MR_GetPhyParams(struct mrsas_softc *sc, 
 	if ((sc->device_id == MRSAS_INVADER) ||
 	    (sc->device_id == MRSAS_FURY) ||
 	    (sc->device_id == MRSAS_INTRUDER) ||
-	    (sc->device_id == MRSAS_INTRUDER_24))
+	    (sc->device_id == MRSAS_INTRUDER_24) ||
+	    (sc->device_id == MRSAS_CUTLASS_52) ||
+	    (sc->device_id == MRSAS_CUTLASS_53))
 		do_invader = 1;
 
 	row = mega_div64_32(stripRow, raid->rowDataSize);

---

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606060710.u567Ackh002797>

Legal Notices | © 1995-2025 The FreeBSD Project. All rights reserved.

Contact