tmscsim: new pci-device inerface
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 tmscsim: new pci-device inerface
Attached is a patch for the tmscsim driver, converting it to the new pci_device interface. Applies to 2.6.3 on the top of the other pending patches:
my earlier patch, reported on the list and regenerated against 2.6.3:
http://home.arcor.de/g.liakhovetski/scsi/tmscsim-20040304-no_internal_queue.diff
2 patches from Christoph Hellwig:
follow up to my above patch "Re: [PATCH, 2.6] tmscsim - no internal command-queuing"
http://marc.theaimsgroup.com/?l=linux-scsi&m=107563427310863&w=2
and "[PATCH] remove procfs write support from tmscsim:"
http://marc.theaimsgroup.com/?l=linux-scsi&m=107564997426650&w=2
Works on my machine with the on-board AM53C974 controller. More testing, in particular in modular build would be nice. Comments welcome as usual.
Kurt, please consider.
Thanks to Christoph for the idea and help
Guennadi
---
Guennadi Liakhovetski
drivers/scsi/scsiiom.c +14 -34
@@ -227,7 +227,7 @@#if DMA_INT UCHAR dstatus;#endif -DC390_AFLAGS DC390_IFLAGS ;//DC390_DFLAGS +DC390_IFLAGS ; pACB = (PACB )dev_id;for (pACB2 = dc390_pACB_start; (pACB2 && pACB2 != pACB); pACB2 = pACB2->pNextACB);
@@ -237,26 +237,21 @@return IRQ_NONE ; } -//DC390_LOCK_DRV; - sstatus =DC390_read8 (Scsi_Status);if ( !(sstatus &INTERRUPT ) ) - {/*DC390_UNLOCK_DRV;*/ return IRQ_NONE ; }; +return IRQ_NONE ;DEBUG1 (printk (KERN_DEBUG "sstatus=%02x," , sstatus));#if DMA_INT DC390_LOCK_IO (pACB->pScsiHost); -DC390_LOCK_ACB ; dstatus =dc390_dma_intr (pACB); -DC390_UNLOCK_ACB ;DC390_UNLOCK_IO (pACB->pScsiHost);DEBUG1 (printk (KERN_DEBUG "dstatus=%02x," , dstatus));if (! (dstatus &SCSI_INTERRUPT )) {DEBUG0 (printk (KERN_WARNING "DC390 Int w/o SCSI actions (only DMA?)\n" )); -//DC390_UNLOCK_DRV; return IRQ_NONE ; };#else
@@ -266,8 +261,6 @@#endif DC390_LOCK_IO (pACB->pScsiHost); -DC390_LOCK_ACB ; -//DC390_UNLOCK_DRV_NI; /* Allow _other_ CPUs to process IRQ (useful for shared IRQs) */ istate =DC390_read8 (Intern_State); istatus =DC390_read8 (INT_Status);/* This clears Scsi_Status, Intern_State and INT_Status ! */
@@ -339,10 +332,7 @@ } unlock: -//DC390_LOCK_DRV_NI; -DC390_UNLOCK_ACB ;DC390_UNLOCK_IO (pACB->pScsiHost); -//DC390_UNLOCK_DRV; /* Restore initial flags */ return IRQ_HANDLED ; }
@@ -1360,7 +1350,7 @@void dc390_SRBdone (PACB pACB,PDCB pDCB,PSRB pSRB ) { -UCHAR bval, status, i, DCB_removed; +UCHAR bval, status, i;PSCSICMD pcmd;PSCSI_INQDATA ptr;PSGL ptr2;
@@ -1370,7 +1360,6 @@/* KG: Moved pci_unmap here */ dc390_pci_unmap (pSRB); - DCB_removed =0 ; status = pSRB->TargetStatus; ptr = (PSCSI_INQDATA ) (pcmd->request_buffer);if ( pcmd->use_sg )
@@ -1572,14 +1561,14 @@ pcmd->sense_buffer[2], pcmd->sense_buffer[3]); else printk ("\n");#endif -if ( (host_byte (pcmd->result) !=DID_OK && !(status_byte (pcmd->result) &CHECK_CONDITION ) && !(status_byte (pcmd->result) &BUSY )) || - ((driver_byte (pcmd->result) &DRIVER_SENSE ) && (pcmd->sense_buffer[0 ] &0x70 ) ==0x70 && - (pcmd->sense_buffer[2 ] &0xf ) ==ILLEGAL_REQUEST ) ||host_byte (pcmd->result) &DID_ERROR ) +if ( (host_byte (pcmd->result) !=DID_OK && !(status_byte (pcmd->result) &CHECK_CONDITION ) && + !(status_byte (pcmd->result) &BUSY )) || + ((driver_byte (pcmd->result) &DRIVER_SENSE ) && (pcmd->sense_buffer[0 ] &0x70 ) ==0x70 && + (pcmd->sense_buffer[2 ] &0xf ) ==ILLEGAL_REQUEST ) ||host_byte (pcmd->result) &DID_ERROR ) {/* device not present: remove */ //dc390_Going_remove (pDCB, pSRB); -dc390_remove_dev (pACB, pDCB); DCB_removed =1 ; - +if ( (pcmd->device->id == pACB->pScsiHost->max_id -1 ) && ((pcmd->device->lun ==0 ) || (pcmd->device->lun == pACB->pScsiHost->max_lun -1 )) ) pACB->scan_devices =0 ;
@@ -1594,22 +1583,19 @@ } } } - -//if( pSRB->pcmd->cmnd[0] == INQUIRY && -// (host_byte(pcmd->result) == DID_OK || status_byte(pcmd->result) & CHECK_CONDITION) ) +if ( pcmd->cmnd[0 ] ==INQUIRY && - (pcmd->result == (DID_OK <<16 ) ||status_byte (pcmd->result) &CHECK_CONDITION ) ) - { -if ((ptr->DevType &SCSI_DEVTYPE ) ==TYPE_NODEV && !DCB_removed) + (host_byte (pcmd->result) ==DID_OK ||status_byte (pcmd->result) &CHECK_CONDITION ) ) + { +if ( (ptr->DevType &SCSI_DEVTYPE ) ==TYPE_NODEV ) {//printk ("DC390: Type = nodev! (%02i-%i)\n", pcmd->target, pcmd->lun); /* device not present: remove */ //dc390_Going_remove (pDCB, pSRB); -dc390_remove_dev (pACB, pDCB); DCB_removed =1 ; }else { -/* device found: add */ +/* device found: add */ dc390_add_dev (pACB, pDCB, ptr);if (pACB->scan_devices) pACB->DeviceCnt++; }
@@ -1618,18 +1604,14 @@ pACB->scan_devices =0 ; }; -#if LINUX_VERSION_CODE >KERNEL_VERSION (2 ,3 ,30 ) pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen; -#endif -if (!DCB_removed)dc390_Going_remove (pDCB, pSRB); +dc390_Going_remove (pDCB, pSRB);/* Add to free list */ dc390_Free_insert (pACB, pSRB);DEBUG0 (printk (KERN_DEBUG "DC390: SRBdone: done pid %li\n" , pcmd->pid)); -DC390_UNLOCK_ACB_NI ; pcmd->scsi_done (pcmd); -DC390_LOCK_ACB_NI ;dc390_Waiting_process (pACB);return ;
@@ -1666,9 +1648,7 @@/* ReleaseSRB( pDCB, pSRB ); */ DEBUG0 (printk (KERN_DEBUG "DC390: DoingSRB_Done: done pid %li\n" , pcmd->pid)); -DC390_UNLOCK_ACB_NI ; pcmd->scsi_done ( pcmd ); -DC390_LOCK_ACB_NI ;#endif psrb = psrb2; }
drivers/scsi/tmscsim.c +153 -206
591 lines not on this page · raw message