2 files changed, 506 insertions, 236 deletions

diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 9dd3142d1933..ea37da30db93 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -88,6 +88,8 @@
 ** 1.50.00.03   05/04/2021  Ching Huang     Fixed doorbell status arrived late on ARC-1886
 ** 1.50.00.04   12/08/2021  Ching Huang     Fixed boot up hung under ARC-1886 with no volume created
 ** 1.50.00.05   03/23/2023  Ching Huang     Fixed reading buffer empty length error
+** 1.50.00.06   08/07/2023  Ching Huang     Add support adapter using system memory as XOR buffer,
+**                                          Add support device ID 1883,1886
 ******************************************************************************************
 */
 
@@ -143,7 +145,7 @@
 
 #define arcmsr_callout_init(a)	callout_init(a, /*mpsafe*/1);
 
-#define ARCMSR_DRIVER_VERSION	"arcmsr version 1.50.00.05 2023-03-23"
+#define ARCMSR_DRIVER_VERSION	"arcmsr version 1.50.00.06 2023-08-07"
 #include <dev/arcmsr/arcmsr.h>
 /*
 **************************************************************************
@@ -1071,7 +1073,7 @@ static void arcmsr_build_srb(struct CommandControlBlock *srb,
 */ 
 static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandControlBlock *srb)
 {
-	u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr_low;
+	u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr;
 	struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&srb->arcmsr_cdb;
 
 	bus_dmamap_sync(acb->srb_dmat, acb->srb_dmamap, (srb->srb_flags & SRB_FLAG_WRITE) ? BUS_DMASYNC_POSTWRITE:BUS_DMASYNC_POSTREAD);
@@ -1131,10 +1133,10 @@ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandContr
 			ARCMSR_LOCK_ACQUIRE(&acb->postDone_lock);
 			postq_index = phbdmu->postq_index;
 			pinbound_srb = (struct InBound_SRB *)&phbdmu->post_qbuffer[postq_index & 0xFF];
-			pinbound_srb->addressHigh = srb->cdb_phyaddr_high;
-			pinbound_srb->addressLow = srb->cdb_phyaddr_low;
+			pinbound_srb->addressHigh = (u_int32_t)((srb->cdb_phyaddr >> 16) >> 16);
+			pinbound_srb->addressLow = (u_int32_t)srb->cdb_phyaddr;
 			pinbound_srb->length = srb->arc_cdb_size >> 2;
-			arcmsr_cdb->Context = srb->cdb_phyaddr_low;
+			arcmsr_cdb->Context = (u_int32_t)srb->cdb_phyaddr;
 			if (postq_index & 0x4000) {
 				index_stripped = postq_index & 0xFF;
 				index_stripped += 1;
@@ -1742,7 +1744,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 		devicemap = offsetof(struct HBA_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]);
 		for (target = 0; target < 4; target++) 
 		{
-			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0],  devicemap);
+			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap);
 			devicemap += 4;
 		}
 		break;
@@ -1751,7 +1753,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 		devicemap = offsetof(struct HBB_RWBUFFER, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]);
 		for (target = 0; target < 4; target++) 
 		{
-			deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1],  devicemap);
+			deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap);
 			devicemap += 4;
 		}
 		break;
@@ -1760,7 +1762,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 		devicemap = offsetof(struct HBC_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]);
 		for (target = 0; target < 4; target++) 
 		{
-			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0],  devicemap);
+			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap);
 			devicemap += 4;
 		}
 		break;
@@ -1768,7 +1770,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 		devicemap = offsetof(struct HBD_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]);
 		for (target = 0; target < 4; target++) 
 		{
-			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0],  devicemap);
+			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap);
 			devicemap += 4;
 		}
 		break;
@@ -1776,7 +1778,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 		devicemap = offsetof(struct HBE_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]);
 		for (target = 0; target < 4; target++) 
 		{
-			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0],  devicemap);
+			deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap);
 			devicemap += 4;
 		}
 		break;
