1 files changed, 24 insertions, 40 deletions

diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 06c0dce3b839..0f0a1ae99434 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -8,7 +8,7 @@
 ** Copyright (C) 2002 - 2005, Areca Technology Corporation All rights reserved
 **
 **     Web site: www.areca.com.tw
-**       E-mail: erich@areca.com.tw
+**       E-mail: support@areca.com.tw
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License version 2 as
@@ -49,6 +49,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
+#include <linux/pci.h>
 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -58,15 +59,11 @@
 
 struct class_device_attribute *arcmsr_host_attrs[];
 
-static ssize_t
-arcmsr_sysfs_iop_message_read(struct kobject *kobj,
-                              struct bin_attribute *bin_attr,
-                              char *buf, loff_t off, size_t count)
+static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
         struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
-        struct MessageUnit __iomem *reg = acb->pmu;
         uint8_t *pQbuffer,*ptmpQbuffer;
         int32_t allxfer_len = 0;
 
@@ -85,12 +82,13 @@ arcmsr_sysfs_iop_message_read(struct kobject *kobj,
                 allxfer_len++;
         }
         if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
-                struct QBUFFER __iomem * prbuffer = (struct QBUFFER __iomem *)
-                                        &reg->message_rbuffer;
-                uint8_t __iomem * iop_data = (uint8_t __iomem *)prbuffer->data;
+                struct QBUFFER *prbuffer;
+                uint8_t *iop_data;
                 int32_t iop_len;
 
                 acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
+                prbuffer = arcmsr_get_iop_rqbuffer(acb);
+                iop_data = (uint8_t *)prbuffer->data;
                 iop_len = readl(&prbuffer->data_len);
                 while (iop_len > 0) {
                         acb->rqbuffer[acb->rqbuf_lastindex] = readb(iop_data);
@@ -99,16 +97,12 @@ arcmsr_sysfs_iop_message_read(struct kobject *kobj,
                         iop_data++;
                         iop_len--;
                 }
-                writel(ARCMSR_INBOUND_DRIVER_DATA_READ_OK,
-                                &reg->inbound_doorbell);
+                arcmsr_iop_message_read(acb);
         }
         return (allxfer_len);
 }
 
-static ssize_t
-arcmsr_sysfs_iop_message_write(struct kobject *kobj,
-                               struct bin_attribute *bin_attr,
-                               char *buf, loff_t off, size_t count)
+static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
@@ -126,7 +120,7 @@ arcmsr_sysfs_iop_message_write(struct kobject *kobj,
         wqbuf_lastindex = acb->wqbuf_lastindex;
         wqbuf_firstindex = acb->wqbuf_firstindex;
         if (wqbuf_lastindex != wqbuf_firstindex) {
-                arcmsr_post_Qbuffer(acb);
+                arcmsr_post_ioctldata2iop(acb);
                 return 0;       /*need retry*/
         } else {
                 my_empty_len = (wqbuf_firstindex-wqbuf_lastindex - 1)
@@ -144,7 +138,7 @@ arcmsr_sysfs_iop_message_write(struct kobject *kobj,
                         if (acb->acb_flags & ACB_F_MESSAGE_WQBUFFER_CLEARED) {
                                 acb->acb_flags &=
                                         ~ACB_F_MESSAGE_WQBUFFER_CLEARED;
-                                arcmsr_post_Qbuffer(acb);
+                                arcmsr_post_ioctldata2iop(acb);
                         }
                         return count;
                 } else {
@@ -153,15 +147,11 @@ arcmsr_sysfs_iop_message_write(struct kobject *kobj,
         }
 }
 
-static ssize_t
-arcmsr_sysfs_iop_message_clear(struct kobject *kobj,
-                               struct bin_attribute *bin_attr,
-                               char *buf, loff_t off, size_t count)
+static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj, char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
         struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
-        struct MessageUnit __iomem *reg = acb->pmu;
         uint8_t *pQbuffer;
 
         if (!capable(CAP_SYS_ADMIN))
@@ -169,8 +159,7 @@ arcmsr_sysfs_iop_message_clear(struct kobject *kobj,
 
         if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
                 acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
-                writel(ARCMSR_INBOUND_DRIVER_DATA_READ_OK
-                                , &reg->inbound_doorbell);
+                arcmsr_iop_message_read(acb);
         }
         acb->acb_flags |=
                 (ACB_F_MESSAGE_WQBUFFER_CLEARED
@@ -191,6 +180,7 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = {
         .attr = {
                 .name = "mu_read",
                 .mode = S_IRUSR ,
+                .owner = THIS_MODULE,
         },
         .size = 1032,
         .read = arcmsr_sysfs_iop_message_read,
@@ -200,6 +190,7 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = {
         .attr = {
                 .name = "mu_write",
                 .mode = S_IWUSR,
+                .owner = THIS_MODULE,
         },
         .size = 1032,
         .write = arcmsr_sysfs_iop_message_write,
@@ -209,6 +200,7 @@ static struct bin_attribute arcmsr_sysfs_message_clear_attr = {
         .attr = {
                 .name = "mu_clear",
                 .mode = S_IWUSR,
+                .owner = THIS_MODULE,
         },
         .size = 1,
         .write = arcmsr_sysfs_iop_message_clear,
@@ -219,31 +211,26 @@ int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *acb)
         struct Scsi_Host *host = acb->host;
         int error;
 
-        error = sysfs_create_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_read_attr);
+        error = sysfs_create_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_read_attr);
         if (error) {
                 printk(KERN_ERR "arcmsr: alloc sysfs mu_read failed\n");
                 goto error_bin_file_message_read;
         }
-        error = sysfs_create_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_write_attr);
+        error = sysfs_create_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_write_attr);
         if (error) {
                 printk(KERN_ERR "arcmsr: alloc sysfs mu_write failed\n");
                 goto error_bin_file_message_write;
         }
-        error = sysfs_create_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_clear_attr);
+        error = sysfs_create_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_clear_attr);
         if (error) {
                 printk(KERN_ERR "arcmsr: alloc sysfs mu_clear failed\n");
                 goto error_bin_file_message_clear;
         }
         return 0;
 error_bin_file_message_clear:
-        sysfs_remove_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_write_attr);
+        sysfs_remove_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_write_attr);
 error_bin_file_message_write:
-        sysfs_remove_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_read_attr);
+        sysfs_remove_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_read_attr);
 error_bin_file_message_read:
         return error;
 }
@@ -252,12 +239,9 @@ void
 arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) {
         struct Scsi_Host *host = acb->host;
 
-        sysfs_remove_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_clear_attr);
-        sysfs_remove_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_write_attr);
-        sysfs_remove_bin_file(&host->shost_classdev.kobj,
-                                &arcmsr_sysfs_message_read_attr);
+        sysfs_remove_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_clear_attr);
+        sysfs_remove_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_write_attr);
+        sysfs_remove_bin_file(&host->shost_classdev.kobj, &arcmsr_sysfs_message_read_attr);
 }