d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh vendor driver version which adds ARC-1224 support.

Browse Source 
Many thanks to Areca for continuing to support FreeBSD.

Submitted by:	黃清隆 <ching2048 areca com tw>
MFC after:	3 days
This commit is contained in:
delphij 2013-02-28 04:16:47 +00:00
parent a7aacdcc59
commit 625ec702fe
3 changed files with 129 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/man/man4/arcmsr.4
View File

@ -24,7 +24,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd December 18, 2012 .Dd February 27, 2013
.Dt ARCMSR 4 .Dt ARCMSR 4
.Os .Os
.Sh NAME .Sh NAME
@ -108,6 +108,8 @@ ARC-1222
.It .It
ARC-1223 ARC-1223
.It .It
ARC-1224
.It
ARC-1230 ARC-1230
.It .It
ARC-1231 ARC-1231

135
sys/dev/arcmsr/arcmsr.c
View File

@ -1,16 +1,15 @@
/* /*
***************************************************************************************** ********************************************************************************
** O.S : FreeBSD ** OS : FreeBSD
** FILE NAME : arcmsr.c ** FILE NAME : arcmsr.c
** BY : Erich Chen, Ching Huang ** BY : Erich Chen, Ching Huang
** Description: SCSI RAID Device Driver for ** Description: SCSI RAID Device Driver for
** ARECA (ARC11XX/ARC12XX/ARC13XX/ARC16XX/ARC188x) SATA/SAS RAID HOST Adapter ** ARECA (ARC11XX/ARC12XX/ARC13XX/ARC16XX/ARC188x)
** ARCMSR RAID Host adapter ** SATA/SAS RAID HOST Adapter
** [RAID controller:INTEL 331(PCI-X) 341(PCI-EXPRESS) chip set] ********************************************************************************
****************************************************************************************** ********************************************************************************
************************************************************************
** **
** Copyright (C) 2002 - 2010, Areca Technology Corporation All rights reserved. ** Copyright (C) 2002 - 2012, Areca Technology Corporation All rights reserved.
** **
** Redistribution and use in source and binary forms, with or without ** Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions ** modification, are permitted provided that the following conditions
@ -33,7 +32,7 @@
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
**(INCLUDING NEGLIGENCE OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF **(INCLUDING NEGLIGENCE OR OTHERWISE)ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
************************************************************************** ********************************************************************************
** History ** History
** **
** REV# DATE NAME DESCRIPTION ** REV# DATE NAME DESCRIPTION
@ -73,7 +72,7 @@
** 1.20.00.23 01/30/2012 Ching Huang Fixed Request requeued and Retrying command ** 1.20.00.23 01/30/2012 Ching Huang Fixed Request requeued and Retrying command
** 1.20.00.24 06/11/2012 Ching Huang Fixed return sense data condition ** 1.20.00.24 06/11/2012 Ching Huang Fixed return sense data condition
** 1.20.00.25 08/17/2012 Ching Huang Fixed hotplug device no function on type A adapter ** 1.20.00.25 08/17/2012 Ching Huang Fixed hotplug device no function on type A adapter
** 1.20.00.26 12/14/2012 Ching Huang Added support ARC1214 ** 1.20.00.26 12/14/2012 Ching Huang Added support ARC1214,1224
****************************************************************************************** ******************************************************************************************
*/ */
@ -145,7 +144,7 @@ __FBSDID("$FreeBSD$");
#define arcmsr_callout_init(a) callout_init(a); #define arcmsr_callout_init(a) callout_init(a);
#endif #endif
#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.26 2012-12-14" #define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.26 2013-01-08"
#include <dev/arcmsr/arcmsr.h> #include <dev/arcmsr/arcmsr.h>
/* /*
************************************************************************** **************************************************************************
@ -168,7 +167,7 @@ static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb);
static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb); static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb);
static void arcmsr_iop_init(struct AdapterControlBlock *acb); static void arcmsr_iop_init(struct AdapterControlBlock *acb);
static void arcmsr_flush_adapter_cache(struct AdapterControlBlock *acb); static void arcmsr_flush_adapter_cache(struct AdapterControlBlock *acb);
static void arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, struct QBUFFER *prbuffer); static u_int32_t arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, struct QBUFFER *prbuffer);
static void arcmsr_Write_data_2iop_wqbuffer(struct AdapterControlBlock *acb); static void arcmsr_Write_data_2iop_wqbuffer(struct AdapterControlBlock *acb);
static void arcmsr_abort_allcmd(struct AdapterControlBlock *acb); static void arcmsr_abort_allcmd(struct AdapterControlBlock *acb);
static void arcmsr_srb_complete(struct CommandControlBlock *srb, int stand_flag); static void arcmsr_srb_complete(struct CommandControlBlock *srb, int stand_flag);
@ -212,7 +211,11 @@ static device_method_t arcmsr_methods[]={
DEVMETHOD(device_suspend, arcmsr_suspend), DEVMETHOD(device_suspend, arcmsr_suspend),
DEVMETHOD(device_resume, arcmsr_resume), DEVMETHOD(device_resume, arcmsr_resume),
#if __FreeBSD_version >= 803000
DEVMETHOD_END DEVMETHOD_END
#else
{ 0, 0 }
#endif
}; };
static driver_t arcmsr_driver={ static driver_t arcmsr_driver={
@ -1381,13 +1384,61 @@ static void arcmsr_poll(struct cam_sim *psim)
************************************************************************** **************************************************************************
************************************************************************** **************************************************************************
*/ */
static void arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, static u_int32_t arcmsr_Read_iop_rqbuffer_data_D(struct AdapterControlBlock *acb,
struct QBUFFER *prbuffer) {
u_int8_t *pQbuffer;
u_int8_t *buf1 = 0;
u_int32_t *iop_data, *buf2 = 0;
u_int32_t iop_len, data_len;
iop_data = (u_int32_t *)prbuffer->data;
iop_len = (u_int32_t)prbuffer->data_len;
if ( iop_len > 0 )
{
buf1 = malloc(128, M_DEVBUF, M_NOWAIT | M_ZERO);
buf2 = (u_int32_t *)buf1;
if( buf1 == NULL)
return (0);
data_len = iop_len;
while(data_len >= 4)
{
*buf2++ = *iop_data++;
data_len -= 4;
}
if(data_len)
*buf2 = *iop_data;
buf2 = (u_int32_t *)buf1;
}
while (iop_len > 0) {
pQbuffer = &acb->rqbuffer[acb->rqbuf_lastindex];
*pQbuffer = *buf1;
acb->rqbuf_lastindex++;
/* if last, index number set it to 0 */
acb->rqbuf_lastindex %= ARCMSR_MAX_QBUFFER;
buf1++;
iop_len--;
}
if(buf2)
free( (u_int8_t *)buf2, M_DEVBUF);
/* let IOP know data has been read */
arcmsr_iop_message_read(acb);
return (1);
}
/*
**************************************************************************
**************************************************************************
*/
static u_int32_t arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb,
struct QBUFFER *prbuffer) { struct QBUFFER *prbuffer) {
u_int8_t *pQbuffer; u_int8_t *pQbuffer;
u_int8_t *iop_data; u_int8_t *iop_data;
u_int32_t iop_len; u_int32_t iop_len;
if(acb->adapter_type == ACB_ADAPTER_TYPE_D) {
return(arcmsr_Read_iop_rqbuffer_data_D(acb, prbuffer));
}
iop_data = (u_int8_t *)prbuffer->data; iop_data = (u_int8_t *)prbuffer->data;
iop_len = (u_int32_t)prbuffer->data_len; iop_len = (u_int32_t)prbuffer->data_len;
while (iop_len > 0) { while (iop_len > 0) {
@ -1401,6 +1452,7 @@ static void arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb,
} }
/* let IOP know data has been read */ /* let IOP know data has been read */
arcmsr_iop_message_read(acb); arcmsr_iop_message_read(acb);
return (1);
} }
/* /*
************************************************************************** **************************************************************************
@ -1417,7 +1469,8 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb)
my_empty_len = (acb->rqbuf_lastindex - acb->rqbuf_firstindex - 1) & my_empty_len = (acb->rqbuf_lastindex - acb->rqbuf_firstindex - 1) &
(ARCMSR_MAX_QBUFFER-1); (ARCMSR_MAX_QBUFFER-1);
if(my_empty_len >= prbuffer->data_len) { if(my_empty_len >= prbuffer->data_len) {
arcmsr_Read_iop_rqbuffer_data(acb, prbuffer); if(arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0)
acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW;
} else { } else {
acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW; acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW;
} }
@ -1427,6 +1480,50 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb)
********************************************************************** **********************************************************************
********************************************************************** **********************************************************************
*/ */
static void arcmsr_Write_data_2iop_wqbuffer_D(struct AdapterControlBlock *acb)
{
u_int8_t *pQbuffer;
struct QBUFFER *pwbuffer;
u_int8_t *buf1 = 0;
u_int32_t *iop_data, *buf2 = 0;
u_int32_t allxfer_len = 0, data_len;
if(acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_READ) {
buf1 = malloc(128, M_DEVBUF, M_NOWAIT | M_ZERO);
buf2 = (u_int32_t *)buf1;
if( buf1 == NULL)
return;
acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READ);
pwbuffer = arcmsr_get_iop_wqbuffer(acb);
iop_data = (u_int32_t *)pwbuffer->data;
while((acb->wqbuf_firstindex != acb->wqbuf_lastindex)
&& (allxfer_len < 124)) {
pQbuffer = &acb->wqbuffer[acb->wqbuf_firstindex];
*buf1 = *pQbuffer;
acb->wqbuf_firstindex++;
acb->wqbuf_firstindex %= ARCMSR_MAX_QBUFFER;
buf1++;
allxfer_len++;
}
pwbuffer->data_len = allxfer_len;
data_len = allxfer_len;
buf1 = (u_int8_t *)buf2;
while(data_len >= 4)
{
*iop_data++ = *buf2++;
data_len -= 4;
}
if(data_len)
*iop_data = *buf2;
free( buf1, M_DEVBUF);
arcmsr_iop_message_wrote(acb);
}
}
/*
**********************************************************************
**********************************************************************
*/
static void arcmsr_Write_data_2iop_wqbuffer(struct AdapterControlBlock *acb) static void arcmsr_Write_data_2iop_wqbuffer(struct AdapterControlBlock *acb)
{ {
u_int8_t *pQbuffer; u_int8_t *pQbuffer;
@ -1434,6 +1531,10 @@ static void arcmsr_Write_data_2iop_wqbuffer(struct AdapterControlBlock *acb)
u_int8_t *iop_data; u_int8_t *iop_data;
int32_t allxfer_len=0; int32_t allxfer_len=0;
if(acb->adapter_type == ACB_ADAPTER_TYPE_D) {
arcmsr_Write_data_2iop_wqbuffer_D(acb);
return;
}
if(acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_READ) { if(acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_READ) {
acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READ); acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READ);
pwbuffer = arcmsr_get_iop_wqbuffer(acb); pwbuffer = arcmsr_get_iop_wqbuffer(acb);
@ -2153,7 +2254,8 @@ u_int32_t arcmsr_iop_ioctlcmd(struct AdapterControlBlock *acb, u_int32_t ioctl_c
acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW; acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
prbuffer = arcmsr_get_iop_rqbuffer(acb); prbuffer = arcmsr_get_iop_rqbuffer(acb);
arcmsr_Read_iop_rqbuffer_data(acb, prbuffer); if(arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0)
acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW;
} }
pcmdmessagefld->cmdmessage.Length = allxfer_len; pcmdmessagefld->cmdmessage.Length = allxfer_len;
pcmdmessagefld->cmdmessage.ReturnCode = ARCMSR_MESSAGE_RETURNCODE_OK; pcmdmessagefld->cmdmessage.ReturnCode = ARCMSR_MESSAGE_RETURNCODE_OK;
@ -2374,7 +2476,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, union ccb *p
acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW; acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
prbuffer = arcmsr_get_iop_rqbuffer(acb); prbuffer = arcmsr_get_iop_rqbuffer(acb);
arcmsr_Read_iop_rqbuffer_data(acb, prbuffer); if(arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0)
acb->acb_flags |= ACB_F_IOPDATA_OVERFLOW;
} }
pcmdmessagefld->cmdmessage.Length = allxfer_len; pcmdmessagefld->cmdmessage.Length = allxfer_len;
pcmdmessagefld->cmdmessage.ReturnCode = ARCMSR_MESSAGE_RETURNCODE_OK; pcmdmessagefld->cmdmessage.ReturnCode = ARCMSR_MESSAGE_RETURNCODE_OK;