@@ -1813,14 +1815,15 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) {
 				{
 					if(acb->device_map[target] & bit_check)
 					{/* unit departed */
-						printf("arcmsr_dr_handle: Target=%x, lun=%x, GONE!!!\n",target,lun);
+						if (target != 0x0f)
+							printf("arcmsr_dr_handle: Target=0x%x, lun=%x, GONE!!!\n",target,lun);
 						arcmsr_abort_dr_ccbs(acb, target, lun);
 						arcmsr_rescan_lun(acb, target, lun);
 						acb->devstate[target][lun] = ARECA_RAID_GONE;
 					}
 					else
 					{/* unit arrived */
-						printf("arcmsr_dr_handle: Target=%x, lun=%x, Plug-IN!!!\n",target,lun);
+						printf("arcmsr_dr_handle: Target=0x%x, lun=%x, Plug-IN!!!\n",target,lun);
 						arcmsr_rescan_lun(acb, target, lun);
 						acb->devstate[target][lun] = ARECA_RAID_GOOD;
 					}
@@ -3170,7 +3173,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
 				return;
 			}
 
-			if(target == 16) {
+			if(target == ARCMSR_VIRTUAL_DEVICE_ID) {
 				/* virtual device for iop message transfer */
 				arcmsr_handle_virtual_command(acb, pccb);
 				return;
@@ -3216,7 +3219,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
 			else
 				cpi->base_transfer_speed = 300000;
 			if((acb->vendor_device_id == PCIDevVenIDARC1880) ||
+			   (acb->vendor_device_id == PCIDevVenIDARC1883) ||
 			   (acb->vendor_device_id == PCIDevVenIDARC1884) ||
+			   (acb->vendor_device_id == PCIDevVenIDARC1886) ||
 			   (acb->vendor_device_id == PCIDevVenIDARC1680) ||
 			   (acb->vendor_device_id == PCIDevVenIDARC1214))
 			{
@@ -3282,7 +3287,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
 	case XPT_GET_TRAN_SETTINGS: {
 			struct ccb_trans_settings *cts;
 
-			if(pccb->ccb_h.target_id == 16) {
+			if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) {
 				pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL;
 				xpt_done(pccb);
 				break;
@@ -3299,7 +3304,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
 				cts->protocol = PROTO_SCSI;
 
 				if((acb->vendor_device_id == PCIDevVenIDARC1880) ||
+				   (acb->vendor_device_id == PCIDevVenIDARC1883) ||
 				   (acb->vendor_device_id == PCIDevVenIDARC1884) ||
+				   (acb->vendor_device_id == PCIDevVenIDARC1886) ||
 				   (acb->vendor_device_id == PCIDevVenIDARC1680) ||
 				   (acb->vendor_device_id == PCIDevVenIDARC1214))
 				{
@@ -3344,7 +3351,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
 			break;
 		}
 	case XPT_CALC_GEOMETRY:
-			if(pccb->ccb_h.target_id == 16) {
+			if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) {
 				pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL;
 				xpt_done(pccb);
 				break;
@@ -4047,6 +4054,7 @@ static void arcmsr_get_hbf_config(struct AdapterControlBlock *acb)
 	acb->firm_sdram_size	= acb->msgcode_rwbuffer[3];	/*firm_sdram_size,    3, 12-15*/
 	acb->firm_ide_channels	= acb->msgcode_rwbuffer[4];	/*firm_ide_channels,  4, 16-19*/
 	acb->firm_cfg_version	= acb->msgcode_rwbuffer[ARCMSR_FW_CFGVER_OFFSET]; /*firm_cfg_version,  25*/
+	acb->firm_PicStatus	= acb->msgcode_rwbuffer[ARCMSR_FW_PICSTATUS]; /* firm_PicStatus, 30 */
 	if(acb->firm_numbers_queue > ARCMSR_MAX_OUTSTANDING_CMD)
 		acb->maxOutstanding = ARCMSR_MAX_OUTSTANDING_CMD - 1;
 	else
@@ -4340,6 +4348,12 @@ static u_int32_t arcmsr_iop_confirm(struct AdapterControlBlock *acb)
 			acb->msgcode_rwbuffer[5] = cdb_phyaddr_lo32;
 			acb->msgcode_rwbuffer[6] = srb_phyaddr_hi32;
 			acb->msgcode_rwbuffer[7] = COMPLETION_Q_POOL_SIZE;
+			if (acb->xor_mega) {
+				acb->msgcode_rwbuffer[8] = 0x555AA;	//FreeBSD init 2
+				acb->msgcode_rwbuffer[9] = 0;
+				acb->msgcode_rwbuffer[10] = (uint32_t)acb->xor_sgtable_phy;
+				acb->msgcode_rwbuffer[11] = (uint32_t)((acb->xor_sgtable_phy >> 16) >> 16);
+			}
 			CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_SET_CONFIG);
 			acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE;
 			CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, acb->out_doorbell);
@@ -4414,20 +4428,48 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in
 		if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == ACB_ADAPTER_TYPE_D)
 			 || (acb->adapter_type == ACB_ADAPTER_TYPE_E) || (acb->adapter_type == ACB_ADAPTER_TYPE_F))
 		{
-			srb_tmp->cdb_phyaddr_low = srb_phyaddr;
-			srb_tmp->cdb_phyaddr_high = (u_int32_t)((srb_phyaddr >> 16) >> 16);
+			srb_tmp->cdb_phyaddr = srb_phyaddr;
 		}
 		else
-			srb_tmp->cdb_phyaddr_low = srb_phyaddr >> 5;
+			srb_tmp->cdb_phyaddr = srb_phyaddr >> 5;
 		srb_tmp->acb = acb;
 		srb_tmp->smid = i << 16;
 		acb->srbworkingQ[i] = acb->psrb_pool[i] = srb_tmp;
 		srb_phyaddr = srb_phyaddr + SRB_SIZE;
 		srb_tmp = (struct CommandControlBlock *)((unsigned long)srb_tmp + SRB_SIZE);
 	}
-	if (acb->adapter_type == ACB_ADAPTER_TYPE_E)
+	srb_tmp = (struct CommandControlBlock *)(acb->uncacheptr + ARCMSR_SRBS_POOL_SIZE);
+	srb_phyaddr = (unsigned long)segs->ds_addr + ARCMSR_SRBS_POOL_SIZE;
+	switch (acb->adapter_type) {
+	case ACB_ADAPTER_TYPE_B: {
+		struct HBB_MessageUnit *phbbmu;
+
+		acb->pmu = (struct MessageUnit_UNION *)srb_tmp;
+		phbbmu = (struct HBB_MessageUnit *)acb->pmu;
+		phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)acb->mem_base0;
+		phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)acb->mem_base1;
+		if (acb->vendor_device_id == PCIDevVenIDARC1203) {
+			phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell);
+			phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask);
+			phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell);
+			phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask);
+		} else {
+			phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell);
+			phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask);
+			phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell);
+			phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask);
+		}
+		}
+		break;
+	case ACB_ADAPTER_TYPE_D:
+		acb->pmu = (struct MessageUnit_UNION *)srb_tmp;
+		acb->pmu->muu.hbdmu.phbdmu = (struct HBD_MessageUnit *)acb->mem_base0;
+		break;
+	case ACB_ADAPTER_TYPE_E:
 		acb->pCompletionQ = (pCompletion_Q)srb_tmp;
-	else if (acb->adapter_type == ACB_ADAPTER_TYPE_F) {
+		break;
+	case ACB_ADAPTER_TYPE_F: {
+		unsigned long	host_buffer_dma;
 		acb->pCompletionQ = (pCompletion_Q)srb_tmp;
 		acb->completeQ_phys = srb_phyaddr;
 		memset(acb->pCompletionQ, 0xff, COMPLETION_Q_POOL_SIZE);
@@ -4435,9 +4477,62 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in
 		acb->message_rbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x100);
 		acb->msgcode_rwbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x200);
 		memset((void *)acb->message_wbuffer, 0, MESG_RW_BUFFER_SIZE);
+		arcmsr_wait_firmware_ready(acb);
+		host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE;
+		CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1));  /* host buffer low addr, bit0:1 all buffer active */
+		CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */
+		CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1);       /* set host buffer physical address */
+		acb->firm_PicStatus = CHIP_REG_READ32(HBF_MessageUnit, 0, outbound_msgaddr1);	/* get firmware spec info */
+		break;
+		}
 	}
 	acb->vir2phy_offset = (unsigned long)srb_tmp - (unsigned long)srb_phyaddr;
 }
