[SCSI] Add target alloc/destroy callbacks to the host template

[linux-2.6] / drivers / scsi / dpt_i2o.c

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 53c9b93013f1c5fbb4912efb15fde88622a5b97a..2fd728731d5ed37cc519f154e419e4bfb366c052 100644 (file)
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NULL;
 static int sys_tbl_ind = 0;
 static int sys_tbl_len = 0;
 
-static adpt_hba* hbas[DPTI_MAX_HBA];
 static adpt_hba* hba_chain = NULL;
 static int hba_count = 0;
 
@@ -691,7 +690,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
        u32 msg[4];
        u32 rcode;
        int old_state;
-       struct adpt_device* d = (void*) cmd->device->hostdata;
+       struct adpt_device* d = cmd->device->hostdata;
 
        pHba = (void*) cmd->device->host->hostdata[0];
        printk(KERN_INFO"%s: Trying to reset device\n",pHba->name);
@@ -707,7 +706,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
 
        old_state = d->state;
        d->state |= DPTI_DEV_RESET;
-       if( (rcode = adpt_i2o_post_wait(pHba, (void*)msg,sizeof(msg), FOREVER)) ){
+       if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){
                d->state = old_state;
                if(rcode == -EOPNOTSUPP ){
                        printk(KERN_INFO"%s: Device reset not supported\n",pHba->name);
@@ -737,7 +736,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
        msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid);
        msg[2] = 0;
        msg[3] = 0;
-       if(adpt_i2o_post_wait(pHba, (void*)msg,sizeof(msg), FOREVER) ){
+       if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){
                printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name);
                return FAILED;
        } else {
@@ -875,7 +874,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
        void __iomem *msg_addr_virt = NULL;
 
        int raptorFlag = FALSE;
-       int i;
 
        if(pci_enable_device(pDev)) {
                return -EINVAL;
@@ -935,12 +933,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
        memset(pHba, 0, sizeof(adpt_hba));
 
        down(&adpt_configuration_lock);
-       for(i=0;i<DPTI_MAX_HBA;i++) {
-               if(hbas[i]==NULL) {
-                       hbas[i]=pHba;
-                       break;
-               }
-       }
 
        if(hba_chain != NULL){
                for(p = hba_chain; p->next; p = p->next);
@@ -950,7 +942,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
        }
        pHba->next = NULL;
        pHba->unit = hba_count;
-       sprintf(pHba->name, "dpti%d", i);
+       sprintf(pHba->name, "dpti%d", hba_count);
        hba_count++;
        
        up(&adpt_configuration_lock);
@@ -1015,11 +1007,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
        if(pHba->host){
                free_irq(pHba->host->irq, pHba);
        }
-       for(i=0;i<DPTI_MAX_HBA;i++) {
-               if(hbas[i]==pHba) {
-                       hbas[i] = NULL;
-               }
-       }
        p2 = NULL;
        for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){
                if(p1 == pHba) {
@@ -1076,12 +1063,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 
 static int adpt_init(void)
 {
-       int i;
-
        printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
-       for (i = 0; i < DPTI_MAX_HBA; i++) {
-               hbas[i] = NULL;
-       }
 #ifdef REBOOT_NOTIFIER
        register_reboot_notifier(&adpt_reboot_notifier);
 #endif
@@ -1454,7 +1436,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                        return -ENOMEM;
                }
                
-               d->controller = (void*)pHba;
+               d->controller = pHba;
                d->next = NULL;
 
                memcpy(&d->lct_data, &lct->lct_entry[i], sizeof(i2o_lct_entry));
@@ -2000,7 +1982,7 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
        struct scsi_cmnd* cmd;
        adpt_hba* pHba = dev_id;
        u32 m;
-       ulong reply;
+       void __iomem *reply;
        u32 status=0;
        u32 context;
        ulong flags = 0;
@@ -2025,11 +2007,11 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
                                goto out;
                        }
                }
-               reply = (ulong)bus_to_virt(m);
+               reply = bus_to_virt(m);
 
                if (readl(reply) & MSG_FAIL) {
                        u32 old_m = readl(reply+28); 
-                       ulong msg;
+                       void __iomem *msg;
                        u32 old_context;
                        PDEBUG("%s: Failed message\n",pHba->name);
                        if(old_m >= 0x100000){
@@ -2038,16 +2020,16 @@ static irqreturn_t adpt_isr(int irq, void *dev_id, struct pt_regs *regs)
                                continue;
                        }
                        // Transaction context is 0 in failed reply frame
-                       msg = (ulong)(pHba->msg_addr_virt + old_m);
+                       msg = pHba->msg_addr_virt + old_m;
                        old_context = readl(msg+12);
                        writel(old_context, reply+12);
                        adpt_send_nop(pHba, old_m);
                } 
                context = readl(reply+8);
                if(context & 0x40000000){ // IOCTL
-                       ulong p = (ulong)(readl(reply+12));
-                       if( p != 0) {
-                               memcpy((void*)p, (void*)reply, REPLY_FRAME_SIZE * 4);
+                       void *p = (void *)readl(reply+12);
+                       if( p != NULL) {
+                               memcpy_fromio(p, reply, REPLY_FRAME_SIZE * 4);
                        }
                        // All IOCTLs will also be post wait
                }
@@ -2231,7 +2213,7 @@ static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht)
 }
 
 
-static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd)
+static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
 {
        adpt_hba* pHba;
        u32 hba_status;
@@ -2323,7 +2305,7 @@ static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd)
                        u32 len = sizeof(cmd->sense_buffer);
                        len = (len > 40) ?  40 : len;
                        // Copy over the sense data
-                       memcpy(cmd->sense_buffer, (void*)(reply+28) , len);
+                       memcpy_fromio(cmd->sense_buffer, (reply+28) , len);
                        if(cmd->sense_buffer[0] == 0x70 /* class 7 */ && 
                           cmd->sense_buffer[2] == DATA_PROTECT ){
                                /* This is to handle an array failed */
@@ -2438,7 +2420,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                                        return -ENOMEM;
                                }
                                
-                               d->controller = (void*)pHba;
+                               d->controller = pHba;
                                d->next = NULL;
 
                                memcpy(&d->lct_data, &lct->lct_entry[i], sizeof(i2o_lct_entry));
@@ -2985,8 +2967,8 @@ static int adpt_i2o_build_sys_table(void)
                sys_tbl->iops[count].frame_size = pHba->status_block->inbound_frame_size;
                sys_tbl->iops[count].last_changed = sys_tbl_ind - 1; // ??
                sys_tbl->iops[count].iop_capabilities = pHba->status_block->iop_capabilities;
-               sys_tbl->iops[count].inbound_low = (u32)virt_to_bus((void*)pHba->post_port);
-               sys_tbl->iops[count].inbound_high = (u32)((u64)virt_to_bus((void*)pHba->post_port)>>32);
+               sys_tbl->iops[count].inbound_low = (u32)virt_to_bus(pHba->post_port);
+               sys_tbl->iops[count].inbound_high = (u32)((u64)virt_to_bus(pHba->post_port)>>32);
 
                count++;
        }