Skip to content

L
linux
Commit 2e9feb43 authored by Ching Huang's avatar Ching Huang Committed by Christoph Hellwig
Browse files
Options

arcmsr: simplify ioctl data read/write 

Signed-off-by: Ching Huang <ching 2048@areca.com.tw>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3185ea63
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 229 deletions
drivers/scsi/arcmsr/arcmsr.h
View file @ 2e9feb43
...@@ -52,7 +52,7 @@ struct device_attribute; ...@@ -52,7 +52,7 @@ struct device_attribute;
#define ARCMSR_MAX_FREECCB_NUM 320 #define ARCMSR_MAX_FREECCB_NUM 320
#define ARCMSR_MAX_OUTSTANDING_CMD 255 #define ARCMSR_MAX_OUTSTANDING_CMD 255
#endif #endif
#define ARCMSR_DRIVER_VERSION "v1.30.00.04-20140428" #define ARCMSR_DRIVER_VERSION "v1.30.00.04-20140919"
#define ARCMSR_SCSI_INITIATOR_ID 255 #define ARCMSR_SCSI_INITIATOR_ID 255
#define ARCMSR_MAX_XFER_SECTORS 512 #define ARCMSR_MAX_XFER_SECTORS 512
#define ARCMSR_MAX_XFER_SECTORS_B 4096 #define ARCMSR_MAX_XFER_SECTORS_B 4096
...@@ -107,10 +107,11 @@ struct CMD_MESSAGE ...@@ -107,10 +107,11 @@ struct CMD_MESSAGE
** IOP Message Transfer Data for user space ** IOP Message Transfer Data for user space
******************************************************************************* *******************************************************************************
*/ */
#define ARCMSR_API_DATA_BUFLEN 1032
struct CMD_MESSAGE_FIELD struct CMD_MESSAGE_FIELD
{ {
struct CMD_MESSAGE cmdmessage; struct CMD_MESSAGE cmdmessage;
uint8_t messagedatabuffer[1032]; uint8_t messagedatabuffer[ARCMSR_API_DATA_BUFLEN];
}; };
/* IOP message transfer */ /* IOP message transfer */
#define ARCMSR_MESSAGE_FAIL 0x0001 #define ARCMSR_MESSAGE_FAIL 0x0001
...@@ -678,15 +679,15 @@ struct AdapterControlBlock ...@@ -678,15 +679,15 @@ struct AdapterControlBlock
unsigned int uncache_size; unsigned int uncache_size;
uint8_t rqbuffer[ARCMSR_MAX_QBUFFER]; uint8_t rqbuffer[ARCMSR_MAX_QBUFFER];
/* data collection buffer for read from 80331 */ /* data collection buffer for read from 80331 */
int32_t rqbuf_firstindex; int32_t rqbuf_getIndex;
/* first of read buffer */ /* first of read buffer */
int32_t rqbuf_lastindex; int32_t rqbuf_putIndex;
/* last of read buffer */ /* last of read buffer */
uint8_t wqbuffer[ARCMSR_MAX_QBUFFER]; uint8_t wqbuffer[ARCMSR_MAX_QBUFFER];
/* data collection buffer for write to 80331 */ /* data collection buffer for write to 80331 */
int32_t wqbuf_firstindex; int32_t wqbuf_getIndex;
/* first of write buffer */ /* first of write buffer */
int32_t wqbuf_lastindex; int32_t wqbuf_putIndex;
/* last of write buffer */ /* last of write buffer */
uint8_t devstate[ARCMSR_MAX_TARGETID][ARCMSR_MAX_TARGETLUN]; uint8_t devstate[ARCMSR_MAX_TARGETID][ARCMSR_MAX_TARGETLUN];
/* id0 ..... id15, lun0...lun7 */ /* id0 ..... id15, lun0...lun7 */
......
drivers/scsi/arcmsr/arcmsr_attr.c
View file @ 2e9feb43
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/circ_buf.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
...@@ -68,7 +69,7 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp, ...@@ -68,7 +69,7 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp,
struct device *dev = container_of(kobj,struct device,kobj); struct device *dev = container_of(kobj,struct device,kobj);
struct Scsi_Host *host = class_to_shost(dev); struct Scsi_Host *host = class_to_shost(dev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata; struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
uint8_t *pQbuffer,*ptmpQbuffer; uint8_t *ptmpQbuffer;
int32_t allxfer_len = 0; int32_t allxfer_len = 0;
unsigned long flags; unsigned long flags;
...@@ -78,57 +79,22 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp, ...@@ -78,57 +79,22 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp,
/* do message unit read. */ /* do message unit read. */
ptmpQbuffer = (uint8_t *)buf; ptmpQbuffer = (uint8_t *)buf;
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
if (acb->rqbuf_firstindex != acb->rqbuf_lastindex) { if (acb->rqbuf_getIndex != acb->rqbuf_putIndex) {
pQbuffer = &acb->rqbuffer[acb->rqbuf_firstindex]; unsigned int tail = acb->rqbuf_getIndex;
if (acb->rqbuf_firstindex > acb->rqbuf_lastindex) { unsigned int head = acb->rqbuf_putIndex;
if ((ARCMSR_MAX_QBUFFER - acb->rqbuf_firstindex) >= 1032) { unsigned int cnt_to_end = CIRC_CNT_TO_END(head, tail, ARCMSR_MAX_QBUFFER);
memcpy(ptmpQbuffer, pQbuffer, 1032);
acb->rqbuf_firstindex += 1032; allxfer_len = CIRC_CNT(head, tail, ARCMSR_MAX_QBUFFER);
acb->rqbuf_firstindex %= ARCMSR_MAX_QBUFFER; if (allxfer_len > ARCMSR_API_DATA_BUFLEN)
allxfer_len = 1032; allxfer_len = ARCMSR_API_DATA_BUFLEN;
} else {
if (((ARCMSR_MAX_QBUFFER - acb->rqbuf_firstindex) if (allxfer_len <= cnt_to_end)
+ acb->rqbuf_lastindex) > 1032) { memcpy(ptmpQbuffer, acb->rqbuffer + tail, allxfer_len);
memcpy(ptmpQbuffer, pQbuffer, else {
ARCMSR_MAX_QBUFFER memcpy(ptmpQbuffer, acb->rqbuffer + tail, cnt_to_end);
- acb->rqbuf_firstindex); memcpy(ptmpQbuffer + cnt_to_end, acb->rqbuffer, allxfer_len - cnt_to_end);
ptmpQbuffer += ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex;
memcpy(ptmpQbuffer, acb->rqbuffer, 1032
- (ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex));
acb->rqbuf_firstindex = 1032 -
(ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex);
allxfer_len = 1032;
} else {
memcpy(ptmpQbuffer, pQbuffer,
ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex);
ptmpQbuffer += ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex;
memcpy(ptmpQbuffer, acb->rqbuffer,
acb->rqbuf_lastindex);
allxfer_len = ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex +
acb->rqbuf_lastindex;
acb->rqbuf_firstindex =
acb->rqbuf_lastindex;
}
}
} else {
if ((acb->rqbuf_lastindex - acb->rqbuf_firstindex) > 1032) {
memcpy(ptmpQbuffer, pQbuffer, 1032);
acb->rqbuf_firstindex += 1032;
allxfer_len = 1032;
} else {
memcpy(ptmpQbuffer, pQbuffer, acb->rqbuf_lastindex
- acb->rqbuf_firstindex);
allxfer_len = acb->rqbuf_lastindex -
acb->rqbuf_firstindex;
acb->rqbuf_firstindex = acb->rqbuf_lastindex;
}
} }
acb->rqbuf_getIndex = (acb->rqbuf_getIndex + allxfer_len) % ARCMSR_MAX_QBUFFER;
} }
if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) { if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
struct QBUFFER __iomem *prbuffer; struct QBUFFER __iomem *prbuffer;
...@@ -150,47 +116,42 @@ static ssize_t arcmsr_sysfs_iop_message_write(struct file *filp, ...@@ -150,47 +116,42 @@ static ssize_t arcmsr_sysfs_iop_message_write(struct file *filp,
struct device *dev = container_of(kobj,struct device,kobj); struct device *dev = container_of(kobj,struct device,kobj);
struct Scsi_Host *host = class_to_shost(dev); struct Scsi_Host *host = class_to_shost(dev);
struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata; struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
int32_t my_empty_len, user_len, wqbuf_firstindex, wqbuf_lastindex; int32_t user_len, cnt2end;
uint8_t *pQbuffer, *ptmpuserbuffer; uint8_t *pQbuffer, *ptmpuserbuffer;
unsigned long flags; unsigned long flags;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EACCES; return -EACCES;
if (count > 1032) if (count > ARCMSR_API_DATA_BUFLEN)
return -EINVAL; return -EINVAL;
/* do message unit write. */ /* do message unit write. */
ptmpuserbuffer = (uint8_t *)buf; ptmpuserbuffer = (uint8_t *)buf;
user_len = (int32_t)count; user_len = (int32_t)count;
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
wqbuf_lastindex = acb->wqbuf_lastindex; if (acb->wqbuf_putIndex != acb->wqbuf_getIndex) {
wqbuf_firstindex = acb->wqbuf_firstindex;
if (wqbuf_lastindex != wqbuf_firstindex) {
arcmsr_write_ioctldata2iop(acb); arcmsr_write_ioctldata2iop(acb);
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
return 0; /*need retry*/ return 0; /*need retry*/
} else { } else {
my_empty_len = (wqbuf_firstindex-wqbuf_lastindex - 1) pQbuffer = &acb->wqbuffer[acb->wqbuf_putIndex];
&(ARCMSR_MAX_QBUFFER - 1); cnt2end = ARCMSR_MAX_QBUFFER - acb->wqbuf_putIndex;
if (my_empty_len >= user_len) { if (user_len > cnt2end) {
while (user_len > 0) { memcpy(pQbuffer, ptmpuserbuffer, cnt2end);
pQbuffer = &acb->wqbuffer[acb->wqbuf_lastindex]; ptmpuserbuffer += cnt2end;
memcpy(pQbuffer, ptmpuserbuffer, 1); user_len -= cnt2end;
acb->wqbuf_lastindex++; acb->wqbuf_putIndex = 0;
acb->wqbuf_lastindex %= ARCMSR_MAX_QBUFFER; pQbuffer = acb->wqbuffer;
ptmpuserbuffer++;
user_len--;
}
if (acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_CLEARED) {
acb->acb_flags &=
~ACB_F_MESSAGE_WQBUFFER_CLEARED;
arcmsr_write_ioctldata2iop(acb);
}
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
return count;
} else {
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
return 0; /*need retry*/
} }
memcpy(pQbuffer, ptmpuserbuffer, user_len);
acb->wqbuf_putIndex += user_len;
acb->wqbuf_putIndex %= ARCMSR_MAX_QBUFFER;
if (acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_CLEARED) {
acb->acb_flags &=
~ACB_F_MESSAGE_WQBUFFER_CLEARED;
arcmsr_write_ioctldata2iop(acb);
}
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
return count;
} }
} }
...@@ -215,12 +176,12 @@ static ssize_t arcmsr_sysfs_iop_message_clear(struct file *filp, ...@@ -215,12 +176,12 @@ static ssize_t arcmsr_sysfs_iop_message_clear(struct file *filp,
| ACB_F_MESSAGE_RQBUFFER_CLEARED | ACB_F_MESSAGE_RQBUFFER_CLEARED
| ACB_F_MESSAGE_WQBUFFER_READED); | ACB_F_MESSAGE_WQBUFFER_READED);
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
acb->rqbuf_firstindex = 0; acb->rqbuf_getIndex = 0;
acb->rqbuf_lastindex = 0; acb->rqbuf_putIndex = 0;
spin_unlock_irqrestore(&acb->rqbuffer_lock, flags); spin_unlock_irqrestore(&acb->rqbuffer_lock, flags);
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
acb->wqbuf_firstindex = 0; acb->wqbuf_getIndex = 0;
acb->wqbuf_lastindex = 0; acb->wqbuf_putIndex = 0;
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
pQbuffer = acb->rqbuffer; pQbuffer = acb->rqbuffer;
memset(pQbuffer, 0, sizeof (struct QBUFFER)); memset(pQbuffer, 0, sizeof (struct QBUFFER));
...@@ -234,7 +195,7 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = { ...@@ -234,7 +195,7 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = {
.name = "mu_read", .name = "mu_read",
.mode = S_IRUSR , .mode = S_IRUSR ,
}, },
.size = 1032, .size = ARCMSR_API_DATA_BUFLEN,
.read = arcmsr_sysfs_iop_message_read, .read = arcmsr_sysfs_iop_message_read,
}; };
...@@ -243,7 +204,7 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = { ...@@ -243,7 +204,7 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = {
.name = "mu_write", .name = "mu_write",
.mode = S_IWUSR, .mode = S_IWUSR,
}, },
.size = 1032, .size = ARCMSR_API_DATA_BUFLEN,
.write = arcmsr_sysfs_iop_message_write, .write = arcmsr_sysfs_iop_message_write,
}; };
......
drivers/scsi/arcmsr/arcmsr_hba.c
View file @ 2e9feb43
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/aer.h> #include <linux/aer.h>
#include <linux/circ_buf.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -1701,16 +1702,15 @@ arcmsr_Read_iop_rqbuffer_in_DWORD(struct AdapterControlBlock *acb, ...@@ -1701,16 +1702,15 @@ arcmsr_Read_iop_rqbuffer_in_DWORD(struct AdapterControlBlock *acb,
buf2 = (uint32_t *)buf1; buf2 = (uint32_t *)buf1;
} }
while (iop_len > 0) { while (iop_len > 0) {
pQbuffer = &acb->rqbuffer[acb->rqbuf_lastindex]; pQbuffer = &acb->rqbuffer[acb->rqbuf_putIndex];
*pQbuffer = *buf1; *pQbuffer = *buf1;
acb->rqbuf_lastindex++; acb->rqbuf_putIndex++;
/* if last, index number set it to 0 */ /* if last, index number set it to 0 */
acb->rqbuf_lastindex %= ARCMSR_MAX_QBUFFER; acb->rqbuf_putIndex %= ARCMSR_MAX_QBUFFER;
buf1++; buf1++;
iop_len--; iop_len--;
} }
if (buf2) kfree(buf2);
kfree(buf2);
/* 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; return 1;
...@@ -1729,10 +1729,10 @@ arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, ...@@ -1729,10 +1729,10 @@ arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb,
iop_data = (uint8_t __iomem *)prbuffer->data; iop_data = (uint8_t __iomem *)prbuffer->data;
iop_len = readl(&prbuffer->data_len); iop_len = readl(&prbuffer->data_len);
while (iop_len > 0) { while (iop_len > 0) {
pQbuffer = &acb->rqbuffer[acb->rqbuf_lastindex]; pQbuffer = &acb->rqbuffer[acb->rqbuf_putIndex];
*pQbuffer = readb(iop_data); *pQbuffer = readb(iop_data);
acb->rqbuf_lastindex++; acb->rqbuf_putIndex++;
acb->rqbuf_lastindex %= ARCMSR_MAX_QBUFFER; acb->rqbuf_putIndex %= ARCMSR_MAX_QBUFFER;
iop_data++; iop_data++;
iop_len--; iop_len--;
} }
...@@ -1748,7 +1748,7 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb) ...@@ -1748,7 +1748,7 @@ static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb)
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
prbuffer = arcmsr_get_iop_rqbuffer(acb); prbuffer = arcmsr_get_iop_rqbuffer(acb);
buf_empty_len = (acb->rqbuf_lastindex - acb->rqbuf_firstindex - 1) & buf_empty_len = (acb->rqbuf_putIndex - acb->rqbuf_getIndex - 1) &
(ARCMSR_MAX_QBUFFER - 1); (ARCMSR_MAX_QBUFFER - 1);
if (buf_empty_len >= readl(&prbuffer->data_len)) { if (buf_empty_len >= readl(&prbuffer->data_len)) {
if (arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0) if (arcmsr_Read_iop_rqbuffer_data(acb, prbuffer) == 0)
...@@ -1775,12 +1775,12 @@ static void arcmsr_write_ioctldata2iop_in_DWORD(struct AdapterControlBlock *acb) ...@@ -1775,12 +1775,12 @@ static void arcmsr_write_ioctldata2iop_in_DWORD(struct AdapterControlBlock *acb)
acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READED); acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READED);
pwbuffer = arcmsr_get_iop_wqbuffer(acb); pwbuffer = arcmsr_get_iop_wqbuffer(acb);
iop_data = (uint32_t __iomem *)pwbuffer->data; iop_data = (uint32_t __iomem *)pwbuffer->data;
while ((acb->wqbuf_firstindex != acb->wqbuf_lastindex) while ((acb->wqbuf_getIndex != acb->wqbuf_putIndex)
&& (allxfer_len < 124)) { && (allxfer_len < 124)) {
pQbuffer = &acb->wqbuffer[acb->wqbuf_firstindex]; pQbuffer = &acb->wqbuffer[acb->wqbuf_getIndex];
*buf1 = *pQbuffer; *buf1 = *pQbuffer;
acb->wqbuf_firstindex++; acb->wqbuf_getIndex++;
acb->wqbuf_firstindex %= ARCMSR_MAX_QBUFFER; acb->wqbuf_getIndex %= ARCMSR_MAX_QBUFFER;
buf1++; buf1++;
allxfer_len++; allxfer_len++;
} }
...@@ -1818,12 +1818,12 @@ arcmsr_write_ioctldata2iop(struct AdapterControlBlock *acb) ...@@ -1818,12 +1818,12 @@ arcmsr_write_ioctldata2iop(struct AdapterControlBlock *acb)
acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READED); acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READED);
pwbuffer = arcmsr_get_iop_wqbuffer(acb); pwbuffer = arcmsr_get_iop_wqbuffer(acb);
iop_data = (uint8_t __iomem *)pwbuffer->data; iop_data = (uint8_t __iomem *)pwbuffer->data;
while ((acb->wqbuf_firstindex != acb->wqbuf_lastindex) while ((acb->wqbuf_getIndex != acb->wqbuf_putIndex)
&& (allxfer_len < 124)) { && (allxfer_len < 124)) {
pQbuffer = &acb->wqbuffer[acb->wqbuf_firstindex]; pQbuffer = &acb->wqbuffer[acb->wqbuf_getIndex];
writeb(*pQbuffer, iop_data); writeb(*pQbuffer, iop_data);
acb->wqbuf_firstindex++; acb->wqbuf_getIndex++;
acb->wqbuf_firstindex %= ARCMSR_MAX_QBUFFER; acb->wqbuf_getIndex %= ARCMSR_MAX_QBUFFER;
iop_data++; iop_data++;
allxfer_len++; allxfer_len++;
} }
...@@ -1838,9 +1838,9 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb) ...@@ -1838,9 +1838,9 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb)
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
acb->acb_flags |= ACB_F_MESSAGE_WQBUFFER_READED; acb->acb_flags |= ACB_F_MESSAGE_WQBUFFER_READED;
if (acb->wqbuf_firstindex != acb->wqbuf_lastindex) if (acb->wqbuf_getIndex != acb->wqbuf_putIndex)
arcmsr_write_ioctldata2iop(acb); arcmsr_write_ioctldata2iop(acb);
if (acb->wqbuf_firstindex == acb->wqbuf_lastindex) if (acb->wqbuf_getIndex == acb->wqbuf_putIndex)
acb->acb_flags |= ACB_F_MESSAGE_WQBUFFER_CLEARED; acb->acb_flags |= ACB_F_MESSAGE_WQBUFFER_CLEARED;
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
} }
...@@ -2210,14 +2210,14 @@ void arcmsr_clear_iop2drv_rqueue_buffer(struct AdapterControlBlock *acb) ...@@ -2210,14 +2210,14 @@ void arcmsr_clear_iop2drv_rqueue_buffer(struct AdapterControlBlock *acb)
for (i = 0; i < 15; i++) { for (i = 0; i < 15; i++) {
if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) { if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW; acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
acb->rqbuf_firstindex = 0; acb->rqbuf_getIndex = 0;
acb->rqbuf_lastindex = 0; acb->rqbuf_putIndex = 0;
arcmsr_iop_message_read(acb); arcmsr_iop_message_read(acb);
mdelay(30); mdelay(30);
} else if (acb->rqbuf_firstindex != } else if (acb->rqbuf_getIndex !=
acb->rqbuf_lastindex) { acb->rqbuf_putIndex) {
acb->rqbuf_firstindex = 0; acb->rqbuf_getIndex = 0;
acb->rqbuf_lastindex = 0; acb->rqbuf_putIndex = 0;
mdelay(30); mdelay(30);
} else } else
break; break;
...@@ -2256,9 +2256,9 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2256,9 +2256,9 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
switch (controlcode) { switch (controlcode) {
case ARCMSR_MESSAGE_READ_RQBUFFER: { case ARCMSR_MESSAGE_READ_RQBUFFER: {
unsigned char *ver_addr; unsigned char *ver_addr;
uint8_t *pQbuffer, *ptmpQbuffer; uint8_t *ptmpQbuffer;
uint32_t allxfer_len = 0; uint32_t allxfer_len = 0;
ver_addr = kmalloc(1032, GFP_ATOMIC); ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);
if (!ver_addr) { if (!ver_addr) {
retvalue = ARCMSR_MESSAGE_FAIL; retvalue = ARCMSR_MESSAGE_FAIL;
pr_info("%s: memory not enough!\n", __func__); pr_info("%s: memory not enough!\n", __func__);
...@@ -2266,66 +2266,22 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2266,66 +2266,22 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
} }
ptmpQbuffer = ver_addr; ptmpQbuffer = ver_addr;
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
if (acb->rqbuf_firstindex != acb->rqbuf_lastindex) { if (acb->rqbuf_getIndex != acb->rqbuf_putIndex) {
pQbuffer = &acb->rqbuffer[acb->rqbuf_firstindex]; unsigned int tail = acb->rqbuf_getIndex;
if (acb->rqbuf_firstindex > acb->rqbuf_lastindex) { unsigned int head = acb->rqbuf_putIndex;
if ((ARCMSR_MAX_QBUFFER - unsigned int cnt_to_end = CIRC_CNT_TO_END(head, tail, ARCMSR_MAX_QBUFFER);
acb->rqbuf_firstindex) >= 1032) {
memcpy(ptmpQbuffer, pQbuffer, 1032); allxfer_len = CIRC_CNT(head, tail, ARCMSR_MAX_QBUFFER);
acb->rqbuf_firstindex += 1032; if (allxfer_len > ARCMSR_API_DATA_BUFLEN)
acb->rqbuf_firstindex %= ARCMSR_MAX_QBUFFER; allxfer_len = ARCMSR_API_DATA_BUFLEN;
allxfer_len = 1032;
} else { if (allxfer_len <= cnt_to_end)
if (((ARCMSR_MAX_QBUFFER - memcpy(ptmpQbuffer, acb->rqbuffer + tail, allxfer_len);
acb->rqbuf_firstindex) + else {
acb->rqbuf_lastindex) > 1032) { memcpy(ptmpQbuffer, acb->rqbuffer + tail, cnt_to_end);
memcpy(ptmpQbuffer, memcpy(ptmpQbuffer + cnt_to_end, acb->rqbuffer, allxfer_len - cnt_to_end);
pQbuffer, ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex);
ptmpQbuffer +=
ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex;
memcpy(ptmpQbuffer,
acb->rqbuffer, 1032 -
(ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex));
acb->rqbuf_firstindex =
1032 - (ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex);
allxfer_len = 1032;
} else {
memcpy(ptmpQbuffer,
pQbuffer, ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex);
ptmpQbuffer +=
ARCMSR_MAX_QBUFFER -
acb->rqbuf_firstindex;
memcpy(ptmpQbuffer,
acb->rqbuffer,
acb->rqbuf_lastindex);
allxfer_len = ARCMSR_MAX_QBUFFER
- acb->rqbuf_firstindex +
acb->rqbuf_lastindex;
acb->rqbuf_firstindex =
acb->rqbuf_lastindex;
}
}
} else {
if ((acb->rqbuf_lastindex -
acb->rqbuf_firstindex) > 1032) {
memcpy(ptmpQbuffer, pQbuffer, 1032);
acb->rqbuf_firstindex += 1032;
allxfer_len = 1032;
} else {
memcpy(ptmpQbuffer, pQbuffer,
acb->rqbuf_lastindex -
acb->rqbuf_firstindex);
allxfer_len = acb->rqbuf_lastindex
- acb->rqbuf_firstindex;
acb->rqbuf_firstindex =
acb->rqbuf_lastindex;
}
} }
acb->rqbuf_getIndex = (acb->rqbuf_getIndex + allxfer_len) % ARCMSR_MAX_QBUFFER;
} }
memcpy(pcmdmessagefld->messagedatabuffer, ver_addr, memcpy(pcmdmessagefld->messagedatabuffer, ver_addr,
allxfer_len); allxfer_len);
...@@ -2349,9 +2305,9 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2349,9 +2305,9 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
} }
case ARCMSR_MESSAGE_WRITE_WQBUFFER: { case ARCMSR_MESSAGE_WRITE_WQBUFFER: {
unsigned char *ver_addr; unsigned char *ver_addr;
int32_t my_empty_len, user_len, wqbuf_firstindex, wqbuf_lastindex; int32_t user_len, cnt2end;
uint8_t *pQbuffer, *ptmpuserbuffer; uint8_t *pQbuffer, *ptmpuserbuffer;
ver_addr = kmalloc(1032, GFP_ATOMIC); ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC);
if (!ver_addr) { if (!ver_addr) {
retvalue = ARCMSR_MESSAGE_FAIL; retvalue = ARCMSR_MESSAGE_FAIL;
goto message_out; goto message_out;
...@@ -2361,9 +2317,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2361,9 +2317,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
memcpy(ptmpuserbuffer, memcpy(ptmpuserbuffer,
pcmdmessagefld->messagedatabuffer, user_len); pcmdmessagefld->messagedatabuffer, user_len);
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
wqbuf_lastindex = acb->wqbuf_lastindex; if (acb->wqbuf_putIndex != acb->wqbuf_getIndex) {
wqbuf_firstindex = acb->wqbuf_firstindex;
if (wqbuf_lastindex != wqbuf_firstindex) {
struct SENSE_DATA *sensebuffer = struct SENSE_DATA *sensebuffer =
(struct SENSE_DATA *)cmd->sense_buffer; (struct SENSE_DATA *)cmd->sense_buffer;
arcmsr_write_ioctldata2iop(acb); arcmsr_write_ioctldata2iop(acb);
...@@ -2375,48 +2329,22 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2375,48 +2329,22 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
sensebuffer->Valid = 1; sensebuffer->Valid = 1;
retvalue = ARCMSR_MESSAGE_FAIL; retvalue = ARCMSR_MESSAGE_FAIL;
} else { } else {
my_empty_len = (wqbuf_firstindex - wqbuf_lastindex - 1) pQbuffer = &acb->wqbuffer[acb->wqbuf_putIndex];
& (ARCMSR_MAX_QBUFFER - 1); cnt2end = ARCMSR_MAX_QBUFFER - acb->wqbuf_putIndex;
if (my_empty_len >= user_len) { if (user_len > cnt2end) {
while (user_len > 0) { memcpy(pQbuffer, ptmpuserbuffer, cnt2end);
pQbuffer = &acb->wqbuffer[acb->wqbuf_lastindex]; ptmpuserbuffer += cnt2end;
if ((acb->wqbuf_lastindex + user_len) user_len -= cnt2end;
> ARCMSR_MAX_QBUFFER) { acb->wqbuf_putIndex = 0;
memcpy(pQbuffer, ptmpuserbuffer, pQbuffer = acb->wqbuffer;
ARCMSR_MAX_QBUFFER - }
acb->wqbuf_lastindex); memcpy(pQbuffer, ptmpuserbuffer, user_len);
ptmpuserbuffer += acb->wqbuf_putIndex += user_len;
(ARCMSR_MAX_QBUFFER acb->wqbuf_putIndex %= ARCMSR_MAX_QBUFFER;
- acb->wqbuf_lastindex); if (acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_CLEARED) {
user_len -= (ARCMSR_MAX_QBUFFER acb->acb_flags &=
- acb->wqbuf_lastindex);
acb->wqbuf_lastindex = 0;
} else {
memcpy(pQbuffer, ptmpuserbuffer,
user_len);
acb->wqbuf_lastindex += user_len;
acb->wqbuf_lastindex %=
ARCMSR_MAX_QBUFFER;
user_len = 0;
}
}
if (acb->acb_flags &
ACB_F_MESSAGE_WQBUFFER_CLEARED) {
acb->acb_flags &=
~ACB_F_MESSAGE_WQBUFFER_CLEARED; ~ACB_F_MESSAGE_WQBUFFER_CLEARED;
arcmsr_write_ioctldata2iop(acb); arcmsr_write_ioctldata2iop(acb);
}
} else {
struct SENSE_DATA *sensebuffer =
(struct SENSE_DATA *)cmd->sense_buffer;
/* has error report sensedata */
sensebuffer->ErrorCode =
SCSI_SENSE_CURRENT_ERRORS;
sensebuffer->SenseKey = ILLEGAL_REQUEST;
sensebuffer->AdditionalSenseLength = 0x0A;
sensebuffer->AdditionalSenseCode = 0x20;
sensebuffer->Valid = 1;
retvalue = ARCMSR_MESSAGE_FAIL;
} }
} }
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
...@@ -2435,8 +2363,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2435,8 +2363,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
arcmsr_clear_iop2drv_rqueue_buffer(acb); arcmsr_clear_iop2drv_rqueue_buffer(acb);
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
acb->acb_flags |= ACB_F_MESSAGE_RQBUFFER_CLEARED; acb->acb_flags |= ACB_F_MESSAGE_RQBUFFER_CLEARED;
acb->rqbuf_firstindex = 0; acb->rqbuf_getIndex = 0;
acb->rqbuf_lastindex = 0; acb->rqbuf_putIndex = 0;
memset(pQbuffer, 0, ARCMSR_MAX_QBUFFER); memset(pQbuffer, 0, ARCMSR_MAX_QBUFFER);
spin_unlock_irqrestore(&acb->rqbuffer_lock, flags); spin_unlock_irqrestore(&acb->rqbuffer_lock, flags);
if (acb->fw_flag == FW_DEADLOCK) if (acb->fw_flag == FW_DEADLOCK)
...@@ -2452,8 +2380,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2452,8 +2380,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
acb->acb_flags |= (ACB_F_MESSAGE_WQBUFFER_CLEARED | acb->acb_flags |= (ACB_F_MESSAGE_WQBUFFER_CLEARED |
ACB_F_MESSAGE_WQBUFFER_READED); ACB_F_MESSAGE_WQBUFFER_READED);
acb->wqbuf_firstindex = 0; acb->wqbuf_getIndex = 0;
acb->wqbuf_lastindex = 0; acb->wqbuf_putIndex = 0;
memset(pQbuffer, 0, ARCMSR_MAX_QBUFFER); memset(pQbuffer, 0, ARCMSR_MAX_QBUFFER);
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
if (acb->fw_flag == FW_DEADLOCK) if (acb->fw_flag == FW_DEADLOCK)
...@@ -2469,16 +2397,16 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, ...@@ -2469,16 +2397,16 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
arcmsr_clear_iop2drv_rqueue_buffer(acb); arcmsr_clear_iop2drv_rqueue_buffer(acb);
spin_lock_irqsave(&acb->rqbuffer_lock, flags); spin_lock_irqsave(&acb->rqbuffer_lock, flags);
acb->acb_flags |= ACB_F_MESSAGE_RQBUFFER_CLEARED; acb->acb_flags |= ACB_F_MESSAGE_RQBUFFER_CLEARED;
acb->rqbuf_firstindex = 0; acb->rqbuf_getIndex = 0;
acb->rqbuf_lastindex = 0; acb->rqbuf_putIndex = 0;
pQbuffer = acb->rqbuffer; pQbuffer = acb->rqbuffer;
memset(pQbuffer, 0, sizeof(struct QBUFFER)); memset(pQbuffer, 0, sizeof(struct QBUFFER));
spin_unlock_irqrestore(&acb->rqbuffer_lock, flags); spin_unlock_irqrestore(&acb->rqbuffer_lock, flags);
spin_lock_irqsave(&acb->wqbuffer_lock, flags); spin_lock_irqsave(&acb->wqbuffer_lock, flags);
acb->acb_flags |= (ACB_F_MESSAGE_WQBUFFER_CLEARED | acb->acb_flags |= (ACB_F_MESSAGE_WQBUFFER_CLEARED |
ACB_F_MESSAGE_WQBUFFER_READED); ACB_F_MESSAGE_WQBUFFER_READED);
acb->wqbuf_firstindex = 0; acb->wqbuf_getIndex = 0;
acb->wqbuf_lastindex = 0; acb->wqbuf_putIndex = 0;
pQbuffer = acb->wqbuffer; pQbuffer = acb->wqbuffer;
memset(pQbuffer, 0, sizeof(struct QBUFFER)); memset(pQbuffer, 0, sizeof(struct QBUFFER));
spin_unlock_irqrestore(&acb->wqbuffer_lock, flags); spin_unlock_irqrestore(&acb->wqbuffer_lock, flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7