+
+static void arcmsr_map_xor_sgtable(void *arg, bus_dma_segment_t *segs, int nseg, int error)
+{
+	struct AdapterControlBlock *acb = arg;
+
+	acb->xor_sgtable_phy = (unsigned long)segs->ds_addr;
+	if ((nseg != 1) || ((u_int32_t)segs->ds_len != acb->init2cfg_size)) {
+		acb->acb_flags |= ACB_F_MAPXOR_FAILD;
+		printf("arcmsr%d: alloc xor table seg num or size not as i wish!\n", acb->pci_unit);
+		return;
+	}
+}
+
+static void arcmsr_map_xor_sg(void *arg, bus_dma_segment_t *segs, int nseg, int error)
+{
+	struct AdapterControlBlock *acb = arg;
+	int	i;
+	struct HostRamBuf *pRamBuf;
+	struct XorSg *pxortable = (struct XorSg *)(acb->xortable + sizeof(struct HostRamBuf));
+
+	if (nseg != acb->xor_mega) {
+		acb->acb_flags |= ACB_F_MAPXOR_FAILD;
+		printf("arcmsr%d: alloc xor seg NUM not as i wish!\n", acb->pci_unit);
+		return;
+	}
+	for (i = 0; i < nseg; i++) {
+		if ((u_int32_t)segs->ds_len != ARCMSR_XOR_SEG_SIZE) {
+			acb->acb_flags |= ACB_F_MAPXOR_FAILD;
+			printf("arcmsr%d: alloc xor seg SIZE not as i wish!\n", acb->pci_unit);
+			return;
+		}
+		pxortable->xorPhys = (u_int64_t)segs->ds_addr;
+		pxortable->xorBufLen = (u_int64_t)segs->ds_len;
+		pxortable++;
+		segs++;
+	}
+	pRamBuf = (struct HostRamBuf *)acb->xortable;
+	pRamBuf->hrbSignature = 0x53425248;	//HRBS
+	pRamBuf->hrbSize = ARCMSR_XOR_SEG_SIZE * nseg;
+	pRamBuf->hrbRes[0] = 0;
+	pRamBuf->hrbRes[1] = 0;
+	bus_dmamap_sync(acb->xortable_dmat, acb->xortable_dmamap, BUS_DMASYNC_PREREAD);
+	bus_dmamap_sync(acb->xor_dmat, acb->xor_dmamap, BUS_DMASYNC_PREWRITE);
+}
+
 /*
 ************************************************************************
 ************************************************************************
@@ -4448,11 +4543,55 @@ static void arcmsr_free_resource(struct AdapterControlBlock *acb)
 	if(acb->ioctl_dev != NULL) {
 		destroy_dev(acb->ioctl_dev);
 	}
-	bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap);
-	bus_dmamap_destroy(acb->srb_dmat, acb->srb_dmamap);
-	bus_dma_tag_destroy(acb->srb_dmat);
-	bus_dma_tag_destroy(acb->dm_segs_dmat);
-	bus_dma_tag_destroy(acb->parent_dmat);
+	if (acb->acb_flags & ACB_F_DMAMAP_SG)
+		bus_dmamap_unload(acb->xor_dmat, acb->xor_dmamap);
+	if (acb->xor_dmamap) {
+		bus_dmamem_free(acb->xor_dmat, acb->xorptr, acb->xor_dmamap);
+	}
+	if (acb->acb_flags & ACB_F_DMAMAP_SGTABLE)
+		bus_dmamap_unload(acb->xortable_dmat, acb->xortable_dmamap);
+	if (acb->xortable_dmamap) {
+		bus_dmamem_free(acb->xortable_dmat, acb->xortable, acb->xortable_dmamap);
+	}
+	if (acb->acb_flags & ACB_F_DMAMAP_SRB)
+		bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap);
+	if (acb->srb_dmamap) {
+		bus_dmamem_free(acb->srb_dmat, acb->uncacheptr, acb->srb_dmamap);
+	}
+	if (acb->srb_dmat)
+		bus_dma_tag_destroy(acb->srb_dmat);
+	if (acb->dm_segs_dmat)
+		bus_dma_tag_destroy(acb->dm_segs_dmat);
+	if (acb->parent_dmat)
+		bus_dma_tag_destroy(acb->parent_dmat);
+	switch(acb->adapter_type) {
+		case ACB_ADAPTER_TYPE_A:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]);
+			break;
+		case ACB_ADAPTER_TYPE_B:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]);
+			if (acb->sys_res_arcmsr[1])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(2), acb->sys_res_arcmsr[1]);
+			break;
+		case ACB_ADAPTER_TYPE_C:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]);
+			break;
+		case ACB_ADAPTER_TYPE_D:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]);
+			break;
+		case ACB_ADAPTER_TYPE_E:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]);
+			break;
+		case ACB_ADAPTER_TYPE_F:
+			if (acb->sys_res_arcmsr[0])
+				bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]);
+			break;
+	}
 }
 /*
 ************************************************************************
@@ -4480,21 +4619,16 @@ static void arcmsr_mutex_destroy(struct AdapterControlBlock *acb)
 ************************************************************************
 ************************************************************************
 */