17
sys/dev/arcmsr/arcmsr.h
View File

@ -1,17 +1,14 @@
/* /*
*********************************************************************************************** ********************************************************************************
** O.S : FreeBSD ** OS : FreeBSD
** FILE NAME : arcmsr.h ** FILE NAME : arcmsr.h
** BY : Erich Chen, Ching Huang ** BY : Erich Chen, Ching Huang
** Description: SCSI RAID Device Driver for ** Description: SCSI RAID Device Driver for
** ARECA SATA/SAS RAID HOST Adapter ** ARECA (ARC11XX/ARC12XX/ARC13XX/ARC16XX/ARC188x)
** [RAID controller:INTEL 331(PCI-X) 341(PCI-EXPRESS) chip set] ** SATA/SAS RAID HOST Adapter
*********************************************************************************************** ********************************************************************************
************************************************************************ ********************************************************************************
** Copyright (C) 2002 - 2010, Areca Technology Corporation All rights reserved. ** Copyright (C) 2002 - 2012, Areca Technology Corporation All rights reserved.
**
** Web site: www.areca.com.tw
** E-mail: erich@areca.com.tw; ching2048@areca.com.tw
** **
** Redistribution and use in source and binary forms,with or without ** Redistribution and use in source and binary forms,with or without
** modification,are permitted provided that the following conditions ** modification,are permitted provided that the following conditions