-static u_int32_t arcmsr_initialize(device_t dev)
+static int arcmsr_define_adapter_type(struct AdapterControlBlock *acb)
 {
-	struct AdapterControlBlock *acb = device_get_softc(dev);
-	u_int16_t pci_command;
-	int i, j,max_coherent_size;
-	u_int32_t vendor_dev_id;
+	int rc = 0;
 
-	vendor_dev_id = pci_get_devid(dev);
-	acb->vendor_device_id = vendor_dev_id;
-	acb->sub_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2);
-	switch (vendor_dev_id) {
-	case PCIDevVenIDARC1880:
-	case PCIDevVenIDARC1882:
-	case PCIDevVenIDARC1213:
-	case PCIDevVenIDARC1223: {
+	switch (acb->vendor_device_id) {
+		case PCIDevVenIDARC1880:
+		case PCIDevVenIDARC1882:
+		case PCIDevVenIDARC1883:
+		case PCIDevVenIDARC1213:
+		case PCIDevVenIDARC1223: {
 			acb->adapter_type = ACB_ADAPTER_TYPE_C;
 			if ((acb->sub_device_id == ARECA_SUB_DEV_ID_1883) ||
 			    (acb->sub_device_id == ARECA_SUB_DEV_ID_1216) ||
@@ -4502,158 +4636,78 @@ static u_int32_t arcmsr_initialize(device_t dev)
 				acb->adapter_bus_speed = ACB_BUS_SPEED_12G;
 			else
 				acb->adapter_bus_speed = ACB_BUS_SPEED_6G;
-			max_coherent_size = ARCMSR_SRBS_POOL_SIZE;
-		}
-		break;
-	case PCIDevVenIDARC1884:
-		acb->adapter_type = ACB_ADAPTER_TYPE_E;
-		acb->adapter_bus_speed = ACB_BUS_SPEED_12G;
-		max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE;
-		acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ);
-		break;
-	case PCIDevVenIDARC1886_:
-	case PCIDevVenIDARC1886:
-		acb->adapter_type = ACB_ADAPTER_TYPE_F;
-		acb->adapter_bus_speed = ACB_BUS_SPEED_12G;
-		max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE;
-		acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ);
-		break;
-	case PCIDevVenIDARC1214: {
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE;
+			}
+			break;
+		case PCIDevVenIDARC1884:
+			acb->adapter_type = ACB_ADAPTER_TYPE_E;
+			acb->adapter_bus_speed = ACB_BUS_SPEED_12G;
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE;
+			acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ);
+			break;
+		case PCIDevVenIDARC1886_0:
+		case PCIDevVenIDARC1886_:
+		case PCIDevVenIDARC1886:
+			acb->adapter_type = ACB_ADAPTER_TYPE_F;
+			acb->adapter_bus_speed = ACB_BUS_SPEED_12G;
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE;
+			acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ);
+			break;
+		case PCIDevVenIDARC1214:
+		case PCIDevVenIDARC1224: {
 			acb->adapter_type = ACB_ADAPTER_TYPE_D;
 			acb->adapter_bus_speed = ACB_BUS_SPEED_6G;
-			max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0));
-		}
-		break;
-	case PCIDevVenIDARC1200:
-	case PCIDevVenIDARC1201: {
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0));
+			}
+			break;
+		case PCIDevVenIDARC1200:
+		case PCIDevVenIDARC1201: {
 			acb->adapter_type = ACB_ADAPTER_TYPE_B;
 			acb->adapter_bus_speed = ACB_BUS_SPEED_3G;
-			max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit));
-		}
-		break;
-	case PCIDevVenIDARC1203: {
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit));
+			}
+			break;
+		case PCIDevVenIDARC1203: {
 			acb->adapter_type = ACB_ADAPTER_TYPE_B;
 			acb->adapter_bus_speed = ACB_BUS_SPEED_6G;
-			max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit));
-		}
-		break;
-	case PCIDevVenIDARC1110:
-	case PCIDevVenIDARC1120:
-	case PCIDevVenIDARC1130:
-	case PCIDevVenIDARC1160:
-	case PCIDevVenIDARC1170:
-	case PCIDevVenIDARC1210:
-	case PCIDevVenIDARC1220:
-	case PCIDevVenIDARC1230:
-	case PCIDevVenIDARC1231:
-	case PCIDevVenIDARC1260:
-	case PCIDevVenIDARC1261:
-	case PCIDevVenIDARC1270:
-	case PCIDevVenIDARC1280:
-	case PCIDevVenIDARC1212:
-	case PCIDevVenIDARC1222:
-	case PCIDevVenIDARC1380:
-	case PCIDevVenIDARC1381:
-	case PCIDevVenIDARC1680:
-	case PCIDevVenIDARC1681: {
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit));
+			}
+			break;
+		case PCIDevVenIDARC1110:
+		case PCIDevVenIDARC1120:
+		case PCIDevVenIDARC1130:
+		case PCIDevVenIDARC1160:
+		case PCIDevVenIDARC1170:
+		case PCIDevVenIDARC1210:
+		case PCIDevVenIDARC1220:
+		case PCIDevVenIDARC1230:
+		case PCIDevVenIDARC1231:
+		case PCIDevVenIDARC1260:
+		case PCIDevVenIDARC1261:
+		case PCIDevVenIDARC1270:
+		case PCIDevVenIDARC1280:
+		case PCIDevVenIDARC1212:
+		case PCIDevVenIDARC1222:
+		case PCIDevVenIDARC1380:
+		case PCIDevVenIDARC1381:
+		case PCIDevVenIDARC1680:
+		case PCIDevVenIDARC1681: {
 			acb->adapter_type = ACB_ADAPTER_TYPE_A;
 			acb->adapter_bus_speed = ACB_BUS_SPEED_3G;
-			max_coherent_size = ARCMSR_SRBS_POOL_SIZE;
-		}
-		break;
-	default: {
+			acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE;
+			}
+			break;
+		default: {
 			printf("arcmsr%d:"
-			" unknown RAID adapter type \n", device_get_unit(dev));
-			return ENOMEM;
+			" unknown RAID adapter type \n", acb->pci_unit);
+			rc = ENOMEM;
 		}
 	}
-	if(bus_dma_tag_create(  /*PCI parent*/		bus_get_dma_tag(dev),
-				/*alignemnt*/		1,
-				/*boundary*/		0,
-				/*lowaddr*/		BUS_SPACE_MAXADDR,
-				/*highaddr*/		BUS_SPACE_MAXADDR,
-				/*filter*/		NULL,
-				/*filterarg*/		NULL,
-				/*maxsize*/		BUS_SPACE_MAXSIZE_32BIT,
-				/*nsegments*/		BUS_SPACE_UNRESTRICTED,
-				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
-				/*flags*/		0,
-				/*lockfunc*/		NULL,
-				/*lockarg*/		NULL,
-							&acb->parent_dmat) != 0)
-	{
-		printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", device_get_unit(dev));
-		return ENOMEM;
-	}
-
-	/* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */
-	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
-				/*alignment*/		1,
-				/*boundary*/		0,
-#ifdef PAE
-				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
-#else
-				/*lowaddr*/		BUS_SPACE_MAXADDR,
-#endif
-				/*highaddr*/		BUS_SPACE_MAXADDR,
-				/*filter*/		NULL,
-				/*filterarg*/		NULL,
-				/*maxsize*/		ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM,
-				/*nsegments*/		ARCMSR_MAX_SG_ENTRIES,
-				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
-				/*flags*/		0,
-				/*lockfunc*/		busdma_lock_mutex,
-				/*lockarg*/		&acb->isr_lock,
-							&acb->dm_segs_dmat) != 0)
-	{
-		bus_dma_tag_destroy(acb->parent_dmat);
-		printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", device_get_unit(dev));
-		return ENOMEM;
-	}
+	return rc;
+}
 
-	/* DMA tag for our srb structures.... Allocate the freesrb memory */
-	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
-				/*alignment*/		0x20,
-				/*boundary*/		0,
-				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
-				/*highaddr*/		BUS_SPACE_MAXADDR,
-				/*filter*/		NULL,
-				/*filterarg*/		NULL,
-				/*maxsize*/		max_coherent_size,
-				/*nsegments*/		1,
-				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
-				/*flags*/		0,
-				/*lockfunc*/		NULL,
-				/*lockarg*/		NULL,
-							&acb->srb_dmat) != 0)
-	{
-		bus_dma_tag_destroy(acb->dm_segs_dmat);
-		bus_dma_tag_destroy(acb->parent_dmat);
-		printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", device_get_unit(dev));
-		return ENXIO;
-	}
-	/* Allocation for our srbs */
-	if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) {
-		bus_dma_tag_destroy(acb->srb_dmat);
-		bus_dma_tag_destroy(acb->dm_segs_dmat);
-		bus_dma_tag_destroy(acb->parent_dmat);
-		printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", device_get_unit(dev));
-		return ENXIO;
-	}
-	/* And permanently map them */
-	if(bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0)) {
-		bus_dma_tag_destroy(acb->srb_dmat);
-		bus_dma_tag_destroy(acb->dm_segs_dmat);
-		bus_dma_tag_destroy(acb->parent_dmat);
-		printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", device_get_unit(dev));
-		return ENXIO;
-	}
-	pci_command = pci_read_config(dev, PCIR_COMMAND, 2);
-	pci_command |= PCIM_CMD_BUSMASTEREN;
-	pci_command |= PCIM_CMD_PERRESPEN;
-	pci_command |= PCIM_CMD_MWRICEN;
-	/* Enable Busmaster */
-	pci_write_config(dev, PCIR_COMMAND, pci_command, 2);
+static int arcmsr_map_pcireg(device_t dev, struct AdapterControlBlock *acb)
+{
 	switch(acb->adapter_type) {
 	case ACB_ADAPTER_TYPE_A: {
 		u_int32_t rid0 = PCIR_BAR(0);
@@ -4662,18 +4716,18 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE);
 		if(acb->sys_res_arcmsr[0] == NULL) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit);
 			return ENOMEM;
 		}
 		if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]);
 		if(mem_base0 == 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]);
@@ -4683,47 +4737,33 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		}
 		break;
 	case ACB_ADAPTER_TYPE_B: {
-		struct HBB_MessageUnit *phbbmu;
-		struct CommandControlBlock *freesrb;
 		u_int32_t rid[]={ PCIR_BAR(0), PCIR_BAR(2) };
 		vm_offset_t	mem_base[]={0,0};
+		u_int16_t i;
+
 		for(i=0; i < 2; i++) {
 			acb->sys_res_arcmsr[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid[i], RF_ACTIVE);
 			if(acb->sys_res_arcmsr[i] == NULL) {
 				arcmsr_free_resource(acb);
-				printf("arcmsr%d: bus_alloc_resource %d failure!\n", device_get_unit(dev), i);
+				printf("arcmsr%d: bus_alloc_resource %d failure!\n", acb->pci_unit, i);
 				return ENOMEM;
 			}
 			if(rman_get_start(acb->sys_res_arcmsr[i]) <= 0) {
 				arcmsr_free_resource(acb);
-				printf("arcmsr%d: rman_get_start %d failure!\n", device_get_unit(dev), i);
+				printf("arcmsr%d: rman_get_start %d failure!\n", acb->pci_unit, i);
 				return ENXIO;
 			}
 			mem_base[i] = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[i]);
 			if(mem_base[i] == 0) {
 				arcmsr_free_resource(acb);
-				printf("arcmsr%d: rman_get_virtual %d failure!\n", device_get_unit(dev), i);
+				printf("arcmsr%d: rman_get_virtual %d failure!\n", acb->pci_unit, i);
 				return ENXIO;
 			}
 			acb->btag[i] = rman_get_bustag(acb->sys_res_arcmsr[i]);
 			acb->bhandle[i] = rman_get_bushandle(acb->sys_res_arcmsr[i]);
 		}
-		freesrb = (struct CommandControlBlock *)acb->uncacheptr;
-		acb->pmu = (struct MessageUnit_UNION *)((unsigned long)freesrb+ARCMSR_SRBS_POOL_SIZE);
-		phbbmu = (struct HBB_MessageUnit *)acb->pmu;
-		phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)mem_base[0];
-		phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)mem_base[1];
-		if (vendor_dev_id == PCIDevVenIDARC1203) {
-			phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell);
-			phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask);
-			phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell);
-			phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask);
-		} else {
-			phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell);
-			phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask);
-			phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell);
-			phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask);
-		}
+		acb->mem_base0 = mem_base[0];
+		acb->mem_base1 = mem_base[1];
 		acb->rid[0] = rid[0];
 		acb->rid[1] = rid[1];
 		}
@@ -4735,18 +4775,18 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE);
 		if(acb->sys_res_arcmsr[0] == NULL) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit);
 			return ENOMEM;
 		}
 		if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]);
 		if(mem_base0 == 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]);
@@ -4756,32 +4796,29 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		}
 		break;
 	case ACB_ADAPTER_TYPE_D: {
-		struct HBD_MessageUnit0 *phbdmu;
 		u_int32_t rid0 = PCIR_BAR(0);
 		vm_offset_t	mem_base0;
 
 		acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE);
 		if(acb->sys_res_arcmsr[0] == NULL) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit);
 			return ENOMEM;
 		}
 		if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]);
 		if(mem_base0 == 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]);
 		acb->bhandle[0] = rman_get_bushandle(acb->sys_res_arcmsr[0]);
-		acb->pmu = (struct MessageUnit_UNION *)((unsigned long)acb->uncacheptr+ARCMSR_SRBS_POOL_SIZE);
-		phbdmu = (struct HBD_MessageUnit0 *)acb->pmu;
-		phbdmu->phbdmu = (struct HBD_MessageUnit *)mem_base0;
+		acb->mem_base0 = mem_base0;
 		acb->rid[0] = rid0;
 		}
 		break;
@@ -4792,18 +4829,18 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE);
 		if(acb->sys_res_arcmsr[0] == NULL) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit);
 			return ENOMEM;
 		}
 		if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]);
 		if(mem_base0 == 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]);
@@ -4820,23 +4857,22 @@ static u_int32_t arcmsr_initialize(device_t dev)
 	case ACB_ADAPTER_TYPE_F: {
 		u_int32_t rid0 = PCIR_BAR(0);
 		vm_offset_t	mem_base0;
-		unsigned long	host_buffer_dma;
 
 		acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE);
 		if(acb->sys_res_arcmsr[0] == NULL) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit);
 			return ENOMEM;
 		}
 		if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]);
 		if(mem_base0 == 0) {
 			arcmsr_free_resource(acb);
-			printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev));
+			printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit);
 			return ENXIO;
 		}
 		acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]);
@@ -4848,17 +4884,203 @@ static u_int32_t arcmsr_initialize(device_t dev)
 		acb->rid[0] = rid0;
 		CHIP_REG_WRITE32(HBF_MessageUnit, 0, host_int_status, 0); /*clear interrupt*/
 		CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBEMU_DOORBELL_SYNC); /* synchronize doorbell to 0 */
-		arcmsr_wait_firmware_ready(acb);
-		host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE;
-		CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1));  /* host buffer low addr, bit0:1 all buffer active */
-		CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */
-		CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1);       /* set host buffer physical address */
 		}
 		break;
 	}
-	if(acb->acb_flags & ACB_F_MAPFREESRB_FAILD) {
+	return (0);
+}
+
+static int arcmsr_alloc_srb(device_t dev, struct AdapterControlBlock *acb)
+{
+	int rc;
+
+	if(bus_dma_tag_create(  /*PCI parent*/		bus_get_dma_tag(dev),
+				/*alignemnt*/		1,
+				/*boundary*/		0,
+				/*lowaddr*/		BUS_SPACE_MAXADDR,
+				/*highaddr*/		BUS_SPACE_MAXADDR,
+				/*filter*/		NULL,
+				/*filterarg*/		NULL,
+				/*maxsize*/		BUS_SPACE_MAXSIZE_32BIT,
+				/*nsegments*/		BUS_SPACE_UNRESTRICTED,
+				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
+				/*flags*/		0,
+				/*lockfunc*/		NULL,
+				/*lockarg*/		NULL,
+							&acb->parent_dmat) != 0)
+	{
+		printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", acb->pci_unit);
+		return ENOMEM;
+	}
+
+	/* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */
+	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
+				/*alignment*/		1,
+				/*boundary*/		0,
+#ifdef PAE
+				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
+#else
+				/*lowaddr*/		BUS_SPACE_MAXADDR,
+#endif
+				/*highaddr*/		BUS_SPACE_MAXADDR,
+				/*filter*/		NULL,
+				/*filterarg*/		NULL,
+				/*maxsize*/		ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM,
+				/*nsegments*/		ARCMSR_MAX_SG_ENTRIES,
+				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
+				/*flags*/		0,
+				/*lockfunc*/		busdma_lock_mutex,
+				/*lockarg*/		&acb->isr_lock,
+							&acb->dm_segs_dmat) != 0)
+	{
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", acb->pci_unit);
+		return ENOMEM;
+	}
+
+	/* DMA tag for our srb structures.... Allocate the freesrb memory */
+	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
+				/*alignment*/		0x20,
+				/*boundary*/		0,
+				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
+				/*highaddr*/		BUS_SPACE_MAXADDR,
+				/*filter*/		NULL,
+				/*filterarg*/		NULL,
+				/*maxsize*/		acb->max_coherent_size,
+				/*nsegments*/		1,
+				/*maxsegsz*/		BUS_SPACE_MAXSIZE_32BIT,
+				/*flags*/		0,
+				/*lockfunc*/		NULL,
+				/*lockarg*/		NULL,
+							&acb->srb_dmat) != 0)
+	{
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* Allocation for our srbs */
+	if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, ARCMSR_DMA_ALLOC_FLAG, &acb->srb_dmamap) != 0) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* And permanently map them */
+	rc = bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, acb->max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0);
+	if((rc != 0) && (rc != EINPROGRESS)) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	acb->acb_flags |= ACB_F_DMAMAP_SRB;
+	return (0);
+}
+
+static int arcmsr_alloc_xor_mem(device_t dev, struct AdapterControlBlock *acb)
+{
+	int rc, xor_ram;
+
+	xor_ram = (acb->firm_PicStatus >> 24) & 0x0f;
+	acb->xor_mega = (xor_ram - 1) * 32 + 128 + 3;
+	acb->init2cfg_size = sizeof(struct HostRamBuf) + (sizeof(struct XorSg) * acb->xor_mega);
+	/* DMA tag for XOR engine of Raid 5,6 */
+	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
+				/*alignment*/		0x40,
+				/*boundary*/		0,
+				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
+				/*highaddr*/		BUS_SPACE_MAXADDR,
+				/*filter*/		NULL,
+				/*filterarg*/		NULL,
+				/*maxsize*/		acb->init2cfg_size,
+				/*nsegments*/		1,
+				/*maxsegsz*/		acb->init2cfg_size,
+				/*flags*/		0,
+				/*lockfunc*/		NULL,
+				/*lockarg*/		NULL,
+							&acb->xortable_dmat) != 0)
+	{
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: xor table bus_dma_tag_create failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* Allocation for xors */
+	if(bus_dmamem_alloc(acb->xortable_dmat, (void **)&acb->xortable, ARCMSR_DMA_ALLOC_FLAG, &acb->xortable_dmamap) != 0) {
 		arcmsr_free_resource(acb);
-		printf("arcmsr%d: map free srb failure!\n", device_get_unit(dev));
+		printf("arcmsr%d: xor table bus_dmamem_alloc failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* And permanently map xor segs */
+	rc = bus_dmamap_load(acb->xortable_dmat, acb->xortable_dmamap, acb->xortable, acb->init2cfg_size, arcmsr_map_xor_sgtable, acb, /*flags*/0);
+	if((rc != 0) && (rc != EINPROGRESS)) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: xor table bus_dmamap_load failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	acb->acb_flags |= ACB_F_DMAMAP_SGTABLE;
+
+	/* DMA tag for XOR engine of Raid 5,6 */
+	if(bus_dma_tag_create(  /*parent_dmat*/		acb->parent_dmat,
+				/*alignment*/		0x1000,
+				/*boundary*/		0,
+				/*lowaddr*/		BUS_SPACE_MAXADDR_32BIT,
+				/*highaddr*/		BUS_SPACE_MAXADDR,
+				/*filter*/		NULL,
+				/*filterarg*/		NULL,
+				/*maxsize*/		(ARCMSR_XOR_SEG_SIZE * acb->xor_mega),
+				/*nsegments*/		acb->xor_mega,
+				/*maxsegsz*/		ARCMSR_XOR_SEG_SIZE,
+				/*flags*/		0,
+				/*lockfunc*/		NULL,
+				/*lockarg*/		NULL,
+							&acb->xor_dmat) != 0)
+	{
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: xor bus_dma_tag_create failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* Allocation for xors */
+	if(bus_dmamem_alloc(acb->xor_dmat, (void **)&acb->xorptr, ARCMSR_DMA_ALLOC_FLAG, &acb->xor_dmamap) != 0) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: xor bus_dmamem_alloc failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	/* And permanently map xor segs */
+	rc = bus_dmamap_load(acb->xor_dmat, acb->xor_dmamap, acb->xorptr, (ARCMSR_XOR_SEG_SIZE * acb->xor_mega), arcmsr_map_xor_sg, acb, /*flags*/0);
+	if((rc != 0) && (rc != EINPROGRESS)) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: xor bus_dmamap_load failure!\n", acb->pci_unit);
+		return ENXIO;
+	}
+	acb->acb_flags |= ACB_F_DMAMAP_SG;
+	return (0);
+}
+
+static u_int32_t arcmsr_initialize(device_t dev)
+{
+	struct AdapterControlBlock *acb = device_get_softc(dev);
+	int i, j, rc;
+	u_int32_t vendor_dev_id;
+
+	vendor_dev_id = pci_get_devid(dev);
+	acb->vendor_device_id = vendor_dev_id;
+	acb->sub_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2);
+	rc = arcmsr_define_adapter_type(acb);
+	if (rc)
+		return rc;
+	rc = arcmsr_map_pcireg(dev, acb);
+	if (rc)
+		return rc;
+	rc = arcmsr_alloc_srb(dev, acb);
+	if (rc)
+		return rc;
+	// allocate N times 1 MB physical continuous memory for XOR engine of Raid 5, 6.
+	if ((acb->firm_PicStatus >> 24) & 0x0f) {
+		rc = arcmsr_alloc_xor_mem(dev, acb);
+		if (rc)
+			return rc;
+	}
+	if(acb->acb_flags & (ACB_F_MAPFREESRB_FAILD | ACB_F_MAPXOR_FAILD)) {
+		arcmsr_free_resource(acb);
+		printf("arcmsr%d: map free srb or xor buffer failure!\n", acb->pci_unit);
 		return ENXIO;
 	}
 	acb->acb_flags  |= (ACB_F_MESSAGE_WQBUFFER_CLEARED|ACB_F_MESSAGE_RQBUFFER_CLEARED|ACB_F_MESSAGE_WQBUFFER_READ);
@@ -5055,23 +5277,32 @@ static int arcmsr_probe(device_t dev)
 		break;
 	case PCIDevVenIDARC1880:
 	case PCIDevVenIDARC1882:
+	case PCIDevVenIDARC1883:
 	case PCIDevVenIDARC1213:
 	case PCIDevVenIDARC1223:
 		if ((sub_device_id == ARECA_SUB_DEV_ID_1883) ||
 		    (sub_device_id == ARECA_SUB_DEV_ID_1216) ||
 		    (sub_device_id == ARECA_SUB_DEV_ID_1226))
-			type = "SAS 12G";
+			type = "SAS 12G,SATA 6G";
 		else
-			type = "SAS 6G";
+			type = "SAS,SATA 6G";
 		break;
 	case PCIDevVenIDARC1884:
 		type = "SAS 12G";
 		break;
+	case PCIDevVenIDARC1886_0:
 	case PCIDevVenIDARC1886_:
 	case PCIDevVenIDARC1886:
 		type = "NVME,SAS-12G,SATA-6G";
 		break;
 	case PCIDevVenIDARC1214:
+	case PCIDevVenIDARC1224:
+		if ((sub_device_id == ARECA_SUB_DEV_ID_1214) ||
+		    (sub_device_id == ARECA_SUB_DEV_ID_1224))
+			type = "SAS 6G";
+		else
+			type = "SATA 6G";
+		break;
 	case PCIDevVenIDARC1203:
 		type = "SATA 6G";
 		break;
@@ -5164,15 +5395,11 @@ static void arcmsr_teardown_intr(device_t dev, struct AdapterControlBlock *acb)
 static int arcmsr_detach(device_t dev)
 {
 	struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev);
-	int i;
 
 	callout_stop(&acb->devmap_callout);
 	arcmsr_teardown_intr(dev, acb);
 	arcmsr_shutdown(dev);
 	arcmsr_free_resource(acb);
-	for(i=0; (acb->sys_res_arcmsr[i]!=NULL) && (i<2); i++) {
-		bus_release_resource(dev, SYS_RES_MEMORY, acb->rid[i], acb->sys_res_arcmsr[i]);
-	}
 	ARCMSR_LOCK_ACQUIRE(&acb->isr_lock);
 	xpt_async(AC_LOST_DEVICE, acb->ppath, NULL);
 	xpt_free_path(acb->ppath);
diff --git a/sys/dev/arcmsr/arcmsr.h b/sys/dev/arcmsr/arcmsr.h
index 285cff3f2a1c..742615d33645 100644
--- a/sys/dev/arcmsr/arcmsr.h
+++ b/sys/dev/arcmsr/arcmsr.h
@@ -40,6 +40,7 @@
 #define ARCMSR_MAX_XFER_SECTORS		4096
 #define ARCMSR_MAX_TARGETID		17	/*16 max target id + 1*/
 #define ARCMSR_MAX_TARGETLUN		8	/*8*/
+#define ARCMSR_VIRTUAL_DEVICE_ID	(ARCMSR_MAX_TARGETID - 1)
 #define ARCMSR_MAX_CHIPTYPE_NUM		4
 #define ARCMSR_MAX_OUTSTANDING_CMD	256
 #define ARCMSR_MAX_START_JOB		256
@@ -108,6 +109,7 @@ typedef struct mtx			arcmsr_lock_t;
 #define PCI_DEVICE_ID_ARECA_1680        0x1680 /* Device ID	*/
 #define PCI_DEVICE_ID_ARECA_1681        0x1681 /* Device ID	*/
 #define PCI_DEVICE_ID_ARECA_1880        0x1880 /* Device ID	*/
+#define PCI_DEVICE_ID_ARECA_1883        0x1883 /* Device ID	*/
 #define PCI_DEVICE_ID_ARECA_1884        0x1884 /* Device ID	*/
 
 #define ARECA_SUB_DEV_ID_1880	0x1880 /* Subsystem Device ID	*/
@@ -116,9 +118,11 @@ typedef struct mtx			arcmsr_lock_t;
 #define ARECA_SUB_DEV_ID_1884	0x1884 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1212	0x1212 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1213	0x1213 /* Subsystem Device ID	*/
+#define ARECA_SUB_DEV_ID_1214	0x1214 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1216	0x1216 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1222	0x1222 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1223	0x1223 /* Subsystem Device ID	*/
+#define ARECA_SUB_DEV_ID_1224	0x1224 /* Subsystem Device ID	*/
 #define ARECA_SUB_DEV_ID_1226	0x1226 /* Subsystem Device ID	*/
 
 #define PCIDevVenIDARC1110              0x111017D3 /* Vendor Device ID	*/
@@ -136,6 +140,7 @@ typedef struct mtx			arcmsr_lock_t;
 #define PCIDevVenIDARC1220              0x122017D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1222              0x122217D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1223              0x122317D3 /* Vendor Device ID	*/
+#define PCIDevVenIDARC1224              0x122417D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1230              0x123017D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1231              0x123117D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1260              0x126017D3 /* Vendor Device ID	*/
@@ -148,7 +153,9 @@ typedef struct mtx			arcmsr_lock_t;
 #define PCIDevVenIDARC1681              0x168117D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1880              0x188017D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1882              0x188217D3 /* Vendor Device ID	*/
+#define PCIDevVenIDARC1883              0x188317D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1884              0x188417D3 /* Vendor Device ID	*/
+#define PCIDevVenIDARC1886_0            0x188617D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1886_             0x188917D3 /* Vendor Device ID	*/
 #define PCIDevVenIDARC1886              0x188A17D3 /* Vendor Device ID	*/
 
@@ -1166,6 +1173,7 @@ typedef struct PHYS_ADDR64 {
 #define	ARCMSR_FW_VERS_OFFSET		17
 #define	ARCMSR_FW_DEVMAP_OFFSET		21
 #define	ARCMSR_FW_CFGVER_OFFSET		25
+#define	ARCMSR_FW_PICSTATUS		30
 
 struct FIRMWARE_INFO {
 	u_int32_t      signature;           /*0,00-03*/
@@ -1274,15 +1282,14 @@ struct ARCMSR_CDB {
 */
 struct CommandControlBlock {
 	struct ARCMSR_CDB	arcmsr_cdb;		/* 0  -503 (size of CDB=504): arcmsr messenger scsi command descriptor size 504 bytes */
-	u_int32_t		cdb_phyaddr_low;	/* 504-507 */
-	u_int32_t		arc_cdb_size;		/* 508-511 */
+	unsigned long		cdb_phyaddr;		/* 504-507 */
 	/*  ======================512+32 bytes============================  */
 	union ccb		*pccb;			/* 512-515 516-519 pointer of freebsd scsi command */
 	struct AdapterControlBlock	*acb;		/* 520-523 524-527 */
 	bus_dmamap_t		dm_segs_dmamap;		/* 528-531 532-535 */
 	u_int16_t   		srb_flags;		/* 536-537 */
 	u_int16_t		srb_state;              /* 538-539 */
-	u_int32_t		cdb_phyaddr_high;	/* 540-543 */
+	u_int32_t		arc_cdb_size;		/* 508-511 */
 	struct	callout		ccb_callout;
 	u_int32_t		smid;
     /*  ==========================================================  */
@@ -1298,6 +1305,8 @@ struct CommandControlBlock {
 #define		SRB_FLAG_DMAWRITE		0x0040
 #define		SRB_FLAG_PKTBIND		0x0080
 #define		SRB_FLAG_TIMER_START		0x0080
+#define		SRB_FLAG_DIRECT_IO		0x0100
+#define		SRB_FLAG_USE_SG			0x0200
 /*	srb_state */
 #define		ARCMSR_SRB_DONE   		0x0000
 #define		ARCMSR_SRB_UNBUILD 		0x0000
@@ -1359,6 +1368,8 @@ struct AdapterControlBlock {
 	u_int32_t		outbound_int_enable;
 
 	struct MessageUnit_UNION	*pmu;		/* message unit ATU inbound base address0 */
+	vm_offset_t		mem_base0;
+	vm_offset_t		mem_base1;
 	uint32_t		*message_wbuffer;	//0x000 - COMPORT_IN  (to be sent to ROC)
 	uint32_t		*message_rbuffer;	//0x100 - COMPORT_OUT (to be sent to Host)
 	uint32_t		*msgcode_rwbuffer;	//0x200 - BIOS_AREA
@@ -1397,6 +1408,7 @@ struct AdapterControlBlock {
 	char			firm_model[12];		/*15,60-67*/
 	char			firm_version[20];	/*17,68-83*/
 	char			device_map[20];		/*21,84-99 */
+	u_int32_t		firm_PicStatus;
 	struct	callout		devmap_callout;
 	u_int32_t		pktRequestCount;
 	u_int32_t		pktReturnCount;
@@ -1409,10 +1421,35 @@ struct AdapterControlBlock {
 	u_int32_t		out_doorbell;
 	u_int32_t		completionQ_entry;
 	pCompletion_Q		pCompletionQ;
+	int			xor_mega;
 	int			msix_vectors;
 	int			rid[2];
 	unsigned long		completeQ_phys;
+	u_int32_t		max_coherent_size;
+	u_int8_t		*xortable;
+	unsigned long		xor_sgtable_phy;
+	bus_dma_tag_t		xortable_dmat;		/* dmat for xor table */
+	bus_dmamap_t		xortable_dmamap;
+	u_int8_t		*xorptr;
+	bus_dma_tag_t		xor_dmat;		/* dmat for xor */
+	bus_dmamap_t		xor_dmamap;
+	unsigned int		init2cfg_size;
+	unsigned int		xorVirtOffset;
 };/* HW_DEVICE_EXTENSION */
+
+struct HostRamBuf {
+	u_int32_t	hrbSignature;	// must be "HRBS"
+	u_int32_t	hrbSize;	// total buffer size(must be multiples of MB, this version should be 128+3 MB, i.e. 0x8300000)
+	u_int32_t	hrbRes[2];	// reserved, must be set to 0
+};
+struct	XorSg {
+	u_int64_t	xorPhys;
+	u_int64_t	xorBufLen;
+};
+#define ARCMSR_XOR_SEG_SIZE	(1024 * 1024)
+#define ARCMSR_MAX_XOR_SEG	128 + 3
+#define ARCMSR_DMA_ALLOC_FLAG	(BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO | BUS_DMA_NOCACHE)
+
 /* acb_flags */
 #define ACB_F_SCSISTOPADAPTER           0x0001
 #define ACB_F_MSG_STOP_BGRB             0x0002		/* stop RAID background rebuild */
@@ -1427,7 +1464,13 @@ struct AdapterControlBlock {
 #define ACB_F_CAM_DEV_QFRZN             0x0400
 #define ACB_F_BUS_HANG_ON               0x0800		/* need hardware reset bus */
 #define ACB_F_SRB_FUNCTION_POWER        0x1000
-#define	ACB_F_MSIX_ENABLED		0x2000
+#define ACB_F_MSIX_ENABLED		0x2000
+#define ACB_F_MSG_GET_CONFIG		0x4000
+#define ACB_F_DIRECT_IO			0x8000
+#define ACB_F_DMAMAP_SRB		0x10000
+#define ACB_F_DMAMAP_SGTABLE		0x20000
+#define ACB_F_DMAMAP_SG			0x40000
+#define ACB_F_MAPXOR_FAILD		0x80000
 /* devstate */
 #define ARECA_RAID_GONE         	0x55
 #define ARECA_RAID_GOOD         	0xaa