gdth combined patchset & call for testers
cover gdth combined patchset & call for testers
Hi!
following is an attempted at unified patchset for the gdth driver.
They try to incorporate floating patches to gdth from:
Christoph Hellwig
Jeff Garzik
Matthew Wilcox
and Me Boaz Harrosh
They are done in the mindset of "likelihood of inducing breakage", hence the need for testers. Christoph & Jeff please review for any obvious easy-to-catch bugs.
Some short explanations:
[1/16] gdth: split out isa probing - Christoph Hellwig [2/16] gdth: split out eisa probing - Christoph Hellwig [3/16] gdth: split out pci probing - Christoph Hellwig
These three are from Christoph and where ACKed by Jeff at the time.
[4/16] gdth: Remove 2.4.x support, in-kernel changelog - Jeff Garzik
Same but partial work was done both by Christoph and Matthew.
[5/16] gdth: kill gdth_{read,write}[bwl] wrappers - Jeff Garzik [6/16] Reorder scsi_host_template intitializers [7/16] gdth: make some virt ctrlr code common
These 3 are from Jeff's patchset 6 & 7 where the same patch
[8/16] gdth: Remove virt hosts - Christoph && Boaz
Here we need an executive decision! The issue is as stated by Christoph:
"The virt_ctr option allows to register a new scsi_host for each bus on the raid controller. This non-default option makes no sense with the current scsi code and prevents cleaning up the host registration, so remove it."
I agree. This is just exactly the same as done buy scsi-ml scans but only more resource consuming. Unless I'm totally missing something, perhaps it is just a leftover from old kernels.
But if it is decided that this "virt_ctr" fixture is absolutely needed than I have a patch for re-enabling it at: "after the patchset", done in a different way. Because for now it prevents the cleanups I need.
Also this patch can Just be merged with [7/16] but I wanted it separate in the case we decide for "virt_ctr" fixture return.
[9/16] gdth: clean up host private data - Christoph && Boaz
This is based on the same patch from Christoph, but taken one step farther, by just passing the ha pointer everywhere instead of hanum. Christoph please acknowledge your signed-of-by on this patch.
[10/16] gdth: gdth_get_status() return pointer to host not its index - Boaz
This logically belongs to [9/16] but is separated for reviewing and bisect-ability As it is a sensitive matter.
[11/16] gdth: switch to modern scsi host registration - Christoph
Christoph what is missing from here is the remove of the deprecated pci_find_device() call. Can I Just use pci_get_device() of the same signature or do I need to call some other pci_ members after that?
[12/16] gdth: Remove gdth_ctr_tab[] - Boaz
I took Christoph's cleanup one step farther and got read of the statically allocated gdth_ctr_tab[]. In it's place I use the new link-list introduced by the [11/16] patch.
[13/16] gdth: Make one abuse of scsi_cmnd less obvious - Matthew Wilcox
This is the first patch sent by Matthew Wilcox, rebased to all above patches. Matthew, thanks, it saved me from a much uglier hack I had with regard to per-command-private-data.
[14/16] gdth: Setup proper per-command private data - Boaz [15/16] gdth: Move members from SCp to gdth_cmndinfo, stage 2 - Boaz
These two move me much closer to the agenda I had in all this, which is: "gdth diss-abuse of of scsi_cmnd IO members". With these patches I also conform to Matthew's second patch:
"gdth: Stop abusing ->done for internal commands"
[16/16] gdth: !use_sg cleanup and use of scsi accessors
And finally this one.
Boaz
PATCH 1/16 gdth: split out isa probing
(note: this is ontop of Jeff's pci cleanup patch)
Split out isa probing into a helper of it's own. Error handling is cleaned up, but errors are not propagated yet. Also enclose the isa probe under the proper CONFIG_ISA symbol instead of the !IA64 hack.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/scsi/gdth.c | 281 ++++++++++++++++++++++++++++----------------------- 1 files changed, 154 insertions(+), 127 deletions(-)
drivers/scsi/gdth.c +154 -127
@@ -476,6 +476,9 @@ static void gdth_flush(int hanum);static int gdth_halt (struct notifier_block *nb,ulong event,void *buf);static int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *));static void gdth_scsi_done (struct scsi_cmnd *scp); +#ifdef CONFIG_ISA +static int gdth_isa_probe_one (struct scsi_host_template *,ulong32 ); +#endif #ifdef DEBUG_GDTH static unchar DebugState =DEBUG_GDTH ;
@@ -4277,6 +4280,7 @@ int __init option_setup(char *str)return 1 ; } +#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )static int __init gdth_detect (struct scsi_host_template *shtp) #else
@@ -4323,135 +4327,15 @@ static int __init gdth_detect(Scsi_Host_Template *shtp)/* As default we do not probe for EISA or ISA controllers */ if (probe_eisa_isa) {/* scanning for controllers, at first: ISA controller */ -for (isa_bios=0xc8000UL ; isa_bios<=0xd8000UL ; isa_bios+=0x8000UL ) { -dma_addr_t scratch_dma_handle; - scratch_dma_handle =0 ; - -if (gdth_ctr_count >=MAXHA ) -break ; -if (gdth_search_isa (isa_bios)) {/* controller found */ - shp =scsi_register (shtp,sizeof (gdth_ext_str)); -if (shp ==NULL ) -continue ; - - ha =HADATA (shp); -if (!gdth_init_isa (isa_bios,ha)) { -scsi_unregister (shp); -continue ; - } -#ifdef __ia64__ +#ifdef CONFIG_ISA +for (isa_bios =0xc8000UL ; isa_bios <=0xd8000UL ; + isa_bios +=0x8000UL ) { +if (gdth_ctr_count >=MAXHA )break ; -#else -/* controller found and initialized */ -printk ("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n" , - isa_bios,ha->irq,ha->drq); - -if (request_irq (ha->irq,gdth_interrupt,IRQF_DISABLED ,"gdth" ,ha)) { -printk ("GDT-ISA: Unable to allocate IRQ\n" ); -scsi_unregister (shp); -continue ; - } -if (request_dma (ha->drq,"gdth" )) { -printk ("GDT-ISA: Unable to allocate DMA channel\n" ); -free_irq (ha->irq,ha); -scsi_unregister (shp); -continue ; - } -set_dma_mode (ha->drq,DMA_MODE_CASCADE ); -enable_dma (ha->drq); - shp->unchecked_isa_dma =1 ; - shp->irq = ha->irq; - shp->dma_channel = ha->drq; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; - -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ; - - ha->pccb =CMDDATA (shp); - ha->ccb_phys =0L ; - ha->pdev =NULL ; - ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , - &scratch_dma_handle); - ha->scratch_phys = scratch_dma_handle; - ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), - &scratch_dma_handle); - ha->msg_phys = scratch_dma_handle; -#ifdef INT_COAL - ha->coal_stat = (gdth_coal_status *) -pci_alloc_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , &scratch_dma_handle); - ha->coal_stat_phys = scratch_dma_handle; -#endif - - ha->scratch_busy = FALSE; - ha->req_first =NULL ; - ha->tid_cnt =MAX_HDRIVES ; -if (max_ids >0 && max_ids < ha->tid_cnt) - ha->tid_cnt = max_ids; -for (i=0 ; i<GDTH_MAXCMDS ; ++i) - ha->cmd_tab[i].cmnd =UNUSED_CMND ; - ha->scan_mode = rescan ?0x10 :0 ; - -if (ha->pscratch ==NULL || ha->pmsg ==NULL || - !gdth_search_drives (hanum)) { -printk ("GDT-ISA: Error during device scan\n" ); - --gdth_ctr_count; - --gdth_ctr_vcount; - -#ifdef INT_COAL -if (ha->coal_stat) -pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , ha->coal_stat, - ha->coal_stat_phys); -#endif -if (ha->pscratch) -pci_free_consistent (ha->pdev,GDTH_SCRATCH , - ha->pscratch, ha->scratch_phys); -if (ha->pmsg) -pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), - ha->pmsg, ha->msg_phys); - -free_irq (ha->irq,ha); -scsi_unregister (shp); -continue ; - } -if (hdr_channel <0 || hdr_channel > ha->bus_cnt) - hdr_channel = ha->bus_cnt; - ha->virt_bus = hdr_channel; - -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,4 ,20 ) && \ -LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,0 ) - shp->highmem_io =0 ; -#endif -if (ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT ) - shp->max_cmd_len =16 ; - - shp->max_id = ha->tid_cnt; - shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =1 ; - shp->irq = ha->irq; - shp->dma_channel = ha->drq; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } - -spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); -#endif /* !__ia64__ */ - } +gdth_isa_probe_one (shtp, isa_bios); } +#endif -/* scanning for EISA controllers */ for (eisa_slot=0x1000 ; eisa_slot<=0x8000 ; eisa_slot+=0x1000 ) {dma_addr_t scratch_dma_handle; scratch_dma_handle =0 ;
@@ -4749,7 +4633,7 @@ static int gdth_release(struct Scsi_Host *shp)if (shp->irq) {free_irq (shp->irq,ha); } -#ifndef __ia64__ +#ifdef CONFIG_ISA if (shp->dma_channel !=0xff ) {free_dma (shp->dma_channel); }
@@ -5668,6 +5552,149 @@ static Scsi_Host_Template driver_template = {#endif }; +#ifdef CONFIG_ISA +static int gdth_isa_probe_one (struct scsi_host_template *shtp,ulong32 isa_bios) +{ +struct Scsi_Host *shp; +gdth_ha_str *ha; +dma_addr_t scratch_dma_handle =0 ; +int error, hanum, i; +u8 b; + +if (!gdth_search_isa (isa_bios)) +return -ENXIO ; + + shp =scsi_register (shtp,sizeof (gdth_ext_str)); +if (!shp) +return -ENOMEM ; + ha =HADATA (shp); + + error = -ENODEV ; +if (!gdth_init_isa (isa_bios,ha)) + goto out_host_put; + +/* controller found and initialized */ +printk ("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n" , + isa_bios, ha->irq, ha->drq); + + error =request_irq (ha->irq, gdth_interrupt,IRQF_DISABLED ,"gdth" , ha); +if (error) { +printk ("GDT-ISA: Unable to allocate IRQ\n" ); + goto out_host_put; + } + + error =request_dma (ha->drq,"gdth" ); +if (error) { +printk ("GDT-ISA: Unable to allocate DMA channel\n" ); + goto out_free_irq; + } + +set_dma_mode (ha->drq,DMA_MODE_CASCADE ); +enable_dma (ha->drq); + shp->unchecked_isa_dma =1 ; + shp->irq = ha->irq; + shp->dma_channel = ha->drq; + hanum = gdth_ctr_count; + gdth_ctr_tab[gdth_ctr_count++] = shp; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum=0 ; + + ha->pccb =CMDDATA (shp); + ha->ccb_phys =0L ; + ha->pdev =NULL ; + + error = -ENOMEM ; + + ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , + &scratch_dma_handle); +if (!ha->pscratch) + goto out_dec_counters; + ha->scratch_phys = scratch_dma_handle; + + ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), + &scratch_dma_handle); +if (!ha->pmsg) + goto out_free_pscratch; + ha->msg_phys = scratch_dma_handle; + +#ifdef INT_COAL + ha->coal_stat =pci_alloc_consistent (ha->pdev, +sizeof (gdth_coal_status) *MAXOFFSETS , + &scratch_dma_handle); +if (!ha->coal_stat) + goto out_free_pmsg; + ha->coal_stat_phys = scratch_dma_handle; +#endif + + ha->scratch_busy = FALSE; + ha->req_first =NULL ; + ha->tid_cnt =MAX_HDRIVES ; +if (max_ids >0 && max_ids < ha->tid_cnt) + ha->tid_cnt = max_ids; +for (i =0 ; i <GDTH_MAXCMDS ; ++i) + ha->cmd_tab[i].cmnd =UNUSED_CMND ; + ha->scan_mode = rescan ?0x10 :0 ; + + error = -ENODEV ; +if (!gdth_search_drives (hanum)) { +printk ("GDT-ISA: Error during device scan\n" ); + goto out_free_coal_stat; + } + +if (hdr_channel <0 || hdr_channel > ha->bus_cnt) + hdr_channel = ha->bus_cnt; + ha->virt_bus = hdr_channel; + +if (ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT ) + shp->max_cmd_len =16 ; + + shp->max_id = ha->tid_cnt; + shp->max_lun =MAXLUN ; + shp->max_channel = virt_ctr ?0 : ha->bus_cnt; +if (virt_ctr) { + virt_ctr =1 ; +/* register addit. SCSI channels as virtual controllers */ +for (b =1 ; b < ha->bus_cnt +1 ; ++b) { + shp =scsi_register (shtp,sizeof (gdth_num_str)); + shp->unchecked_isa_dma =1 ; + shp->irq = ha->irq; + shp->dma_channel = ha->drq; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum = b; + } + } + +spin_lock_init (&ha->smp_lock); +gdth_enable_int (hanum); + +return 0 ; + + out_free_coal_stat: +#ifdef INT_COAL +pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) *MAXOFFSETS , + ha->coal_stat, ha->coal_stat_phys); + out_free_pmsg: +#endif +pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), + ha->pmsg, ha->msg_phys); + out_free_pscratch: +pci_free_consistent (ha->pdev,GDTH_SCRATCH , + ha->pscratch, ha->scratch_phys); + out_dec_counters: + gdth_ctr_count--; + gdth_ctr_vcount--; + out_free_irq: +free_irq (ha->irq, ha); + out_host_put: +scsi_unregister (shp); +return error; +} +#endif /* CONFIG_ISA */ + +#include "scsi_module.c" #ifndef MODULE __setup ("gdth=" , option_setup);
Signature · 1 line
1.5.3.1
PATCH 2/16 gdth: split out eisa probing
In reply to Boaz HarroshSplit eisa probing into it's own helper, and do proper error unwinding. Protect EISA probind by the proper CONFIG_EISA symbol.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/scsi/gdth.c | 270 ++++++++++++++++++++++++++++----------------------- 1 files changed, 150 insertions(+), 120 deletions(-)
drivers/scsi/gdth.c +150 -120
@@ -479,6 +479,9 @@ static void gdth_scsi_done(struct scsi_cmnd *scp);#ifdef CONFIG_ISA static int gdth_isa_probe_one (struct scsi_host_template *,ulong32 );#endif +#ifdef CONFIG_EISA +static int gdth_eisa_probe_one (struct scsi_host_template *,ushort ); +#endif #ifdef DEBUG_GDTH static unchar DebugState =DEBUG_GDTH ;
@@ -4335,129 +4338,14 @@ static int __init gdth_detect(Scsi_Host_Template *shtp)gdth_isa_probe_one (shtp, isa_bios); }#endif - -for (eisa_slot=0x1000 ; eisa_slot<=0x8000 ; eisa_slot+=0x1000 ) { -dma_addr_t scratch_dma_handle; - scratch_dma_handle =0 ; - -if (gdth_ctr_count >=MAXHA ) +#ifdef CONFIG_EISA +for (eisa_slot =0x1000 ; eisa_slot <=0x8000 ; eisa_slot +=0x1000 ) { +if (gdth_ctr_count >=MAXHA )break ; -if (gdth_search_eisa (eisa_slot)) {/* controller found */ - shp =scsi_register (shtp,sizeof (gdth_ext_str)); -if (shp ==NULL ) -continue ; - - ha =HADATA (shp); -if (!gdth_init_eisa (eisa_slot,ha)) { -scsi_unregister (shp); -continue ; - } -/* controller found and initialized */ -printk ("Configuring GDT-EISA HA at Slot %d IRQ %u\n" , - eisa_slot>>12 ,ha->irq); - -if (request_irq (ha->irq,gdth_interrupt,IRQF_DISABLED ,"gdth" ,ha)) { -printk ("GDT-EISA: Unable to allocate IRQ\n" ); -scsi_unregister (shp); -continue ; - } - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; - -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ; -TRACE2 (("EISA detect Bus 0: hanum %d\n" , -NUMDATA (shp)->hanum)); - - ha->pccb =CMDDATA (shp); - ha->ccb_phys =0L ; - - ha->pdev =NULL ; - ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , - &scratch_dma_handle); - ha->scratch_phys = scratch_dma_handle; - ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), - &scratch_dma_handle); - ha->msg_phys = scratch_dma_handle; -#ifdef INT_COAL - ha->coal_stat = (gdth_coal_status *) -pci_alloc_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , &scratch_dma_handle); - ha->coal_stat_phys = scratch_dma_handle; -#endif - ha->ccb_phys = -pci_map_single (ha->pdev,ha->pccb, -sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); - ha->scratch_busy = FALSE; - ha->req_first =NULL ; - ha->tid_cnt =MAX_HDRIVES ; -if (max_ids >0 && max_ids < ha->tid_cnt) - ha->tid_cnt = max_ids; -for (i=0 ; i<GDTH_MAXCMDS ; ++i) - ha->cmd_tab[i].cmnd =UNUSED_CMND ; - ha->scan_mode = rescan ?0x10 :0 ; - -if (ha->pscratch ==NULL || ha->pmsg ==NULL || - !gdth_search_drives (hanum)) { -printk ("GDT-EISA: Error during device scan\n" ); - --gdth_ctr_count; - --gdth_ctr_vcount; -#ifdef INT_COAL -if (ha->coal_stat) -pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , ha->coal_stat, - ha->coal_stat_phys); -#endif -if (ha->pscratch) -pci_free_consistent (ha->pdev,GDTH_SCRATCH , - ha->pscratch, ha->scratch_phys); -if (ha->pmsg) -pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), - ha->pmsg, ha->msg_phys); -if (ha->ccb_phys) -pci_unmap_single (ha->pdev,ha->ccb_phys, -sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); -free_irq (ha->irq,ha); -scsi_unregister (shp); -continue ; - } -if (hdr_channel <0 || hdr_channel > ha->bus_cnt) - hdr_channel = ha->bus_cnt; - ha->virt_bus = hdr_channel; - -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,4 ,20 ) && \ -LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,0 ) - shp->highmem_io =0 ; -#endif -if (ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT ) - shp->max_cmd_len =16 ; - - shp->max_id = ha->tid_cnt; - shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } - -spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); - } +gdth_eisa_probe_one (shtp, eisa_slot); } } +#endif /* scanning for PCI controllers */ cnt =gdth_search_pci (pcistr);
@@ -5694,6 +5582,148 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) }#endif /* CONFIG_ISA */ +#ifdef CONFIG_EISA +static int gdth_eisa_probe_one (struct scsi_host_template *shtp, +ushort eisa_slot) +{ +struct Scsi_Host *shp; +gdth_ha_str *ha; +dma_addr_t scratch_dma_handle =0 ; +int error, hanum, i; +u8 b; + +if (!gdth_search_eisa (eisa_slot)) +return -ENXIO ; + + shp =scsi_register (shtp,sizeof (gdth_ext_str)); +if (!shp) +return -ENOMEM ; + ha =HADATA (shp); + + error = -ENODEV ; +if (!gdth_init_eisa (eisa_slot,ha)) + goto out_host_put; + +/* controller found and initialized */ +printk ("Configuring GDT-EISA HA at Slot %d IRQ %u\n" , + eisa_slot >>12 , ha->irq); + + error =request_irq (ha->irq, gdth_interrupt,IRQF_DISABLED ,"gdth" , ha); +if (error) { +printk ("GDT-EISA: Unable to allocate IRQ\n" ); + goto out_host_put; + } + + shp->unchecked_isa_dma =0 ; + shp->irq = ha->irq; + shp->dma_channel =0xff ; + hanum = gdth_ctr_count; + gdth_ctr_tab[gdth_ctr_count++] = shp; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum=0 ; +TRACE2 (("EISA detect Bus 0: hanum %d\n" , +NUMDATA (shp)->hanum)); + + ha->pccb =CMDDATA (shp); + ha->ccb_phys =0L ; + + error = -ENOMEM ; + + ha->pdev =NULL ; + ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , + &scratch_dma_handle); +if (!ha->pscratch) + goto out_free_irq; + ha->scratch_phys = scratch_dma_handle; + + ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), + &scratch_dma_handle); +if (!ha->pmsg) + goto out_free_pscratch; + ha->msg_phys = scratch_dma_handle; + +#ifdef INT_COAL + ha->coal_stat =pci_alloc_consistent (ha->pdev, +sizeof (gdth_coal_status) *MAXOFFSETS , + &scratch_dma_handle); +if (!ha->coal_stat) + goto out_free_pmsg; + ha->coal_stat_phys = scratch_dma_handle; +#endif + + ha->ccb_phys =pci_map_single (ha->pdev,ha->pccb, +sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); +if (!ha->ccb_phys) + goto out_free_coal_stat; + + ha->scratch_busy = FALSE; + ha->req_first =NULL ; + ha->tid_cnt =MAX_HDRIVES ; +if (max_ids >0 && max_ids < ha->tid_cnt) + ha->tid_cnt = max_ids; +for (i =0 ; i <GDTH_MAXCMDS ; ++i) + ha->cmd_tab[i].cmnd =UNUSED_CMND ; + ha->scan_mode = rescan ?0x10 :0 ; + +if (!gdth_search_drives (hanum)) { +printk ("GDT-EISA: Error during device scan\n" ); + error = -ENODEV ; + goto out_free_ccb_phys; + } + +if (hdr_channel <0 || hdr_channel > ha->bus_cnt) + hdr_channel = ha->bus_cnt; + ha->virt_bus = hdr_channel; + +if (ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT ) + shp->max_cmd_len =16 ; + + shp->max_id = ha->tid_cnt; + shp->max_lun =MAXLUN ; + shp->max_channel = virt_ctr ?0 : ha->bus_cnt; +if (virt_ctr) { + virt_ctr =1 ; +/* register addit. SCSI channels as virtual controllers */ +for (b =1 ; b < ha->bus_cnt +1 ; ++b) { + shp =scsi_register (shtp,sizeof (gdth_num_str)); + shp->unchecked_isa_dma =0 ; + shp->irq = ha->irq; + shp->dma_channel =0xff ; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum = b; + } + } + +spin_lock_init (&ha->smp_lock); +gdth_enable_int (hanum); +return 0 ; + + out_free_ccb_phys: +pci_unmap_single (ha->pdev,ha->ccb_phys,sizeof (gdth_cmd_str), +PCI_DMA_BIDIRECTIONAL ); + out_free_coal_stat: +#ifdef INT_COAL +pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) *MAXOFFSETS , + ha->coal_stat, ha->coal_stat_phys); + out_free_pmsg: +#endif +pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), + ha->pmsg, ha->msg_phys); + out_free_pscratch: +pci_free_consistent (ha->pdev,GDTH_SCRATCH , + ha->pscratch, ha->scratch_phys); + out_free_irq: +free_irq (ha->irq, ha); + gdth_ctr_count--; + gdth_ctr_vcount--; + out_host_put: +scsi_unregister (shp); +return error; +} +#endif /* CONFIG_EISA */ #include "scsi_module.c" #ifndef MODULE
Signature · 1 line
1.5.3.1
PATCH 3/16 gdth: split out pci probing
In reply to Boaz HarroshSplit out per-device pci probing and put it under proper CONFIG_PCI.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/scsi/gdth.c | 287 +++++++++++++++++++++++++++----------------------- 1 files changed, 155 insertions(+), 132 deletions(-)
drivers/scsi/gdth.c +155 -132
@@ -482,6 +482,9 @@ static int gdth_isa_probe_one(struct scsi_host_template *, ulong32);#ifdef CONFIG_EISA static int gdth_eisa_probe_one (struct scsi_host_template *,ushort );#endif +#ifdef CONFIG_PCI +static int gdth_pci_probe_one (struct scsi_host_template *,gdth_pci_str *,int ); +#endif #ifdef DEBUG_GDTH static unchar DebugState =DEBUG_GDTH ;
@@ -4290,12 +4293,10 @@ static int __init gdth_detect(struct scsi_host_template *shtp) static int __init gdth_detect(Scsi_Host_Template *shtp)#endif { -struct Scsi_Host *shp;gdth_pci_str pcistr[MAXHA ]; -gdth_ha_str *ha;ulong32 isa_bios;ushort eisa_slot; -int i,hanum,cnt,ctr,err; +int cnt,ctr;unchar b;
@@ -4347,143 +4348,17 @@ static int __init gdth_detect(Scsi_Host_Template *shtp) }#endif +#ifdef CONFIG_PCI /* scanning for PCI controllers */ cnt =gdth_search_pci (pcistr);printk ("GDT-HA: Found %d PCI Storage RAID Controllers\n" ,cnt);gdth_sort_pci (pcistr,cnt);for (ctr =0 ; ctr < cnt; ++ctr) { -dma_addr_t scratch_dma_handle; - scratch_dma_handle =0 ; -if (gdth_ctr_count >=MAXHA )break ; - shp =scsi_register (shtp,sizeof (gdth_ext_str)); -if (shp ==NULL ) -continue ; - - ha =HADATA (shp); -if (!gdth_init_pci (&pcistr[ctr],ha)) { -scsi_unregister (shp); -continue ; - } -/* controller found and initialized */ -printk ("Configuring GDT-PCI HA at %d/%d IRQ %u\n" , - pcistr[ctr].pdev->bus->number, -PCI_SLOT (pcistr[ctr].pdev->devfn), ha->irq); - -if (request_irq (ha->irq, gdth_interrupt, -IRQF_DISABLED |IRQF_SHARED ,"gdth" , ha)) - { -printk ("GDT-PCI: Unable to allocate IRQ\n" ); -scsi_unregister (shp); -continue ; - } - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; - -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ; - - ha->pccb =CMDDATA (shp); - ha->ccb_phys =0L ; - - ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , - &scratch_dma_handle); - ha->scratch_phys = scratch_dma_handle; - ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), - &scratch_dma_handle); - ha->msg_phys = scratch_dma_handle; -#ifdef INT_COAL - ha->coal_stat = (gdth_coal_status *) -pci_alloc_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , &scratch_dma_handle); - ha->coal_stat_phys = scratch_dma_handle; -#endif - ha->scratch_busy = FALSE; - ha->req_first =NULL ; - ha->tid_cnt = pcistr[ctr].pdev->device >=0x200 ?MAXID :MAX_HDRIVES ; -if (max_ids >0 && max_ids < ha->tid_cnt) - ha->tid_cnt = max_ids; -for (i=0 ; i<GDTH_MAXCMDS ; ++i) - ha->cmd_tab[i].cmnd =UNUSED_CMND ; - ha->scan_mode = rescan ?0x10 :0 ; - - err = FALSE; -if (ha->pscratch ==NULL || ha->pmsg ==NULL || - !gdth_search_drives (hanum)) { - err = TRUE; - }else { -if (hdr_channel <0 || hdr_channel > ha->bus_cnt) - hdr_channel = ha->bus_cnt; - ha->virt_bus = hdr_channel; - - -#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,0 ) -scsi_set_pci_device (shp, pcistr[ctr].pdev); -#endif -if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT )|| -/* 64-bit DMA only supported from FW >= x.43 */ - (!ha->dma64_support)) { -if (pci_set_dma_mask (pcistr[ctr].pdev,DMA_32BIT_MASK )) { -printk (KERN_WARNING "GDT-PCI %d: Unable to set 32-bit DMA\n" , hanum); - err = TRUE; - } - }else { - shp->max_cmd_len =16 ; -if (!pci_set_dma_mask (pcistr[ctr].pdev,DMA_64BIT_MASK )) { -printk ("GDT-PCI %d: 64-bit DMA enabled\n" , hanum); - }else if (pci_set_dma_mask (pcistr[ctr].pdev,DMA_32BIT_MASK )) { -printk (KERN_WARNING "GDT-PCI %d: Unable to set 64/32-bit DMA\n" , hanum); - err = TRUE; - } - } - } - -if (err) { -printk ("GDT-PCI %d: Error during device scan\n" , hanum); - --gdth_ctr_count; - --gdth_ctr_vcount; -#ifdef INT_COAL -if (ha->coal_stat) -pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , ha->coal_stat, - ha->coal_stat_phys); -#endif -if (ha->pscratch) -pci_free_consistent (ha->pdev,GDTH_SCRATCH , - ha->pscratch, ha->scratch_phys); -if (ha->pmsg) -pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), - ha->pmsg, ha->msg_phys); -free_irq (ha->irq,ha); -scsi_unregister (shp); -continue ; - } - - shp->max_id = ha->tid_cnt; - shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } - -spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); +gdth_pci_probe_one (shtp, pcistr, ctr); } +#endif TRACE2 (("gdth_detect() %d controller detected\n" ,gdth_ctr_count));if (gdth_ctr_count >0 ) {
@@ -5725,6 +5600,154 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, }#endif /* CONFIG_EISA */ +#ifdef CONFIG_PCI +static int gdth_pci_probe_one (struct scsi_host_template *shtp, +gdth_pci_str *pcistr,int ctr) +{ +struct Scsi_Host *shp; +gdth_ha_str *ha; +dma_addr_t scratch_dma_handle =0 ; +int error, hanum, i; +u8 b; + + shp =scsi_register (shtp,sizeof (gdth_ext_str)); +if (!shp) +return -ENOMEM ; + ha =HADATA (shp); + + error = -ENODEV ; +if (!gdth_init_pci (&pcistr[ctr],ha)) + goto out_host_put; + +/* controller found and initialized */ +printk ("Configuring GDT-PCI HA at %d/%d IRQ %u\n" , + pcistr[ctr].pdev->bus->number, +PCI_SLOT (pcistr[ctr].pdev->devfn), + ha->irq); + + error =request_irq (ha->irq, gdth_interrupt, +IRQF_DISABLED |IRQF_SHARED ,"gdth" , ha); +if (error) { +printk ("GDT-PCI: Unable to allocate IRQ\n" ); + goto out_host_put; + } + + shp->unchecked_isa_dma =0 ; + shp->irq = ha->irq; + shp->dma_channel =0xff ; + hanum = gdth_ctr_count; + gdth_ctr_tab[gdth_ctr_count++] = shp; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum=0 ; + + ha->pccb =CMDDATA (shp); + ha->ccb_phys =0L ; + + error = -ENOMEM ; + + ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , + &scratch_dma_handle); +if (!ha->pscratch) + goto out_free_irq; + ha->scratch_phys = scratch_dma_handle; + + ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), + &scratch_dma_handle); +if (!ha->pmsg) + goto out_free_pscratch; + ha->msg_phys = scratch_dma_handle; + +#ifdef INT_COAL + ha->coal_stat =pci_alloc_consistent (ha->pdev, +sizeof (gdth_coal_status) *MAXOFFSETS , + &scratch_dma_handle); +if (!ha->coal_stat) + goto out_free_pmsg; + ha->coal_stat_phys = scratch_dma_handle; +#endif + + ha->scratch_busy = FALSE; + ha->req_first =NULL ; + ha->tid_cnt = pcistr[ctr].pdev->device >=0x200 ?MAXID :MAX_HDRIVES ; +if (max_ids >0 && max_ids < ha->tid_cnt) + ha->tid_cnt = max_ids; +for (i =0 ; i <GDTH_MAXCMDS ; ++i) + ha->cmd_tab[i].cmnd =UNUSED_CMND ; + ha->scan_mode = rescan ?0x10 :0 ; + + error = -ENODEV ; +if (!gdth_search_drives (hanum)) { +printk ("GDT-PCI %d: Error during device scan\n" , hanum); + goto out_free_coal_stat; + } + +if (hdr_channel <0 || hdr_channel > ha->bus_cnt) + hdr_channel = ha->bus_cnt; + ha->virt_bus = hdr_channel; + +/* 64-bit DMA only supported from FW >= x.43 */ +if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat &GDT_64BIT ) || + !ha->dma64_support) { +if (pci_set_dma_mask (pcistr[ctr].pdev,DMA_32BIT_MASK )) { +printk (KERN_WARNING "GDT-PCI %d: " +"Unable to set 32-bit DMA\n" , hanum); + goto out_free_coal_stat; + } + }else { + shp->max_cmd_len =16 ; +if (!pci_set_dma_mask (pcistr[ctr].pdev,DMA_64BIT_MASK )) { +printk ("GDT-PCI %d: 64-bit DMA enabled\n" , hanum); + }else if (pci_set_dma_mask (pcistr[ctr].pdev,DMA_32BIT_MASK )) { +printk (KERN_WARNING "GDT-PCI %d: " +"Unable to set 64/32-bit DMA\n" , hanum); + goto out_free_coal_stat; + } + } + + shp->max_id = ha->tid_cnt; + shp->max_lun =MAXLUN ; + shp->max_channel = virt_ctr ?0 : ha->bus_cnt; +if (virt_ctr) { + virt_ctr =1 ; +/* register addit. SCSI channels as virtual controllers */ +for (b =1 ; b < ha->bus_cnt +1 ; ++b) { + shp =scsi_register (shtp,sizeof (gdth_num_str)); + shp->unchecked_isa_dma =0 ; + shp->irq = ha->irq; + shp->dma_channel =0xff ; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum = b; + } + } + +spin_lock_init (&ha->smp_lock); +gdth_enable_int (hanum); +return 0 ; + + out_free_coal_stat: +#ifdef INT_COAL +pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) *MAXOFFSETS , + ha->coal_stat, ha->coal_stat_phys); + out_free_pmsg: +#endif +pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), + ha->pmsg, ha->msg_phys); + out_free_pscratch: +pci_free_consistent (ha->pdev,GDTH_SCRATCH , + ha->pscratch, ha->scratch_phys); + out_free_irq: +free_irq (ha->irq, ha); + gdth_ctr_count--; + gdth_ctr_vcount--; + out_host_put: +scsi_unregister (shp); +return error; +} +#endif /* CONFIG_PCI */ +#include "scsi_module.c" #ifndef MODULE __setup ("gdth=" , option_setup);
PATCH 4/16 gdth: Remove 2.4.x support, in-kernel changelog
In reply to Boaz Harrosh* Remove in-source changelog. It's archived permanently in git and various kernel archives, and changelogs should exist purely in git.
* Remove 2.4.x kernel support. It is an active obstacle to modernizing this driver, at this point. This includes killing gdth_kcompat.h which is 100% redundant in modern kernels.
Signed-off-by Jeff Garzik <[email protected]>
--- drivers/scsi/gdth.c | 396 +------------------------------------------ drivers/scsi/gdth.h | 1 - drivers/scsi/gdth_kcompat.h | 31 ---- drivers/scsi/gdth_proc.c | 27 --- 4 files changed, 2 insertions(+), 453 deletions(-) delete mode 100644 drivers/scsi/gdth_kcompat.h
drivers/scsi/gdth.c +2 -394
@@ -27,280 +27,8 @@* along with this kernel; if not, write to the Free Software * * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * * -* Linux kernel 2.4.x, 2.6.x supported * +* Linux kernel 2.6.x supported * * * -* $Log: gdth.c,v $ -* Revision 1.74 2006/04/10 13:44:47 achim -* Community changes for 2.6.x -* Kernel 2.2.x no longer supported -* scsi_request interface removed, thanks to Christoph Hellwig -* -* Revision 1.73 2004/03/31 13:33:03 achim -* Special command 0xfd implemented to detect 64-bit DMA support -* -* Revision 1.72 2004/03/17 08:56:04 achim -* 64-bit DMA only enabled if FW >= x.43 -* -* Revision 1.71 2004/03/05 15:51:29 achim -* Screen service: separate message buffer, bugfixes -* -* Revision 1.70 2004/02/27 12:19:07 achim -* Bugfix: Reset bit in config (0xfe) call removed -* -* Revision 1.69 2004/02/20 09:50:24 achim -* Compatibility changes for kernels < 2.4.20 -* Bugfix screen service command size -* pci_set_dma_mask() error handling added -* -* Revision 1.68 2004/02/19 15:46:54 achim -* 64-bit DMA bugfixes -* Drive size bugfix for drives > 1TB -* -* Revision 1.67 2004/01/14 13:11:57 achim -* Tool access over /proc no longer supported -* Bugfixes IOCTLs -* -* Revision 1.66 2003/12/19 15:04:06 achim -* Bugfixes support for drives > 2TB -* -* Revision 1.65 2003/12/15 11:21:56 achim -* 64-bit DMA support added -* Support for drives > 2 TB implemented -* Kernels 2.2.x, 2.4.x, 2.6.x supported -* -* Revision 1.64 2003/09/17 08:30:26 achim -* EISA/ISA controller scan disabled -* Command line switch probe_eisa_isa added -* -* Revision 1.63 2003/07/12 14:01:00 Daniele Bellucci <[email protected]> -* Minor cleanups in gdth_ioctl. -* -* Revision 1.62 2003/02/27 15:01:59 achim -* Dynamic DMA mapping implemented -* New (character device) IOCTL interface added -* Other controller related changes made -* -* Revision 1.61 2002/11/08 13:09:52 boji -* Added support for XSCALE based RAID Controllers -* Fixed SCREENSERVICE initialization in SMP cases -* Added checks for gdth_polling before GDTH_HA_LOCK -* -* Revision 1.60 2002/02/05 09:35:22 achim -* MODULE_LICENSE only if kernel >= 2.4.11 -* -* Revision 1.59 2002/01/30 09:46:33 achim -* Small changes -* -* Revision 1.58 2002/01/29 15:30:02 achim -* Set default value of shared_access to Y -* New status S_CACHE_RESERV for clustering added -* -* Revision 1.57 2001/08/21 11:16:35 achim -* Bugfix free_irq() -* -* Revision 1.56 2001/08/09 11:19:39 achim -* Scsi_Host_Template changes -* -* Revision 1.55 2001/08/09 10:11:28 achim -* Command HOST_UNFREEZE_IO before cache service init. -* -* Revision 1.54 2001/07/20 13:48:12 achim -* Expand: gdth_analyse_hdrive() removed -* -* Revision 1.53 2001/07/17 09:52:49 achim -* Small OEM related change -* -* Revision 1.52 2001/06/19 15:06:20 achim -* New host command GDT_UNFREEZE_IO added -* -* Revision 1.51 2001/05/22 06:42:37 achim -* PCI: Subdevice ID added -* -* Revision 1.50 2001/05/17 13:42:16 achim -* Support for Intel Storage RAID Controllers added -* -* Revision 1.50 2001/05/17 12:12:34 achim -* Support for Intel Storage RAID Controllers added -* -* Revision 1.49 2001/03/15 15:07:17 achim -* New __setup interface for boot command line options added -* -* Revision 1.48 2001/02/06 12:36:28 achim -* Bugfix Cluster protocol -* -* Revision 1.47 2001/01/10 14:42:06 achim -* New switch shared_access added -* -* Revision 1.46 2001/01/09 08:11:35 achim -* gdth_command() removed -* meaning of Scsi_Pointer members changed -* -* Revision 1.45 2000/11/16 12:02:24 achim -* Changes for kernel 2.4 -* -* Revision 1.44 2000/10/11 08:44:10 achim -* Clustering changes: New flag media_changed added -* -* Revision 1.43 2000/09/20 12:59:01 achim -* DPMEM remap functions for all PCI controller types implemented -* Small changes for ia64 platform -* -* Revision 1.42 2000/07/20 09:04:50 achim -* Small changes for kernel 2.4 -* -* Revision 1.41 2000/07/04 14:11:11 achim -* gdth_analyse_hdrive() added to rescan drives after online expansion -* -* Revision 1.40 2000/06/27 11:24:16 achim -* Changes Clustering, Screenservice -* -* Revision 1.39 2000/06/15 13:09:04 achim -* Changes for gdth_do_cmd() -* -* Revision 1.38 2000/06/15 12:08:43 achim -* Bugfix gdth_sync_event(), service SCREENSERVICE -* Data direction for command 0xc2 changed to DOU -* -* Revision 1.37 2000/05/25 13:50:10 achim -* New driver parameter virt_ctr added -* -* Revision 1.36 2000/05/04 08:50:46 achim -* Event buffer now in gdth_ha_str -* -* Revision 1.35 2000/03/03 10:44:08 achim -* New event_string only valid for the RP controller family -* -* Revision 1.34 2000/03/02 14:55:29 achim -* New mechanism for async. event handling implemented -* -* Revision 1.33 2000/02/21 15:37:37 achim -* Bugfix Alpha platform + DPMEM above 4GB -* -* Revision 1.32 2000/02/14 16:17:37 achim -* Bugfix sense_buffer[] + raw devices -* -* Revision 1.31 2000/02/10 10:29:00 achim -* Delete sense_buffer[0], if command OK -* -* Revision 1.30 1999/11/02 13:42:39 achim -* ARRAY_DRV_LIST2 implemented -* Now 255 log. and 100 host drives supported -* -* Revision 1.29 1999/10/05 13:28:47 achim -* GDT_CLUST_RESET added -* -* Revision 1.28 1999/08/12 13:44:54 achim -* MOUNTALL removed -* Cluster drives -> removeable drives -* -* Revision 1.27 1999/06/22 07:22:38 achim -* Small changes -* -* Revision 1.26 1999/06/10 16:09:12 achim -* Cluster Host Drive support: Bugfixes -* -* Revision 1.25 1999/06/01 16:03:56 achim -* gdth_init_pci(): Manipulate config. space to start RP controller -* -* Revision 1.24 1999/05/26 11:53:06 achim -* Cluster Host Drive support added -* -* Revision 1.23 1999/03/26 09:12:31 achim -* Default value for hdr_channel set to 0 -* -* Revision 1.22 1999/03/22 16:27:16 achim -* Bugfix: gdth_store_event() must not be locked with GDTH_LOCK_HA() -* -* Revision 1.21 1999/03/16 13:40:34 achim -* Problems with reserved drives solved -* gdth_eh_bus_reset() implemented -* -* Revision 1.20 1999/03/10 09:08:13 achim -* Bugfix: Corrections in gdth_direction_tab[] made -* Bugfix: Increase command timeout (gdth_update_timeout()) NOT in gdth_putq() -* -* Revision 1.19 1999/03/05 14:38:16 achim -* Bugfix: Heads/Sectors mapping for reserved devices possibly wrong -* -> gdth_eval_mapping() implemented, changes in gdth_bios_param() -* INIT_RETRIES set to 100s to avoid DEINIT-Timeout for controllers -* with BIOS disabled and memory test set to Intensive -* Enhanced /proc support -* -* Revision 1.18 1999/02/24 09:54:33 achim -* Command line parameter hdr_channel implemented -* Bugfix for EISA controllers + Linux 2.2.x -* -* Revision 1.17 1998/12/17 15:58:11 achim -* Command line parameters implemented -* Changes for Alpha platforms -* PCI controller scan changed -* SMP support improved (spin_lock_irqsave(),...) -* New async. events, new scan/reserve commands included -* -* Revision 1.16 1998/09/28 16:08:46 achim -* GDT_PCIMPR: DPMEM remapping, if required -* mdelay() added -* -* Revision 1.15 1998/06/03 14:54:06 achim -* gdth_delay(), gdth_flush() implemented -* Bugfix: gdth_release() changed -* -* Revision 1.14 1998/05/22 10:01:17 achim -* mj: pcibios_strerror() removed -* Improved SMP support (if version >= 2.1.95) -* gdth_halt(): halt_called flag added (if version < 2.1) -* -* Revision 1.13 1998/04/16 09:14:57 achim -* Reserve drives (for raw service) implemented -* New error handling code enabled -* Get controller name from board_info() IOCTL -* Final round of PCI device driver patches by Martin Mares -* -* Revision 1.12 1998/03/03 09:32:37 achim -* Fibre channel controller support added -* -* Revision 1.11 1998/01/27 16:19:14 achim -* SA_SHIRQ added -* add_timer()/del_timer() instead of GDTH_TIMER -* scsi_add_timer()/scsi_del_timer() instead of SCSI_TIMER -* New error handling included -* -* Revision 1.10 1997/10/31 12:29:57 achim -* Read heads/sectors from host drive -* -* Revision 1.9 1997/09/04 10:07:25 achim -* IO-mapping with virt_to_bus(), gdth_readb(), gdth_writeb(), ... -* register_reboot_notifier() to get a notify on shutown used -* -* Revision 1.8 1997/04/02 12:14:30 achim -* Version 1.00 (see gdth.h), tested with kernel 2.0.29 -* -* Revision 1.7 1997/03/12 13:33:37 achim -* gdth_reset() changed, new async. events -* -* Revision 1.6 1997/03/04 14:01:11 achim -* Shutdown routine gdth_halt() implemented -* -* Revision 1.5 1997/02/21 09:08:36 achim -* New controller included (RP, RP1, RP2 series) -* IOCTL interface implemented -* -* Revision 1.4 1996/07/05 12:48:55 achim -* Function gdth_bios_param() implemented -* New constant GDTH_MAXC_P_L inserted -* GDT_WRITE_THR, GDT_EXT_INFO implemented -* Function gdth_reset() changed -* -* Revision 1.3 1996/05/10 09:04:41 achim -* Small changes for Linux 1.2.13 -* -* Revision 1.2 1996/05/09 12:45:27 achim -* Loadable module support implemented -* /proc support corrections made -* -* Revision 1.1 1996/04/11 07:35:57 achim -* Initial revision -* ************************************************************************/ /* All GDT Disk Array Controllers are fully supported by this driver.
@@ -392,12 +120,7 @@#include <linux/proc_fs.h> #include <linux/time.h> #include <linux/timer.h> -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,6 )#include <linux/dma-mapping.h> -#else -#define DMA_32BIT_MASK 0x00000000ffffffffULL -#define DMA_64BIT_MASK 0xffffffffffffffffULL -#endif #ifdef GDTH_RTC #include <linux/mc146818rtc.h>
@@ -409,16 +132,10 @@#include <asm/io.h> #include <asm/uaccess.h> #include <linux/spinlock.h> -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )#include <linux/blkdev.h> -#else -#include <linux/blk.h> -#include "sd.h" -#endif #include "scsi.h" #include <scsi/scsi_host.h> -#include "gdth_kcompat.h" #include "gdth.h" static void gdth_delay (int milliseconds);
@@ -664,7 +381,6 @@ static int probe_eisa_isa = 0;static int force_dma32 =0 ;/* parameters for modprobe/insmod */ -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,11 )module_param_array (irq, int,NULL ,0 );module_param (disable, int,0 );module_param (reserve_mode, int,0 );
@@ -677,20 +393,6 @@ module_param(virt_ctr, int, 0);module_param (shared_access, int,0 );module_param (probe_eisa_isa, int,0 );module_param (force_dma32, int,0 ); -#else -MODULE_PARM (irq,"i" ); -MODULE_PARM (disable,"i" ); -MODULE_PARM (reserve_mode,"i" ); -MODULE_PARM(reserve_list, "4-" __MODULE_STRING(MAX_RES_ARGS) "i"); -MODULE_PARM (reverse_scan,"i" ); -MODULE_PARM (hdr_channel,"i" ); -MODULE_PARM (max_ids,"i" ); -MODULE_PARM (rescan,"i" ); -MODULE_PARM (virt_ctr,"i" ); -MODULE_PARM (shared_access,"i" ); -MODULE_PARM (probe_eisa_isa,"i" ); -MODULE_PARM (force_dma32,"i" ); -#endif MODULE_AUTHOR ("Achim Leubner" );MODULE_LICENSE ("GPL" );
@@ -719,7 +421,6 @@ static void gdth_delay(int milliseconds) } } -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )static void gdth_scsi_done (struct scsi_cmnd *scp) {TRACE2 (("gdth_scsi_done()\n" ));
@@ -757,42 +458,6 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,kfree (scp);return rval; } -#else -static void gdth_scsi_done (Scsi_Cmnd *scp) -{ -TRACE2 (("gdth_scsi_done()\n" )); - - scp->request.rq_status =RQ_SCSI_DONE ; -if (scp->request.waiting) -complete (scp->request.waiting); -} - -int __gdth_execute (struct scsi_device *sdev,gdth_cmd_str *gdtcmd,char *cmnd, -int timeout,u32 *info) -{ -Scsi_Cmnd *scp =scsi_allocate_device (sdev,1 , FALSE); -unsigned bufflen = gdtcmd ?sizeof (gdth_cmd_str) :0 ; -DECLARE_COMPLETION_ONSTACK (wait); -int rval; - -if (!scp) -return -ENOMEM ; - scp->cmd_len =12 ; - scp->use_sg =0 ; - scp->SCp.this_residual =IOCTL_PRI ;/* priority */ - scp->request.rq_status =RQ_SCSI_BUSY ; - scp->request.waiting = &wait; -scsi_do_cmd (scp, cmnd, gdtcmd, bufflen, gdth_scsi_done, timeout*HZ ,1 ); -wait_for_completion (&wait); - - rval = scp->SCp.Status; -if (info) - *info = scp->SCp.Message; - -scsi_release_command (scp); -return rval; -} -#endif int gdth_execute (struct Scsi_Host *shost,gdth_cmd_str *gdtcmd,char *cmnd,int timeout,u32 *info)
@@ -2252,29 +1917,17 @@ static int __init gdth_search_drives(int hanum)printk ("GDT-HA %d: Vendor: %s Name: %s\n" , hanum,oemstr->text.oem_company_name,ha->binfo.type_string);/* Save the Host Drive inquiry data */ -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )strlcpy (ha->oem_name,oemstr->text.scsi_host_drive_inquiry_vendor_id,sizeof (ha->oem_name)); -#else -strncpy (ha->oem_name,oemstr->text.scsi_host_drive_inquiry_vendor_id,7 ); - ha->oem_name[7 ] ='\0' ; -#endif }else {/* Old method, based on PCI ID */ TRACE2 (("gdth_search_drives(): CACHE_READ_OEM_STRING_RECORD failed\n" ));printk ("GDT-HA %d: Name: %s\n" , hanum,ha->binfo.type_string); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )if (ha->oem_id ==OEM_ID_INTEL )strlcpy (ha->oem_name,"Intel " ,sizeof (ha->oem_name));else strlcpy (ha->oem_name,"ICP " ,sizeof (ha->oem_name)); -#else -if (ha->oem_id ==OEM_ID_INTEL ) -strcpy (ha->oem_name,"Intel " ); -else -strcpy (ha->oem_name,"ICP " ); -#endif }/* scanning for host drives */
@@ -2683,17 +2336,10 @@ static void gdth_copy_internal_data(int hanum,Scsi_Cmnd *scp,return ; }local_irq_save (flags); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 ) address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset;memcpy (address,buffer,cpnow);flush_dcache_page (sl->page);kunmap_atomic (address,KM_BIO_SRC_IRQ ); -#else - address =kmap_atomic (sl->page,KM_BH_IRQ ) + sl->offset; -memcpy (address,buffer,cpnow); -flush_dcache_page (sl->page); -kunmap_atomic (address,KM_BH_IRQ ); -#endif local_irq_restore (flags);if (cpsum == cpcount)break ;
@@ -4287,11 +3933,7 @@ int __init option_setup(char *str) } -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )static int __init gdth_detect (struct scsi_host_template *shtp) -#else -static int __init gdth_detect(Scsi_Host_Template *shtp) -#endif {gdth_pci_str pcistr[MAXHA ];ulong32 isa_bios;
@@ -4531,11 +4173,7 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)return SUCCESS ; } -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )static int gdth_bios_param (struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) -#else -static int gdth_bios_param(Disk *disk,kdev_t dev,int *ip) -#endif {unchar b, t;int hanum;
@@ -4543,13 +4181,8 @@ static int gdth_bios_param(Disk *disk,kdev_t dev,int *ip)struct scsi_device *sd;unsigned capacity; -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 ) sd = sdev; capacity = cap; -#else - sd = disk->device; - capacity = disk->capacity; -#endif hanum =NUMDATA (sd->host)->hanum; b = virt_ctr ?NUMDATA (sd->host)->busnum : sd->channel; t = sd->id;
@@ -5164,7 +4797,6 @@ static int gdth_ioctl(struct inode *inode, struct file *filep, hanum = res.ionode; ha =HADATA (gdth_ctr_tab[hanum]); -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 ) scp =kzalloc (sizeof (*scp),GFP_KERNEL );if (!scp)return -ENOMEM ;
@@ -5175,17 +4807,7 @@ static int gdth_ioctl(struct inode *inode, struct file *filep, rval =gdth_eh_bus_reset (scp); res.status = (rval ==SUCCESS ?S_OK :S_GENERR );kfree (scp); -#else - scp =scsi_allocate_device (ha->sdev,1 , FALSE); -if (!scp) -return -ENOMEM ; - scp->cmd_len =12 ; - scp->use_sg =0 ; - scp->channel = virt_ctr ?0 : res.number; - rval =gdth_eh_bus_reset (scp); - res.status = (rval ==SUCCESS ?S_OK :S_GENERR ); -scsi_release_command (scp); -#endif +if (copy_to_user (argp, &res,sizeof (gdth_ioctl_reset)))return -EFAULT ;break ;
@@ -5273,7 +4895,6 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf)return NOTIFY_OK ; } -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )/* configure lun */ static int gdth_slave_configure (struct scsi_device *sdev) {
@@ -5282,13 +4903,8 @@ static int gdth_slave_configure(struct scsi_device *sdev) sdev->skip_ms_page_8 =1 ;return 0 ; } -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)static struct scsi_host_template driver_template = { -#else -static Scsi_Host_Template driver_template = { -#endif .proc_name ="gdth" , .proc_info = gdth_proc_info, .name ="GDT SCSI Disk Array Controller" ,
@@ -5299,20 +4915,12 @@ static Scsi_Host_Template driver_template = { .eh_bus_reset_handler = gdth_eh_bus_reset, .bios_param = gdth_bios_param, .can_queue = GDTH_MAXCMDS, -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 ) .slave_configure = gdth_slave_configure, -#endif .this_id = -1, .sg_tablesize = GDTH_MAXSG, .cmd_per_lun = GDTH_MAXC_P_L, .unchecked_isa_dma = 1, .use_clustering = ENABLE_CLUSTERING, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) - .use_new_eh_code =1 , -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) - .highmem_io = 1, -#endif -#endif };#ifdef CONFIG_ISA
drivers/scsi/gdth.h +0 -1
@@ -13,7 +13,6 @@* $Id: gdth.h,v 1.58 2006/01/11 16:14:09 achim Exp $ */ -#include <linux/version.h> #include <linux/types.h> #ifndef TRUE
drivers/scsi/gdth_kcompat.h deleted +0 -31
@@ -1,31 +0,0 @@ -#ifndef IRQ_HANDLED -typedef void irqreturn_t ; -#define IRQ_NONE -#define IRQ_HANDLED -#endif - -#ifndef MODULE_LICENSE -#define MODULE_LICENSE (x) -#endif - -#ifndef __iomem -#define __iomem -#endif - -#ifndef __attribute_used__ -#define __attribute_used__ __devinitdata -#endif - -#ifndef __user -#define __user -#endif - -#ifndef SERVICE_ACTION_IN -#define SERVICE_ACTION_IN 0x9e -#endif -#ifndef READ_16 -#define READ_16 0x88 -#endif -#ifndef WRITE_16 -#define WRITE_16 0x8a -#endif
drivers/scsi/gdth_proc.c +0 -27
@@ -4,7 +4,6 @@#include <linux/completion.h> -#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )int gdth_proc_info (struct Scsi_Host *host,char *buffer,char **start,off_t offset,int length,int inout) {
@@ -21,32 +20,6 @@ int gdth_proc_info(struct Scsi_Host *host, char *buffer,char **start,off_t offseelse return (gdth_get_info (buffer,start,offset,length,host,hanum,busnum)); } -#else -int gdth_proc_info (char *buffer,char **start,off_t offset,int length,int hostno, -int inout) -{ -int hanum,busnum,i; - -TRACE2 (("gdth_proc_info() length %d offs %d inout %d\n" , - length,(int )offset,inout)); - -for (i =0 ; i < gdth_ctr_vcount; ++i) { -if (gdth_ctr_vtab[i]->host_no == hostno) -break ; - } -if (i == gdth_ctr_vcount) -return (-EINVAL ); - - hanum =NUMDATA (gdth_ctr_vtab[i])->hanum; - busnum=NUMDATA (gdth_ctr_vtab[i])->busnum; - -if (inout) -return (gdth_set_info (buffer,length,gdth_ctr_vtab[i],hanum,busnum)); -else -return (gdth_get_info (buffer,start,offset,length, - gdth_ctr_vtab[i],hanum,busnum)); -} -#endif static int gdth_set_info (char *buffer,int length,struct Scsi_Host *host,int hanum,int busnum)
Signature · 1 line
1.5.3.1
PATCH 5/16 gdth: kill gdth_{read,write}[bwl] wrappers
In reply to Boaz HarroshThey are direct equivalents to {read,write}[bwl].
Signed-off-by Jeff Garzik <[email protected]>
--- drivers/scsi/gdth.c | 313 +++++++++++++++++++++++++-------------------------- 1 files changed, 153 insertions(+), 160 deletions(-)
drivers/scsi/gdth.c +153 -160
@@ -303,13 +303,6 @@ static struct timer_list gdth_timer;#define BUS_L2P (a,b) ((b)>(a)->virt_bus ? (b-1):(b)) -#define gdth_readb (addr) readb(addr) -#define gdth_readw (addr) readw(addr) -#define gdth_readl (addr) readl(addr) -#define gdth_writeb (b,addr) writeb((b),(addr)) -#define gdth_writew (b,addr) writew((b),(addr)) -#define gdth_writel (b,addr) writel((b),(addr)) -static unchar gdth_drq_tab[4 ] = {5 ,6 ,7 ,7 };/* DRQ table */ static unchar gdth_irq_tab[6 ] = {0 ,10 ,11 ,12 ,14 ,0 };/* IRQ table */ static unchar gdth_polling;/* polling if TRUE */
@@ -515,7 +508,7 @@ static int __init gdth_search_isa(ulong32 bios_adr)TRACE (("gdth_search_isa() bios adr. %x\n" ,bios_adr));if ((addr =ioremap (bios_adr+BIOS_ID_OFFS ,sizeof (ulong32))) !=NULL ) { - id =gdth_readl (addr); + id =readl (addr);iounmap (addr);if (id ==GDT2_ID )/* GDT2000 */ return 1 ;
@@ -749,22 +742,22 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha)return 0 ; } dp2_ptr = ha->brd; -gdth_writeb (1 , &dp2_ptr->io.memlock);/* switch off write protection */ +writeb (1 , &dp2_ptr->io.memlock);/* switch off write protection */ /* reset interface area */ memset_io (&dp2_ptr->u,0 ,sizeof (dp2_ptr->u)); -if (gdth_readl (&dp2_ptr->u) !=0 ) { +if (readl (&dp2_ptr->u) !=0 ) {printk ("GDT-ISA: Initialization error (DPMEM write error)\n" );iounmap (ha->brd);return 0 ; }/* disable board interrupts, read DRQ and IRQ */ -gdth_writeb (0xff , &dp2_ptr->io.irqdel); -gdth_writeb (0x00 , &dp2_ptr->io.irqen); -gdth_writeb (0x00 , &dp2_ptr->u.ic.S_Status); -gdth_writeb (0x00 , &dp2_ptr->u.ic.Cmd_Index); +writeb (0xff , &dp2_ptr->io.irqdel); +writeb (0x00 , &dp2_ptr->io.irqen); +writeb (0x00 , &dp2_ptr->u.ic.S_Status); +writeb (0x00 , &dp2_ptr->u.ic.Cmd_Index); - irq_drq =gdth_readb (&dp2_ptr->io.rq); + irq_drq =readb (&dp2_ptr->io.rq);for (i=0 ; i<3 ; ++i) {if ((irq_drq &1 )==0 )break ;
@@ -772,7 +765,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) } ha->drq = gdth_drq_tab[i]; - irq_drq =gdth_readb (&dp2_ptr->io.rq) >>3 ; + irq_drq =readb (&dp2_ptr->io.rq) >>3 ;for (i=1 ; i<5 ; ++i) {if ((irq_drq &1 )==0 )break ;
@@ -781,12 +774,12 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) ha->irq = gdth_irq_tab[i];/* deinitialize services */ -gdth_writel (bios_adr, &dp2_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0xff , &dp2_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (0 , &dp2_ptr->io.event); +writel (bios_adr, &dp2_ptr->u.ic.S_Info[0 ]); +writeb (0xff , &dp2_ptr->u.ic.S_Cmd_Indx); +writeb (0 , &dp2_ptr->io.event); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp2_ptr->u.ic.S_Status) !=0xff ) { +while (readb (&dp2_ptr->u.ic.S_Status) !=0xff ) {if (--retries ==0 ) {printk ("GDT-ISA: Initialization error (DEINIT failed)\n" );iounmap (ha->brd);
@@ -794,9 +787,9 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) }gdth_delay (1 ); } - prot_ver = (unchar )gdth_readl (&dp2_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0 , &dp2_ptr->u.ic.Status); -gdth_writeb (0xff , &dp2_ptr->io.irqdel); + prot_ver = (unchar )readl (&dp2_ptr->u.ic.S_Info[0 ]); +writeb (0 , &dp2_ptr->u.ic.Status); +writeb (0xff , &dp2_ptr->io.irqdel);if (prot_ver !=PROTOCOL_VERSION ) {printk ("GDT-ISA: Illegal protocol version\n" );iounmap (ha->brd);
@@ -810,15 +803,15 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) ha->brd_phys = bios_adr >>4 ;/* special request to controller BIOS */ -gdth_writel (0x00 , &dp2_ptr->u.ic.S_Info[0 ]); -gdth_writel (0x00 , &dp2_ptr->u.ic.S_Info[1 ]); -gdth_writel (0x01 , &dp2_ptr->u.ic.S_Info[2 ]); -gdth_writel (0x00 , &dp2_ptr->u.ic.S_Info[3 ]); -gdth_writeb (0xfe , &dp2_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (0 , &dp2_ptr->io.event); +writel (0x00 , &dp2_ptr->u.ic.S_Info[0 ]); +writel (0x00 , &dp2_ptr->u.ic.S_Info[1 ]); +writel (0x01 , &dp2_ptr->u.ic.S_Info[2 ]); +writel (0x00 , &dp2_ptr->u.ic.S_Info[3 ]); +writeb (0xfe , &dp2_ptr->u.ic.S_Cmd_Indx); +writeb (0 , &dp2_ptr->io.event); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp2_ptr->u.ic.S_Status) !=0xfe ) { +while (readb (&dp2_ptr->u.ic.S_Status) !=0xfe ) {if (--retries ==0 ) {printk ("GDT-ISA: Initialization error\n" );iounmap (ha->brd);
@@ -826,8 +819,8 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) }gdth_delay (1 ); } -gdth_writeb (0 , &dp2_ptr->u.ic.Status); -gdth_writeb (0xff , &dp2_ptr->io.irqdel); +writeb (0 , &dp2_ptr->u.ic.Status); +writeb (0xff , &dp2_ptr->io.irqdel); ha->dma64_support =0 ;return 1 ;
@@ -864,8 +857,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }/* check and reset interface area */ dp6_ptr = ha->brd; -gdth_writel (DPMEM_MAGIC , &dp6_ptr->u); -if (gdth_readl (&dp6_ptr->u) !=DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6_ptr->u); +if (readl (&dp6_ptr->u) !=DPMEM_MAGIC ) {printk ("GDT-PCI: Cannot access DPMEM at 0x%lx (shadowed?)\n" , pcistr->dpmem); found = FALSE;
@@ -876,7 +869,7 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)printk ("GDT-PCI: Initialization error (DPMEM remap error)\n" );return 0 ; } -if (gdth_readw (ha->brd) !=0xffff ) { +if (readw (ha->brd) !=0xffff ) {TRACE2 (("init_pci_old() address 0x%x busy\n" , i));continue ; }
@@ -889,8 +882,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)return 0 ; } dp6_ptr = ha->brd; -gdth_writel (DPMEM_MAGIC , &dp6_ptr->u); -if (gdth_readl (&dp6_ptr->u) ==DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6_ptr->u); +if (readl (&dp6_ptr->u) ==DPMEM_MAGIC ) {printk ("GDT-PCI: Use free address at 0x%x\n" , i); found = TRUE;break ;
@@ -903,24 +896,24 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) } }memset_io (&dp6_ptr->u,0 ,sizeof (dp6_ptr->u)); -if (gdth_readl (&dp6_ptr->u) !=0 ) { +if (readl (&dp6_ptr->u) !=0 ) {printk ("GDT-PCI: Initialization error (DPMEM write error)\n" );iounmap (ha->brd);return 0 ; }/* disable board interrupts, deinit services */ -gdth_writeb (0xff , &dp6_ptr->io.irqdel); -gdth_writeb (0x00 , &dp6_ptr->io.irqen); -gdth_writeb (0x00 , &dp6_ptr->u.ic.S_Status); -gdth_writeb (0x00 , &dp6_ptr->u.ic.Cmd_Index); - -gdth_writel (pcistr->dpmem, &dp6_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0xff , &dp6_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (0 , &dp6_ptr->io.event); +writeb (0xff , &dp6_ptr->io.irqdel); +writeb (0x00 , &dp6_ptr->io.irqen); +writeb (0x00 , &dp6_ptr->u.ic.S_Status); +writeb (0x00 , &dp6_ptr->u.ic.Cmd_Index); + +writel (pcistr->dpmem, &dp6_ptr->u.ic.S_Info[0 ]); +writeb (0xff , &dp6_ptr->u.ic.S_Cmd_Indx); +writeb (0 , &dp6_ptr->io.event); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6_ptr->u.ic.S_Status) !=0xff ) { +while (readb (&dp6_ptr->u.ic.S_Status) !=0xff ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error (DEINIT failed)\n" );iounmap (ha->brd);
@@ -928,9 +921,9 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } - prot_ver = (unchar )gdth_readl (&dp6_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0 , &dp6_ptr->u.ic.S_Status); -gdth_writeb (0xff , &dp6_ptr->io.irqdel); + prot_ver = (unchar )readl (&dp6_ptr->u.ic.S_Info[0 ]); +writeb (0 , &dp6_ptr->u.ic.S_Status); +writeb (0xff , &dp6_ptr->io.irqdel);if (prot_ver !=PROTOCOL_VERSION ) {printk ("GDT-PCI: Illegal protocol version\n" );iounmap (ha->brd);
@@ -941,15 +934,15 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) ha->ic_all_size =sizeof (dp6_ptr->u);/* special command to controller BIOS */ -gdth_writel (0x00 , &dp6_ptr->u.ic.S_Info[0 ]); -gdth_writel (0x00 , &dp6_ptr->u.ic.S_Info[1 ]); -gdth_writel (0x00 , &dp6_ptr->u.ic.S_Info[2 ]); -gdth_writel (0x00 , &dp6_ptr->u.ic.S_Info[3 ]); -gdth_writeb (0xfe , &dp6_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (0 , &dp6_ptr->io.event); +writel (0x00 , &dp6_ptr->u.ic.S_Info[0 ]); +writel (0x00 , &dp6_ptr->u.ic.S_Info[1 ]); +writel (0x00 , &dp6_ptr->u.ic.S_Info[2 ]); +writel (0x00 , &dp6_ptr->u.ic.S_Info[3 ]); +writeb (0xfe , &dp6_ptr->u.ic.S_Cmd_Indx); +writeb (0 , &dp6_ptr->io.event); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6_ptr->u.ic.S_Status) !=0xfe ) { +while (readb (&dp6_ptr->u.ic.S_Status) !=0xfe ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error\n" );iounmap (ha->brd);
@@ -957,8 +950,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } -gdth_writeb (0 , &dp6_ptr->u.ic.S_Status); -gdth_writeb (0xff , &dp6_ptr->io.irqdel); +writeb (0 , &dp6_ptr->u.ic.S_Status); +writeb (0xff , &dp6_ptr->io.irqdel); ha->dma64_support =0 ;
@@ -974,8 +967,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }/* check and reset interface area */ dp6c_ptr = ha->brd; -gdth_writel (DPMEM_MAGIC , &dp6c_ptr->u); -if (gdth_readl (&dp6c_ptr->u) !=DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6c_ptr->u); +if (readl (&dp6c_ptr->u) !=DPMEM_MAGIC ) {printk ("GDT-PCI: Cannot access DPMEM at 0x%lx (shadowed?)\n" , pcistr->dpmem); found = FALSE;
@@ -986,7 +979,7 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)printk ("GDT-PCI: Initialization error (DPMEM remap error)\n" );return 0 ; } -if (gdth_readw (ha->brd) !=0xffff ) { +if (readw (ha->brd) !=0xffff ) {TRACE2 (("init_pci_plx() address 0x%x busy\n" , i));continue ; }
@@ -999,8 +992,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)return 0 ; } dp6c_ptr = ha->brd; -gdth_writel (DPMEM_MAGIC , &dp6c_ptr->u); -if (gdth_readl (&dp6c_ptr->u) ==DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6c_ptr->u); +if (readl (&dp6c_ptr->u) ==DPMEM_MAGIC ) {printk ("GDT-PCI: Use free address at 0x%x\n" , i); found = TRUE;break ;
@@ -1013,7 +1006,7 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) } }memset_io (&dp6c_ptr->u,0 ,sizeof (dp6c_ptr->u)); -if (gdth_readl (&dp6c_ptr->u) !=0 ) { +if (readl (&dp6c_ptr->u) !=0 ) {printk ("GDT-PCI: Initialization error (DPMEM write error)\n" );iounmap (ha->brd);return 0 ;
@@ -1023,17 +1016,17 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)outb (0x00 ,PTR2USHORT (&ha->plx->control1));outb (0xff ,PTR2USHORT (&ha->plx->edoor_reg)); -gdth_writeb (0x00 , &dp6c_ptr->u.ic.S_Status); -gdth_writeb (0x00 , &dp6c_ptr->u.ic.Cmd_Index); +writeb (0x00 , &dp6c_ptr->u.ic.S_Status); +writeb (0x00 , &dp6c_ptr->u.ic.Cmd_Index); -gdth_writel (pcistr->dpmem, &dp6c_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0xff , &dp6c_ptr->u.ic.S_Cmd_Indx); +writel (pcistr->dpmem, &dp6c_ptr->u.ic.S_Info[0 ]); +writeb (0xff , &dp6c_ptr->u.ic.S_Cmd_Indx);outb (1 ,PTR2USHORT (&ha->plx->ldoor_reg)); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6c_ptr->u.ic.S_Status) !=0xff ) { +while (readb (&dp6c_ptr->u.ic.S_Status) !=0xff ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error (DEINIT failed)\n" );iounmap (ha->brd);
@@ -1041,8 +1034,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } - prot_ver = (unchar )gdth_readl (&dp6c_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0 , &dp6c_ptr->u.ic.Status); + prot_ver = (unchar )readl (&dp6c_ptr->u.ic.S_Info[0 ]); +writeb (0 , &dp6c_ptr->u.ic.Status);if (prot_ver !=PROTOCOL_VERSION ) {printk ("GDT-PCI: Illegal protocol version\n" );iounmap (ha->brd);
@@ -1053,17 +1046,17 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) ha->ic_all_size =sizeof (dp6c_ptr->u);/* special command to controller BIOS */ -gdth_writel (0x00 , &dp6c_ptr->u.ic.S_Info[0 ]); -gdth_writel (0x00 , &dp6c_ptr->u.ic.S_Info[1 ]); -gdth_writel (0x00 , &dp6c_ptr->u.ic.S_Info[2 ]); -gdth_writel (0x00 , &dp6c_ptr->u.ic.S_Info[3 ]); -gdth_writeb (0xfe , &dp6c_ptr->u.ic.S_Cmd_Indx); +writel (0x00 , &dp6c_ptr->u.ic.S_Info[0 ]); +writel (0x00 , &dp6c_ptr->u.ic.S_Info[1 ]); +writel (0x00 , &dp6c_ptr->u.ic.S_Info[2 ]); +writel (0x00 , &dp6c_ptr->u.ic.S_Info[3 ]); +writeb (0xfe , &dp6c_ptr->u.ic.S_Cmd_Indx);outb (1 ,PTR2USHORT (&ha->plx->ldoor_reg)); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6c_ptr->u.ic.S_Status) !=0xfe ) { +while (readb (&dp6c_ptr->u.ic.S_Status) !=0xfe ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error\n" );iounmap (ha->brd);
@@ -1071,7 +1064,7 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } -gdth_writeb (0 , &dp6c_ptr->u.ic.S_Status); +writeb (0 , &dp6c_ptr->u.ic.S_Status); ha->dma64_support =0 ;
@@ -1099,12 +1092,12 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)/* Ensure that it is safe to access the non HW portions of DPMEM. * Aditional check needed for Xscale based RAID controllers */ -while ( ((int )gdth_readb (&dp6m_ptr->i960r.sema0_reg) ) &3 ) +while ( ((int )readb (&dp6m_ptr->i960r.sema0_reg) ) &3 )gdth_delay (1 );/* check and reset interface area */ -gdth_writel (DPMEM_MAGIC , &dp6m_ptr->u); -if (gdth_readl (&dp6m_ptr->u) !=DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6m_ptr->u); +if (readl (&dp6m_ptr->u) !=DPMEM_MAGIC ) {printk ("GDT-PCI: Cannot access DPMEM at 0x%lx (shadowed?)\n" , pcistr->dpmem); found = FALSE;
@@ -1115,7 +1108,7 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)printk ("GDT-PCI: Initialization error (DPMEM remap error)\n" );return 0 ; } -if (gdth_readw (ha->brd) !=0xffff ) { +if (readw (ha->brd) !=0xffff ) {TRACE2 (("init_pci_mpr() address 0x%x busy\n" , i));continue ; }
@@ -1128,8 +1121,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)return 0 ; } dp6m_ptr = ha->brd; -gdth_writel (DPMEM_MAGIC , &dp6m_ptr->u); -if (gdth_readl (&dp6m_ptr->u) ==DPMEM_MAGIC ) { +writel (DPMEM_MAGIC , &dp6m_ptr->u); +if (readl (&dp6m_ptr->u) ==DPMEM_MAGIC ) {printk ("GDT-PCI: Use free address at 0x%x\n" , i); found = TRUE;break ;
@@ -1144,18 +1137,18 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)memset_io (&dp6m_ptr->u,0 ,sizeof (dp6m_ptr->u));/* disable board interrupts, deinit services */ -gdth_writeb (gdth_readb (&dp6m_ptr->i960r.edoor_en_reg) |4 , +writeb (readb (&dp6m_ptr->i960r.edoor_en_reg) |4 , &dp6m_ptr->i960r.edoor_en_reg); -gdth_writeb (0xff , &dp6m_ptr->i960r.edoor_reg); -gdth_writeb (0x00 , &dp6m_ptr->u.ic.S_Status); -gdth_writeb (0x00 , &dp6m_ptr->u.ic.Cmd_Index); +writeb (0xff , &dp6m_ptr->i960r.edoor_reg); +writeb (0x00 , &dp6m_ptr->u.ic.S_Status); +writeb (0x00 , &dp6m_ptr->u.ic.Cmd_Index); -gdth_writel (pcistr->dpmem, &dp6m_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0xff , &dp6m_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (1 , &dp6m_ptr->i960r.ldoor_reg); +writel (pcistr->dpmem, &dp6m_ptr->u.ic.S_Info[0 ]); +writeb (0xff , &dp6m_ptr->u.ic.S_Cmd_Indx); +writeb (1 , &dp6m_ptr->i960r.ldoor_reg); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6m_ptr->u.ic.S_Status) !=0xff ) { +while (readb (&dp6m_ptr->u.ic.S_Status) !=0xff ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error (DEINIT failed)\n" );iounmap (ha->brd);
@@ -1163,8 +1156,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } - prot_ver = (unchar )gdth_readl (&dp6m_ptr->u.ic.S_Info[0 ]); -gdth_writeb (0 , &dp6m_ptr->u.ic.S_Status); + prot_ver = (unchar )readl (&dp6m_ptr->u.ic.S_Info[0 ]); +writeb (0 , &dp6m_ptr->u.ic.S_Status);if (prot_ver !=PROTOCOL_VERSION ) {printk ("GDT-PCI: Illegal protocol version\n" );iounmap (ha->brd);
@@ -1175,15 +1168,15 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) ha->ic_all_size =sizeof (dp6m_ptr->u);/* special command to controller BIOS */ -gdth_writel (0x00 , &dp6m_ptr->u.ic.S_Info[0 ]); -gdth_writel (0x00 , &dp6m_ptr->u.ic.S_Info[1 ]); -gdth_writel (0x00 , &dp6m_ptr->u.ic.S_Info[2 ]); -gdth_writel (0x00 , &dp6m_ptr->u.ic.S_Info[3 ]); -gdth_writeb (0xfe , &dp6m_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (1 , &dp6m_ptr->i960r.ldoor_reg); +writel (0x00 , &dp6m_ptr->u.ic.S_Info[0 ]); +writel (0x00 , &dp6m_ptr->u.ic.S_Info[1 ]); +writel (0x00 , &dp6m_ptr->u.ic.S_Info[2 ]); +writel (0x00 , &dp6m_ptr->u.ic.S_Info[3 ]); +writeb (0xfe , &dp6m_ptr->u.ic.S_Cmd_Indx); +writeb (1 , &dp6m_ptr->i960r.ldoor_reg); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6m_ptr->u.ic.S_Status) !=0xfe ) { +while (readb (&dp6m_ptr->u.ic.S_Status) !=0xfe ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error\n" );iounmap (ha->brd);
@@ -1191,14 +1184,14 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } -gdth_writeb (0 , &dp6m_ptr->u.ic.S_Status); +writeb (0 , &dp6m_ptr->u.ic.S_Status);/* read FW version to detect 64-bit DMA support */ -gdth_writeb (0xfd , &dp6m_ptr->u.ic.S_Cmd_Indx); -gdth_writeb (1 , &dp6m_ptr->i960r.ldoor_reg); +writeb (0xfd , &dp6m_ptr->u.ic.S_Cmd_Indx); +writeb (1 , &dp6m_ptr->i960r.ldoor_reg); retries =INIT_RETRIES ;gdth_delay (20 ); -while (gdth_readb (&dp6m_ptr->u.ic.S_Status) !=0xfd ) { +while (readb (&dp6m_ptr->u.ic.S_Status) !=0xfd ) {if (--retries ==0 ) {printk ("GDT-PCI: Initialization error (DEINIT failed)\n" );iounmap (ha->brd);
@@ -1206,8 +1199,8 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha) }gdth_delay (1 ); } - prot_ver = (unchar)(gdth_readl (&dp6m_ptr->u.ic.S_Info[0 ]) >>16 ); -gdth_writeb (0 , &dp6m_ptr->u.ic.S_Status); + prot_ver = (unchar)(readl (&dp6m_ptr->u.ic.S_Info[0 ]) >>16 ); +writeb (0 , &dp6m_ptr->u.ic.S_Status);if (prot_ver <0x2b )/* FW < x.43: no 64-bit DMA support */ ha->dma64_support =0 ;else
@@ -1238,21 +1231,21 @@ static void __init gdth_enable_int(int hanum)outb (0x01 , ha->bmic +EINTENABREG ); }else if (ha->type ==GDT_ISA ) { dp2_ptr = ha->brd; -gdth_writeb (1 , &dp2_ptr->io.irqdel); -gdth_writeb (0 , &dp2_ptr->u.ic.Cmd_Index); -gdth_writeb (1 , &dp2_ptr->io.irqen); +writeb (1 , &dp2_ptr->io.irqdel); +writeb (0 , &dp2_ptr->u.ic.Cmd_Index); +writeb (1 , &dp2_ptr->io.irqen); }else if (ha->type ==GDT_PCI ) { dp6_ptr = ha->brd; -gdth_writeb (1 , &dp6_ptr->io.irqdel); -gdth_writeb (0 , &dp6_ptr->u.ic.Cmd_Index); -gdth_writeb (1 , &dp6_ptr->io.irqen); +writeb (1 , &dp6_ptr->io.irqdel); +writeb (0 , &dp6_ptr->u.ic.Cmd_Index); +writeb (1 , &dp6_ptr->io.irqen); }else if (ha->type ==GDT_PCINEW ) {outb (0xff ,PTR2USHORT (&ha->plx->edoor_reg));outb (0x03 ,PTR2USHORT (&ha->plx->control1)); }else if (ha->type ==GDT_PCIMPR ) { dp6m_ptr = ha->brd; -gdth_writeb (0xff , &dp6m_ptr->i960r.edoor_reg); -gdth_writeb (gdth_readb (&dp6m_ptr->i960r.edoor_en_reg) & ~4 , +writeb (0xff , &dp6m_ptr->i960r.edoor_reg); +writeb (readb (&dp6m_ptr->i960r.edoor_en_reg) & ~4 , &dp6m_ptr->i960r.edoor_en_reg); }spin_unlock_irqrestore (&ha->smp_lock, flags);
@@ -1276,15 +1269,15 @@ static int gdth_get_status(unchar *pIStatus,int irq) *pIStatus =inb ((ushort )ha->bmic +EDOORREG ); else if (ha->type == GDT_ISA) *pIStatus = -gdth_readb (&((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index); +readb (&((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index); else if (ha->type == GDT_PCI) *pIStatus = -gdth_readb (&((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index); +readb (&((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index); else if (ha->type == GDT_PCINEW) *pIStatus = inb(PTR2USHORT(&ha->plx->edoor_reg)); else if (ha->type == GDT_PCIMPR) *pIStatus = -gdth_readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.edoor_reg); +readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.edoor_reg);if (*pIStatus)return i;/* board found */
@@ -1304,14 +1297,14 @@ static int gdth_test_busy(int hanum)if (ha->type ==GDT_EISA ) gdtsema0 = (int )inb (ha->bmic +SEMA0REG );else if (ha->type ==GDT_ISA ) - gdtsema0 = (int )gdth_readb (&((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Sema0); + gdtsema0 = (int )readb (&((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Sema0);else if (ha->type ==GDT_PCI ) - gdtsema0 = (int )gdth_readb (&((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Sema0); + gdtsema0 = (int )readb (&((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Sema0);else if (ha->type ==GDT_PCINEW ) gdtsema0 = (int )inb (PTR2USHORT (&ha->plx->sema0_reg));else if (ha->type ==GDT_PCIMPR ) gdtsema0 = - (int )gdth_readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.sema0_reg); + (int )readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.sema0_reg);return (gdtsema0 &1 ); }
@@ -1347,13 +1340,13 @@ static void gdth_set_sema0(int hanum)if (ha->type ==GDT_EISA ) {outb (1 , ha->bmic +SEMA0REG ); }else if (ha->type ==GDT_ISA ) { -gdth_writeb (1 , &((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Sema0); +writeb (1 , &((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Sema0); }else if (ha->type ==GDT_PCI ) { -gdth_writeb (1 , &((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Sema0); +writeb (1 , &((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Sema0); }else if (ha->type ==GDT_PCINEW ) {outb (1 ,PTR2USHORT (&ha->plx->sema0_reg)); }else if (ha->type ==GDT_PCIMPR ) { -gdth_writeb (1 , &((gdt6m_dpram_str __iomem *)ha->brd)->i960r.sema0_reg); +writeb (1 , &((gdt6m_dpram_str __iomem *)ha->brd)->i960r.sema0_reg); } }
@@ -1389,30 +1382,30 @@ static void gdth_copy_command(int hanum)/* set offset and service, copy command to DPMEM */ if (ha->type ==GDT_ISA ) { dp2_ptr = ha->brd; -gdth_writew (dp_offset +DPMEM_COMMAND_OFFSET , +writew (dp_offset +DPMEM_COMMAND_OFFSET , &dp2_ptr->u.ic.comm_queue[cmd_no].offset); -gdth_writew ((ushort )cmd_ptr->Service, +writew ((ushort )cmd_ptr->Service, &dp2_ptr->u.ic.comm_queue[cmd_no].serv_id);memcpy_toio (&dp2_ptr->u.ic.gdt_dpr_cmd[dp_offset],cmd_ptr,cp_count); }else if (ha->type ==GDT_PCI ) { dp6_ptr = ha->brd; -gdth_writew (dp_offset +DPMEM_COMMAND_OFFSET , +writew (dp_offset +DPMEM_COMMAND_OFFSET , &dp6_ptr->u.ic.comm_queue[cmd_no].offset); -gdth_writew ((ushort )cmd_ptr->Service, +writew ((ushort )cmd_ptr->Service, &dp6_ptr->u.ic.comm_queue[cmd_no].serv_id);memcpy_toio (&dp6_ptr->u.ic.gdt_dpr_cmd[dp_offset],cmd_ptr,cp_count); }else if (ha->type ==GDT_PCINEW ) { dp6c_ptr = ha->brd; -gdth_writew (dp_offset +DPMEM_COMMAND_OFFSET , +writew (dp_offset +DPMEM_COMMAND_OFFSET , &dp6c_ptr->u.ic.comm_queue[cmd_no].offset); -gdth_writew ((ushort )cmd_ptr->Service, +writew ((ushort )cmd_ptr->Service, &dp6c_ptr->u.ic.comm_queue[cmd_no].serv_id);memcpy_toio (&dp6c_ptr->u.ic.gdt_dpr_cmd[dp_offset],cmd_ptr,cp_count); }else if (ha->type ==GDT_PCIMPR ) { dp6m_ptr = ha->brd; -gdth_writew (dp_offset +DPMEM_COMMAND_OFFSET , +writew (dp_offset +DPMEM_COMMAND_OFFSET , &dp6m_ptr->u.ic.comm_queue[cmd_no].offset); -gdth_writew ((ushort )cmd_ptr->Service, +writew ((ushort )cmd_ptr->Service, &dp6m_ptr->u.ic.comm_queue[cmd_no].serv_id);memcpy_toio (&dp6m_ptr->u.ic.gdt_dpr_cmd[dp_offset],cmd_ptr,cp_count); }
@@ -1448,13 +1441,13 @@ static void gdth_release_event(int hanum)outl (ha->ccb_phys, ha->bmic +MAILBOXREG );outb (ha->pccb->Service, ha->bmic +LDOORREG ); }else if (ha->type ==GDT_ISA ) { -gdth_writeb (0 , &((gdt2_dpram_str __iomem *)ha->brd)->io.event); +writeb (0 , &((gdt2_dpram_str __iomem *)ha->brd)->io.event); }else if (ha->type ==GDT_PCI ) { -gdth_writeb (0 , &((gdt6_dpram_str __iomem *)ha->brd)->io.event); +writeb (0 , &((gdt6_dpram_str __iomem *)ha->brd)->io.event); }else if (ha->type ==GDT_PCINEW ) {outb (1 ,PTR2USHORT (&ha->plx->ldoor_reg)); }else if (ha->type ==GDT_PCIMPR ) { -gdth_writeb (1 , &((gdt6m_dpram_str __iomem *)ha->brd)->i960r.ldoor_reg); +writeb (1 , &((gdt6m_dpram_str __iomem *)ha->brd)->i960r.ldoor_reg); } }
@@ -3137,32 +3130,32 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) dp2_ptr = ha->brd;if (IStatus &0x80 ) {/* error flag */ IStatus &= ~0x80 ; - ha->status =gdth_readw (&dp2_ptr->u.ic.Status); + ha->status =readw (&dp2_ptr->u.ic.Status);TRACE2 (("gdth_interrupt() error %d/%d\n" ,IStatus,ha->status)); }else /* no error */ ha->status =S_OK ; - ha->info =gdth_readl (&dp2_ptr->u.ic.Info[0 ]); - ha->service =gdth_readw (&dp2_ptr->u.ic.Service); - ha->info2 =gdth_readl (&dp2_ptr->u.ic.Info[1 ]); + ha->info =readl (&dp2_ptr->u.ic.Info[0 ]); + ha->service =readw (&dp2_ptr->u.ic.Service); + ha->info2 =readl (&dp2_ptr->u.ic.Info[1 ]); -gdth_writeb (0xff , &dp2_ptr->io.irqdel);/* acknowledge interrupt */ -gdth_writeb (0 , &dp2_ptr->u.ic.Cmd_Index);/* reset command index */ -gdth_writeb (0 , &dp2_ptr->io.Sema1);/* reset status semaphore */ +writeb (0xff , &dp2_ptr->io.irqdel);/* acknowledge interrupt */ +writeb (0 , &dp2_ptr->u.ic.Cmd_Index);/* reset command index */ +writeb (0 , &dp2_ptr->io.Sema1);/* reset status semaphore */ }else if (ha->type ==GDT_PCI ) { dp6_ptr = ha->brd;if (IStatus &0x80 ) {/* error flag */ IStatus &= ~0x80 ; - ha->status =gdth_readw (&dp6_ptr->u.ic.Status); + ha->status =readw (&dp6_ptr->u.ic.Status);TRACE2 (("gdth_interrupt() error %d/%d\n" ,IStatus,ha->status)); }else /* no error */ ha->status =S_OK ; - ha->info =gdth_readl (&dp6_ptr->u.ic.Info[0 ]); - ha->service =gdth_readw (&dp6_ptr->u.ic.Service); - ha->info2 =gdth_readl (&dp6_ptr->u.ic.Info[1 ]); + ha->info =readl (&dp6_ptr->u.ic.Info[0 ]); + ha->service =readw (&dp6_ptr->u.ic.Service); + ha->info2 =readl (&dp6_ptr->u.ic.Info[1 ]); -gdth_writeb (0xff , &dp6_ptr->io.irqdel);/* acknowledge interrupt */ -gdth_writeb (0 , &dp6_ptr->u.ic.Cmd_Index);/* reset command index */ -gdth_writeb (0 , &dp6_ptr->io.Sema1);/* reset status semaphore */ +writeb (0xff , &dp6_ptr->io.irqdel);/* acknowledge interrupt */ +writeb (0 , &dp6_ptr->u.ic.Cmd_Index);/* reset command index */ +writeb (0 , &dp6_ptr->io.Sema1);/* reset status semaphore */ }else if (ha->type ==GDT_PCINEW ) {if (IStatus &0x80 ) {/* error flag */ IStatus &= ~0x80 ;
@@ -3185,7 +3178,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) ha->status = pcs->ext_status &0xffff ; else#endif - ha->status =gdth_readw (&dp6m_ptr->i960r.status); + ha->status =readw (&dp6m_ptr->i960r.status);TRACE2 (("gdth_interrupt() error %d/%d\n" ,IStatus,ha->status)); }else /* no error */ ha->status =S_OK ;
@@ -3198,18 +3191,18 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) } else#endif { - ha->info =gdth_readl (&dp6m_ptr->i960r.info[0 ]); - ha->service =gdth_readw (&dp6m_ptr->i960r.service); - ha->info2 =gdth_readl (&dp6m_ptr->i960r.info[1 ]); + ha->info =readl (&dp6m_ptr->i960r.info[0 ]); + ha->service =readw (&dp6m_ptr->i960r.service); + ha->info2 =readl (&dp6m_ptr->i960r.info[1 ]); }/* event string */ if (IStatus ==ASYNCINDEX ) {if (ha->service !=SCREENSERVICE && (ha->fw_vers &0xff ) >=0x1a ) { - ha->dvr.severity =gdth_readb + ha->dvr.severity =readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.severity);for (i =0 ; i <256 ; ++i) { - ha->dvr.event_string[i] =gdth_readb + ha->dvr.event_string[i] =readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.evt_str[i]);if (ha->dvr.event_string[i] ==0 )break ;
@@ -3222,8 +3215,8 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) if (!coalesced)#endif { -gdth_writeb (0xff , &dp6m_ptr->i960r.edoor_reg); -gdth_writeb (0 , &dp6m_ptr->i960r.sema1_reg); +writeb (0xff , &dp6m_ptr->i960r.edoor_reg); +writeb (0 , &dp6m_ptr->i960r.sema1_reg); } }else {TRACE2 (("gdth_interrupt() unknown controller type\n" ));
@@ -3308,8 +3301,8 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)/* coalescing only for new GDT_PCIMPR controllers available */ if (ha->type ==GDT_PCIMPR && coalesced) { -gdth_writeb (0xff , &dp6m_ptr->i960r.edoor_reg); -gdth_writeb (0 , &dp6m_ptr->i960r.sema1_reg); +writeb (0xff , &dp6m_ptr->i960r.edoor_reg); +writeb (0 , &dp6m_ptr->i960r.sema1_reg); }#endif
Signature · 1 line
1.5.3.1
PATCH 6/16 Reorder scsi_host_template intitializers
In reply to Boaz Harrosh * shuffle scsi_host_template members such that they appear in the order in which they are defined in the header. this makes is easier to verify when initializers are missing members.
Signed-off-by Jeff Garzik <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/gdth.c +3 -3
@@ -4898,17 +4898,17 @@ static int gdth_slave_configure(struct scsi_device *sdev) }static struct scsi_host_template driver_template = { - .proc_name ="gdth" , - .proc_info = gdth_proc_info, .name ="GDT SCSI Disk Array Controller" , .detect = gdth_detect, .release = gdth_release, .info = gdth_info, .queuecommand = gdth_queuecommand, .eh_bus_reset_handler = gdth_eh_bus_reset, + .slave_configure = gdth_slave_configure, .bios_param = gdth_bios_param, + .proc_info = gdth_proc_info, + .proc_name ="gdth" , .can_queue =GDTH_MAXCMDS , - .slave_configure = gdth_slave_configure, .this_id =-1 , .sg_tablesize =GDTH_MAXSG , .cmd_per_lun =GDTH_MAXC_P_L ,
Signature · 1 line
1.5.3.1
PATCH 7/16 gdth: make some virt ctrlr code common
In reply to Boaz Harrosh * New function gdth_register_virt() replaces the three basically-duplicate copies of virtual controller registration.
Signed-off-by Jeff Garzik <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 80 ++++++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 39 deletions(-)
drivers/scsi/gdth.c +41 -39
@@ -3925,6 +3925,44 @@ int __init option_setup(char *str)return 1 ; } +static int __init gdth_register_virt (struct scsi_host_template *shtp, +gdth_ha_str *ha,int hanum, +struct device *dev,bool isa_dma) +{ +struct Scsi_Host *shp; +unchar b; +int done =0 ; + +if (!virt_ctr) +return 0 ; + + virt_ctr =1 ; + +/* register addit. SCSI channels as virtual controllers */ +for (b =1 ; b < ha->bus_cnt +1 ; ++b) { + shp =scsi_register (shtp,sizeof (gdth_num_str)); + +if (isa_dma) { + shp->unchecked_isa_dma =1 ; + shp->dma_channel = ha->drq; + }else { + shp->unchecked_isa_dma =0 ; + shp->dma_channel =0xff ; + } + + shp->irq = ha->irq; + +gdth_push_vshp (shp); + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum = b; + + done++; + } + +return done ?0 : -ENODEV ; +} +static int __init gdth_detect (struct scsi_host_template *shtp) {
@@ -5017,19 +5055,7 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =1 ; - shp->irq = ha->irq; - shp->dma_channel = ha->drq; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } +gdth_register_virt (shtp, ha, hanum,NULL , true);spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
@@ -5159,19 +5185,7 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } +gdth_register_virt (shtp, ha, hanum,NULL , false);spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
@@ -5310,19 +5324,7 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -if (virt_ctr) { - virt_ctr =1 ; -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - shp->unchecked_isa_dma =0 ; - shp->irq = ha->irq; - shp->dma_channel =0xff ; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - } - } +gdth_register_virt (shtp, ha, hanum, &pcistr[ctr].pdev->dev, false);spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
PATCH 8/16 gdth: Remove virt hosts
In reply to Boaz HarroshThe virt_ctr option allows to register a new scsi_host for each bus on the raid controller. This non-default option makes no sense with the current scsi code and prevents cleaning up the host registration, so remove it.
Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 90 ++++++--------------------------------------- drivers/scsi/gdth_proc.c | 28 ++++++--------- drivers/scsi/gdth_proc.h | 4 +- 3 files changed, 25 insertions(+), 97 deletions(-)
drivers/scsi/gdth.c +12 -78
@@ -56,8 +56,6 @@* max_ids:x x - target ID count per channel (1..MAXID) * rescan:Y rescan all channels/IDs * rescan:N use all devices found until now -* virt_ctr:Y map every channel to a virtual controller -* virt_ctr:N use multi channel support * hdr_channel:x x - number of virtual bus for host drives * shared_access:Y disable driver reserve/release protocol to * access a shared resource from several nodes,
@@ -69,7 +67,7 @@* force_dma32:N use 64 bit DMA mode, if supported * * The default values are: "gdth=disable:N,reserve_mode:1,reverse_scan:N, -* max_ids:127,rescan:N,virt_ctr:N,hdr_channel:0, +* max_ids:127,rescan:N,hdr_channel:0, * shared_access:Y,probe_eisa_isa:N,force_dma32:N". * Here is another example: "gdth=reserve_list:0,1,2,0,0,1,3,0,rescan:Y". *
@@ -80,7 +78,7 @@* '1' in place of 'Y' and '0' in place of 'N'. * * Default: "modprobe gdth disable=0 reserve_mode=1 reverse_scan=0 -* max_ids=127 rescan=0 virt_ctr=0 hdr_channel=0 shared_access=0 +* max_ids=127 rescan=0 hdr_channel=0 shared_access=0 * probe_eisa_isa=0 force_dma32=0" * The other example: "modprobe gdth reserve_list=0,1,2,0,0,1,3,0 rescan=1". */
@@ -309,10 +307,8 @@ static unchar gdth_polling; /* polling if TRUE */static unchar gdth_from_wait = FALSE;/* gdth_wait() */ static int wait_index,wait_hanum;/* gdth_wait() */ static int gdth_ctr_count =0 ;/* controller count */ -static int gdth_ctr_vcount =0 ;/* virt. ctr. count */ static int gdth_ctr_released =0 ;/* gdth_release() */ static struct Scsi_Host *gdth_ctr_tab[MAXHA ];/* controller table */ -static struct Scsi_Host *gdth_ctr_vtab[MAXHA *MAXBUS ];/* virt. ctr. table */ static unchar gdth_write_through = FALSE;/* write through */ static gdth_evt_str ebuffer[MAX_EVENTS ];/* event buffer */ static int elastidx;
@@ -364,8 +360,6 @@ static int hdr_channel = 0;static int max_ids =MAXID ;/* rescan all IDs */ static int rescan =0 ; -/* map channels to virtual controllers */ -static int virt_ctr =0 ;/* shared access */ static int shared_access =1 ;/* enable support for EISA and ISA controllers */
@@ -382,7 +376,6 @@ module_param(reverse_scan, int, 0);module_param (hdr_channel, int,0 );module_param (max_ids, int,0 );module_param (rescan, int,0 ); -module_param (virt_ctr, int,0 );module_param (shared_access, int,0 );module_param (probe_eisa_isa, int,0 );module_param (force_dma32, int,0 );
@@ -2012,7 +2005,7 @@ static void gdth_putq(int hanum,Scsi_Cmnd *scp,unchar priority)if (scp->done != gdth_scsi_done) { scp->SCp.this_residual = (int )priority; - b = virt_ctr ?NUMDATA (scp->device->host)->busnum:scp->device->channel; + b = scp->device->channel; t = scp->device->id;if (priority >=DEFAULT_PRI ) { if ((b != ha->virt_bus && ha->raw[BUS_L2P(ha,b)].lock) ||
@@ -2074,8 +2067,7 @@ static void gdth_next(int hanum)if (nscp != pscp && nscp != (Scsi_Cmnd *)pscp->SCp.ptr) pscp = (Scsi_Cmnd *)pscp->SCp.ptr;if (nscp->done != gdth_scsi_done) { - b = virt_ctr ? -NUMDATA (nscp->device->host)->busnum : nscp->device->channel; + b = nscp->device->channel; t = nscp->device->id; l = nscp->device->lun;if (nscp->SCp.this_residual >=DEFAULT_PRI ) {
@@ -3391,7 +3383,7 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp)printk ("\n" ); }else { - b = virt_ctr ?NUMDATA (scp->device->host)->busnum : scp->device->channel; + b = scp->device->channel; t = scp->device->id;if (scp->SCp.sent_command ==-1 && b != ha->virt_bus) { ha->raw[BUS_L2P (ha,b)].io_cnt[t]--;
@@ -3877,8 +3869,6 @@ static void __init internal_setup(char *str,int *ints) max_ids = val; else if (!strncmp(argv, "rescan:", 7)) rescan = val; - else if (!strncmp(argv, "virt_ctr:", 9)) - virt_ctr = val; else if (!strncmp(argv, "shared_access:", 14)) shared_access = val; else if (!strncmp(argv, "probe_eisa_isa:", 15))
@@ -3925,45 +3915,6 @@ int __init option_setup(char *str)return 1 ; } -static int __init gdth_register_virt (struct scsi_host_template *shtp, -gdth_ha_str *ha,int hanum, -struct device *dev,bool isa_dma) -{ -struct Scsi_Host *shp; -unchar b; -int done =0 ; - -if (!virt_ctr) -return 0 ; - - virt_ctr =1 ; - -/* register addit. SCSI channels as virtual controllers */ -for (b =1 ; b < ha->bus_cnt +1 ; ++b) { - shp =scsi_register (shtp,sizeof (gdth_num_str)); - -if (isa_dma) { - shp->unchecked_isa_dma =1 ; - shp->dma_channel = ha->drq; - }else { - shp->unchecked_isa_dma =0 ; - shp->dma_channel =0xff ; - } - - shp->irq = ha->irq; - -gdth_push_vshp (shp); - -NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum = b; - - done++; - } - -return done ?0 : -ENODEV ; -} - -static int __init gdth_detect (struct scsi_host_template *shtp) {gdth_pci_str pcistr[MAXHA ];
@@ -4048,7 +3999,7 @@ static int __init gdth_detect(struct scsi_host_template *shtp)register_reboot_notifier (&gdth_notifier); } gdth_polling = FALSE; -return gdth_ctr_vcount; +return gdth_ctr_count; }static int gdth_release (struct Scsi_Host *shp)
@@ -4057,7 +4008,6 @@ static int gdth_release(struct Scsi_Host *shp)gdth_ha_str *ha;TRACE2 (("gdth_release()\n" )); -if (NUMDATA (shp)->busnum ==0 ) { hanum =NUMDATA (shp)->hanum; ha =HADATA (gdth_ctr_tab[hanum]);if (ha->sdev) {
@@ -4099,7 +4049,6 @@ static int gdth_release(struct Scsi_Host *shp)unregister_chrdev (major,"gdth" );unregister_reboot_notifier (&gdth_notifier); } - }scsi_unregister (shp);return 0 ;
@@ -4161,7 +4110,7 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)TRACE2 (("gdth_eh_bus_reset()\n" )); hanum =NUMDATA (scp->device->host)->hanum; - b = virt_ctr ?NUMDATA (scp->device->host)->busnum : scp->device->channel; + b = scp->device->channel; ha =HADATA (gdth_ctr_tab[hanum]);/* clear command tab */
@@ -4215,7 +4164,7 @@ static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,se sd = sdev; capacity = cap; hanum =NUMDATA (sd->host)->hanum; - b = virt_ctr ?NUMDATA (sd->host)->busnum : sd->channel; + b = sd->channel; t = sd->id;TRACE2 (("gdth_bios_param() ha %d bus %d target %d\n" , hanum, b, t)); ha =HADATA (gdth_ctr_tab[hanum]);
@@ -4834,7 +4783,7 @@ static int gdth_ioctl(struct inode *inode, struct file *filep, scp->device = ha->sdev; scp->cmd_len =12 ; scp->use_sg =0 ; - scp->device->channel = virt_ctr ?0 : res.number; + scp->device->channel = res.number; rval =gdth_eh_bus_reset (scp); res.status = (rval ==SUCCESS ?S_OK :S_GENERR );kfree (scp);
@@ -4961,7 +4910,6 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios)gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ;int error, hanum, i; -u8 b;if (!gdth_search_isa (isa_bios))return -ENXIO ;
@@ -4998,10 +4946,8 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) shp->dma_channel = ha->drq; hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp;NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ; ha->pccb =CMDDATA (shp); ha->ccb_phys =0L ;
@@ -5054,8 +5000,7 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -gdth_register_virt (shtp, ha, hanum,NULL , true); + shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
@@ -5075,7 +5020,6 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) ha->pscratch, ha->scratch_phys); out_dec_counters: gdth_ctr_count--; - gdth_ctr_vcount--; out_free_irq:free_irq (ha->irq, ha); out_host_put:
@@ -5092,7 +5036,6 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp,gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ;int error, hanum, i; -u8 b;if (!gdth_search_eisa (eisa_slot))return -ENXIO ;
@@ -5121,10 +5064,8 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, shp->dma_channel =0xff ; hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp;NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ;TRACE2 (("EISA detect Bus 0: hanum %d\n" ,NUMDATA (shp)->hanum));
@@ -5184,8 +5125,7 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -gdth_register_virt (shtp, ha, hanum,NULL , false); + shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
@@ -5208,7 +5148,6 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, out_free_irq:free_irq (ha->irq, ha); gdth_ctr_count--; - gdth_ctr_vcount--; out_host_put:scsi_unregister (shp);return error;
@@ -5223,7 +5162,6 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp,gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ;int error, hanum, i; -u8 b; shp =scsi_register (shtp,sizeof (gdth_ext_str));if (!shp)
@@ -5252,10 +5190,8 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, shp->dma_channel =0xff ; hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; - gdth_ctr_vtab[gdth_ctr_vcount++] = shp;NUMDATA (shp)->hanum = (ushort )hanum; -NUMDATA (shp)->busnum=0 ; ha->pccb =CMDDATA (shp); ha->ccb_phys =0L ;
@@ -5323,8 +5259,7 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, shp->max_id = ha->tid_cnt; shp->max_lun =MAXLUN ; - shp->max_channel = virt_ctr ?0 : ha->bus_cnt; -gdth_register_virt (shtp, ha, hanum, &pcistr[ctr].pdev->dev, false); + shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock);gdth_enable_int (hanum);
@@ -5344,7 +5279,6 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, out_free_irq:free_irq (ha->irq, ha); gdth_ctr_count--; - gdth_ctr_vcount--; out_host_put:scsi_unregister (shp);return error;
drivers/scsi/gdth_proc.c +11 -17
@@ -7,26 +7,25 @@int gdth_proc_info (struct Scsi_Host *host,char *buffer,char **start,off_t offset,int length,int inout) { -int hanum,busnum; +int hanum;TRACE2 (("gdth_proc_info() length %d offs %d inout %d\n" , length,(int )offset,inout)); hanum =NUMDATA (host)->hanum; - busnum=NUMDATA (host)->busnum;if (inout) -return (gdth_set_info (buffer,length,host,hanum,busnum)); +return (gdth_set_info (buffer,length,host,hanum));else -return (gdth_get_info (buffer,start,offset,length,host,hanum,busnum)); +return (gdth_get_info (buffer,start,offset,length,host,hanum)); }static int gdth_set_info (char *buffer,int length,struct Scsi_Host *host, -int hanum,int busnum) +int hanum) {int ret_val = -EINVAL ; -TRACE2 (("gdth_set_info() ha %d bus %d\n" ,hanum,busnum)); + TRACE2(("gdth_set_info() ha %d\n",hanum,));if (length >=4 ) {if (strncmp (buffer,"gdth" ,4 ) ==0 ) {
@@ -154,7 +153,7 @@ static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer, }static int gdth_get_info (char *buffer,char **start,off_t offset,int length, -struct Scsi_Host *host,int hanum,int busnum) +struct Scsi_Host *host,int hanum) {int size =0 ,len =0 ;off_t begin =0 ,pos =0 ;
@@ -187,7 +186,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,memset (cmnd,0xff ,12 );memset (gdtcmd,0 ,sizeof (gdth_cmd_str)); -TRACE2 (("gdth_get_info() ha %d bus %d\n" ,hanum,busnum)); +TRACE2 (("gdth_get_info() ha %d\n" ,hanum)); ha =HADATA (gdth_ctr_tab[hanum]);
@@ -218,10 +217,7 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,/* controller information */ size =sprintf (buffer+len,"\nDisk Array Controller Information:\n" ); len += size; pos = begin + len; -if (virt_ctr) -sprintf (hrec,"%s (Bus %d)" , ha->binfo.type_string, busnum); -else -strcpy (hrec, ha->binfo.type_string); +strcpy (hrec, ha->binfo.type_string); size =sprintf (buffer+len," Number: \t%d \tName: \t%s\n" , hanum, hrec);
@@ -753,7 +749,7 @@ static void gdth_wait_completion(int hanum, int busnum, int id)for (i =0 ; i <GDTH_MAXCMDS ; ++i) { scp = ha->cmd_tab[i].cmnd; - b = virt_ctr ?NUMDATA (scp->device->host)->busnum : scp->device->channel; + b = scp->device->channel; t = scp->device->id;if (!SPECIAL_SCP (scp) && t == (unchar )id && b == (unchar )busnum) {
@@ -779,8 +775,7 @@ static void gdth_stop_timeout(int hanum, int busnum, int id)for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) {if (scp->done != gdth_scsi_done) { - b = virt_ctr ? -NUMDATA (scp->device->host)->busnum : scp->device->channel; + b = scp->device->channel; t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {TRACE2 (("gdth_stop_timeout(): update_timeout()\n" ));
@@ -803,8 +798,7 @@ static void gdth_start_timeout(int hanum, int busnum, int id)for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) {if (scp->done != gdth_scsi_done) { - b = virt_ctr ? -NUMDATA (scp->device->host)->busnum : scp->device->channel; + b = scp->device->channel; t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {TRACE2 (("gdth_start_timeout(): update_timeout()\n" ));
drivers/scsi/gdth_proc.h +2 -2
@@ -9,9 +9,9 @@ int gdth_execute(struct Scsi_Host *shost, gdth_cmd_str *gdtcmd, char *cmnd, int timeout, u32 *info);static int gdth_set_info (char *buffer,int length,struct Scsi_Host *host, -int hanum,int busnum); +int hanum);static int gdth_get_info (char *buffer,char **start,off_t offset,int length, -struct Scsi_Host *host,int hanum,int busnum); +struct Scsi_Host *host,int hanum);static int gdth_set_asc_info (struct Scsi_Host *host,char *buffer,int length,int hanum);
Signature · 1 line
1.5.3.1
PATCH 9/16 gdth: clean up host private data
In reply to Boaz Harrosh - Get rid of all the indirection in the Scsi_Host private data and always put the gdth_ha_str directly into it.
- Change all internal functions prototype to recieve an "gdth_ha_str *ha"
pointer directlly and kill all that redundent access to the "gdth_ctr_tab[]"
controller-table.Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 558 ++++++++++++++++++++-------------------------- drivers/scsi/gdth.h | 17 +-- drivers/scsi/gdth_proc.c | 80 +++---- drivers/scsi/gdth_proc.h | 20 +- 4 files changed, 291 insertions(+), 384 deletions(-)
drivers/scsi/gdth.c +247 -311
@@ -139,14 +139,15 @@static void gdth_delay (int milliseconds);static void gdth_eval_mapping (ulong32 size,ulong32 *cyls,int *heads,int *secs);static irqreturn_t gdth_interrupt (int irq,void *dev_id); -static int gdth_sync_event (int hanum,int service,unchar index,Scsi_Cmnd *scp); -static int gdth_async_event (int hanum); +static int gdth_sync_event (gdth_ha_str *ha,int service,unchar index, +Scsi_Cmnd *scp); +static int gdth_async_event (gdth_ha_str *ha);static void gdth_log_event (gdth_evt_data *dvr,char *buffer); -static void gdth_putq (int hanum,Scsi_Cmnd *scp,unchar priority); -static void gdth_next (int hanum); -static int gdth_fill_raw_cmd (int hanum,Scsi_Cmnd *scp,unchar b); -static int gdth_special_cmd (int hanum,Scsi_Cmnd *scp); +static void gdth_putq (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar priority); +static void gdth_next (gdth_ha_str *ha); +static int gdth_fill_raw_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar b); +static int gdth_special_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp);static gdth_evt_str *gdth_store_event (gdth_ha_str *ha,ushort source,ushort idx,gdth_evt_data *evt);static int gdth_read_event (gdth_ha_str *ha,int handle,gdth_evt_str *estr);
@@ -154,10 +155,10 @@ static void gdth_readapp_event(gdth_ha_str *ha, unchar application, gdth_evt_str *estr);static void gdth_clear_events (void ); -static void gdth_copy_internal_data (int hanum,Scsi_Cmnd *scp, +static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp,char *buffer,ushort count); -static int gdth_internal_cache_cmd (int hanum,Scsi_Cmnd *scp); -static int gdth_fill_cache_cmd (int hanum,Scsi_Cmnd *scp,ushort hdrive); +static int gdth_internal_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp); +static int gdth_fill_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,ushort hdrive);static int gdth_search_eisa (ushort eisa_adr);static int gdth_search_isa (ulong32 bios_adr);
@@ -169,25 +170,25 @@ static int gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha);static int gdth_init_isa (ulong32 bios_adr,gdth_ha_str *ha);static int gdth_init_pci (gdth_pci_str *pcistr,gdth_ha_str *ha); -static void gdth_enable_int (int hanum); +static void gdth_enable_int (gdth_ha_str *ha);static int gdth_get_status (unchar *pIStatus,int irq); -static int gdth_test_busy (int hanum); -static int gdth_get_cmd_index (int hanum); -static void gdth_release_event (int hanum); -static int gdth_wait (int hanum,int index,ulong32 time); -static int gdth_internal_cmd (int hanum,unchar service,ushort opcode,ulong32 p1, -ulong64 p2,ulong64 p3); -static int gdth_search_drives (int hanum); -static int gdth_analyse_hdrive (int hanum,ushort hdrive); +static int gdth_test_busy (gdth_ha_str *ha); +static int gdth_get_cmd_index (gdth_ha_str *ha); +static void gdth_release_event (gdth_ha_str *ha); +static int gdth_wait (gdth_ha_str *ha,int index,ulong32 time); +static int gdth_internal_cmd (gdth_ha_str *ha,unchar service,ushort opcode, +ulong32 p1,ulong64 p2,ulong64 p3); +static int gdth_search_drives (gdth_ha_str *ha); +static int gdth_analyse_hdrive (gdth_ha_str *ha,ushort hdrive); -static const char *gdth_ctr_name (int hanum); +static const char *gdth_ctr_name (gdth_ha_str *ha);static int gdth_open (struct inode *inode,struct file *filep);static int gdth_close (struct inode *inode,struct file *filep);static int gdth_ioctl (struct inode *inode,struct file *filep,unsigned int cmd,unsigned long arg); -static void gdth_flush (int hanum); +static void gdth_flush (gdth_ha_str *ha);static int gdth_halt (struct notifier_block *nb,ulong event,void *buf);static int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *));static void gdth_scsi_done (struct scsi_cmnd *scp);
@@ -295,10 +296,6 @@ static struct timer_list gdth_timer;#define GDTOFFSOF (a,b) (size_t)&(((a*)0)->b)#define INDEX_OK (i,t) ((i)<ARRAY_SIZE(t)) -#define NUMDATA (a) ( (gdth_num_str *)((a)->hostdata)) -#define HADATA (a) (&((gdth_ext_str *)((a)->hostdata))->haext) -#define CMDDATA (a) (&((gdth_ext_str *)((a)->hostdata))->cmdext) -#define BUS_L2P (a,b) ((b)>(a)->virt_bus ? (b-1):(b))static unchar gdth_drq_tab[4 ] = {5 ,6 ,7 ,7 };/* DRQ table */
@@ -1206,16 +1203,14 @@ static int __init gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha)/* controller protocol functions */ -static void __init gdth_enable_int (int hanum) +static void __init gdth_enable_int (gdth_ha_str *ha) { -gdth_ha_str *ha;ulong flags;gdt2_dpram_str __iomem *dp2_ptr;gdt6_dpram_str __iomem *dp6_ptr;gdt6m_dpram_str __iomem *dp6m_ptr; -TRACE (("gdth_enable_int() hanum %d\n" ,hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE (("gdth_enable_int() hanum %d\n" ,ha->hanum));spin_lock_irqsave (&ha->smp_lock, flags);if (ha->type ==GDT_EISA ) {
@@ -1255,7 +1250,7 @@ static int gdth_get_status(unchar *pIStatus,int irq) *pIStatus =0 ;for (i=0 ; i<gdth_ctr_count; ++i) { - ha =HADATA (gdth_ctr_tab[i]); + ha =shost_priv (gdth_ctr_tab[i]);if (ha->irq != (unchar )irq)/* check IRQ */ continue ;if (ha->type ==GDT_EISA )
@@ -1279,14 +1274,12 @@ static int gdth_get_status(unchar *pIStatus,int irq) } -static int gdth_test_busy (int hanum) +static int gdth_test_busy (gdth_ha_str *ha) { - registergdth_ha_str *ha; registerint gdtsema0 =0 ; -TRACE (("gdth_test_busy() hanum %d\n" ,hanum)); - - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE (("gdth_test_busy() hanum %d\n" , ha->hanum)); +if (ha->type ==GDT_EISA ) gdtsema0 = (int )inb (ha->bmic +SEMA0REG );else if (ha->type ==GDT_ISA )
@@ -1303,14 +1296,12 @@ static int gdth_test_busy(int hanum) } -static int gdth_get_cmd_index (int hanum) +static int gdth_get_cmd_index (gdth_ha_str *ha) { - registergdth_ha_str *ha;int i; -TRACE (("gdth_get_cmd_index() hanum %d\n" ,hanum)); +TRACE (("gdth_get_cmd_index() hanum %d\n" , ha->hanum)); - ha =HADATA (gdth_ctr_tab[hanum]);for (i=0 ; i<GDTH_MAXCMDS ; ++i) {if (ha->cmd_tab[i].cmnd ==UNUSED_CMND ) { ha->cmd_tab[i].cmnd = ha->pccb->RequestBuffer;
@@ -1323,13 +1314,10 @@ static int gdth_get_cmd_index(int hanum) } -static void gdth_set_sema0 (int hanum) +static void gdth_set_sema0 (gdth_ha_str *ha) { - registergdth_ha_str *ha; - -TRACE (("gdth_set_sema0() hanum %d\n" ,hanum)); +TRACE (("gdth_set_sema0() hanum %d\n" , ha->hanum)); - ha =HADATA (gdth_ctr_tab[hanum]);if (ha->type ==GDT_EISA ) {outb (1 , ha->bmic +SEMA0REG ); }else if (ha->type ==GDT_ISA ) {
@@ -1344,9 +1332,8 @@ static void gdth_set_sema0(int hanum) } -static void gdth_copy_command (int hanum) +static void gdth_copy_command (gdth_ha_str *ha) { - registergdth_ha_str *ha; registergdth_cmd_str *cmd_ptr; registergdt6m_dpram_str __iomem *dp6m_ptr; registergdt6c_dpram_str __iomem *dp6c_ptr;
@@ -1354,9 +1341,8 @@ static void gdth_copy_command(int hanum)gdt2_dpram_str __iomem *dp2_ptr;ushort cp_count,dp_offset,cmd_no; -TRACE (("gdth_copy_command() hanum %d\n" ,hanum)); +TRACE (("gdth_copy_command() hanum %d\n" , ha->hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); cp_count = ha->cmd_len; dp_offset= ha->cmd_offs_dpmem; cmd_no = ha->cmd_cnt;
@@ -1405,12 +1391,9 @@ static void gdth_copy_command(int hanum) } -static void gdth_release_event (int hanum) +static void gdth_release_event (gdth_ha_str *ha) { - registergdth_ha_str *ha; - -TRACE (("gdth_release_event() hanum %d\n" ,hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE (("gdth_release_event() hanum %d\n" , ha->hanum));#ifdef GDTH_STATISTICS {
@@ -1444,46 +1427,41 @@ static void gdth_release_event(int hanum) } } - -static int gdth_wait (int hanum,int index,ulong32 time) +static int gdth_wait (gdth_ha_str *ha,int index,ulong32 time) { -gdth_ha_str *ha;int answer_found = FALSE; -TRACE (("gdth_wait() hanum %d index %d time %d\n" ,hanum,index,time)); +TRACE (("gdth_wait() hanum %d index %d time %d\n" , ha->hanum, index, time)); - ha =HADATA (gdth_ctr_tab[hanum]);if (index ==0 )return 1 ;/* no wait required */ gdth_from_wait = TRUE;do {gdth_interrupt ((int )ha->irq,ha); -if (wait_hanum==hanum && wait_index==index) { +if (wait_hanum==ha->hanum && wait_index==index) { answer_found = TRUE;break ; }gdth_delay (1 ); }while (--time); gdth_from_wait = FALSE; - -while (gdth_test_busy (hanum)) + +while (gdth_test_busy (ha))gdth_delay (0 );return (answer_found); } -static int gdth_internal_cmd (int hanum,unchar service,ushort opcode,ulong32 p1, -ulong64 p2,ulong64 p3) +static int gdth_internal_cmd (gdth_ha_str *ha,unchar service,ushort opcode, +ulong32 p1,ulong64 p2,ulong64 p3) { - registergdth_ha_str *ha; registergdth_cmd_str *cmd_ptr;int retries,index;TRACE2 (("gdth_internal_cmd() service %d opcode %d\n" ,service,opcode)); - ha =HADATA (gdth_ctr_tab[hanum]); cmd_ptr = ha->pccb;memset ((char *)cmd_ptr,0 ,sizeof (gdth_cmd_str));
@@ -1491,11 +1469,11 @@ static int gdth_internal_cmd(int hanum,unchar service,ushort opcode,ulong32 p1,for (retries =INIT_RETRIES ;;) { cmd_ptr->Service = service; cmd_ptr->RequestBuffer =INTERNAL_CMND ; -if (!(index=gdth_get_cmd_index (hanum))) { +if (!(index=gdth_get_cmd_index (ha))) {TRACE (("GDT: No free command index found\n" ));return 0 ; } -gdth_set_sema0 (hanum); +gdth_set_sema0 (ha); cmd_ptr->OpCode = opcode; cmd_ptr->BoardNode =LOCALBOARD ;if (service ==CACHESERVICE ) {
@@ -1535,10 +1513,10 @@ static int gdth_internal_cmd(int hanum,unchar service,ushort opcode,ulong32 p1, ha->cmd_len =sizeof (gdth_cmd_str); ha->cmd_offs_dpmem =0 ; ha->cmd_cnt =0 ; -gdth_copy_command (hanum); -gdth_release_event (hanum); +gdth_copy_command (ha); +gdth_release_event (ha);gdth_delay (20 ); -if (!gdth_wait (hanum,index,INIT_TIMEOUT )) { +if (!gdth_wait (ha, index,INIT_TIMEOUT )) {printk ("GDT: Initialization error (timeout service %d)\n" ,service);return 0 ; }
@@ -1553,9 +1531,8 @@ static int gdth_internal_cmd(int hanum,unchar service,ushort opcode,ulong32 p1,/* search for devices */ -static int __init gdth_search_drives (int hanum) +static int __init gdth_search_drives (gdth_ha_str *ha) { - registergdth_ha_str *ha;ushort cdev_cnt, i;int ok;ulong32 bus_no, drv_cnt, drv_no, j;
@@ -1575,22 +1552,21 @@ static int __init gdth_search_drives(int hanum)ulong flags;#endif -TRACE (("gdth_search_drives() hanum %d\n" ,hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE (("gdth_search_drives() hanum %d\n" , ha->hanum)); ok =0 ;/* initialize controller services, at first: screen service */ ha->screen_feat =0 ;if (!force_dma32) { - ok =gdth_internal_cmd (hanum,SCREENSERVICE ,GDT_X_INIT_SCR ,0 ,0 ,0 ); + ok =gdth_internal_cmd (ha,SCREENSERVICE ,GDT_X_INIT_SCR ,0 ,0 ,0 );if (ok) ha->screen_feat =GDT_64BIT ; }if (force_dma32 || (!ok && ha->status == (ushort )S_NOFUNC )) - ok =gdth_internal_cmd (hanum,SCREENSERVICE ,GDT_INIT ,0 ,0 ,0 ); + ok =gdth_internal_cmd (ha,SCREENSERVICE ,GDT_INIT ,0 ,0 ,0 );if (!ok) {printk ("GDT-HA %d: Initialization error screen service (code %d)\n" , - hanum, ha->status); + ha->hanum, ha->status);return 0 ; }TRACE2 (("gdth_search_drives(): SCREENSERVICE initialized\n" ));
@@ -1614,25 +1590,26 @@ static int __init gdth_search_drives(int hanum)TRACE2 (("gdth_search_drives(): RTC: %x/%x/%x\n" ,*(ulong32 *)&rtc[0 ], *(ulong32 *)&rtc[4 ], *(ulong32 *)&rtc[8 ]));/* 3. send to controller firmware */ -gdth_internal_cmd (hanum,SCREENSERVICE ,GDT_REALTIME , *(ulong32 *)&rtc[0 ], +gdth_internal_cmd (ha,SCREENSERVICE ,GDT_REALTIME , *(ulong32 *)&rtc[0 ], *(ulong32 *)&rtc[4 ], *(ulong32 *)&rtc[8 ]);#endif /* unfreeze all IOs */ -gdth_internal_cmd (hanum,CACHESERVICE ,GDT_UNFREEZE_IO ,0 ,0 ,0 ); +gdth_internal_cmd (ha,CACHESERVICE ,GDT_UNFREEZE_IO ,0 ,0 ,0 );/* initialize cache service */ ha->cache_feat =0 ;if (!force_dma32) { - ok =gdth_internal_cmd (hanum,CACHESERVICE ,GDT_X_INIT_HOST ,LINUX_OS ,0 ,0 ); + ok =gdth_internal_cmd (ha,CACHESERVICE ,GDT_X_INIT_HOST ,LINUX_OS , +0 ,0 );if (ok) ha->cache_feat =GDT_64BIT ; }if (force_dma32 || (!ok && ha->status == (ushort )S_NOFUNC )) - ok =gdth_internal_cmd (hanum,CACHESERVICE ,GDT_INIT ,LINUX_OS ,0 ,0 ); + ok =gdth_internal_cmd (ha,CACHESERVICE ,GDT_INIT ,LINUX_OS ,0 ,0 );if (!ok) {printk ("GDT-HA %d: Initialization error cache service (code %d)\n" , - hanum, ha->status); + ha->hanum, ha->status);return 0 ; }TRACE2 (("gdth_search_drives(): CACHESERVICE initialized\n" ));
@@ -1661,9 +1638,9 @@ static int __init gdth_search_drives(int hanum) pmod->cmd_buff_size =0 ; pmod->reserved1 =0 ; pmod->reserved2 =0 ; -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,SET_PERF_MODES , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,SET_PERF_MODES ,INVALID_CHANNEL ,sizeof (gdth_perf_modes))) { -printk ("GDT-HA %d: Interrupt coalescing activated\n" , hanum); +printk ("GDT-HA %d: Interrupt coalescing activated\n" , ha->hanum); } }#endif
@@ -1675,7 +1652,7 @@ static int __init gdth_search_drives(int hanum) iocr->hdr.first_chan =0 ; iocr->hdr.last_chan =MAXBUS -1 ; iocr->hdr.list_offset =GDTOFFSOF (gdth_raw_iochan_str, list[0 ]); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,IOCHAN_RAW_DESC , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,IOCHAN_RAW_DESC ,INVALID_CHANNEL ,sizeof (gdth_raw_iochan_str))) {TRACE2 (("IOCHAN_RAW_DESC supported!\n" )); ha->bus_cnt = iocr->hdr.chan_count;
@@ -1690,13 +1667,13 @@ static int __init gdth_search_drives(int hanum) chn = (gdth_getch_str *)ha->pscratch;for (bus_no =0 ; bus_no <MAXBUS ; ++bus_no) { chn->channel_no = bus_no; -if (!gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , +if (!gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,SCSI_CHAN_CNT |L_CTRL_PATTERN ,IO_CHANNEL |INVALID_CHANNEL ,sizeof (gdth_getch_str))) {if (bus_no ==0 ) {printk ("GDT-HA %d: Error detecting channel count (0x%x)\n" , - hanum, ha->status); + ha->hanum, ha->status);return 0 ; }break ;
@@ -1711,10 +1688,10 @@ static int __init gdth_search_drives(int hanum)TRACE2 (("gdth_search_drives() %d channels\n" ,ha->bus_cnt));/* read cache configuration */ -if (!gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,CACHE_INFO , +if (!gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,CACHE_INFO ,INVALID_CHANNEL ,sizeof (gdth_cinfo_str))) {printk ("GDT-HA %d: Initialization error cache service (code %d)\n" , - hanum, ha->status); + ha->hanum, ha->status);return 0 ; } ha->cpar = ((gdth_cinfo_str *)ha->pscratch)->cpar;
@@ -1724,11 +1701,11 @@ static int __init gdth_search_drives(int hanum)/* read board info and features */ ha->more_proc = FALSE; -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,BOARD_INFO , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,BOARD_INFO ,INVALID_CHANNEL ,sizeof (gdth_binfo_str))) {memcpy (&ha->binfo, (gdth_binfo_str *)ha->pscratch,sizeof (gdth_binfo_str)); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,BOARD_FEATURES , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,BOARD_FEATURES ,INVALID_CHANNEL ,sizeof (gdth_bfeat_str))) {TRACE2 (("BOARD_INFO/BOARD_FEATURES supported\n" )); ha->bfeat = *(gdth_bfeat_str *)ha->pscratch;
@@ -1736,7 +1713,7 @@ static int __init gdth_search_drives(int hanum) } }else {TRACE2 (("BOARD_INFO requires firmware >= 1.10/2.08\n" )); -strcpy (ha->binfo.type_string,gdth_ctr_name (hanum)); +strcpy (ha->binfo.type_string,gdth_ctr_name (ha)); }TRACE2 (("Controller name: %s\n" ,ha->binfo.type_string));
@@ -1749,7 +1726,7 @@ static int __init gdth_search_drives(int hanum) ioc->hdr.first_chan =0 ; ioc->hdr.last_chan =MAXBUS -1 ; ioc->hdr.list_offset =GDTOFFSOF (gdth_iochan_str, list[0 ]); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,IOCHAN_DESC , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,IOCHAN_DESC ,INVALID_CHANNEL ,sizeof (gdth_iochan_str))) {for (bus_no =0 ; bus_no < ha->bus_cnt; ++bus_no) { ha->raw[bus_no].address = ioc->list[bus_no].address;
@@ -1764,7 +1741,7 @@ static int __init gdth_search_drives(int hanum)for (bus_no =0 ; bus_no < ha->bus_cnt; ++bus_no) { chn = (gdth_getch_str *)ha->pscratch; chn->channel_no = ha->raw[bus_no].local_no; -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,SCSI_CHAN_CNT |L_CTRL_PATTERN , ha->raw[bus_no].address |INVALID_CHANNEL ,sizeof (gdth_getch_str))) {
@@ -1776,7 +1753,7 @@ static int __init gdth_search_drives(int hanum) drl = (gdth_drlist_str *)ha->pscratch; drl->sc_no = ha->raw[bus_no].local_no; drl->sc_cnt = ha->raw[bus_no].pdev_cnt; -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,SCSI_DR_LIST |L_CTRL_PATTERN , ha->raw[bus_no].address |INVALID_CHANNEL ,sizeof (gdth_drlist_str))) {
@@ -1789,10 +1766,10 @@ static int __init gdth_search_drives(int hanum) }/* logical drives */ -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,CACHE_DRV_CNT , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,CACHE_DRV_CNT ,INVALID_CHANNEL ,sizeof (ulong32))) { drv_cnt = *(ulong32 *)ha->pscratch; -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL ,CACHE_DRV_LIST , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,CACHE_DRV_LIST ,INVALID_CHANNEL ,drv_cnt *sizeof (ulong32))) {for (j =0 ; j < drv_cnt; ++j) { drv_no = ((ulong32 *)ha->pscratch)[j];
@@ -1806,7 +1783,7 @@ static int __init gdth_search_drives(int hanum) alst->entries_avail =MAX_LDRIVES ; alst->first_entry =0 ; alst->list_offset =GDTOFFSOF (gdth_arcdl_str, list[0 ]); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,ARRAY_DRV_LIST2 |LA_CTRL_PATTERN ,INVALID_CHANNEL ,sizeof (gdth_arcdl_str) + (alst->entries_avail-1 ) *sizeof (gdth_alist_str))) {
@@ -1817,7 +1794,7 @@ static int __init gdth_search_drives(int hanum) ha->hdr[j].is_hotfix = alst->list[j].is_hotfix; ha->hdr[j].master_no = alst->list[j].cd_handle; } - }else if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , + }else if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,ARRAY_DRV_LIST |LA_CTRL_PATTERN ,0 ,35 *sizeof (gdth_alist_str))) {for (j =0 ; j <35 ; ++j) {
@@ -1835,24 +1812,24 @@ static int __init gdth_search_drives(int hanum)/* initialize raw service */ ha->raw_feat =0 ;if (!force_dma32) { - ok =gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_X_INIT_RAW ,0 ,0 ,0 ); + ok =gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_X_INIT_RAW ,0 ,0 ,0 );if (ok) ha->raw_feat =GDT_64BIT ; }if (force_dma32 || (!ok && ha->status == (ushort )S_NOFUNC )) - ok =gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_INIT ,0 ,0 ,0 ); + ok =gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_INIT ,0 ,0 ,0 );if (!ok) {printk ("GDT-HA %d: Initialization error raw service (code %d)\n" , - hanum, ha->status); + ha->hanum, ha->status);return 0 ; }TRACE2 (("gdth_search_drives(): RAWSERVICE initialized\n" ));/* set/get features raw service (scatter/gather) */ -if (gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_SET_FEAT ,SCATTER_GATHER , -0 ,0 )) { +if (gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_SET_FEAT ,SCATTER_GATHER , +0 ,0 )) {TRACE2 (("gdth_search_drives(): set features RAWSERVICE OK\n" )); -if (gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_GET_FEAT ,0 ,0 ,0 )) { +if (gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_GET_FEAT ,0 ,0 ,0 )) {TRACE2 (("gdth_search_dr(): get feat RAWSERVICE %d\n" , ha->info)); ha->raw_feat |= (ushort )ha->info;
@@ -1860,10 +1837,10 @@ static int __init gdth_search_drives(int hanum) }/* set/get features cache service (equal to raw service) */ -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_SET_FEAT ,0 , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_SET_FEAT ,0 ,SCATTER_GATHER ,0 )) {TRACE2 (("gdth_search_drives(): set features CACHESERVICE OK\n" )); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_GET_FEAT ,0 ,0 ,0 )) { +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_GET_FEAT ,0 ,0 ,0 )) {TRACE2 (("gdth_search_dr(): get feat CACHESERV. %d\n" , ha->info)); ha->cache_feat |= (ushort )ha->info;
@@ -1872,22 +1849,22 @@ static int __init gdth_search_drives(int hanum)/* reserve drives for raw service */ if (reserve_mode !=0 ) { -gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_RESERVE_ALL , +gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_RESERVE_ALL , reserve_mode ==1 ?1 :3 ,0 ,0 );TRACE2 (("gdth_search_drives(): RESERVE_ALL code %d\n" , ha->status)); }for (i =0 ; i <MAX_RES_ARGS ; i +=4 ) { -if (reserve_list[i] == hanum && reserve_list[i+1 ] < ha->bus_cnt && +if (reserve_list[i] == ha->hanum && reserve_list[i+1 ] < ha->bus_cnt && reserve_list[i+2 ] < ha->tid_cnt && reserve_list[i+3 ] <MAXLUN ) {TRACE2 (("gdth_search_drives(): reserve ha %d bus %d id %d lun %d\n" , reserve_list[i], reserve_list[i+1 ], reserve_list[i+2 ], reserve_list[i+3 ])); -if (!gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_RESERVE ,0 , +if (!gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_RESERVE ,0 , reserve_list[i+1 ], reserve_list[i+2 ] | (reserve_list[i+3 ] <<8 ))) {printk ("GDT-HA %d: Error raw service (RESERVE, code %d)\n" , - hanum, ha->status); + ha->hanum, ha->status); } } }
@@ -1896,12 +1873,12 @@ static int __init gdth_search_drives(int hanum) oemstr = (gdth_oem_str_ioctl *)ha->pscratch; oemstr->params.ctl_version =0x01 ; oemstr->params.buffer_size =sizeof (oemstr->text); -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_IOCTL , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_IOCTL ,CACHE_READ_OEM_STRING_RECORD ,INVALID_CHANNEL ,sizeof (gdth_oem_str_ioctl))) {TRACE2 (("gdth_search_drives(): CACHE_READ_OEM_STRING_RECORD OK\n" ));printk ("GDT-HA %d: Vendor: %s Name: %s\n" , - hanum,oemstr->text.oem_company_name,ha->binfo.type_string); + ha->hanum, oemstr->text.oem_company_name, ha->binfo.type_string);/* Save the Host Drive inquiry data */ strlcpy (ha->oem_name,oemstr->text.scsi_host_drive_inquiry_vendor_id,sizeof (ha->oem_name));
@@ -1909,7 +1886,7 @@ static int __init gdth_search_drives(int hanum)/* Old method, based on PCI ID */ TRACE2 (("gdth_search_drives(): CACHE_READ_OEM_STRING_RECORD failed\n" ));printk ("GDT-HA %d: Name: %s\n" , - hanum,ha->binfo.type_string); + ha->hanum, ha->binfo.type_string);if (ha->oem_id ==OEM_ID_INTEL )strlcpy (ha->oem_name,"Intel " ,sizeof (ha->oem_name));else
@@ -1918,24 +1895,22 @@ static int __init gdth_search_drives(int hanum)/* scanning for host drives */ for (i =0 ; i < cdev_cnt; ++i) -gdth_analyse_hdrive (hanum,i); +gdth_analyse_hdrive (ha, i);TRACE (("gdth_search_drives() OK\n" ));return 1 ; } -static int gdth_analyse_hdrive (int hanum,ushort hdrive) +static int gdth_analyse_hdrive (gdth_ha_str *ha,ushort hdrive) { - registergdth_ha_str *ha;ulong32 drv_cyls;int drv_hds, drv_secs; -TRACE (("gdth_analyse_hdrive() hanum %d drive %d\n" ,hanum,hdrive)); +TRACE (("gdth_analyse_hdrive() hanum %d drive %d\n" , ha->hanum, hdrive));if (hdrive >=MAX_HDRIVES )return 0 ; - ha =HADATA (gdth_ctr_tab[hanum]); -if (!gdth_internal_cmd (hanum,CACHESERVICE ,GDT_INFO ,hdrive,0 ,0 )) +if (!gdth_internal_cmd (ha,CACHESERVICE ,GDT_INFO , hdrive,0 ,0 ))return 0 ; ha->hdr[hdrive].present = TRUE; ha->hdr[hdrive].size = ha->info;
@@ -1955,7 +1930,7 @@ static int gdth_analyse_hdrive(int hanum,ushort hdrive) ha->hdr[hdrive].size = drv_cyls * drv_hds * drv_secs;if (ha->cache_feat &GDT_64BIT ) { -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_X_INFO ,hdrive,0 ,0 ) +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_X_INFO , hdrive,0 ,0 ) && ha->info2 !=0 ) { ha->hdr[hdrive].size = ((ulong64 )ha->info2 <<32 ) | ha->info; }
@@ -1964,14 +1939,14 @@ static int gdth_analyse_hdrive(int hanum,ushort hdrive) hdrive,ha->hdr[hdrive].size,drv_hds,drv_secs));/* get informations about device */ -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_DEVTYPE ,hdrive,0 ,0 )) { +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_DEVTYPE , hdrive,0 ,0 )) {TRACE2 (("gdth_search_dr() cache drive %d devtype %d\n" , hdrive,ha->info)); ha->hdr[hdrive].devtype = (ushort )ha->info; }/* cluster info */ -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_CLUST_INFO ,hdrive,0 ,0 )) { +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_CLUST_INFO , hdrive,0 ,0 )) {TRACE2 (("gdth_search_dr() cache drive %d cluster info %d\n" , hdrive,ha->info));if (!shared_access)
@@ -1979,7 +1954,7 @@ static int gdth_analyse_hdrive(int hanum,ushort hdrive) }/* R/W attributes */ -if (gdth_internal_cmd (hanum,CACHESERVICE ,GDT_RW_ATTRIBS ,hdrive,0 ,0 )) { +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_RW_ATTRIBS , hdrive,0 ,0 )) {TRACE2 (("gdth_search_dr() cache drive %d r/w attrib. %d\n" , hdrive,ha->info)); ha->hdr[hdrive].rw_attribs = (unchar )ha->info;
@@ -1991,16 +1966,14 @@ static int gdth_analyse_hdrive(int hanum,ushort hdrive)/* command queueing/sending functions */ -static void gdth_putq (int hanum,Scsi_Cmnd *scp,unchar priority) +static void gdth_putq (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar priority) { - registergdth_ha_str *ha; registerScsi_Cmnd *pscp; registerScsi_Cmnd *nscp;ulong flags;unchar b, t;TRACE (("gdth_putq() priority %d\n" ,priority)); - ha =HADATA (gdth_ctr_tab[hanum]);spin_lock_irqsave (&ha->smp_lock, flags);if (scp->done != gdth_scsi_done) {
@@ -2011,7 +1984,7 @@ static void gdth_putq(int hanum,Scsi_Cmnd *scp,unchar priority)if ((b != ha->virt_bus && ha->raw[BUS_L2P (ha,b)].lock) || (b==ha->virt_bus && t<MAX_HDRIVES && ha->hdr[t].lock)) {TRACE2 (("gdth_putq(): locked IO ->update_timeout()\n" )); - scp->SCp.buffers_residual =gdth_update_timeout (hanum, scp,0 ); + scp->SCp.buffers_residual =gdth_update_timeout (scp,0 ); } } }
@@ -2043,9 +2016,8 @@ static void gdth_putq(int hanum,Scsi_Cmnd *scp,unchar priority)#endif } -static void gdth_next (int hanum) +static void gdth_next (gdth_ha_str *ha) { - registergdth_ha_str *ha; registerScsi_Cmnd *pscp; registerScsi_Cmnd *nscp;unchar b, t, l, firsttime;
@@ -2053,8 +2025,7 @@ static void gdth_next(int hanum)ulong flags =0 ;int cmd_index; -TRACE (("gdth_next() hanum %d\n" ,hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE (("gdth_next() hanum %d\n" , ha->hanum));if (!gdth_polling)spin_lock_irqsave (&ha->smp_lock, flags);
@@ -2079,13 +2050,13 @@ static void gdth_next(int hanum) b = t = l =0 ;if (firsttime) { -if (gdth_test_busy (hanum)) {/* controller busy ? */ -TRACE (("gdth_next() controller %d busy !\n" ,hanum)); +if (gdth_test_busy (ha)) {/* controller busy ? */ +TRACE (("gdth_next() controller %d busy !\n" , ha->hanum));if (!gdth_polling) {spin_unlock_irqrestore (&ha->smp_lock, flags);return ; } -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (1 ); } firsttime = FALSE;
@@ -2137,11 +2108,11 @@ static void gdth_next(int hanum)if (nscp->SCp.sent_command !=-1 ) {if ((nscp->SCp.phase &0xff ) ==CACHESERVICE ) { -if (!(cmd_index=gdth_fill_cache_cmd (hanum,nscp,t))) +if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE; next_cmd = FALSE; }else if ((nscp->SCp.phase &0xff ) ==SCSIRAWSERVICE ) { -if (!(cmd_index=gdth_fill_raw_cmd (hanum,nscp,BUS_L2P (ha,b)))) +if (!(cmd_index=gdth_fill_raw_cmd (ha, nscp,BUS_L2P (ha, b)))) this_cmd = FALSE; next_cmd = FALSE; }else {
@@ -2155,12 +2126,12 @@ static void gdth_next(int hanum) nscp->scsi_done (nscp); } }else if (nscp->done == gdth_scsi_done) { -if (!(cmd_index=gdth_special_cmd (hanum,nscp))) +if (!(cmd_index=gdth_special_cmd (ha, nscp))) this_cmd = FALSE; next_cmd = FALSE; }else if (b != ha->virt_bus) {if (ha->raw[BUS_L2P (ha,b)].io_cnt[t] >=GDTH_MAX_RAW || - !(cmd_index=gdth_fill_raw_cmd (hanum,nscp,BUS_L2P (ha,b)))) + !(cmd_index=gdth_fill_raw_cmd (ha, nscp,BUS_L2P (ha, b)))) this_cmd = FALSE;else ha->raw[BUS_L2P (ha,b)].io_cnt[t]++;
@@ -2198,7 +2169,7 @@ static void gdth_next(int hanum) nscp->SCp.have_data_in++; else nscp->scsi_done(nscp); - }else if (gdth_internal_cache_cmd (hanum,nscp)) + }else if (gdth_internal_cache_cmd (ha, nscp)) nscp->scsi_done (nscp);break ;
@@ -2218,7 +2189,7 @@ static void gdth_next(int hanum) nscp->cmnd[3 ] = (ha->hdr[t].devtype&1 ) ?1 :0 ;TRACE (("Prevent/allow r. %d rem. drive %d\n" , nscp->cmnd[4 ],nscp->cmnd[3 ])); -if (!(cmd_index=gdth_fill_cache_cmd (hanum,nscp,t))) +if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE; }break ;
@@ -2227,7 +2198,7 @@ static void gdth_next(int hanum)case RELEASE :TRACE2 (("cache cmd %s\n" ,nscp->cmnd[0 ] ==RESERVE ?"RESERVE" :"RELEASE" )); -if (!(cmd_index=gdth_fill_cache_cmd (hanum,nscp,t))) +if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE;break ;
@@ -2250,7 +2221,7 @@ static void gdth_next(int hanum) nscp->SCp.have_data_in++; else nscp->scsi_done(nscp); - }else if (!(cmd_index=gdth_fill_cache_cmd (hanum,nscp,t))) + }else if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE;break ;
@@ -2259,7 +2230,7 @@ static void gdth_next(int hanum) nscp->cmnd[1 ],nscp->cmnd[2 ],nscp->cmnd[3 ], nscp->cmnd[4],nscp->cmnd[5]));printk ("GDT-HA %d: Unknown SCSI command 0x%x to cache service !\n" , - hanum, nscp->cmnd[0 ]); + ha->hanum, nscp->cmnd[0 ]); nscp->result =DID_ABORT <<16 ;if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;
@@ -2280,30 +2251,28 @@ static void gdth_next(int hanum) }if (ha->cmd_cnt >0 ) { -gdth_release_event (hanum); +gdth_release_event (ha); }if (!gdth_polling)spin_unlock_irqrestore (&ha->smp_lock, flags);if (gdth_polling && ha->cmd_cnt >0 ) { -if (!gdth_wait (hanum,cmd_index,POLL_TIMEOUT )) +if (!gdth_wait (ha, cmd_index,POLL_TIMEOUT ))printk ("GDT-HA %d: Command %d timed out !\n" , - hanum,cmd_index); + ha->hanum, cmd_index); } } -static void gdth_copy_internal_data (int hanum,Scsi_Cmnd *scp, +static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp,char *buffer,ushort count) {ushort cpcount,i;ushort cpsum,cpnow;struct scatterlist *sl; -gdth_ha_str *ha;char *address; cpcount = count<=(ushort )scp->request_bufflen ? count:(ushort )scp->request_bufflen; - ha =HADATA (gdth_ctr_tab[hanum]);if (scp->use_sg) { sl = (struct scatterlist *)scp->request_buffer;
@@ -2317,7 +2286,7 @@ static void gdth_copy_internal_data(int hanum,Scsi_Cmnd *scp, cpsum += cpnow;if (!sl->page) {printk ("GDT-HA %d: invalid sc/gt element in gdth_copy_internal_data()\n" , - hanum); + ha->hanum);return ; }local_irq_save (flags);
@@ -2336,16 +2305,14 @@ static void gdth_copy_internal_data(int hanum,Scsi_Cmnd *scp, } } -static int gdth_internal_cache_cmd (int hanum,Scsi_Cmnd *scp) +static int gdth_internal_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp) { - registergdth_ha_str *ha;unchar t;gdth_inq_data inq;gdth_rdcap_data rdc;gdth_sense_data sd;gdth_modep_data mpd; - ha =HADATA (gdth_ctr_tab[hanum]); t = scp->device->id;TRACE (("gdth_internal_cache_cmd() cmd 0x%x hdrive %d\n" , scp->cmnd[0 ],t));
@@ -2376,7 +2343,7 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp)strcpy (inq.vendor,ha->oem_name);sprintf (inq.product,"Host Drive #%02d" ,t);strcpy (inq.revision," " ); -gdth_copy_internal_data (hanum,scp,(char *)&inq,sizeof (gdth_inq_data)); +gdth_copy_internal_data (ha, scp, (char *)&inq,sizeof (gdth_inq_data));break ;case REQUEST_SENSE :
@@ -2386,7 +2353,7 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp) sd.key =NO_SENSE ; sd.info =0 ; sd.add_length=0 ; -gdth_copy_internal_data (hanum,scp,(char *)&sd,sizeof (gdth_sense_data)); +gdth_copy_internal_data (ha, scp, (char *)&sd,sizeof (gdth_sense_data));break ;case MODE_SENSE :
@@ -2398,7 +2365,7 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp) mpd.bd.block_length[0 ] = (SECTOR_SIZE &0x00ff0000 ) >>16 ; mpd.bd.block_length[1 ] = (SECTOR_SIZE &0x0000ff00 ) >>8 ; mpd.bd.block_length[2 ] = (SECTOR_SIZE &0x000000ff ); -gdth_copy_internal_data (hanum,scp,(char *)&mpd,sizeof (gdth_modep_data)); +gdth_copy_internal_data (ha, scp, (char *)&mpd,sizeof (gdth_modep_data));break ;case READ_CAPACITY :
@@ -2408,7 +2375,7 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp)else rdc.last_block_no =cpu_to_be32 (ha->hdr[t].size-1 ); rdc.block_length =cpu_to_be32 (SECTOR_SIZE ); -gdth_copy_internal_data (hanum,scp,(char *)&rdc,sizeof (gdth_rdcap_data)); +gdth_copy_internal_data (ha, scp, (char *)&rdc,sizeof (gdth_rdcap_data));break ;case SERVICE_ACTION_IN :
@@ -2419,7 +2386,8 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp)TRACE2 (("Read capacity (16) hdrive %d\n" ,t)); rdc16.last_block_no =cpu_to_be64 (ha->hdr[t].size-1 ); rdc16.block_length =cpu_to_be32 (SECTOR_SIZE ); -gdth_copy_internal_data (hanum,scp,(char *)&rdc16,sizeof (gdth_rdcap16_data)); +gdth_copy_internal_data (ha, scp, (char *)&rdc16, +sizeof (gdth_rdcap16_data)); }else { scp->result =DID_ABORT <<16 ; }
@@ -2437,10 +2405,9 @@ static int gdth_internal_cache_cmd(int hanum,Scsi_Cmnd *scp)return 0 ; } - -static int gdth_fill_cache_cmd (int hanum,Scsi_Cmnd *scp,ushort hdrive) + +static int gdth_fill_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,ushort hdrive) { - registergdth_ha_str *ha; registergdth_cmd_str *cmdp;struct scatterlist *sl;ulong32 cnt, blockcnt;
@@ -2450,7 +2417,6 @@ static int gdth_fill_cache_cmd(int hanum,Scsi_Cmnd *scp,ushort hdrive)struct page *page;ulong offset; - ha =HADATA (gdth_ctr_tab[hanum]); cmdp = ha->pccb;TRACE (("gdth_fill_cache_cmd() cmd 0x%x cmdsize %d hdrive %d\n" , scp->cmnd[0 ],scp->cmd_len,hdrive));
@@ -2466,13 +2432,13 @@ static int gdth_fill_cache_cmd(int hanum,Scsi_Cmnd *scp,ushort hdrive) cmdp->Service =CACHESERVICE ; cmdp->RequestBuffer = scp;/* search free command index */ -if (!(cmd_index=gdth_get_cmd_index (hanum))) { +if (!(cmd_index=gdth_get_cmd_index (ha))) {TRACE (("GDT: No free command index found\n" ));return 0 ; }/* if it's the first command, set command semaphore */ if (ha->cmd_cnt ==0 ) -gdth_set_sema0 (hanum); +gdth_set_sema0 (ha);/* fill command */ read_write =0 ;
@@ -2644,13 +2610,12 @@ static int gdth_fill_cache_cmd(int hanum,Scsi_Cmnd *scp,ushort hdrive) }/* copy command */ -gdth_copy_command (hanum); +gdth_copy_command (ha);return cmd_index; } -static int gdth_fill_raw_cmd (int hanum,Scsi_Cmnd *scp,unchar b) +static int gdth_fill_raw_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar b) { - registergdth_ha_str *ha; registergdth_cmd_str *cmdp;struct scatterlist *sl;ushort i;
@@ -2660,7 +2625,6 @@ static int gdth_fill_raw_cmd(int hanum,Scsi_Cmnd *scp,unchar b)struct page *page;ulong offset; - ha =HADATA (gdth_ctr_tab[hanum]); t = scp->device->id; l = scp->device->lun; cmdp = ha->pccb;
@@ -2675,13 +2639,13 @@ static int gdth_fill_raw_cmd(int hanum,Scsi_Cmnd *scp,unchar b) cmdp->Service =SCSIRAWSERVICE ; cmdp->RequestBuffer = scp;/* search free command index */ -if (!(cmd_index=gdth_get_cmd_index (hanum))) { +if (!(cmd_index=gdth_get_cmd_index (ha))) {TRACE (("GDT: No free command index found\n" ));return 0 ; }/* if it's the first command, set command semaphore */ if (ha->cmd_cnt ==0 ) -gdth_set_sema0 (hanum); +gdth_set_sema0 (ha);/* fill command */ if (scp->SCp.sent_command !=-1 ) {
@@ -2849,17 +2813,15 @@ static int gdth_fill_raw_cmd(int hanum,Scsi_Cmnd *scp,unchar b) }/* copy command */ -gdth_copy_command (hanum); +gdth_copy_command (ha);return cmd_index; } -static int gdth_special_cmd (int hanum,Scsi_Cmnd *scp) +static int gdth_special_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp) { - registergdth_ha_str *ha; registergdth_cmd_str *cmdp;int cmd_index; - ha =HADATA (gdth_ctr_tab[hanum]); cmdp= ha->pccb;TRACE2 (("gdth_special_cmd(): " ));
@@ -2870,14 +2832,14 @@ static int gdth_special_cmd(int hanum,Scsi_Cmnd *scp) cmdp->RequestBuffer = scp;/* search free command index */ -if (!(cmd_index=gdth_get_cmd_index (hanum))) { +if (!(cmd_index=gdth_get_cmd_index (ha))) {TRACE (("GDT: No free command index found\n" ));return 0 ; }/* if it's the first command, set command semaphore */ if (ha->cmd_cnt ==0 ) -gdth_set_sema0 (hanum); +gdth_set_sema0 (ha);/* evaluate command size, check space */ if (cmdp->OpCode ==GDT_IOCTL ) {
@@ -2915,7 +2877,7 @@ static int gdth_special_cmd(int hanum,Scsi_Cmnd *scp) }/* copy command */ -gdth_copy_command (hanum); +gdth_copy_command (ha);return cmd_index; }
@@ -3081,7 +3043,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)spin_unlock_irqrestore (&ha2->smp_lock, flags);return IRQ_HANDLED ; } - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[hanum]);#ifdef GDTH_STATISTICS ++act_ints;
@@ -3227,10 +3189,10 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (IStatus ==ASYNCINDEX ) {TRACE2 (("gdth_interrupt() async. event\n" )); -gdth_async_event (hanum); +gdth_async_event (ha);if (!gdth_polling)spin_unlock_irqrestore (&ha2->smp_lock, flags); -gdth_next (hanum); +gdth_next (ha);return IRQ_HANDLED ; }
@@ -3264,11 +3226,11 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) }TRACE (("gdth_interrupt() sync. status\n" )); - rval =gdth_sync_event (hanum,Service,IStatus,scp); + rval =gdth_sync_event (ha,Service,IStatus,scp);if (!gdth_polling)spin_unlock_irqrestore (&ha2->smp_lock, flags);if (rval ==2 ) { -gdth_putq (hanum,scp,scp->SCp.this_residual); +gdth_putq (ha, scp,scp->SCp.this_residual); }else if (rval ==1 ) { scp->scsi_done (scp); }
@@ -3298,18 +3260,17 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) }#endif -gdth_next (hanum); +gdth_next (ha);return IRQ_HANDLED ; } -static int gdth_sync_event (int hanum,int service,unchar index,Scsi_Cmnd *scp) +static int gdth_sync_event (gdth_ha_str *ha,int service,unchar index, +Scsi_Cmnd *scp) { - registergdth_ha_str *ha;gdth_msg_str *msg;gdth_cmd_str *cmdp;unchar b, t; - ha =HADATA (gdth_ctr_tab[hanum]); cmdp = ha->pccb;TRACE (("gdth_sync_event() serv %d status %d\n" , service,ha->status));
@@ -3327,12 +3288,12 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) }if (msg->msg_ext && !msg->msg_answer) { -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (0 ); cmdp->Service =SCREENSERVICE ; cmdp->RequestBuffer =SCREEN_CMND ; -gdth_get_cmd_index (hanum); -gdth_set_sema0 (hanum); +gdth_get_cmd_index (ha); +gdth_set_sema0 (ha); cmdp->OpCode =GDT_READ ; cmdp->BoardNode =LOCALBOARD ; cmdp->u.screen.reserved =0 ;
@@ -3342,8 +3303,8 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) ha->cmd_len =GDTOFFSOF (gdth_cmd_str,u.screen.su.msg.msg_addr) +sizeof (ulong64); ha->cmd_cnt =0 ; -gdth_copy_command (hanum); -gdth_release_event (hanum); +gdth_copy_command (ha); +gdth_release_event (ha);return 0 ; }
@@ -3361,12 +3322,12 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) } msg->msg_ext =0 ; msg->msg_answer =0 ; -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (0 ); cmdp->Service =SCREENSERVICE ; cmdp->RequestBuffer =SCREEN_CMND ; -gdth_get_cmd_index (hanum); -gdth_set_sema0 (hanum); +gdth_get_cmd_index (ha); +gdth_set_sema0 (ha); cmdp->OpCode =GDT_WRITE ; cmdp->BoardNode =LOCALBOARD ; cmdp->u.screen.reserved =0 ;
@@ -3376,8 +3337,8 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) ha->cmd_len =GDTOFFSOF (gdth_cmd_str,u.screen.su.msg.msg_addr) +sizeof (ulong64); ha->cmd_cnt =0 ; -gdth_copy_command (hanum); -gdth_release_event (hanum); +gdth_copy_command (ha); +gdth_release_event (ha);return 0 ; }printk ("\n" );
@@ -3490,7 +3451,7 @@ static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp) }if (scp->done != gdth_scsi_done) { ha->dvr.size =sizeof (ha->dvr.eu.sync); - ha->dvr.eu.sync.ionode = hanum; + ha->dvr.eu.sync.ionode = ha->hanum; ha->dvr.eu.sync.service = service; ha->dvr.eu.sync.status = ha->status; ha->dvr.eu.sync.info = ha->info;
@@ -3674,25 +3635,23 @@ static char *async_cache_tab[] = { }; -static int gdth_async_event (int hanum) +static int gdth_async_event (gdth_ha_str *ha) { -gdth_ha_str *ha;gdth_cmd_str *cmdp;int cmd_index; - ha =HADATA (gdth_ctr_tab[hanum]); cmdp= ha->pccb;TRACE2 (("gdth_async_event() ha %d serv %d\n" , - hanum,ha->service)); + ha->hanum, ha->service));if (ha->service ==SCREENSERVICE ) {if (ha->status ==MSG_REQUEST ) { -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (0 ); cmdp->Service =SCREENSERVICE ; cmdp->RequestBuffer =SCREEN_CMND ; - cmd_index =gdth_get_cmd_index (hanum); -gdth_set_sema0 (hanum); + cmd_index =gdth_get_cmd_index (ha); +gdth_set_sema0 (ha); cmdp->OpCode =GDT_READ ; cmdp->BoardNode =LOCALBOARD ; cmdp->u.screen.reserved =0 ;
@@ -3702,7 +3661,7 @@ static int gdth_async_event(int hanum) ha->cmd_len =GDTOFFSOF (gdth_cmd_str,u.screen.su.msg.msg_addr) +sizeof (ulong64); ha->cmd_cnt =0 ; -gdth_copy_command (hanum); +gdth_copy_command (ha);if (ha->type ==GDT_EISA )printk ("[EISA slot %d] " ,(ushort )ha->brd_phys);else if (ha->type ==GDT_ISA )
@@ -3710,19 +3669,19 @@ static int gdth_async_event(int hanum)else printk ("[PCI %d/%d] " ,(ushort)(ha->brd_phys>>8 ), (ushort)((ha->brd_phys>>3 )&0x1f )); -gdth_release_event (hanum); +gdth_release_event (ha); } }else {if (ha->type ==GDT_PCIMPR && (ha->fw_vers &0xff ) >=0x1a ) { ha->dvr.size =0 ; - ha->dvr.eu.async.ionode = hanum; + ha->dvr.eu.async.ionode = ha->hanum; ha->dvr.eu.async.status = ha->status;/* severity and event_string already set! */ }else { ha->dvr.size =sizeof (ha->dvr.eu.async); - ha->dvr.eu.async.ionode = hanum; + ha->dvr.eu.async.ionode = ha->hanum; ha->dvr.eu.async.service = ha->service; ha->dvr.eu.async.status = ha->status; ha->dvr.eu.async.info = ha->info;
@@ -3804,9 +3763,8 @@ static void gdth_timeout(ulong data)Scsi_Cmnd *nscp;gdth_ha_str *ha;ulong flags; -int hanum =0 ; - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[0 ]);spin_lock_irqsave (&ha->smp_lock, flags);for (act_stats=0 ,i=0 ; i<GDTH_MAXCMDS ; ++i)
@@ -4004,17 +3962,14 @@ static int __init gdth_detect(struct scsi_host_template *shtp)static int gdth_release (struct Scsi_Host *shp) { -int hanum; -gdth_ha_str *ha; +gdth_ha_str *ha =shost_priv (shp);TRACE2 (("gdth_release()\n" )); - hanum =NUMDATA (shp)->hanum; - ha =HADATA (gdth_ctr_tab[hanum]);if (ha->sdev) {scsi_free_host_dev (ha->sdev); ha->sdev =NULL ; } -gdth_flush (hanum); +gdth_flush (ha);if (shp->irq) {free_irq (shp->irq,ha);
@@ -4055,14 +4010,10 @@ static int gdth_release(struct Scsi_Host *shp) } -static const char *gdth_ctr_name (int hanum) +static const char *gdth_ctr_name (gdth_ha_str *ha) { -gdth_ha_str *ha; -TRACE2 (("gdth_ctr_name()\n" )); - ha =HADATA (gdth_ctr_tab[hanum]); -if (ha->type ==GDT_EISA ) {switch (ha->stype) {case GDT3_ID :
@@ -4089,29 +4040,23 @@ static const char *gdth_ctr_name(int hanum)static const char *gdth_info (struct Scsi_Host *shp) { -int hanum; -gdth_ha_str *ha; +gdth_ha_str *ha =shost_priv (shp);TRACE2 (("gdth_info()\n" )); - hanum =NUMDATA (shp)->hanum; - ha =HADATA (gdth_ctr_tab[hanum]); -return ((const char *)ha->binfo.type_string); }static int gdth_eh_bus_reset (Scsi_Cmnd *scp) { -int i, hanum; -gdth_ha_str *ha; +gdth_ha_str *ha =shost_priv (scp->device->host); +int i;ulong flags;Scsi_Cmnd *cmnd;unchar b;TRACE2 (("gdth_eh_bus_reset()\n" )); - hanum =NUMDATA (scp->device->host)->hanum; b = scp->device->channel; - ha =HADATA (gdth_ctr_tab[hanum]);/* clear command tab */ spin_lock_irqsave (&ha->smp_lock, flags);
@@ -4128,9 +4073,9 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)if (ha->hdr[i].present) {spin_lock_irqsave (&ha->smp_lock, flags); gdth_polling = TRUE; -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (0 ); -if (gdth_internal_cmd (hanum,CACHESERVICE , +if (gdth_internal_cmd (ha,CACHESERVICE ,GDT_CLUST_RESET , i,0 ,0 )) ha->hdr[i].cluster_type &= ~CLUSTER_RESERVED ; gdth_polling = FALSE;
@@ -4143,9 +4088,9 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)for (i =0 ; i <MAXID ; ++i) ha->raw[BUS_L2P (ha,b)].io_cnt[i] =0 ; gdth_polling = TRUE; -while (gdth_test_busy (hanum)) +while (gdth_test_busy (ha))gdth_delay (0 ); -gdth_internal_cmd (hanum,SCSIRAWSERVICE ,GDT_RESET_BUS , +gdth_internal_cmd (ha,SCSIRAWSERVICE ,GDT_RESET_BUS ,BUS_L2P (ha,b),0 ,0 ); gdth_polling = FALSE;spin_unlock_irqrestore (&ha->smp_lock, flags);
@@ -4156,18 +4101,15 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)static int gdth_bios_param (struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) {unchar b, t; -int hanum; -gdth_ha_str *ha; +gdth_ha_str *ha =shost_priv (sdev->host);struct scsi_device *sd;unsigned capacity; sd = sdev; capacity = cap; - hanum =NUMDATA (sd->host)->hanum; b = sd->channel; t = sd->id; -TRACE2 (("gdth_bios_param() ha %d bus %d target %d\n" , hanum, b, t)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE2 (("gdth_bios_param() ha %d bus %d target %d\n" , ha->hanum, b, t));if (b != ha->virt_bus || ha->hdr[t].heads ==0 ) {/* raw device or host drive without mapping information */
@@ -4187,7 +4129,7 @@ static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sestatic int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)) { -int hanum; +gdth_ha_str *ha =shost_priv (scp->device->host);int priority;TRACE (("gdth_queuecommand() cmd 0x%x\n" , scp->cmnd[0 ]));
@@ -4199,7 +4141,6 @@ static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)) scp->SCp.Status =GDTH_MAP_NONE ; scp->SCp.buffer = (struct scatterlist *)NULL ; - hanum =NUMDATA (scp->device->host)->hanum;#ifdef GDTH_STATISTICS ++act_ios;#endif
@@ -4208,10 +4149,10 @@ static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *))if (scp->done == gdth_scsi_done) priority = scp->SCp.this_residual;else -gdth_update_timeout (hanum, scp, scp->timeout_per_command *6 ); +gdth_update_timeout (scp, scp->timeout_per_command *6 ); -gdth_putq ( hanum, scp, priority ); -gdth_next ( hanum ); +gdth_putq (ha, scp, priority); +gdth_next (ha);return 0 ; }
@@ -4222,7 +4163,7 @@ static int gdth_open(struct inode *inode, struct file *filep)int i;for (i =0 ; i < gdth_ctr_count; i++) { - ha =HADATA (gdth_ctr_tab[i]); + ha =shost_priv (gdth_ctr_tab[i]);if (!ha->sdev) ha->sdev =scsi_get_host_dev (gdth_ctr_tab[i]); }
@@ -4246,7 +4187,7 @@ static int ioc_event(void __user *arg)if (copy_from_user (&evt, arg,sizeof (gdth_ioctl_event)) || evt.ionode >= gdth_ctr_count)return -EFAULT ; - ha =HADATA (gdth_ctr_tab[evt.ionode]); + ha =shost_priv (gdth_ctr_tab[evt.ionode]);if (evt.erase ==0xff ) {if (evt.event.event_source ==ES_TEST )
@@ -4283,7 +4224,7 @@ static int ioc_lockdrv(void __user *arg)if (copy_from_user (&ldrv, arg,sizeof (gdth_ioctl_lockdrv)) || ldrv.ionode >= gdth_ctr_count)return -EFAULT ; - ha =HADATA (gdth_ctr_tab[ldrv.ionode]); + ha =shost_priv (gdth_ctr_tab[ldrv.ionode]);for (i =0 ; i < ldrv.drive_cnt && i <MAX_HDRIVES ; ++i) { j = ldrv.drives[i];
@@ -4293,14 +4234,14 @@ static int ioc_lockdrv(void __user *arg)spin_lock_irqsave (&ha->smp_lock, flags); ha->hdr[j].lock =1 ;spin_unlock_irqrestore (&ha->smp_lock, flags); -gdth_wait_completion (ldrv.ionode, ha->bus_cnt, j); -gdth_stop_timeout (ldrv.ionode, ha->bus_cnt, j); +gdth_wait_completion (ha, ha->bus_cnt, j); +gdth_stop_timeout (ha, ha->bus_cnt, j); }else {spin_lock_irqsave (&ha->smp_lock, flags); ha->hdr[j].lock =0 ;spin_unlock_irqrestore (&ha->smp_lock, flags); -gdth_start_timeout (ldrv.ionode, ha->bus_cnt, j); -gdth_next (ldrv.ionode); +gdth_start_timeout (ha, ha->bus_cnt, j); +gdth_next (ha); } }return 0 ;
@@ -4310,16 +4251,14 @@ static int ioc_resetdrv(void __user *arg, char *cmnd) {gdth_ioctl_reset res;gdth_cmd_str cmd; -int hanum;gdth_ha_str *ha;int rval;if (copy_from_user (&res, arg,sizeof (gdth_ioctl_reset)) || res.ionode >= gdth_ctr_count || res.number >=MAX_HDRIVES )return -EFAULT ; - hanum = res.ionode; - ha =HADATA (gdth_ctr_tab[hanum]); - + ha =shost_priv (gdth_ctr_tab[res.ionode]); +if (!ha->hdr[res.number].present)return 0 ;memset (&cmd,0 ,sizeof (gdth_cmd_str));
@@ -4345,22 +4284,20 @@ static int ioc_general(void __user *arg, char *cmnd)gdth_ioctl_general gen;char *buf =NULL ;ulong64 paddr; -int hanum;gdth_ha_str *ha;int rval;if (copy_from_user (&gen, arg,sizeof (gdth_ioctl_general)) || gen.ionode >= gdth_ctr_count)return -EFAULT ; - hanum = gen.ionode; - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[gen.ionode]);if (gen.data_len + gen.sense_len !=0 ) { -if (!(buf =gdth_ioctl_alloc (hanum, gen.data_len + gen.sense_len, +if (!(buf =gdth_ioctl_alloc (ha, gen.data_len + gen.sense_len, FALSE, &paddr)))return -EFAULT ;if (copy_from_user (buf, arg +sizeof (gdth_ioctl_general), gen.data_len + gen.sense_len)) { -gdth_ioctl_free (hanum, gen.data_len+gen.sense_len, buf, paddr); +gdth_ioctl_free (ha, gen.data_len+gen.sense_len, buf, paddr);return -EFAULT ; }
@@ -4434,7 +4371,7 @@ static int ioc_general(void __user *arg, char *cmnd) gen.command.u.raw.sense_data = (ulong32 )paddr + gen.data_len; } }else { -gdth_ioctl_free (hanum, gen.data_len+gen.sense_len, buf, paddr); +gdth_ioctl_free (ha, gen.data_len+gen.sense_len, buf, paddr);return -EFAULT ; } }
@@ -4446,15 +4383,15 @@ static int ioc_general(void __user *arg, char *cmnd)if (copy_to_user (arg +sizeof (gdth_ioctl_general), buf, gen.data_len + gen.sense_len)) { -gdth_ioctl_free (hanum, gen.data_len+gen.sense_len, buf, paddr); +gdth_ioctl_free (ha, gen.data_len+gen.sense_len, buf, paddr);return -EFAULT ; }if (copy_to_user (arg, &gen,sizeof (gdth_ioctl_general) -sizeof (gdth_cmd_str))) { -gdth_ioctl_free (hanum, gen.data_len+gen.sense_len, buf, paddr); +gdth_ioctl_free (ha, gen.data_len+gen.sense_len, buf, paddr);return -EFAULT ; } -gdth_ioctl_free (hanum, gen.data_len+gen.sense_len, buf, paddr); +gdth_ioctl_free (ha, gen.data_len+gen.sense_len, buf, paddr);return 0 ; }
@@ -4464,7 +4401,7 @@ static int ioc_hdrlist(void __user *arg, char *cmnd)gdth_cmd_str *cmd;gdth_ha_str *ha;unchar i; -int hanum, rc = -ENOMEM ; +int rc = -ENOMEM ;u32 cluster_type =0 ; rsc =kmalloc (sizeof (*rsc),GFP_KERNEL );
@@ -4477,8 +4414,7 @@ static int ioc_hdrlist(void __user *arg, char *cmnd) rc = -EFAULT ; goto free_fail; } - hanum = rsc->ionode; - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[rsc->ionode]);memset (cmd,0 ,sizeof (gdth_cmd_str));for (i =0 ; i <MAX_HDRIVES ; ++i) {
@@ -4519,7 +4455,7 @@ static int ioc_rescan(void __user *arg, char *cmnd)gdth_cmd_str *cmd;ushort i, status, hdr_cnt;ulong32 info; -int hanum, cyls, hds, secs; +int cyls, hds, secs;int rc = -ENOMEM ;ulong flags;gdth_ha_str *ha;
@@ -4534,8 +4470,7 @@ static int ioc_rescan(void __user *arg, char *cmnd) rc = -EFAULT ; goto free_fail; } - hanum = rsc->ionode; - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[rsc->ionode]);memset (cmd,0 ,sizeof (gdth_cmd_str));if (rsc->flag ==0 ) {
@@ -4694,7 +4629,7 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,if (copy_from_user (&ctrt, argp,sizeof (gdth_ioctl_ctrtype)) || ctrt.ionode >= gdth_ctr_count)return -EFAULT ; - ha =HADATA (gdth_ctr_tab[ctrt.ionode]); + ha =shost_priv (gdth_ctr_tab[ctrt.ionode]);if (ha->type ==GDT_ISA || ha->type ==GDT_EISA ) { ctrt.type = (unchar)((ha->stype>>20 ) -0x10 ); }else {
@@ -4735,7 +4670,7 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,if (copy_from_user (&lchn, argp,sizeof (gdth_ioctl_lockchn)) || lchn.ionode >= gdth_ctr_count)return -EFAULT ; - ha =HADATA (gdth_ctr_tab[lchn.ionode]); + ha =shost_priv (gdth_ctr_tab[lchn.ionode]); i = lchn.channel;if (i < ha->bus_cnt) {
@@ -4744,16 +4679,16 @@ static int gdth_ioctl(struct inode *inode, struct file *filep, ha->raw[i].lock =1 ;spin_unlock_irqrestore (&ha->smp_lock, flags);for (j =0 ; j < ha->tid_cnt; ++j) { -gdth_wait_completion (lchn.ionode, i, j); -gdth_stop_timeout (lchn.ionode, i, j); +gdth_wait_completion (ha, i, j); +gdth_stop_timeout (ha, i, j); } }else {spin_lock_irqsave (&ha->smp_lock, flags); ha->raw[i].lock =0 ;spin_unlock_irqrestore (&ha->smp_lock, flags);for (j =0 ; j < ha->tid_cnt; ++j) { -gdth_start_timeout (lchn.ionode, i, j); -gdth_next (lchn.ionode); +gdth_start_timeout (ha, i, j); +gdth_next (ha); } } }
@@ -4769,13 +4704,12 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,case GDTIOCTL_RESET_BUS : {gdth_ioctl_reset res; -int hanum, rval; +int rval;if (copy_from_user (&res, argp,sizeof (gdth_ioctl_reset)) || res.ionode >= gdth_ctr_count)return -EFAULT ; - hanum = res.ionode; - ha =HADATA (gdth_ctr_tab[hanum]); + ha =shost_priv (gdth_ctr_tab[res.ionode]); scp =kzalloc (sizeof (*scp),GFP_KERNEL );if (!scp)
@@ -4804,16 +4738,14 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,/* flush routine */ -static void gdth_flush (int hanum) +static void gdth_flush (gdth_ha_str *ha) {int i; -gdth_ha_str *ha;gdth_cmd_str gdtcmd;char cmnd[MAX_COMMAND_SIZE ];memset (cmnd,0xff ,MAX_COMMAND_SIZE ); -TRACE2 (("gdth_flush() hanum %d\n" ,hanum)); - ha =HADATA (gdth_ctr_tab[hanum]); +TRACE2 (("gdth_flush() hanum %d\n" , ha->hanum));for (i =0 ; i <MAX_HDRIVES ; ++i) {if (ha->hdr[i].present) {
@@ -4829,9 +4761,9 @@ static void gdth_flush(int hanum) gdtcmd.u.cache.BlockNo =1 ; gdtcmd.u.cache.sg_canz =0 ; } -TRACE2 (("gdth_flush(): flush ha %d drive %d\n" , hanum, i)); +TRACE2 (("gdth_flush(): flush ha %d drive %d\n" , ha->hanum, i)); -gdth_execute (gdth_ctr_tab[hanum], &gdtcmd, cmnd,30 ,NULL ); +gdth_execute (ha->shost, &gdtcmd, cmnd,30 ,NULL ); } } }
@@ -4855,7 +4787,8 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf) notifier_disabled =1 ;printk ("GDT-HA: Flushing all host drives .. " );for (hanum =0 ; hanum < gdth_ctr_count; ++hanum) { -gdth_flush (hanum); +gdth_ha_str *ha =shost_priv (gdth_ctr_tab[hanum]); +gdth_flush (ha);#ifndef __alpha__/* controller reset */
@@ -4863,8 +4796,8 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf) gdtcmd.BoardNode =LOCALBOARD ; gdtcmd.Service =CACHESERVICE ; gdtcmd.OpCode =GDT_RESET ; -TRACE2 (("gdth_halt(): reset controller %d\n" , hanum)); -gdth_execute (gdth_ctr_tab[hanum], &gdtcmd, cmnd,10 ,NULL ); +TRACE2 (("gdth_halt(): reset controller %d\n" , ha->hanum)); +gdth_execute (ha->shost, &gdtcmd, cmnd,10 ,NULL );#endif }printk ("Done.\n" );
@@ -4914,10 +4847,10 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios)if (!gdth_search_isa (isa_bios))return -ENXIO ; - shp =scsi_register (shtp,sizeof (gdth_ext_str)); + shp =scsi_register (shtp,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; - ha =HADATA (shp); + ha =shost_priv (shp); error = -ENODEV ;if (!gdth_init_isa (isa_bios,ha))
@@ -4947,9 +4880,10 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; + ha->hanum = (ushort )hanum; + ha->shost = shp; - ha->pccb =CMDDATA (shp); + ha->pccb = &ha->cmdext; ha->ccb_phys =0L ; ha->pdev =NULL ;
@@ -4986,7 +4920,7 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) ha->scan_mode = rescan ?0x10 :0 ; error = -ENODEV ; -if (!gdth_search_drives (hanum)) { +if (!gdth_search_drives (ha)) {printk ("GDT-ISA: Error during device scan\n" ); goto out_free_coal_stat; }
@@ -5003,7 +4937,7 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); +gdth_enable_int (ha);return 0 ;
@@ -5040,10 +4974,10 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp,if (!gdth_search_eisa (eisa_slot))return -ENXIO ; - shp =scsi_register (shtp,sizeof (gdth_ext_str)); + shp =scsi_register (shtp,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; - ha =HADATA (shp); + ha =shost_priv (shp); error = -ENODEV ;if (!gdth_init_eisa (eisa_slot,ha))
@@ -5065,11 +4999,12 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; -TRACE2 (("EISA detect Bus 0: hanum %d\n" , -NUMDATA (shp)->hanum)); + ha->hanum = (ushort )hanum; + ha->shost = shp; + +TRACE2 (("EISA detect Bus 0: hanum %d\n" , ha->hanum)); - ha->pccb =CMDDATA (shp); + ha->pccb = &ha->cmdext; ha->ccb_phys =0L ; error = -ENOMEM ;
@@ -5110,7 +5045,7 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, ha->cmd_tab[i].cmnd =UNUSED_CMND ; ha->scan_mode = rescan ?0x10 :0 ; -if (!gdth_search_drives (hanum)) { +if (!gdth_search_drives (ha)) {printk ("GDT-EISA: Error during device scan\n" ); error = -ENODEV ; goto out_free_ccb_phys;
@@ -5128,7 +5063,7 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp, shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); +gdth_enable_int (ha);return 0 ; out_free_ccb_phys:
@@ -5163,10 +5098,10 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp,dma_addr_t scratch_dma_handle =0 ;int error, hanum, i; - shp =scsi_register (shtp,sizeof (gdth_ext_str)); + shp =scsi_register (shtp,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; - ha =HADATA (shp); + ha =shost_priv (shp); error = -ENODEV ;if (!gdth_init_pci (&pcistr[ctr],ha))
@@ -5191,9 +5126,10 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, hanum = gdth_ctr_count; gdth_ctr_tab[gdth_ctr_count++] = shp; -NUMDATA (shp)->hanum = (ushort )hanum; + ha->hanum = (ushort )hanum; + ha->shost = shp; - ha->pccb =CMDDATA (shp); + ha->pccb = &ha->cmdext; ha->ccb_phys =0L ; error = -ENOMEM ;
@@ -5229,8 +5165,8 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, ha->scan_mode = rescan ?0x10 :0 ; error = -ENODEV ; -if (!gdth_search_drives (hanum)) { -printk ("GDT-PCI %d: Error during device scan\n" , hanum); +if (!gdth_search_drives (ha)) { +printk ("GDT-PCI %d: Error during device scan\n" , ha->hanum); goto out_free_coal_stat; }
@@ -5243,16 +5179,16 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, !ha->dma64_support) { if (pci_set_dma_mask(pcistr[ctr].pdev, DMA_32BIT_MASK)) { printk(KERN_WARNING "GDT-PCI %d: " - "Unable to set 32-bit DMA\n", hanum); + "Unable to set 32-bit DMA\n", ha->hanum); goto out_free_coal_stat; } } else { shp->max_cmd_len =16 ;if (!pci_set_dma_mask (pcistr[ctr].pdev,DMA_64BIT_MASK )) { -printk ("GDT-PCI %d: 64-bit DMA enabled\n" , hanum); +printk ("GDT-PCI %d: 64-bit DMA enabled\n" , ha->hanum); }else if (pci_set_dma_mask (pcistr[ctr].pdev,DMA_32BIT_MASK )) {printk (KERN_WARNING "GDT-PCI %d: " -"Unable to set 64/32-bit DMA\n" , hanum); +"Unable to set 64/32-bit DMA\n" , ha->hanum); goto out_free_coal_stat; } }
@@ -5262,7 +5198,7 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp, shp->max_channel = ha->bus_cnt;spin_lock_init (&ha->smp_lock); -gdth_enable_int (hanum); +gdth_enable_int (ha);return 0 ; out_free_coal_stat:
drivers/scsi/gdth.h +3 -14
@@ -853,6 +853,8 @@ typedef struct {/* controller information structure */ typedef struct { + struct Scsi_Host *shost; + ushort hanum; ushort oem_id; /* OEM */ ushort type; /* controller class */ ulong32 stype; /* subtype (PCI: device ID) */
@@ -864,6 +866,7 @@ typedef struct {void __iomem *brd;/* DPRAM address */ ulong32 brd_phys;/* slot number/BIOS address */ gdt6c_plx_regs *plx;/* PLX regs (new PCI contr.) */ +gdth_cmd_str cmdext;gdth_cmd_str *pccb;/* address command structure */ ulong32 ccb_phys;/* phys. address */ #ifdef INT_COAL
@@ -937,20 +940,6 @@ typedef struct {struct scsi_device *sdev; } gdth_ha_str; -/* structure for scsi_register(), SCSI bus != 0 */ -typedef struct { -ushort hanum; -ushort busnum; -}gdth_num_str ; - -/* structure for scsi_register() */ -typedef struct { -gdth_num_str numext;/* must be the first element */ -gdth_ha_str haext; -gdth_cmd_str cmdext; -}gdth_ext_str ; - -/* INQUIRY data format */ typedef struct { unchar type_qual;
drivers/scsi/gdth_proc.c +31 -49
290 lines not on this page · raw message
drivers/scsi/gdth_proc.h +10 -10
@@ -9,20 +9,20 @@ int gdth_execute(struct Scsi_Host *shost, gdth_cmd_str *gdtcmd, char *cmnd, int timeout, u32 *info);static int gdth_set_info (char *buffer,int length,struct Scsi_Host *host, -int hanum); +gdth_ha_str *ha);static int gdth_get_info (char *buffer,char **start,off_t offset,int length, -struct Scsi_Host *host,int hanum); +struct Scsi_Host *host,gdth_ha_str *ha);static int gdth_set_asc_info (struct Scsi_Host *host,char *buffer, -int length,int hanum); +int length,gdth_ha_str *ha); -static char *gdth_ioctl_alloc (int hanum,int size,int scratch, -ulong64 *paddr); -static void gdth_ioctl_free (int hanum,int size,char *buf,ulong64 paddr); -static void gdth_wait_completion (int hanum,int busnum,int id); -static void gdth_stop_timeout (int hanum,int busnum,int id); -static void gdth_start_timeout (int hanum,int busnum,int id); -static int gdth_update_timeout (int hanum,Scsi_Cmnd *scp,int timeout); +static char *gdth_ioctl_alloc (gdth_ha_str *ha,int size,int scratch, +ulong64 *paddr); +static void gdth_ioctl_free (gdth_ha_str *ha,int size,char *buf,ulong64 paddr); +static void gdth_wait_completion (gdth_ha_str *ha,int busnum,int id); +static void gdth_stop_timeout (gdth_ha_str *ha,int busnum,int id); +static void gdth_start_timeout (gdth_ha_str *ha,int busnum,int id); +static int gdth_update_timeout (Scsi_Cmnd *scp,int timeout);#endif
PATCH 10/16 gdth: gdth_get_status() return pointer to host not its index
In reply to Boaz Harrosh - Return the interrupting host and not it's index. NULL if intr is not by gdth.
- fix calling site
FIXME:
Why are we looping on all cards? the passed dev_id can be used for pinpointing the exact interrupting card. The kernel is already looping on all sharing cards so this code makes it O(n^2).
What is that polling mode? can we pass dev_id to gdth_get_status() and do a poll only if dev_id is NULL?
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)
drivers/scsi/gdth.c +11 -15
@@ -171,7 +171,7 @@ static int gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha);static int gdth_init_pci (gdth_pci_str *pcistr,gdth_ha_str *ha);static void gdth_enable_int (gdth_ha_str *ha); -static int gdth_get_status (unchar *pIStatus,int irq); +static gdth_ha_str *gdth_get_status (unchar *pIStatus,int irq);static int gdth_test_busy (gdth_ha_str *ha);static int gdth_get_cmd_index (gdth_ha_str *ha);static void gdth_release_event (gdth_ha_str *ha);
@@ -1240,17 +1240,15 @@ static void __init gdth_enable_int(gdth_ha_str *ha) } -static int gdth_get_status (unchar *pIStatus,int irq) +static gdth_ha_str *gdth_get_status (unchar *pIStatus,int irq) { registergdth_ha_str *ha; -int i;TRACE (("gdth_get_status() irq %d ctr_count %d\n" , irq,gdth_ctr_count)); *pIStatus =0 ; -for (i=0 ; i<gdth_ctr_count; ++i) { - ha =shost_priv (gdth_ctr_tab[i]); +list_for_each_entry (ha, &gdth_instances, list) {if (ha->irq != (unchar )irq)/* check IRQ */ continue ;if (ha->type ==GDT_EISA )
@@ -1268,12 +1266,11 @@ static int gdth_get_status(unchar *pIStatus,int irq)readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.edoor_reg);if (*pIStatus) -return i;/* board found */ +return ha;/* board found */ } -return -1 ; +return NULL ; } - - +static int gdth_test_busy (gdth_ha_str *ha) { registerint gdtsema0 =0 ;
@@ -3012,7 +3009,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)gdt6_dpram_str __iomem *dp6_ptr;gdt2_dpram_str __iomem *dp2_ptr;Scsi_Cmnd *scp; -int hanum, rval, i; +int rval, i;unchar IStatus;ushort Service;ulong flags =0 ;
@@ -3037,13 +3034,12 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) wait_index =0 ;/* search controller */ -if ((hanum =gdth_get_status (&IStatus,irq)) ==-1 ) { +if ((ha =gdth_get_status (&IStatus,irq)) ==NULL ) {/* spurious interrupt */ if (!gdth_polling)spin_unlock_irqrestore (&ha2->smp_lock, flags);return IRQ_HANDLED ; } - ha =shost_priv (gdth_ctr_tab[hanum]);#ifdef GDTH_STATISTICS ++act_ints;
@@ -3183,7 +3179,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) IStatus,ha->status,ha->info));if (gdth_from_wait) { - wait_hanum = hanum; + wait_hanum = ha->hanum; wait_index = (int )IStatus; }
@@ -3199,7 +3195,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (IStatus ==SPEZINDEX ) {TRACE2 (("Service unknown or not initialized !\n" )); ha->dvr.size =sizeof (ha->dvr.eu.driver); - ha->dvr.eu.driver.ionode = hanum; + ha->dvr.eu.driver.ionode = ha->hanum;gdth_store_event (ha,ES_DRIVER ,4 , &ha->dvr);if (!gdth_polling)spin_unlock_irqrestore (&ha2->smp_lock, flags);
@@ -3211,7 +3207,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (scp ==UNUSED_CMND ) {TRACE2 (("gdth_interrupt() index to unused command (%d)\n" ,IStatus)); ha->dvr.size =sizeof (ha->dvr.eu.driver); - ha->dvr.eu.driver.ionode = hanum; + ha->dvr.eu.driver.ionode = ha->hanum; ha->dvr.eu.driver.index = IStatus;gdth_store_event (ha,ES_DRIVER ,1 , &ha->dvr);if (!gdth_polling)
PATCH 11/16 gdth: switch to modern scsi host registration
In reply to Boaz Harrosh - Use scsi_add_host and friends and track instances ourselves. And generally modernize the driver's structure.
- TODO: Next we can remove the controller table
- TODO: Fix use of deprecated pci_find_device()
Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 314 +++++++++++++++++++++++++-------------------------- drivers/scsi/gdth.h | 1 + 2 files changed, 153 insertions(+), 162 deletions(-)
drivers/scsi/gdth.c +152 -162
@@ -119,6 +119,7 @@#include <linux/time.h> #include <linux/timer.h> #include <linux/dma-mapping.h> +#include <linux/list.h> #ifdef GDTH_RTC #include <linux/mc146818rtc.h>
@@ -192,15 +193,6 @@ static void gdth_flush(gdth_ha_str *ha);static int gdth_halt (struct notifier_block *nb,ulong event,void *buf);static int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *));static void gdth_scsi_done (struct scsi_cmnd *scp); -#ifdef CONFIG_ISA -static int gdth_isa_probe_one (struct scsi_host_template *,ulong32 ); -#endif -#ifdef CONFIG_EISA -static int gdth_eisa_probe_one (struct scsi_host_template *,ushort ); -#endif -#ifdef CONFIG_PCI -static int gdth_pci_probe_one (struct scsi_host_template *,gdth_pci_str *,int ); -#endif #ifdef DEBUG_GDTH static unchar DebugState =DEBUG_GDTH ;
@@ -304,8 +296,8 @@ static unchar gdth_polling; /* polling if TRUE */static unchar gdth_from_wait = FALSE;/* gdth_wait() */ static int wait_index,wait_hanum;/* gdth_wait() */ static int gdth_ctr_count =0 ;/* controller count */ -static int gdth_ctr_released =0 ;/* gdth_release() */ static struct Scsi_Host *gdth_ctr_tab[MAXHA ];/* controller table */ +static LIST_HEAD (gdth_instances);static unchar gdth_write_through = FALSE;/* write through */ static gdth_evt_str ebuffer[MAX_EVENTS ];/* event buffer */ static int elastidx;
@@ -3869,143 +3861,6 @@ int __init option_setup(char *str)return 1 ; } -static int __init gdth_detect (struct scsi_host_template *shtp) -{ -gdth_pci_str pcistr[MAXHA ]; -ulong32 isa_bios; -ushort eisa_slot; -int cnt,ctr; -unchar b; - - -#ifdef DEBUG_GDTH -printk ("GDT: This driver contains debugging information !! Trace level = %d\n" , - DebugState); -printk (" Destination of debugging information: " ); -#ifdef __SERIAL__ -#ifdef __COM2__ -printk ("Serial port COM2\n" ); -#else -printk ("Serial port COM1\n" ); -#endif -#else -printk ("Console\n" ); -#endif -gdth_delay (3000 ); -#endif - -TRACE (("gdth_detect()\n" )); - -if (disable) { -printk ("GDT-HA: Controller driver disabled from command line !\n" ); -return 0 ; - } - -printk ("GDT-HA: Storage RAID Controller Driver. Version: %s\n" ,GDTH_VERSION_STR ); -/* initializations */ - gdth_polling = TRUE; b =0 ; -gdth_clear_events (); - -/* As default we do not probe for EISA or ISA controllers */ -if (probe_eisa_isa) { -/* scanning for controllers, at first: ISA controller */ -#ifdef CONFIG_ISA -for (isa_bios =0xc8000UL ; isa_bios <=0xd8000UL ; - isa_bios +=0x8000UL ) { -if (gdth_ctr_count >=MAXHA ) -break ; -gdth_isa_probe_one (shtp, isa_bios); - } -#endif -#ifdef CONFIG_EISA -for (eisa_slot =0x1000 ; eisa_slot <=0x8000 ; eisa_slot +=0x1000 ) { -if (gdth_ctr_count >=MAXHA ) -break ; -gdth_eisa_probe_one (shtp, eisa_slot); - } - } -#endif - -#ifdef CONFIG_PCI -/* scanning for PCI controllers */ - cnt =gdth_search_pci (pcistr); -printk ("GDT-HA: Found %d PCI Storage RAID Controllers\n" ,cnt); -gdth_sort_pci (pcistr,cnt); -for (ctr =0 ; ctr < cnt; ++ctr) { -if (gdth_ctr_count >=MAXHA ) -break ; -gdth_pci_probe_one (shtp, pcistr, ctr); - } -#endif - -TRACE2 (("gdth_detect() %d controller detected\n" ,gdth_ctr_count)); -if (gdth_ctr_count >0 ) { -#ifdef GDTH_STATISTICS -TRACE2 (("gdth_detect(): Initializing timer !\n" )); -init_timer (&gdth_timer); - gdth_timer.expires = jiffies +HZ ; - gdth_timer.data =0L ; - gdth_timer.function = gdth_timeout; -add_timer (&gdth_timer); -#endif - major =register_chrdev (0 ,"gdth" ,&gdth_fops); - notifier_disabled =0 ; -register_reboot_notifier (&gdth_notifier); - } - gdth_polling = FALSE; -return gdth_ctr_count; -} - -static int gdth_release (struct Scsi_Host *shp) -{ -gdth_ha_str *ha =shost_priv (shp); - -TRACE2 (("gdth_release()\n" )); -if (ha->sdev) { -scsi_free_host_dev (ha->sdev); - ha->sdev =NULL ; - } -gdth_flush (ha); - -if (shp->irq) { -free_irq (shp->irq,ha); - } -#ifdef CONFIG_ISA -if (shp->dma_channel !=0xff ) { -free_dma (shp->dma_channel); - } -#endif -#ifdef INT_COAL -if (ha->coal_stat) -pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) * -MAXOFFSETS , ha->coal_stat, ha->coal_stat_phys); -#endif -if (ha->pscratch) -pci_free_consistent (ha->pdev,GDTH_SCRATCH , - ha->pscratch, ha->scratch_phys); -if (ha->pmsg) -pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), - ha->pmsg, ha->msg_phys); -if (ha->ccb_phys) -pci_unmap_single (ha->pdev,ha->ccb_phys, -sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); - gdth_ctr_released++; -TRACE2 (("gdth_release(): HA %d of %d\n" , - gdth_ctr_released, gdth_ctr_count)); - -if (gdth_ctr_released == gdth_ctr_count) { -#ifdef GDTH_STATISTICS -del_timer (&gdth_timer); -#endif -unregister_chrdev (major,"gdth" ); -unregister_reboot_notifier (&gdth_notifier); - } - -scsi_unregister (shp); -return 0 ; -} - -static const char *gdth_ctr_name (gdth_ha_str *ha) {TRACE2 (("gdth_ctr_name()\n" ));
@@ -4813,10 +4668,8 @@ static int gdth_slave_configure(struct scsi_device *sdev)return 0 ; } -static struct scsi_host_template driver_template = { +static struct scsi_host_template gdth_template = { .name ="GDT SCSI Disk Array Controller" , - .detect = gdth_detect, - .release = gdth_release, .info = gdth_info, .queuecommand = gdth_queuecommand, .eh_bus_reset_handler = gdth_eh_bus_reset,
@@ -4833,7 +4686,7 @@ static struct scsi_host_template driver_template = { };#ifdef CONFIG_ISA -static int gdth_isa_probe_one (struct scsi_host_template *shtp,ulong32 isa_bios) +static int gdth_isa_probe_one (ulong32 isa_bios) {struct Scsi_Host *shp;gdth_ha_str *ha;
@@ -4843,7 +4696,7 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios)if (!gdth_search_isa (isa_bios))return -ENXIO ; - shp =scsi_register (shtp,sizeof (gdth_ha_str)); + shp =scsi_host_alloc (&gdth_template,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; ha =shost_priv (shp);
@@ -4935,6 +4788,10 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios)spin_lock_init (&ha->smp_lock);gdth_enable_int (ha); + error =scsi_add_host (shp,NULL ); +if (error) + goto out_free_coal_stat; +list_add_tail (&ha->list, &gdth_instances);return 0 ; out_free_coal_stat:
@@ -4953,14 +4810,13 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) out_free_irq:free_irq (ha->irq, ha); out_host_put: -scsi_unregister (shp); +scsi_host_put (shp);return error; }#endif /* CONFIG_ISA */ #ifdef CONFIG_EISA -static int gdth_eisa_probe_one (struct scsi_host_template *shtp, -ushort eisa_slot) +static int gdth_eisa_probe_one (ushort eisa_slot) {struct Scsi_Host *shp;gdth_ha_str *ha;
@@ -4970,7 +4826,7 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp,if (!gdth_search_eisa (eisa_slot))return -ENXIO ; - shp =scsi_register (shtp,sizeof (gdth_ha_str)); + shp =scsi_host_alloc (&gdth_template,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; ha =shost_priv (shp);
@@ -5060,6 +4916,11 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp,spin_lock_init (&ha->smp_lock);gdth_enable_int (ha); + + error =scsi_add_host (shp,NULL ); +if (error) + goto out_free_coal_stat; +list_add_tail (&ha->list, &gdth_instances);return 0 ; out_free_ccb_phys:
@@ -5080,21 +4941,20 @@ static int gdth_eisa_probe_one(struct scsi_host_template *shtp,free_irq (ha->irq, ha); gdth_ctr_count--; out_host_put: -scsi_unregister (shp); +scsi_host_put (shp);return error; }#endif /* CONFIG_EISA */ #ifdef CONFIG_PCI -static int gdth_pci_probe_one (struct scsi_host_template *shtp, -gdth_pci_str *pcistr,int ctr) +static int gdth_pci_probe_one (gdth_pci_str *pcistr,int ctr) {struct Scsi_Host *shp;gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ;int error, hanum, i; - shp =scsi_register (shtp,sizeof (gdth_ha_str)); + shp =scsi_host_alloc (&gdth_template,sizeof (gdth_ha_str));if (!shp)return -ENOMEM ; ha =shost_priv (shp);
@@ -5195,6 +5055,11 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp,spin_lock_init (&ha->smp_lock);gdth_enable_int (ha); + + error =scsi_add_host (shp, &pcistr[ctr].pdev->dev); +if (error) + goto out_free_coal_stat; +list_add_tail (&ha->list, &gdth_instances);return 0 ; out_free_coal_stat:
@@ -5212,12 +5077,137 @@ static int gdth_pci_probe_one(struct scsi_host_template *shtp,free_irq (ha->irq, ha); gdth_ctr_count--; out_host_put: -scsi_unregister (shp); +scsi_host_put (shp);return error; }#endif /* CONFIG_PCI */ -#include "scsi_module.c" +static void gdth_remove_one (gdth_ha_str *ha) +{ +struct Scsi_Host *shp = ha->shost; + +TRACE2 (("gdth_remove_one()\n" )); + +scsi_remove_host (shp); + +if (ha->sdev) { +scsi_free_host_dev (ha->sdev); + ha->sdev =NULL ; + } + +gdth_flush (ha); + +if (shp->irq) +free_irq (shp->irq,ha); + +#ifdef CONFIG_ISA +if (shp->dma_channel !=0xff ) +free_dma (shp->dma_channel); +#endif +#ifdef INT_COAL +if (ha->coal_stat) +pci_free_consistent (ha->pdev,sizeof (gdth_coal_status) * +MAXOFFSETS , ha->coal_stat, ha->coal_stat_phys); +#endif +if (ha->pscratch) +pci_free_consistent (ha->pdev,GDTH_SCRATCH , + ha->pscratch, ha->scratch_phys); +if (ha->pmsg) +pci_free_consistent (ha->pdev,sizeof (gdth_msg_str), + ha->pmsg, ha->msg_phys); +if (ha->ccb_phys) +pci_unmap_single (ha->pdev,ha->ccb_phys, +sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); + +scsi_host_put (shp); +} + +static int __init gdth_init (void ) +{ +gdth_pci_str pcistr[MAXHA ]; +ulong32 isa_bios; +ushort eisa_slot; +int cnt, ctr; + +if (disable) { +printk ("GDT-HA: Controller driver disabled from" +" command line !\n" ); +return 0 ; + } + +printk ("GDT-HA: Storage RAID Controller Driver. Version: %s\n" , +GDTH_VERSION_STR ); + +/* initializations */ + gdth_polling = TRUE; +gdth_clear_events (); + +/* As default we do not probe for EISA or ISA controllers */ +if (probe_eisa_isa) { +/* scanning for controllers, at first: ISA controller */ +#ifdef CONFIG_ISA +for (isa_bios =0xc8000UL ; isa_bios <=0xd8000UL ; + isa_bios +=0x8000UL ) { +if (gdth_ctr_count >=MAXHA ) +break ; +gdth_isa_probe_one (isa_bios); + } +#endif +#ifdef CONFIG_EISA +for (eisa_slot =0x1000 ; eisa_slot <=0x8000 ; eisa_slot +=0x1000 ) { +if (gdth_ctr_count >=MAXHA ) +break ; +gdth_eisa_probe_one (eisa_slot); + } + } +#endif +#ifdef CONFIG_PCI +/* scanning for PCI controllers */ + cnt =gdth_search_pci (pcistr); +printk ("GDT-HA: Found %d PCI Storage RAID Controllers\n" ,cnt); +gdth_sort_pci (pcistr,cnt); +for (ctr =0 ; ctr < cnt; ++ctr) { +if (gdth_ctr_count >=MAXHA ) +break ; +gdth_pci_probe_one (pcistr, ctr); + } +#endif + +TRACE2 (("gdth_detect() %d controller detected\n" ,gdth_ctr_count)); +#ifdef GDTH_STATISTICS +TRACE2 (("gdth_detect(): Initializing timer !\n" )); +init_timer (&gdth_timer); + gdth_timer.expires = jiffies +HZ ; + gdth_timer.data =0L ; + gdth_timer.function = gdth_timeout; +add_timer (&gdth_timer); +#endif + major =register_chrdev (0 ,"gdth" ,&gdth_fops); + notifier_disabled =0 ; +register_reboot_notifier (&gdth_notifier); + + + gdth_polling = FALSE; +return 0 ; +} + +static void __exit gdth_exit(void) +{ +gdth_ha_str *ha; + +list_for_each_entry (ha, &gdth_instances, list) +gdth_remove_one (ha); + +#ifdef GDTH_STATISTICS +del_timer (&gdth_timer); +#endif +unregister_chrdev (major,"gdth" ); +unregister_reboot_notifier (&gdth_notifier); +} + +module_init (gdth_init); +module_exit (gdth_exit); +#ifndef MODULE __setup ("gdth=" , option_setup);#endif
drivers/scsi/gdth.h +1 -0
@@ -854,6 +854,7 @@ typedef struct {/* controller information structure */ typedef struct { struct Scsi_Host *shost; + struct list_head list; ushort hanum; ushort oem_id; /* OEM */ ushort type; /* controller class */
PATCH 12/16 gdth: Remove gdth_ctr_tab[]
In reply to Boaz Harrosh - Places like Initialization and Reset that Just loop on all devices can use the link list with the list_for_each_entry macro.
But the io_ctrl from user mode now suffers performance-wise because code has to do a sequential search for the requested host number. I have isolated this search in a gdth_find_ha(int hanum) member for future enhancement if needed.
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 109 ++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 58 deletions(-)
drivers/scsi/gdth.c +51 -58
@@ -296,8 +296,7 @@ static unchar gdth_polling; /* polling if TRUE */static unchar gdth_from_wait = FALSE;/* gdth_wait() */ static int wait_index,wait_hanum;/* gdth_wait() */ static int gdth_ctr_count =0 ;/* controller count */ -static struct Scsi_Host *gdth_ctr_tab[MAXHA ];/* controller table */ -static LIST_HEAD (gdth_instances); +static LIST_HEAD (gdth_instances);/* controller list */ static unchar gdth_write_through = FALSE;/* write through */ static gdth_evt_str ebuffer[MAX_EVENTS ];/* event buffer */ static int elastidx;
@@ -387,6 +386,17 @@ static struct notifier_block gdth_notifier = { };static int notifier_disabled =0 ; +static gdth_ha_str *gdth_find_ha (int hanum) +{ +gdth_ha_str *ha; + +list_for_each_entry (ha, &gdth_instances, list) +if (hanum == ha->hanum) +return ha; + +return NULL ; +} +static void gdth_delay (int milliseconds) {if (milliseconds ==0 ) {
@@ -3752,7 +3762,7 @@ static void gdth_timeout(ulong data)gdth_ha_str *ha;ulong flags; - ha =shost_priv (gdth_ctr_tab[0 ]); + ha =list_first_entry (&gdth_instances, gdth_ha_str, list);spin_lock_irqsave (&ha->smp_lock, flags);for (act_stats=0 ,i=0 ; i<GDTH_MAXCMDS ; ++i)
@@ -4011,12 +4021,10 @@ static int gdth_queuecommand(Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *))static int gdth_open (struct inode *inode,struct file *filep) {gdth_ha_str *ha; -int i; -for (i =0 ; i < gdth_ctr_count; i++) { - ha =shost_priv (gdth_ctr_tab[i]); +list_for_each_entry (ha, &gdth_instances, list) {if (!ha->sdev) - ha->sdev =scsi_get_host_dev (gdth_ctr_tab[i]); + ha->sdev =scsi_get_host_dev (ha->shost); }TRACE (("gdth_open()\n" ));
@@ -4035,10 +4043,11 @@ static int ioc_event(void __user *arg)gdth_ha_str *ha;ulong flags; -if (copy_from_user (&evt, arg,sizeof (gdth_ioctl_event)) || - evt.ionode >= gdth_ctr_count) +if (copy_from_user (&evt, arg,sizeof (gdth_ioctl_event))) +return -EFAULT ; + ha =gdth_find_ha (evt.ionode); +if (!ha)return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[evt.ionode]);if (evt.erase ==0xff ) {if (evt.event.event_source ==ES_TEST )
@@ -4072,11 +4081,12 @@ static int ioc_lockdrv(void __user *arg)ulong flags;gdth_ha_str *ha; -if (copy_from_user (&ldrv, arg,sizeof (gdth_ioctl_lockdrv)) || - ldrv.ionode >= gdth_ctr_count) +if (copy_from_user (&ldrv, arg,sizeof (gdth_ioctl_lockdrv)))return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[ldrv.ionode]); - + ha =gdth_find_ha (ldrv.ionode); +if (!ha) +return -EFAULT ; +for (i =0 ; i < ldrv.drive_cnt && i <MAX_HDRIVES ; ++i) { j = ldrv.drives[i];if (j >=MAX_HDRIVES || !ha->hdr[j].present)
@@ -4106,9 +4116,11 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)int rval;if (copy_from_user (&res, arg,sizeof (gdth_ioctl_reset)) || - res.ionode >= gdth_ctr_count || res.number >=MAX_HDRIVES ) + res.number >=MAX_HDRIVES ) +return -EFAULT ; + ha =gdth_find_ha (res.ionode); +if (!ha)return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[res.ionode]);if (!ha->hdr[res.number].present)return 0 ;
@@ -4137,11 +4149,12 @@ static int ioc_general(void __user *arg, char *cmnd)ulong64 paddr;gdth_ha_str *ha;int rval; - -if (copy_from_user (&gen, arg,sizeof (gdth_ioctl_general)) || - gen.ionode >= gdth_ctr_count) + +if (copy_from_user (&gen, arg,sizeof (gdth_ioctl_general))) +return -EFAULT ; + ha =gdth_find_ha (gen.ionode); +if (!ha)return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[gen.ionode]);if (gen.data_len + gen.sense_len !=0 ) {if (!(buf =gdth_ioctl_alloc (ha, gen.data_len + gen.sense_len, FALSE, &paddr)))
@@ -4261,11 +4274,10 @@ static int ioc_hdrlist(void __user *arg, char *cmnd) goto free_fail;if (copy_from_user (rsc, arg,sizeof (gdth_ioctl_rescan)) || - rsc->ionode >= gdth_ctr_count) { + (NULL == (ha =gdth_find_ha (rsc->ionode)))) { rc = -EFAULT ; goto free_fail; } - ha =shost_priv (gdth_ctr_tab[rsc->ionode]);memset (cmd,0 ,sizeof (gdth_cmd_str));for (i =0 ; i <MAX_HDRIVES ; ++i) {
@@ -4317,11 +4329,10 @@ static int ioc_rescan(void __user *arg, char *cmnd) goto free_fail;if (copy_from_user (rsc, arg,sizeof (gdth_ioctl_rescan)) || - rsc->ionode >= gdth_ctr_count) { + (NULL == (ha =gdth_find_ha (rsc->ionode)))) { rc = -EFAULT ; goto free_fail; } - ha =shost_priv (gdth_ctr_tab[rsc->ionode]);memset (cmd,0 ,sizeof (gdth_cmd_str));if (rsc->flag ==0 ) {
@@ -4478,9 +4489,9 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,gdth_ioctl_ctrtype ctrt;if (copy_from_user (&ctrt, argp,sizeof (gdth_ioctl_ctrtype)) || - ctrt.ionode >= gdth_ctr_count) + (NULL == (ha =gdth_find_ha (ctrt.ionode))))return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[ctrt.ionode]); +if (ha->type ==GDT_ISA || ha->type ==GDT_EISA ) { ctrt.type = (unchar)((ha->stype>>20 ) -0x10 ); }else {
@@ -4519,10 +4530,9 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,unchar i, j;if (copy_from_user (&lchn, argp,sizeof (gdth_ioctl_lockchn)) || - lchn.ionode >= gdth_ctr_count) + (NULL == (ha =gdth_find_ha (lchn.ionode))))return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[lchn.ionode]); - + i = lchn.channel;if (i < ha->bus_cnt) {if (lchn.lock) {
@@ -4558,9 +4568,8 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,int rval;if (copy_from_user (&res, argp,sizeof (gdth_ioctl_reset)) || - res.ionode >= gdth_ctr_count) + (NULL == (ha =gdth_find_ha (res.ionode))))return -EFAULT ; - ha =shost_priv (gdth_ctr_tab[res.ionode]); scp =kzalloc (sizeof (*scp),GFP_KERNEL );if (!scp)
@@ -4622,7 +4631,7 @@ static void gdth_flush(gdth_ha_str *ha)/* shutdown routine */ static int gdth_halt (struct notifier_block *nb,ulong event,void *buf) { -int hanum; +gdth_ha_str *ha;#ifndef __alpha__gdth_cmd_str gdtcmd;char cmnd[MAX_COMMAND_SIZE ];
@@ -4637,8 +4646,7 @@ static int gdth_halt(struct notifier_block *nb, ulong event, void *buf) notifier_disabled =1 ;printk ("GDT-HA: Flushing all host drives .. " ); -for (hanum =0 ; hanum < gdth_ctr_count; ++hanum) { -gdth_ha_str *ha =shost_priv (gdth_ctr_tab[hanum]); +list_for_each_entry (ha, &gdth_instances, list) {gdth_flush (ha);#ifndef __alpha__
@@ -4691,7 +4699,7 @@ static int gdth_isa_probe_one(ulong32 isa_bios)struct Scsi_Host *shp;gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ; -int error, hanum, i; +int error, i;if (!gdth_search_isa (isa_bios))return -ENXIO ;
@@ -4726,10 +4734,8 @@ static int gdth_isa_probe_one(ulong32 isa_bios) shp->unchecked_isa_dma =1 ; shp->irq = ha->irq; shp->dma_channel = ha->drq; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - ha->hanum = (ushort )hanum; + ha->hanum = gdth_ctr_count++; ha->shost = shp; ha->pccb = &ha->cmdext;
@@ -4821,7 +4827,7 @@ static int gdth_eisa_probe_one(ushort eisa_slot)struct Scsi_Host *shp;gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ; -int error, hanum, i; +int error, i;if (!gdth_search_eisa (eisa_slot))return -ENXIO ;
@@ -4848,10 +4854,8 @@ static int gdth_eisa_probe_one(ushort eisa_slot) shp->unchecked_isa_dma =0 ; shp->irq = ha->irq; shp->dma_channel =0xff ; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - ha->hanum = (ushort )hanum; + ha->hanum = gdth_ctr_count++; ha->shost = shp;TRACE2 (("EISA detect Bus 0: hanum %d\n" , ha->hanum));
@@ -4952,7 +4956,7 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)struct Scsi_Host *shp;gdth_ha_str *ha;dma_addr_t scratch_dma_handle =0 ; -int error, hanum, i; +int error, i; shp =scsi_host_alloc (&gdth_template,sizeof (gdth_ha_str));if (!shp)
@@ -4979,10 +4983,8 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr) shp->unchecked_isa_dma =0 ; shp->irq = ha->irq; shp->dma_channel =0xff ; - hanum = gdth_ctr_count; - gdth_ctr_tab[gdth_ctr_count++] = shp; - ha->hanum = (ushort )hanum; + ha->hanum = gdth_ctr_count++; ha->shost = shp; ha->pccb = &ha->cmdext;
@@ -5147,18 +5149,12 @@ static int __init gdth_init(void)/* scanning for controllers, at first: ISA controller */ #ifdef CONFIG_ISA for (isa_bios =0xc8000UL ; isa_bios <=0xd8000UL ; - isa_bios +=0x8000UL ) { -if (gdth_ctr_count >=MAXHA ) -break ; + isa_bios +=0x8000UL )gdth_isa_probe_one (isa_bios); - }#endif #ifdef CONFIG_EISA -for (eisa_slot =0x1000 ; eisa_slot <=0x8000 ; eisa_slot +=0x1000 ) { -if (gdth_ctr_count >=MAXHA ) -break ; +for (eisa_slot =0x1000 ; eisa_slot <=0x8000 ; eisa_slot +=0x1000 ) gdth_eisa_probe_one(eisa_slot); - } }#endif #ifdef CONFIG_PCI
@@ -5166,11 +5162,8 @@ static int __init gdth_init(void) cnt =gdth_search_pci (pcistr);printk ("GDT-HA: Found %d PCI Storage RAID Controllers\n" ,cnt);gdth_sort_pci (pcistr,cnt); -for (ctr =0 ; ctr < cnt; ++ctr) { -if (gdth_ctr_count >=MAXHA ) -break ; +for (ctr =0 ; ctr < cnt; ++ctr)gdth_pci_probe_one (pcistr, ctr); - }#endif TRACE2 (("gdth_detect() %d controller detected\n" ,gdth_ctr_count));
PATCH 13/16 gdth: Make one abuse of scsi_cmnd less obvious
In reply to Boaz Harrosh Rather than having internal commands abuse scsi_done to call gdth_scsi_done, have all the places that use to call scsi_done directly call gdth_scsi_done, which now checks whether the command was internal, and calls scsi_done if not.
Signed-off-by Matthew Wilcox <[email protected]>
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-)
drivers/scsi/gdth.c +18 -15
@@ -408,10 +408,12 @@ static void gdth_delay(int milliseconds)static void gdth_scsi_done (struct scsi_cmnd *scp) { -TRACE2 (("gdth_scsi_done()\n" )); +TRACE2 (("gdth_scsi_done()\n" )); -if (scp->request) -complete ((struct completion *)scp->request); +if (scp->done == gdth_scsi_done) +complete ((struct completion *)scp->request); +else + scp->scsi_done (scp); } int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
@@ -433,8 +435,8 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, scp->cmd_len =12 ;memcpy (scp->cmnd, cmnd,12 ); scp->SCp.this_residual =IOCTL_PRI ;/* priority */ - scp->done = gdth_scsi_done;/* some fn. test this */ -gdth_queuecommand (scp, gdth_scsi_done); + scp->done = gdth_scsi_done; +gdth_queuecommand (scp,NULL );wait_for_completion (&wait); rval = scp->SCp.Status;
@@ -2122,7 +2124,7 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp); } }else if (nscp->done == gdth_scsi_done) {if (!(cmd_index=gdth_special_cmd (ha, nscp)))
@@ -2141,7 +2143,7 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp); }else {switch (nscp->cmnd[0 ]) {case TEST_UNIT_READY :
@@ -2167,9 +2169,9 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp); }else if (gdth_internal_cache_cmd (ha, nscp)) - nscp->scsi_done (nscp); +gdth_scsi_done (nscp);break ;case ALLOW_MEDIUM_REMOVAL :
@@ -2183,7 +2185,7 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp); }else { nscp->cmnd[3 ] = (ha->hdr[t].devtype&1 ) ?1 :0 ; TRACE(("Prevent/allow r. %d rem. drive %d\n",
@@ -2219,7 +2221,7 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp); }else if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE;break ;
@@ -2234,7 +2236,7 @@ static void gdth_next(gdth_ha_str *ha)if (!nscp->SCp.have_data_in) nscp->SCp.have_data_in++;else - nscp->scsi_done (nscp); +gdth_scsi_done (nscp);break ; } }
@@ -3230,7 +3232,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (rval ==2 ) {gdth_putq (ha, scp,scp->SCp.this_residual); }else if (rval ==1 ) { - scp->scsi_done (scp); +gdth_scsi_done (scp); }#ifdef INT_COAL
@@ -3988,14 +3990,15 @@ static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,se } -static int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)) +static int gdth_queuecommand (struct scsi_cmnd *scp, +void (*done)(struct scsi_cmnd *)) {gdth_ha_str *ha =shost_priv (scp->device->host);int priority;TRACE (("gdth_queuecommand() cmd 0x%x\n" , scp->cmnd[0 ])); - scp->scsi_done = (void *)done; + scp->scsi_done = done; scp->SCp.have_data_in =1 ; scp->SCp.phase =-1 ; scp->SCp.sent_command =-1 ;
Signature · 1 line
1.5.3.1
PATCH 14/16 gdth: Setup proper per-command private data
In reply to Boaz Harrosh - scsi_cmnd and specifically ->SCp of, where heavily abused with internal meaning members and flags. So introduce a new struct gdth_cmndinfo, put it on ->host_scribble and define a gdth_cmnd_priv() accessor to retrieve it from a scsi_cmnd.
- The structure now holds two members:
internal_command - replaces the scp->done == gdth_scsi_done croft. sense_paddr - which was a 64-bit spanning on 2 32-bit members of SCp. More overloaded members from SCp and scsi_cmnd will be moved in a later patch (For easy review).
- Split up gdth_queuecommand to an additional internal_function. The later is the one called by gdth_execute(). This will be more evident later in the scsi accessors patch, but it also facilitates in the differentiation between internal_command and external. And the setup of gdth_cmndinfo of each command.
Matthew: scp->done is no longer used anywhere in this driver.
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 108 ++++++++++++++++++++++++++++++++------------- drivers/scsi/gdth.h | 10 ++++ drivers/scsi/gdth_proc.c | 6 ++- 3 files changed, 91 insertions(+), 33 deletions(-)
drivers/scsi/gdth.c +77 -31
@@ -86,8 +86,8 @@/* The meaning of the Scsi_Pointer members in this driver is as follows: * ptr: Chaining * this_residual: Command priority -* buffer: phys. DMA sense buffer -* dma_handle: phys. DMA buffer (kernel >= 2.4.0) +* buffer: unused +* dma_handle: will drop in !use_sg patch. * buffers_residual: Timeout value * Status: Command status (gdth_do_cmd()), DMA mem. mappings * Message: Additional info (gdth_do_cmd()), DMA direction
@@ -192,6 +192,8 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,static void gdth_flush (gdth_ha_str *ha);static int gdth_halt (struct notifier_block *nb,ulong event,void *buf);static int gdth_queuecommand (Scsi_Cmnd *scp,void (*done)(Scsi_Cmnd *)); +static int __gdth_queuecommand (gdth_ha_str *ha,struct scsi_cmnd *scp, +struct gdth_cmndinfo *cmndinfo);static void gdth_scsi_done (struct scsi_cmnd *scp);#ifdef DEBUG_GDTH
@@ -397,6 +399,34 @@ static gdth_ha_str *gdth_find_ha(int hanum)return NULL ; } +static struct gdth_cmndinfo *gdth_get_cmndinfo (gdth_ha_str *ha) +{ +struct gdth_cmndinfo *priv =NULL ; +ulong flags; +int i; + +spin_lock_irqsave (&ha->smp_lock, flags); + +for (i=0 ; i<GDTH_MAXCMDS ; ++i) { +if (ha->cmndinfo[i].index ==0 ) { + priv = &ha->cmndinfo[i]; + priv->index = i; +memset (priv,0 ,sizeof (*priv)); +break ; + } + } + +spin_unlock_irqrestore (&ha->smp_lock, flags); + +return priv; +} + +static void gdth_put_cmndinfo (struct gdth_cmndinfo *priv) +{ +BUG_ON (!priv); + priv->index =0 ; +} +static void gdth_delay (int milliseconds) {if (milliseconds ==0 ) {
@@ -408,9 +438,15 @@ static void gdth_delay(int milliseconds)static void gdth_scsi_done (struct scsi_cmnd *scp) { +struct gdth_cmndinfo *priv =gdth_cmnd_priv (scp); +int internal_command = priv->internal_command; +TRACE2 (("gdth_scsi_done()\n" )); -if (scp->done == gdth_scsi_done) +gdth_put_cmndinfo (priv); + scp->host_scribble =NULL ; + +if (internal_command)complete ((struct completion *)scp->request);else scp->scsi_done (scp);
@@ -419,7 +455,9 @@ static void gdth_scsi_done(struct scsi_cmnd *scp)int __gdth_execute (struct scsi_device *sdev,gdth_cmd_str *gdtcmd,char *cmnd,int timeout,u32 *info) { +gdth_ha_str *ha =shost_priv (sdev->host);Scsi_Cmnd *scp; +struct gdth_cmndinfo cmndinfo;DECLARE_COMPLETION_ONSTACK (wait);int rval;
@@ -428,6 +466,8 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,return -ENOMEM ; scp->device = sdev; +memset (&cmndinfo,0 ,sizeof (cmndinfo)); +/* use request field to save the ptr. to completion struct. */ scp->request = (struct request *)&wait; scp->timeout_per_command = timeout*HZ ;
@@ -435,8 +475,11 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, scp->cmd_len =12 ;memcpy (scp->cmnd, cmnd,12 ); scp->SCp.this_residual =IOCTL_PRI ;/* priority */ - scp->done = gdth_scsi_done; -gdth_queuecommand (scp,NULL ); + cmndinfo.internal_command =1 ; + +TRACE (("__gdth_execute() cmd 0x%x\n" , scp->cmnd[0 ])); +__gdth_queuecommand (ha, scp, &cmndinfo); +wait_for_completion (&wait); rval = scp->SCp.Status;
@@ -1969,6 +2012,7 @@ static int gdth_analyse_hdrive(gdth_ha_str *ha, ushort hdrive)static void gdth_putq (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar priority) { +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); registerScsi_Cmnd *pscp; registerScsi_Cmnd *nscp;ulong flags;
@@ -1977,7 +2021,7 @@ static void gdth_putq(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar priority)TRACE (("gdth_putq() priority %d\n" ,priority));spin_lock_irqsave (&ha->smp_lock, flags); -if (scp->done != gdth_scsi_done) { +if (!cmndinfo->internal_command) { scp->SCp.this_residual = (int )priority; b = scp->device->channel; t = scp->device->id;
@@ -2038,7 +2082,7 @@ static void gdth_next(gdth_ha_str *ha)for (nscp = pscp = ha->req_first; nscp; nscp = (Scsi_Cmnd *)nscp->SCp.ptr) {if (nscp != pscp && nscp != (Scsi_Cmnd *)pscp->SCp.ptr) pscp = (Scsi_Cmnd *)pscp->SCp.ptr; -if (nscp->done != gdth_scsi_done) { +if (!gdth_cmnd_priv (nscp)->internal_command) { b = nscp->device->channel; t = nscp->device->id; l = nscp->device->lun;
@@ -2063,7 +2107,7 @@ static void gdth_next(gdth_ha_str *ha) firsttime = FALSE; } -if (nscp->done != gdth_scsi_done) { +if (!gdth_cmnd_priv (nscp)->internal_command) {if (nscp->SCp.phase ==-1 ) { nscp->SCp.phase =CACHESERVICE ;/* default: cache svc. */ if (nscp->cmnd[0 ] ==TEST_UNIT_READY ) {
@@ -2126,7 +2170,7 @@ static void gdth_next(gdth_ha_str *ha)else gdth_scsi_done (nscp); } - }else if (nscp->done == gdth_scsi_done) { + }else if (gdth_cmnd_priv (nscp)->internal_command) {if (!(cmd_index=gdth_special_cmd (ha, nscp))) this_cmd = FALSE; next_cmd = FALSE;
@@ -2625,6 +2669,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b)unchar t,l;struct page *page;ulong offset; +struct gdth_cmndinfo *cmndinfo; t = scp->device->id; l = scp->device->lun;
@@ -2648,6 +2693,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b)if (ha->cmd_cnt ==0 )gdth_set_sema0 (ha); + cmndinfo =gdth_cmnd_priv (scp);/* fill command */ if (scp->SCp.sent_command !=-1 ) { cmdp->OpCode = scp->SCp.sent_command;/* special raw cmd. */
@@ -2671,9 +2717,8 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) offset = (ulong )scp->sense_buffer & ~PAGE_MASK ; sense_paddr =pci_map_page (ha->pdev,page,offset,16 ,PCI_DMA_FROMDEVICE ); - *(ulong32 *)&scp->SCp.buffer = (ulong32 )sense_paddr; -/* high part, if 64bit */ - *(ulong32 *)&scp->host_scribble = (ulong32)((ulong64 )sense_paddr >>32 ); + + cmndinfo->sense_paddr = sense_paddr; cmdp->OpCode =GDT_WRITE ;/* always */ cmdp->BoardNode =LOCALBOARD ;if (mode64) {
@@ -3270,6 +3315,7 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index,gdth_msg_str *msg;gdth_cmd_str *cmdp;unchar b, t; +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); cmdp = ha->pccb; TRACE(("gdth_sync_event() serv %d status %d\n",
@@ -3363,14 +3409,9 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index,else if (scp->SCp.Status ==GDTH_MAP_SINGLE )pci_unmap_page (ha->pdev,scp->SCp.dma_handle, scp->request_bufflen,scp->SCp.Message); -if (scp->SCp.buffer) { -dma_addr_t addr; - addr = (dma_addr_t)*(ulong32 *)&scp->SCp.buffer; -if (scp->host_scribble) - addr += (dma_addr_t) - ((ulong64)(*(ulong32 *)&scp->host_scribble) <<32 ); -pci_unmap_page (ha->pdev,addr,16 ,PCI_DMA_FROMDEVICE ); - } +if (cmndinfo->sense_paddr) +pci_unmap_page (ha->pdev, cmndinfo->sense_paddr,16 , +PCI_DMA_FROMDEVICE );if (ha->status ==S_OK ) { scp->SCp.Status =S_OK ;
@@ -3449,7 +3490,7 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index, scp->sense_buffer[2 ] =NOT_READY ; scp->result = (DID_OK <<16 ) | (CHECK_CONDITION <<1 ); } -if (scp->done != gdth_scsi_done) { +if (!cmndinfo->internal_command) { ha->dvr.size =sizeof (ha->dvr.eu.sync); ha->dvr.eu.sync.ionode = ha->hanum; ha->dvr.eu.sync.service = service;
@@ -3994,28 +4035,33 @@ static int gdth_queuecommand(struct scsi_cmnd *scp, void (*done)(struct scsi_cmnd *)) {gdth_ha_str *ha =shost_priv (scp->device->host); -int priority; +struct gdth_cmndinfo *cmndinfo;TRACE (("gdth_queuecommand() cmd 0x%x\n" , scp->cmnd[0 ])); - + + cmndinfo =gdth_get_cmndinfo (ha); +BUG_ON (!cmndinfo); + scp->scsi_done = done; +gdth_update_timeout (scp, scp->timeout_per_command *6 ); + scp->SCp.this_residual =DEFAULT_PRI ; +return __gdth_queuecommand (ha, scp, cmndinfo); +} + +static int __gdth_queuecommand (gdth_ha_str *ha,struct scsi_cmnd *scp, +struct gdth_cmndinfo *cmndinfo) +{ + scp->host_scribble = (unsigned char *)cmndinfo; scp->SCp.have_data_in =1 ; scp->SCp.phase =-1 ; scp->SCp.sent_command =-1 ; scp->SCp.Status =GDTH_MAP_NONE ; - scp->SCp.buffer = (struct scatterlist *)NULL ;#ifdef GDTH_STATISTICS ++act_ios;#endif - priority =DEFAULT_PRI ; -if (scp->done == gdth_scsi_done) - priority = scp->SCp.this_residual; -else -gdth_update_timeout (scp, scp->timeout_per_command *6 ); - -gdth_putq (ha, scp, priority); +gdth_putq (ha, scp, scp->SCp.this_residual);gdth_next (ha);return 0 ; }
drivers/scsi/gdth.h +10 -0
@@ -919,6 +919,11 @@ typedef struct {Scsi_Cmnd *cmnd;/* pending request */ ushort service;/* service */ } cmd_tab[GDTH_MAXCMDS ];/* table of pend. requests */ +struct gdth_cmndinfo {/* per-command private info */ +int index; +int internal_command;/* don't call scsi_done */ +dma_addr_t sense_paddr;/* sense dma-addr */ + } cmndinfo[GDTH_MAXCMDS ];/* index==0 is free */ unchar bus_cnt;/* SCSI bus count */ unchar tid_cnt;/* Target ID count */ unchar bus_id[MAXBUS ];/* IOP IDs */
@@ -941,6 +946,11 @@ typedef struct {struct scsi_device *sdev; } gdth_ha_str; +static inline struct gdth_cmndinfo *gdth_cmnd_priv (struct scsi_cmnd * cmd) +{ +return (struct gdth_cmndinfo *)cmd->host_scribble; +} +/* INQUIRY data format */ typedef struct { unchar type_qual;
drivers/scsi/gdth_proc.c +4 -2
@@ -758,7 +758,8 @@ static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id)spin_lock_irqsave (&ha->smp_lock, flags);for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) { -if (scp->done != gdth_scsi_done) { +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); +if (!cmndinfo->internal_command) { b = scp->device->channel; t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {
@@ -779,7 +780,8 @@ static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id)spin_lock_irqsave (&ha->smp_lock, flags);for (scp = ha->req_first; scp; scp = (Scsi_Cmnd *)scp->SCp.ptr) { -if (scp->done != gdth_scsi_done) { +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); +if (!cmndinfo->internal_command) { b = scp->device->channel; t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {
Signature · 1 line
1.5.3.1
PATCH 15/16 gdth: Move members from SCp to gdth_cmndinfo, stage 2
In reply to Boaz Harrosh - Cleanup the rest of the scsi_cmnd-SCp members and move them to gdth_cmndinfo:
SCp.this_residual => priority
SCp.buffers_residual => timeout
SCp.Status => status and dma_dir
SCp.Message => info
SCp.have_data_in => volatile wait_for_completion
SCp.sent_command => OpCode
SCp.phase => phase
- Two more members will be naturally removed in the !use_sg cleanup
TODO: What is the meaning of gdth_cmndinfo.phase? (rhetorically)
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 177 +++++++++++++++++++++++---------------------- drivers/scsi/gdth.h | 8 ++ drivers/scsi/gdth_proc.c | 10 ++- 3 files changed, 104 insertions(+), 91 deletions(-)
drivers/scsi/gdth.c +90 -87
@@ -85,15 +85,15 @@/* The meaning of the Scsi_Pointer members in this driver is as follows: * ptr: Chaining -* this_residual: Command priority +* this_residual: unused * buffer: unused * dma_handle: will drop in !use_sg patch. -* buffers_residual: Timeout value -* Status: Command status (gdth_do_cmd()), DMA mem. mappings -* Message: Additional info (gdth_do_cmd()), DMA direction -* have_data_in: Flag for gdth_wait_completion() -* sent_command: Opcode special command -* phase: Service/parameter/return code special command +* buffers_residual: unused +* Status: DMA mem. mappings (FIXME: drop in !use_sg patch.) +* Message: unused +* have_data_in: unused +* sent_command: unused +* phase: unused */
@@ -474,7 +474,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, scp->request_buffer = gdtcmd; scp->cmd_len =12 ;memcpy (scp->cmnd, cmnd,12 ); - scp->SCp.this_residual =IOCTL_PRI ;/* priority */ + cmndinfo.priority =IOCTL_PRI ; cmndinfo.internal_command =1 ;TRACE (("__gdth_execute() cmd 0x%x\n" , scp->cmnd[0 ]));
@@ -482,9 +482,9 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,wait_for_completion (&wait); - rval = scp->SCp.Status; + rval = cmndinfo.status;if (info) - *info = scp->SCp.Message; + *info = cmndinfo.info;kfree (scp);return rval; }
@@ -2022,14 +2022,14 @@ static void gdth_putq(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar priority)spin_lock_irqsave (&ha->smp_lock, flags);if (!cmndinfo->internal_command) { - scp->SCp.this_residual = (int )priority; + cmndinfo->priority = priority; b = scp->device->channel; t = scp->device->id;if (priority >=DEFAULT_PRI ) {if ((b != ha->virt_bus && ha->raw[BUS_L2P (ha,b)].lock) || (b==ha->virt_bus && t<MAX_HDRIVES && ha->hdr[t].lock)) {TRACE2 (("gdth_putq(): locked IO ->update_timeout()\n" )); - scp->SCp.buffers_residual =gdth_update_timeout (scp,0 ); + cmndinfo->timeout =gdth_update_timeout (scp,0 ); } } }
@@ -2041,7 +2041,7 @@ static void gdth_putq(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar priority) pscp = ha->req_first; nscp = (Scsi_Cmnd *)pscp->SCp.ptr;/* priority: 0-highest,..,0xff-lowest */ -while (nscp && (unchar )nscp->SCp.this_residual <= priority) { +while (nscp &&gdth_cmnd_priv (nscp)->priority <= priority) { pscp = nscp; nscp = (Scsi_Cmnd *)pscp->SCp.ptr; }
@@ -2080,13 +2080,14 @@ static void gdth_next(gdth_ha_str *ha) cmd_index =0 ;for (nscp = pscp = ha->req_first; nscp; nscp = (Scsi_Cmnd *)nscp->SCp.ptr) { +struct gdth_cmndinfo *nscp_cmndinfo =gdth_cmnd_priv (nscp);if (nscp != pscp && nscp != (Scsi_Cmnd *)pscp->SCp.ptr) pscp = (Scsi_Cmnd *)pscp->SCp.ptr; -if (!gdth_cmnd_priv (nscp)->internal_command) { +if (!nscp_cmndinfo->internal_command) { b = nscp->device->channel; t = nscp->device->id; l = nscp->device->lun; -if (nscp->SCp.this_residual >=DEFAULT_PRI ) { +if (nscp_cmndinfo->priority >=DEFAULT_PRI ) {if ((b != ha->virt_bus && ha->raw[BUS_L2P (ha,b)].lock) || (b == ha->virt_bus && t <MAX_HDRIVES && ha->hdr[t].lock))continue ;
@@ -2107,9 +2108,9 @@ static void gdth_next(gdth_ha_str *ha) firsttime = FALSE; } -if (!gdth_cmnd_priv (nscp)->internal_command) { -if (nscp->SCp.phase ==-1 ) { - nscp->SCp.phase =CACHESERVICE ;/* default: cache svc. */ +if (!nscp_cmndinfo->internal_command) { +if (nscp_cmndinfo->phase ==-1 ) { + nscp_cmndinfo->phase =CACHESERVICE ;/* default: cache svc. */ if (nscp->cmnd[0 ] ==TEST_UNIT_READY ) {TRACE2 (("TEST_UNIT_READY Bus %d Id %d LUN %d\n" , b, t, l));
@@ -2122,8 +2123,8 @@ static void gdth_next(gdth_ha_str *ha) }else if ((ha->scan_mode &0x0f ) ==1 ) {if (b ==0 && ((t ==0 && l ==1 ) || (t ==1 && l ==0 ))) { - nscp->SCp.sent_command =GDT_SCAN_START ; - nscp->SCp.phase = ((ha->scan_mode &0x10 ?1 :0 ) <<8 ) + nscp_cmndinfo->OpCode =GDT_SCAN_START ; + nscp_cmndinfo->phase = ((ha->scan_mode &0x10 ?1 :0 ) <<8 ) |SCSIRAWSERVICE ; ha->scan_mode =0x12 ; TRACE2(("Scan mode: 0x%x (SCAN_START)\n",
@@ -2134,8 +2135,8 @@ static void gdth_next(gdth_ha_str *ha) } }else if (ha->scan_mode ==0x12 ) {if (b == ha->bus_cnt && t == ha->tid_cnt-1 ) { - nscp->SCp.phase =SCSIRAWSERVICE ; - nscp->SCp.sent_command =GDT_SCAN_END ; + nscp_cmndinfo->phase =SCSIRAWSERVICE ; + nscp_cmndinfo->OpCode =GDT_SCAN_END ; ha->scan_mode &=0x10 ;TRACE2 (("Scan mode: 0x%x (SCAN_END)\n" , ha->scan_mode));
@@ -2146,17 +2147,17 @@ static void gdth_next(gdth_ha_str *ha) nscp->cmnd[0] != READ_CAPACITY && nscp->cmnd[0] != MODE_SENSE && (ha->hdr[t].cluster_type & CLUSTER_DRIVE)) {/* always GDT_CLUST_INFO! */ - nscp->SCp.sent_command =GDT_CLUST_INFO ; + nscp_cmndinfo->OpCode =GDT_CLUST_INFO ; } } } -if (nscp->SCp.sent_command !=-1 ) { -if ((nscp->SCp.phase &0xff ) ==CACHESERVICE ) { +if (nscp_cmndinfo->OpCode !=-1 ) { +if ((nscp_cmndinfo->phase &0xff ) ==CACHESERVICE ) {if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t))) this_cmd = FALSE; next_cmd = FALSE; - }else if ((nscp->SCp.phase &0xff ) ==SCSIRAWSERVICE ) { + }else if ((nscp_cmndinfo->phase &0xff ) ==SCSIRAWSERVICE ) {if (!(cmd_index=gdth_fill_raw_cmd (ha, nscp,BUS_L2P (ha, b)))) this_cmd = FALSE; next_cmd = FALSE;
@@ -2165,8 +2166,8 @@ static void gdth_next(gdth_ha_str *ha) nscp->sense_buffer[0 ] =0x70 ; nscp->sense_buffer[2 ] =NOT_READY ; nscp->result = (DID_OK <<16 ) | (CHECK_CONDITION <<1 ); -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp); }
@@ -2184,8 +2185,8 @@ static void gdth_next(gdth_ha_str *ha)TRACE2 (("Command 0x%x to bus %d id %d lun %d -> IGNORE\n" , nscp->cmnd[0 ], b, t, l)); nscp->result =DID_BAD_TARGET <<16 ; -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp); }else {
@@ -2210,8 +2211,8 @@ static void gdth_next(gdth_ha_str *ha) nscp->sense_buffer[0 ] =0x70 ; nscp->sense_buffer[2 ] =UNIT_ATTENTION ; nscp->result = (DID_OK <<16 ) | (CHECK_CONDITION <<1 ); -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp); }else if (gdth_internal_cache_cmd (ha, nscp))
@@ -2226,8 +2227,8 @@ static void gdth_next(gdth_ha_str *ha)TRACE (("Prevent r. nonremov. drive->do nothing\n" )); nscp->result =DID_OK <<16 ; nscp->sense_buffer[0 ] =0 ; -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp); }else {
@@ -2262,8 +2263,8 @@ static void gdth_next(gdth_ha_str *ha) nscp->sense_buffer[0 ] =0x70 ; nscp->sense_buffer[2 ] =UNIT_ATTENTION ; nscp->result = (DID_OK <<16 ) | (CHECK_CONDITION <<1 ); -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp); }else if (!(cmd_index=gdth_fill_cache_cmd (ha, nscp, t)))
@@ -2277,8 +2278,8 @@ static void gdth_next(gdth_ha_str *ha)printk ("GDT-HA %d: Unknown SCSI command 0x%x to cache service !\n" , ha->hanum, nscp->cmnd[0 ]); nscp->result =DID_ABORT <<16 ; -if (!nscp->SCp.have_data_in) - nscp->SCp.have_data_in++; +if (!nscp_cmndinfo->wait_for_completion) + nscp_cmndinfo->wait_for_completion++;else gdth_scsi_done (nscp);break ;
@@ -2357,6 +2358,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)gdth_rdcap_data rdc;gdth_sense_data sd;gdth_modep_data mpd; +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); t = scp->device->id; TRACE(("gdth_internal_cache_cmd() cmd 0x%x hdrive %d\n",
@@ -2443,8 +2445,8 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)break ; } -if (!scp->SCp.have_data_in) - scp->SCp.have_data_in++; +if (!cmndinfo->wait_for_completion) + cmndinfo->wait_for_completion++;else return 1 ;
@@ -2454,6 +2456,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)static int gdth_fill_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,ushort hdrive) { registergdth_cmd_str *cmdp; +struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp);struct scatterlist *sl;ulong32 cnt, blockcnt;ulong64 no, blockno;
@@ -2487,8 +2490,8 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive)/* fill command */ read_write =0 ; -if (scp->SCp.sent_command !=-1 ) - cmdp->OpCode = scp->SCp.sent_command;/* special cache cmd. */ +if (cmndinfo->OpCode !=-1 ) + cmdp->OpCode = cmndinfo->OpCode;/* special cache cmd. */ else if (scp->cmnd[0 ] ==RESERVE ) cmdp->OpCode =GDT_RESERVE_DRV ;else if (scp->cmnd[0 ] ==RELEASE )
@@ -2553,9 +2556,9 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) sl = (struct scatterlist *)scp->request_buffer; sgcnt = scp->use_sg; scp->SCp.Status =GDTH_MAP_SG ; - scp->SCp.Message = (read_write ==1 ? + cmndinfo->dma_dir = (read_write ==1 ?PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); - sgcnt =pci_map_sg (ha->pdev,sl,scp->use_sg,scp->SCp.Message); + sgcnt =pci_map_sg (ha->pdev, sl, scp->use_sg, cmndinfo->dma_dir);if (mode64) { cmdp->u.cache64.DestAddr= (ulong64)-1 ; cmdp->u.cache64.sg_canz = sgcnt;
@@ -2590,12 +2593,12 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) }else if (scp->request_bufflen) { scp->SCp.Status =GDTH_MAP_SINGLE ; - scp->SCp.Message = (read_write ==1 ? + cmndinfo->dma_dir = (read_write ==1 ?PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); page =virt_to_page (scp->request_buffer); offset = (ulong )scp->request_buffer & ~PAGE_MASK ; phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen,scp->SCp.Message); + scp->request_bufflen, cmndinfo->dma_dir); scp->SCp.dma_handle = phys_addr;if (mode64) {if (ha->cache_feat &SCATTER_GATHER ) {
@@ -2695,17 +2698,17 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmndinfo =gdth_cmnd_priv (scp);/* fill command */ -if (scp->SCp.sent_command !=-1 ) { - cmdp->OpCode = scp->SCp.sent_command;/* special raw cmd. */ +if (cmndinfo->OpCode !=-1 ) { + cmdp->OpCode = cmndinfo->OpCode;/* special raw cmd. */ cmdp->BoardNode =LOCALBOARD ;if (mode64) { - cmdp->u.raw64.direction = (scp->SCp.phase >>8 ); + cmdp->u.raw64.direction = (cmndinfo->phase >>8 );TRACE2 (("special raw cmd 0x%x param 0x%x\n" , cmdp->OpCode, cmdp->u.raw64.direction));/* evaluate command size */ ha->cmd_len =GDTOFFSOF (gdth_cmd_str,u.raw64.sg_lst); }else { - cmdp->u.raw.direction = (scp->SCp.phase >>8 ); + cmdp->u.raw.direction = (cmndinfo->phase >>8 );TRACE2 (("special raw cmd 0x%x param 0x%x\n" , cmdp->OpCode, cmdp->u.raw.direction));/* evaluate command size */
@@ -2760,8 +2763,8 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) sl = (struct scatterlist *)scp->request_buffer; sgcnt = scp->use_sg; scp->SCp.Status =GDTH_MAP_SG ; - scp->SCp.Message =PCI_DMA_BIDIRECTIONAL ; - sgcnt =pci_map_sg (ha->pdev,sl,scp->use_sg,scp->SCp.Message); + cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; + sgcnt =pci_map_sg (ha->pdev,sl, scp->use_sg, cmndinfo->dma_dir);if (mode64) { cmdp->u.raw64.sdata = (ulong64)-1 ; cmdp->u.raw64.sg_ranz = sgcnt;
@@ -2796,11 +2799,11 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) }else if (scp->request_bufflen) { scp->SCp.Status =GDTH_MAP_SINGLE ; - scp->SCp.Message =PCI_DMA_BIDIRECTIONAL ; + cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; page =virt_to_page (scp->request_buffer); offset = (ulong )scp->request_buffer & ~PAGE_MASK ; phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen,scp->SCp.Message); + scp->request_bufflen, cmndinfo->dma_dir); scp->SCp.dma_handle = phys_addr;if (mode64) {
@@ -3275,7 +3278,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (!gdth_polling)spin_unlock_irqrestore (&ha2->smp_lock, flags);if (rval ==2 ) { -gdth_putq (ha, scp,scp->SCp.this_residual); +gdth_putq (ha, scp,gdth_cmnd_priv (scp)->priority); }else if (rval ==1 ) {gdth_scsi_done (scp); }
@@ -3392,60 +3395,60 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index, }else { b = scp->device->channel; t = scp->device->id; -if (scp->SCp.sent_command ==-1 && b != ha->virt_bus) { +if (cmndinfo->OpCode ==-1 && b != ha->virt_bus) { ha->raw[BUS_L2P (ha,b)].io_cnt[t]--; }/* cache or raw service */ if (ha->status ==S_BSY ) {TRACE2 (("Controller busy -> retry !\n" )); -if (scp->SCp.sent_command ==GDT_MOUNT ) - scp->SCp.sent_command =GDT_CLUST_INFO ; +if (cmndinfo->OpCode ==GDT_MOUNT ) + cmndinfo->OpCode =GDT_CLUST_INFO ;/* retry */ return 2 ; }if (scp->SCp.Status ==GDTH_MAP_SG )pci_unmap_sg (ha->pdev,scp->request_buffer, - scp->use_sg,scp->SCp.Message); + scp->use_sg, cmndinfo->dma_dir);else if (scp->SCp.Status ==GDTH_MAP_SINGLE )pci_unmap_page (ha->pdev,scp->SCp.dma_handle, - scp->request_bufflen,scp->SCp.Message); + scp->request_bufflen, cmndinfo->dma_dir);if (cmndinfo->sense_paddr)pci_unmap_page (ha->pdev, cmndinfo->sense_paddr,16 ,PCI_DMA_FROMDEVICE );if (ha->status ==S_OK ) { - scp->SCp.Status =S_OK ; - scp->SCp.Message = ha->info; -if (scp->SCp.sent_command !=-1 ) { + cmndinfo->status =S_OK ; + cmndinfo->info = ha->info; +if (cmndinfo->OpCode !=-1 ) {TRACE2 (("gdth_sync_event(): special cmd 0x%x OK\n" , - scp->SCp.sent_command)); + cmndinfo->OpCode));/* special commands GDT_CLUST_INFO/GDT_MOUNT ? */ -if (scp->SCp.sent_command ==GDT_CLUST_INFO ) { +if (cmndinfo->OpCode ==GDT_CLUST_INFO ) { ha->hdr[t].cluster_type = (unchar )ha->info;if (!(ha->hdr[t].cluster_type &CLUSTER_MOUNTED )) {/* NOT MOUNTED -> MOUNT */ - scp->SCp.sent_command =GDT_MOUNT ; + cmndinfo->OpCode =GDT_MOUNT ;if (ha->hdr[t].cluster_type &CLUSTER_RESERVED ) {/* cluster drive RESERVED (on the other node) */ - scp->SCp.phase =-2 ;/* reservation conflict */ + cmndinfo->phase =-2 ;/* reservation conflict */ } }else { - scp->SCp.sent_command =-1 ; + cmndinfo->OpCode =-1 ; } }else { -if (scp->SCp.sent_command ==GDT_MOUNT ) { +if (cmndinfo->OpCode ==GDT_MOUNT ) { ha->hdr[t].cluster_type |=CLUSTER_MOUNTED ; ha->hdr[t].media_changed = TRUE; - }else if (scp->SCp.sent_command ==GDT_UNMOUNT ) { + }else if (cmndinfo->OpCode ==GDT_UNMOUNT ) { ha->hdr[t].cluster_type &= ~CLUSTER_MOUNTED ; ha->hdr[t].media_changed = TRUE; } - scp->SCp.sent_command =-1 ; + cmndinfo->OpCode =-1 ; }/* retry */ - scp->SCp.this_residual =HIGH_PRI ; + cmndinfo->priority =HIGH_PRI ;return 2 ; }else {/* RESERVE/RELEASE ? */
@@ -3458,17 +3461,17 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index, scp->sense_buffer[0 ] =0 ; } }else { - scp->SCp.Status = ha->status; - scp->SCp.Message = ha->info; + cmndinfo->status = ha->status; + cmndinfo->info = ha->info; -if (scp->SCp.sent_command !=-1 ) { +if (cmndinfo->OpCode !=-1 ) {TRACE2 (("gdth_sync_event(): special cmd 0x%x error 0x%x\n" , - scp->SCp.sent_command, ha->status)); -if (scp->SCp.sent_command ==GDT_SCAN_START || - scp->SCp.sent_command ==GDT_SCAN_END ) { - scp->SCp.sent_command =-1 ; + cmndinfo->OpCode, ha->status)); +if (cmndinfo->OpCode ==GDT_SCAN_START || + cmndinfo->OpCode ==GDT_SCAN_END ) { + cmndinfo->OpCode =-1 ;/* retry */ - scp->SCp.this_residual =HIGH_PRI ; + cmndinfo->priority =HIGH_PRI ;return 2 ; }memset ((char *)scp->sense_buffer,0 ,16 );
@@ -3511,8 +3514,8 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index, } } } -if (!scp->SCp.have_data_in) - scp->SCp.have_data_in++; +if (!cmndinfo->wait_for_completion) + cmndinfo->wait_for_completion++;else return 1 ; }
@@ -4044,7 +4047,7 @@ static int gdth_queuecommand(struct scsi_cmnd *scp, scp->scsi_done = done;gdth_update_timeout (scp, scp->timeout_per_command *6 ); - scp->SCp.this_residual =DEFAULT_PRI ; + cmndinfo->priority =DEFAULT_PRI ;return __gdth_queuecommand (ha, scp, cmndinfo); }
@@ -4052,16 +4055,16 @@ static int __gdth_queuecommand(gdth_ha_str *ha, struct scsi_cmnd *scp, struct gdth_cmndinfo *cmndinfo) { scp->host_scribble = (unsigned char *)cmndinfo; - scp->SCp.have_data_in =1 ; - scp->SCp.phase =-1 ; - scp->SCp.sent_command =-1 ; + cmndinfo->wait_for_completion =1 ; + cmndinfo->phase =-1 ; + cmndinfo->OpCode =-1 ; scp->SCp.Status =GDTH_MAP_NONE ;#ifdef GDTH_STATISTICS ++act_ios;#endif -gdth_putq (ha, scp, scp->SCp.this_residual); +gdth_putq (ha, scp, cmndinfo->priority);gdth_next (ha);return 0 ; }
drivers/scsi/gdth.h +8 -0
@@ -923,6 +923,14 @@ typedef struct {int index;int internal_command;/* don't call scsi_done */ dma_addr_t sense_paddr;/* sense dma-addr */ +unchar priority; +int timeout; +volatile int wait_for_completion; +ushort status; +ulong32 info; +enum dma_data_direction dma_dir; +int phase;/* ???? */ +int OpCode; } cmndinfo[GDTH_MAXCMDS ];/* index==0 is free */ unchar bus_cnt;/* SCSI bus count */ unchar tid_cnt;/* Target ID count */
drivers/scsi/gdth_proc.c +6 -4
@@ -728,20 +728,22 @@ static void gdth_wait_completion(gdth_ha_str *ha, int busnum, int id)ulong flags;int i;Scsi_Cmnd *scp; +struct gdth_cmndinfo *cmndinfo;unchar b, t;spin_lock_irqsave (&ha->smp_lock, flags);for (i =0 ; i <GDTH_MAXCMDS ; ++i) { scp = ha->cmd_tab[i].cmnd; + cmndinfo =gdth_cmnd_priv (scp); b = scp->device->channel; t = scp->device->id;if (!SPECIAL_SCP (scp) && t == (unchar )id && b == (unchar )busnum) { - scp->SCp.have_data_in =0 ; + cmndinfo->wait_for_completion =0 ;spin_unlock_irqrestore (&ha->smp_lock, flags); -while (!scp->SCp.have_data_in) +while (!cmndinfo->wait_for_completion)barrier ();spin_lock_irqsave (&ha->smp_lock, flags); }
@@ -764,7 +766,7 @@ static void gdth_stop_timeout(gdth_ha_str *ha, int busnum, int id) t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {TRACE2 (("gdth_stop_timeout(): update_timeout()\n" )); - scp->SCp.buffers_residual =gdth_update_timeout (scp,0 ); + cmndinfo->timeout =gdth_update_timeout (scp,0 ); } } }
@@ -786,7 +788,7 @@ static void gdth_start_timeout(gdth_ha_str *ha, int busnum, int id) t = scp->device->id;if (t == (unchar )id && b == (unchar )busnum) {TRACE2 (("gdth_start_timeout(): update_timeout()\n" )); -gdth_update_timeout (scp, scp->SCp.buffers_residual); +gdth_update_timeout (scp, cmndinfo->timeout); } } }
Signature · 1 line
1.5.3.1
PATCH 16/16 gdth: !use_sg cleanup and use of scsi accessors
In reply to Boaz Harrosh gdth_execute() will issue an internal, none scsi-standard commands onto __gdth_queuecommand(). Since it is not recommended to set struct scsi_cmnd IO members in llds, gdth now uses internal IO members for IO. In the case of gdth_execute() these members will be set properly. In case the command was issued from scsi-ml (by gdth_queuecommand) they will be set from scsi IO accessors.
* define gdth IO accessors and use them throughout the driver.
* use an sg-of-one in gdth_execute() and fix gdth_special_cmd() accordingly.
* Clean the not use_sg code path and company
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 227 ++++++++++++++++++++++++--------------------------- drivers/scsi/gdth.h | 7 -- 2 files changed, 108 insertions(+), 126 deletions(-)
drivers/scsi/gdth.c +108 -119
@@ -85,11 +85,11 @@/* The meaning of the Scsi_Pointer members in this driver is as follows: * ptr: Chaining -* this_residual: unused -* buffer: unused -* dma_handle: will drop in !use_sg patch. -* buffers_residual: unused -* Status: DMA mem. mappings (FIXME: drop in !use_sg patch.) +* this_residual: gdth_bufflen +* buffer: gdth_sglist +* dma_handle: unused +* buffers_residual: gdth_sg_count +* Status: unused * Message: unused * have_data_in: unused * sent_command: unused
@@ -132,6 +132,7 @@#include <asm/uaccess.h> #include <linux/spinlock.h> #include <linux/blkdev.h> +#include <linux/scatterlist.h> #include "scsi.h" #include <scsi/scsi_host.h>
@@ -157,7 +158,7 @@ static void gdth_readapp_event(gdth_ha_str *ha, unchar application,static void gdth_clear_events (void );static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp, -char *buffer,ushort count); +char *buffer,ushort count,int to_buffer);static int gdth_internal_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp);static int gdth_fill_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,ushort hdrive);
@@ -379,6 +380,47 @@ static const struct file_operations gdth_fops = { .release = gdth_close, }; +/* +* gdth scsi_command access wrappers. +* below 6 functions are used throughout the driver to access scsi_command's +* io parameters. The reason we do not use the regular accessors from +* scsi_cmnd.h is because of gdth_execute(). Since it is unrecommended for +* llds to directly set scsi_cmnd's IO members. This driver will use SCp +* members for IO parameters, and will copy scsi_cmnd's members to Scp +* members in queuecommand. For internal commands through gdth_execute() +* SCp's members will be set directly. +*/ +static inline unsigned gdth_bufflen (struct scsi_cmnd *cmd) +{ +return (unsigned )cmd->SCp.this_residual; +} + +static inline void gdth_set_bufflen (struct scsi_cmnd *cmd,unsigned bufflen) +{ + cmd->SCp.this_residual = bufflen; +} + +static inline unsigned gdth_sg_count (struct scsi_cmnd *cmd) +{ +return (unsigned )cmd->SCp.buffers_residual; +} + +static inline void gdth_set_sg_count (struct scsi_cmnd *cmd,unsigned sg_count) +{ + cmd->SCp.buffers_residual = sg_count; +} + +static inline struct scatterlist *gdth_sglist (struct scsi_cmnd *cmd) +{ +return cmd->SCp.buffer; +} + +static inline void gdth_set_sglist (struct scsi_cmnd *cmd, +struct scatterlist *sglist) +{ + cmd->SCp.buffer = sglist; +} +#include "gdth_proc.h" #include "gdth_proc.c"
@@ -458,6 +500,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,gdth_ha_str *ha =shost_priv (sdev->host);Scsi_Cmnd *scp;struct gdth_cmndinfo cmndinfo; +struct scatterlist one_sg;DECLARE_COMPLETION_ONSTACK (wait);int rval;
@@ -471,7 +514,9 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,/* use request field to save the ptr. to completion struct. */ scp->request = (struct request *)&wait; scp->timeout_per_command = timeout*HZ ; - scp->request_buffer = gdtcmd; +sg_init_one (&one_sg, gdtcmd,sizeof (*gdtcmd)); +gdth_set_sglist (scp, &one_sg); +gdth_set_bufflen (scp,sizeof (*gdtcmd)); scp->cmd_len =12 ;memcpy (scp->cmnd, cmnd,12 ); cmndinfo.priority =IOCTL_PRI ;
@@ -2309,24 +2354,28 @@ static void gdth_next(gdth_ha_str *ha) ha->hanum, cmd_index); } } - + +/* +* gdth_copy_internal_data() - copy to/from a buffer onto a scsi_cmnd's +* buffers, kmap_atomic() as needed. +*/ static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp, -char *buffer,ushort count) +char *buffer,ushort count,int to_buffer) { -ushort cpcount,i; +ushort cpcount,i, max_sg =gdth_sg_count (scp);ushort cpsum,cpnow;struct scatterlist *sl;char *address; - cpcount = count<=(ushort )scp->request_bufflen ? count:(ushort )scp->request_bufflen; + cpcount =min_t (ushort, count,gdth_bufflen (scp)); -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; -for (i=0 ,cpsum=0 ; i<scp->use_sg; ++i,++sl) { +if (cpcount) { + cpsum=0 ; +scsi_for_each_sg (scp, sl, max_sg, i) {unsigned long flags; cpnow = (ushort )sl->length;TRACE (("copy_internal() now %d sum %d count %d %d\n" , - cpnow,cpsum,cpcount,(ushort )scp->bufflen)); + cpnow, cpsum, cpcount,gdth_bufflen (scp)));if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow;
@@ -2337,7 +2386,10 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp, }local_irq_save (flags); address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; -memcpy (address,buffer,cpnow); +if (to_buffer) +memcpy (buffer, address, cpnow); +else +memcpy (address, buffer, cpnow);flush_dcache_page (sl->page);kunmap_atomic (address,KM_BIO_SRC_IRQ );local_irq_restore (flags);
@@ -2345,9 +2397,10 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,break ; buffer += cpnow; } - }else { -TRACE (("copy_internal() count %d\n" ,cpcount)); -memcpy ((char *)scp->request_buffer,buffer,cpcount); + }else if (count) { +printk ("GDT-HA %d: SCSI command with no buffers but data transfer expected!\n" , + ha->hanum); +WARN_ON (1 ); } }
@@ -2390,7 +2443,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)strcpy (inq.vendor,ha->oem_name);sprintf (inq.product,"Host Drive #%02d" ,t);strcpy (inq.revision," " ); -gdth_copy_internal_data (ha, scp, (char *)&inq,sizeof (gdth_inq_data)); +gdth_copy_internal_data (ha, scp, (char *)&inq,sizeof (gdth_inq_data),0 );break ;case REQUEST_SENSE :
@@ -2400,7 +2453,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) sd.key =NO_SENSE ; sd.info =0 ; sd.add_length=0 ; -gdth_copy_internal_data (ha, scp, (char *)&sd,sizeof (gdth_sense_data)); +gdth_copy_internal_data (ha, scp, (char *)&sd,sizeof (gdth_sense_data),0 );break ;case MODE_SENSE :
@@ -2412,7 +2465,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) mpd.bd.block_length[0 ] = (SECTOR_SIZE &0x00ff0000 ) >>16 ; mpd.bd.block_length[1 ] = (SECTOR_SIZE &0x0000ff00 ) >>8 ; mpd.bd.block_length[2 ] = (SECTOR_SIZE &0x000000ff ); -gdth_copy_internal_data (ha, scp, (char *)&mpd,sizeof (gdth_modep_data)); +gdth_copy_internal_data (ha, scp, (char *)&mpd,sizeof (gdth_modep_data),0 );break ;case READ_CAPACITY :
@@ -2422,7 +2475,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)else rdc.last_block_no =cpu_to_be32 (ha->hdr[t].size-1 ); rdc.block_length =cpu_to_be32 (SECTOR_SIZE ); -gdth_copy_internal_data (ha, scp, (char *)&rdc,sizeof (gdth_rdcap_data)); +gdth_copy_internal_data (ha, scp, (char *)&rdc,sizeof (gdth_rdcap_data),0 );break ;case SERVICE_ACTION_IN :
@@ -2434,7 +2487,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) rdc16.last_block_no =cpu_to_be64 (ha->hdr[t].size-1 ); rdc16.block_length =cpu_to_be32 (SECTOR_SIZE );gdth_copy_internal_data (ha, scp, (char *)&rdc16, -sizeof (gdth_rdcap16_data)); +sizeof (gdth_rdcap16_data),0 ); }else { scp->result =DID_ABORT <<16 ; }
@@ -2457,13 +2510,9 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) { registergdth_cmd_str *cmdp;struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); -struct scatterlist *sl;ulong32 cnt, blockcnt;ulong64 no, blockno; -dma_addr_t phys_addr;int i, cmd_index, read_write, sgcnt, mode64; -struct page *page; -ulong offset; cmdp = ha->pccb; TRACE(("gdth_fill_cache_cmd() cmd 0x%x cmdsize %d hdrive %d\n",
@@ -2552,17 +2601,17 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) cmdp->u.cache.BlockCnt = blockcnt; } -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; - sgcnt = scp->use_sg; - scp->SCp.Status =GDTH_MAP_SG ; +if (gdth_bufflen (scp)) { cmndinfo->dma_dir = (read_write ==1 ?PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); - sgcnt =pci_map_sg (ha->pdev, sl, scp->use_sg, cmndinfo->dma_dir); + sgcnt =pci_map_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir);if (mode64) { +struct scatterlist *sl; + cmdp->u.cache64.DestAddr= (ulong64)-1 ; cmdp->u.cache64.sg_canz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.cache64.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS if (cmdp->u.cache64.sg_lst[i].sg_ptr > (ulong64 )0xffffffff )
@@ -2573,9 +2622,11 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) cmdp->u.cache64.sg_lst[i].sg_len =sg_dma_len (sl); } }else { +struct scatterlist *sl; + cmdp->u.cache.DestAddr=0xffffffff ; cmdp->u.cache.sg_canz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.cache.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS ha->dma32_cnt++;
@@ -2591,38 +2642,6 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) }#endif - }else if (scp->request_bufflen) { - scp->SCp.Status =GDTH_MAP_SINGLE ; - cmndinfo->dma_dir = (read_write ==1 ? -PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); - page =virt_to_page (scp->request_buffer); - offset = (ulong )scp->request_buffer & ~PAGE_MASK ; - phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen, cmndinfo->dma_dir); - scp->SCp.dma_handle = phys_addr; -if (mode64) { -if (ha->cache_feat &SCATTER_GATHER ) { - cmdp->u.cache64.DestAddr = (ulong64)-1 ; - cmdp->u.cache64.sg_canz =1 ; - cmdp->u.cache64.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.cache64.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.cache64.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.cache64.DestAddr = phys_addr; - cmdp->u.cache64.sg_canz=0 ; - } - }else { -if (ha->cache_feat &SCATTER_GATHER ) { - cmdp->u.cache.DestAddr =0xffffffff ; - cmdp->u.cache.sg_canz =1 ; - cmdp->u.cache.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.cache.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.cache.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.cache.DestAddr = phys_addr; - cmdp->u.cache.sg_canz=0 ; - } - } } }/* evaluate command size, check space */
@@ -2665,9 +2684,8 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive)static int gdth_fill_raw_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar b) { registergdth_cmd_str *cmdp; -struct scatterlist *sl;ushort i; -dma_addr_t phys_addr, sense_paddr; +dma_addr_t sense_paddr;int cmd_index, sgcnt, mode64;unchar t,l;struct page *page;
@@ -2733,7 +2751,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw64.lun = l; cmdp->u.raw64.bus = b; cmdp->u.raw64.priority =0 ; - cmdp->u.raw64.sdlen = scp->request_bufflen; + cmdp->u.raw64.sdlen =gdth_bufflen (scp); cmdp->u.raw64.sense_len =16 ; cmdp->u.raw64.sense_data = sense_paddr; cmdp->u.raw64.direction =
@@ -2750,7 +2768,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw.bus = b; cmdp->u.raw.priority =0 ; cmdp->u.raw.link_p =0 ; - cmdp->u.raw.sdlen = scp->request_bufflen; + cmdp->u.raw.sdlen =gdth_bufflen (scp); cmdp->u.raw.sense_len =16 ; cmdp->u.raw.sense_data = sense_paddr; cmdp->u.raw.direction =
@@ -2759,16 +2777,16 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw.sg_ranz =0 ; } -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; - sgcnt = scp->use_sg; - scp->SCp.Status =GDTH_MAP_SG ; +if (gdth_bufflen (scp)) { cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; - sgcnt =pci_map_sg (ha->pdev,sl, scp->use_sg, cmndinfo->dma_dir); + sgcnt =pci_map_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir);if (mode64) { +struct scatterlist *sl; + cmdp->u.raw64.sdata = (ulong64)-1 ; cmdp->u.raw64.sg_ranz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.raw64.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS if (cmdp->u.raw64.sg_lst[i].sg_ptr > (ulong64 )0xffffffff )
@@ -2779,9 +2797,11 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw64.sg_lst[i].sg_len =sg_dma_len (sl); } }else { +struct scatterlist *sl; + cmdp->u.raw.sdata =0xffffffff ; cmdp->u.raw.sg_ranz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.raw.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS ha->dma32_cnt++;
@@ -2797,38 +2817,6 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) }#endif - }else if (scp->request_bufflen) { - scp->SCp.Status =GDTH_MAP_SINGLE ; - cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; - page =virt_to_page (scp->request_buffer); - offset = (ulong )scp->request_buffer & ~PAGE_MASK ; - phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen, cmndinfo->dma_dir); - scp->SCp.dma_handle = phys_addr; - -if (mode64) { -if (ha->raw_feat &SCATTER_GATHER ) { - cmdp->u.raw64.sdata = (ulong64)-1 ; - cmdp->u.raw64.sg_ranz=1 ; - cmdp->u.raw64.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.raw64.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.raw64.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.raw64.sdata = phys_addr; - cmdp->u.raw64.sg_ranz=0 ; - } - }else { -if (ha->raw_feat &SCATTER_GATHER ) { - cmdp->u.raw.sdata =0xffffffff ; - cmdp->u.raw.sg_ranz=1 ; - cmdp->u.raw.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.raw.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.raw.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.raw.sdata = phys_addr; - cmdp->u.raw.sg_ranz=0 ; - } - } }if (mode64) { TRACE(("raw cmd: addr. %x sganz %x sgptr0 %x sglen0 %x\n",
@@ -2877,7 +2865,7 @@ static int gdth_special_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)if (ha->type==GDT_EISA && ha->cmd_cnt>0 )return 0 ; -memcpy ( cmdp, scp->request_buffer,sizeof (gdth_cmd_str)); +gdth_copy_internal_data (ha, scp, (char *)cmdp,sizeof (gdth_cmd_str),1 ); cmdp->RequestBuffer = scp;/* search free command index */
@@ -3406,12 +3394,10 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index,/* retry */ return 2 ; } -if (scp->SCp.Status ==GDTH_MAP_SG ) -pci_unmap_sg (ha->pdev,scp->request_buffer, - scp->use_sg, cmndinfo->dma_dir); -else if (scp->SCp.Status ==GDTH_MAP_SINGLE ) -pci_unmap_page (ha->pdev,scp->SCp.dma_handle, - scp->request_bufflen, cmndinfo->dma_dir); +if (gdth_bufflen (scp)) +pci_unmap_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir); +if (cmndinfo->sense_paddr)pci_unmap_page (ha->pdev, cmndinfo->sense_paddr,16 ,PCI_DMA_FROMDEVICE );
@@ -4048,6 +4034,11 @@ static int gdth_queuecommand(struct scsi_cmnd *scp, scp->scsi_done = done;gdth_update_timeout (scp, scp->timeout_per_command *6 ); cmndinfo->priority =DEFAULT_PRI ; + +gdth_set_bufflen (scp,scsi_bufflen (scp)); +gdth_set_sg_count (scp,scsi_sg_count (scp)); +gdth_set_sglist (scp,scsi_sglist (scp)); +return __gdth_queuecommand (ha, scp, cmndinfo); }
@@ -4058,7 +4049,6 @@ static int __gdth_queuecommand(gdth_ha_str *ha, struct scsi_cmnd *scp, cmndinfo->wait_for_completion =1 ; cmndinfo->phase =-1 ; cmndinfo->OpCode =-1 ; - scp->SCp.Status =GDTH_MAP_NONE ;#ifdef GDTH_STATISTICS ++act_ios;
@@ -4628,7 +4618,6 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,return -ENOMEM ; scp->device = ha->sdev; scp->cmd_len =12 ; - scp->use_sg =0 ; scp->device->channel = res.number; rval =gdth_eh_bus_reset (scp); res.status = (rval ==SUCCESS ?S_OK :S_GENERR );
drivers/scsi/gdth.h +0 -7
@@ -303,15 +303,8 @@#define MAILBOXREG 0x0c90/* mailbox reg. (16 bytes) */ #define EISAREG 0x0cc0/* EISA configuration */ -/* DMA memory mappings */ -#define GDTH_MAP_NONE 0 -#define GDTH_MAP_SINGLE 1 -#define GDTH_MAP_SG 2 -#define GDTH_MAP_IOCTL 3 -/* other defines */ #define LINUX_OS 8/* used for cache optim. */ -#define SCATTER_GATHER 1/* s/g feature */ #define SECS32 0x1f/* round capacity */ #define BIOS_ID_OFFS 0x10/* offset contr-ID in ISABIOS */ #define LOCALBOARD 0/* board node always 0 */
Signature · 1 line
1.5.3.1
Quoted 12 lines · Boaz Harrosh
[8/16] gdth: Remove virt hosts - Christoph && Boaz
Here we need an executive decision! The issue is as stated by Christoph:"The
virt_ctroption allows to register a newscsi_hostfor each bus on the raid controller. This non-default option makes no sense with the current scsi code and prevents cleaning up the host registration, so remove it."I agree. This is just exactly the same as done buy scsi-ml scans but only more resource consuming. Unless I'm totally missing something, perhaps it is just a leftover from old kernels.
Quoted 6 lines
But if it is decided that this "
virt_ctr" fixture is absolutely needed than I have a patch for re-enabling it at: "after the patchset", done in a different way. Because for now it prevents the cleanups I need.Also this patch can Just be merged with [7/16] but I wanted it separate in the case we decide for "
virt_ctr" fixture return.
I definitely agree too (that virt_ctr should go away).
My only worry is that this breaks somebody in the field. Given that it is apparently a non-default option, I think that worry can be overlooked.
Jeff
Quoted 4 lines · Boaz Harrosh
[11/16] gdth: switch to modern scsi host registration - Christoph
Christoph what is missing from here is the remove of the deprecatedpci_find_device()call. Can I Just usepci_get_device()of the same signature or do I need to call some otherpci_members after that?
The driver needs to be converted to the "new" hotplug APIs.
The main pre-reqs are accomplished by your patches: the driver is using the modern scsi hotplug API, and uses pointers for the adapter struct rather than indices.
The final pre-req -- if your patches do not do this already -- is to completely eliminate any global driver arrays, and make sure all structures are allocated on a per-HBA basis.
Once this is done, conversion to ISA/EISA/PCI hotplug API is pretty straightforward. Each of those three bus APIs are the same: per-instance probe and remove functions, and (for PCI and sometimes EISA) an id table. This is the reason why the ISA/EISA/PCI codes were split out into separate functions, to prepare for this conversion.
Jeff
Re: [PATCH 7/16] gdth: make some virt ctrlr code common
In reply to Boaz HarroshQuoted 3 lines · Boaz Harrosh
* New function
gdth_register_virt()replaces the three basically-duplicate copies of virtual controller registration.
I think we can just kill this one if 8/16 goes in..
Re: [PATCH 9/16] gdth: clean up host private data
In reply to Boaz HarroshQuoted 7 lines · Boaz Harrosh
- Get rid of all the indirection in the
Scsi_Hostprivate data and always put thegdth_ha_strdirectly into it.- Change all internal functions prototype to recieve an "
gdth_ha_str*ha"pointer directlly and kill all that redundent access to the "gdth_ctr_tab[]" controller-table.
I somewhere had a patch to do that item 2 as a separate patch. But it's fine with me to have it as one if that makes it easier for you.
Re: [PATCH 10/16] gdth: gdth_get_status() return pointer to host not its index
In reply to Boaz HarroshQuoted 10 lines · Boaz Harrosh
- Return the interrupting host and not it's index. NULL if intr is not by gdth.
- fix calling siteFIXME:
Why are we looping on all cards? the passeddev_idcan be used for pinpointing the exact interrupting card. The kernel is already looping on all sharing cards so this code makes it O(n^2).
This is just pre-historic code that makes no sense whatover in a modern kernel. I'd much prefer to stop doing this and use dev_id properly.
Quoted 3 lines
What is that polling mode? can we pass
dev_idtogdth_get_status()and do a poll only ifdev_idis NULL?
Just loop over all host adapters in gdth_wait instead and pass in the ha pointer.
BTW, when reposting the patches of others, its nice to add a From: header to the very first line of the email body. Andrew does that a lot, and the git tools are aware of this convention.
Also, hey, if you like our patches, I think you should add your own Signed-off-by line (assuming/hoping you reviewed it....).
Jeff
Re: [PATCH 13/16] gdth: Make one abuse of scsi_cmnd less obvious
In reply to Boaz HarroshQuoted 5 lines · Boaz Harrosh
Rather than having internal commands abuse
scsi_doneto callgdth_scsi_done, have all the places that use to callscsi_donedirectly callgdth_scsi_done, which now checks whether the command was internal, and callsscsi_doneif not.
I think it would be better if your whole patch series goes ontop of willy's ->done removal series instead. I really hope we can get that one into scsi-misc ASAP.
Quoted 7 lines · Boaz Harrosh
Some short explanations:
[1/16] gdth: split out isa probing - Christoph Hellwig [2/16] gdth: split out eisa probing - Christoph Hellwig [3/16] gdth: split out pci probing - Christoph Hellwig
These three are from Christoph and where ACKed by Jeff at the time.
Quoted 7 lines
[4/16] gdth: Remove 2.4.x support, in-kernel changelog - Jeff Garzik
Same but partial work was done both by Christoph and Matthew.[5/16] gdth: kill gdth_{read,write}[bwl] wrappers - Jeff Garzik [6/16] Reorder
scsi_host_templateintitializers [7/16] gdth: make some virt ctrlr code common
These 3 are from Jeff's patchset 6 & 7 where the same patch
I think up to here their obvious candidates to put into scsi-misc ASAP once we can get an ACK from Achim.
Quoted 12 lines
[8/16] gdth: Remove virt hosts - Christoph && Boaz
Here we need an executive decision! The issue is as stated by Christoph:"The
virt_ctroption allows to register a newscsi_hostfor each bus on the raid controller. This non-default option makes no sense with the current scsi code and prevents cleaning up the host registration, so remove it."I agree. This is just exactly the same as done buy scsi-ml scans but only more resource consuming. Unless I'm totally missing something, perhaps it is just a leftover from old kernels.
Quoted 6 lines
But if it is decided that this "
virt_ctr" fixture is absolutely needed than I have a patch for re-enabling it at: "after the patchset", done in a different way. Because for now it prevents the cleanups I need.Also this patch can Just be merged with [7/16] but I wanted it separate in the case we decide for "
virt_ctr" fixture return.
I think we want to put this in, but maybe keep the modular paramter for now and print a big warning if anyone actually specifies it.
Achim, do you have any opinion on this?
Quoted 4 lines
[9/16] gdth: clean up host private data - Christoph && Boaz
This is based on the same patch from Christoph, but taken one step farther, by just passing the ha pointer everywhere instead of hanum. Christoph please acknowledge your signed-of-by on this patch.
Sure, feel free to add it.
Quoted 4 lines
[10/16] gdth:
gdth_get_status()return pointer to host not its index - Boaz
This logically belongs to [9/16] but is separated for reviewing and bisect-ability As it is a sensitive matter.
As I mentioned in my reply to the patch I'd prefer to just use dev_id directly like any modern driver.
Quoted 4 lines
[11/16] gdth: switch to modern scsi host registration - Christoph
Christoph what is missing from here is the remove of the deprecatedpci_find_device()call. Can I Just usepci_get_device()of the same signature or do I need to call some otherpci_members after that?
if you use pci_get_device you need to call pci_put device to drop a reference when you're done with the device (or in a failure path).
Quoted 4 lines
[12/16] gdth: Remove gdth_ctr_tab[] - Boaz
I took Christoph's cleanup one step farther and got read of the statically allocated gdth_ctr_tab[]. In it's place I use the new link-list introduced by the [11/16] patch.
Looks good. But we'll need some proper locking for this list once we start supporting pci hotplug.
Quoted 12 lines
[13/16] gdth: Make one abuse of
scsi_cmndless obvious - Matthew Wilcox
This is the first patch sent by Matthew Wilcox, rebased to all above patches. Matthew, thanks, it saved me from a much uglier hack I had with regard to per-command-private-data.[14/16] gdth: Setup proper per-command private data - Boaz [15/16] gdth: Move members from SCp to
gdth_cmndinfo, stage 2 - Boaz
These two move me much closer to the agenda I had in all this, which is: "gdth diss-abuse of ofscsi_cmndIO members". With these patches I also conform to Matthew's second patch:
"gdth: Stop abusing ->done for internal commands"
Quoted 2 lines
[16/16] gdth: !use_sg cleanup and use of scsi accessors
And finally this one.
I'll look at these four patches later on, I'm a bit too tired to follow it right now, sorry.
Thanks a lot again for doing all the work on this driver!
Quoted 10 lines · Jeff Garzik
The driver needs to be converted to the "new" hotplug APIs.
The main pre-reqs are accomplished by your patches: the driver is using the modern scsi hotplug API, and uses pointers for the adapter struct rather than indices.
The final pre-req -- if your patches do not do this already -- is to completely eliminate any global driver arrays, and make sure all structures are allocated on a per-HBA basis.
Quoted 5 lines
Once this is done, conversion to ISA/EISA/PCI hotplug API is pretty straightforward. Each of those three bus APIs are the same:
per-instance probe and remove functions, and (for PCI and sometimes EISA) an id table. This is the reason why the ISA/EISA/PCI codes were split out into separate functions, to prepare for this conversion.
I think we're nicely prepared for that conversion, we'll only need to add proper locking for the list of instance.
The big problem with the pci_driver conversion is that lack of device ids in the driver. A few years ago I sent Achim a mail to ask if there's a definitive list of used PCI ids, but didn't get an answer - maybe the mail bounced. If we can't get this list we'd have to add something like 500 PCI ids from the ranges currently probed, which seems rather odd. gdth.h has various PCI_DEVICE_ID_ defines, maybe those are the supported ones?
For eisa we'll probably have the same issue.
Quoted 7 lines · Christoph Hellwig
The big problem with the
pci_driverconversion is that lack of device ids in the driver. A few years ago I sent Achim a mail to ask if there's a definitive list of used PCI ids, but didn't get an answer - maybe the mail bounced. If we can't get this list we'd have to add something like 500 PCI ids from the ranges currently probed, which seems rather odd.gdth.hhas variousPCI_DEVICE_ID_defines, maybe those are the supported ones?
Well, gdth.c is the only user of PCI_VENDOR_ID_VORTEX (ditto for vendor id 0x1119). Thus, gdth_search_pci() has all the info you need.
Put all the specific entries first in the PCI table. Then for the loop entries, use (PCI_VENDOR_ID_VORTEX,PCI_ANY_ID) for the final entry and disambiguate in the code itself.
If/when we get more specific information, it is then trivial to plug in.
Until such time, we are no worse off than we are now.
Jeff
The patchset looks pretty good to me, overall.
Thanks for pulling all this stuff together!
Jeff
Re: [PATCH 13/16] gdth: Make one abuse of scsi_cmnd less obvious
In reply to Christoph HellwigQuoted 3 lines · Christoph Hellwig
I think it would be better if your whole patch series goes ontop of willy's ->done removal series instead. I really hope we can get that one into scsi-misc ASAP.
Actually, I think if Boaz simply flips this patch to be after his next one (or merges them ...), there's no real dependency on the ->done removal.
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH 13/16] gdth: Make one abuse of scsi_cmnd less obvious
Quoted 9 lines · Matthew Wilcox
Quoted 3 lines · Christoph Hellwig
I think it would be better if your whole patch series goes ontop of willy's ->done removal series instead. I really hope we can get that one into scsi-misc ASAP.
Actually, I think if Boaz simply flips this patch to be after his next one (or merges them ...), there's no real dependency on the ->done removal.
But this is exactly it, 14th patch is dependent on this one. Because now I have a central place to deallocate the private per-cmnd-info.
I have looked at it and in it's original form it mainly conflicts with Jeff's "[PATCH 4/16] gdth: Remove 2.4.x support". (And minor other places) What I could do right away is put it at 7-th place. So the first 6 patches can go in now as you said, followed by Matthew's patchset. But on the other hand Matthew's second patch just dropped once a proper per-cmnd-info was setup, so the all thing is entangled in this way.
But I totally understand Christoph's motivation with regard to Matthew's patchset.
OK My suggestion is as follows:
- Accept the first 6 patches right away, I think we have a consensus on that. Except from Achim, I got an "out-of-the-office" notice from his mailer, so it might take some time. Can we push them in anyway, as these should be pretty safe.
- I will advance this patch to 7th place.
- I will revive Matthew's second patch to follow these 7 patches.
- Mathew can now submit the rest of his patchset minus the gdth patches, as these are taken care of.
Following will be a second part. But these will wait Achim's ACKs:
- I will unite my 7th & 8th patch to now be 9th. ("gdth: Remove virt hosts")
- Redo 10th patch as per Christoph comments.
- I will rebase the rest of the patches to the new conditions. Mainly redoing 14th patch
("[PATCH 14/16] gdth: Setup proper per-command private data"
This is because of conflicts with Matthew's second part)
- Christoph or Jeff will work on the finish up of the BUS hotplug API. I have looked at code examples elsewhere in the kernel, and Jeff's master plan sounds very good. But I would hope not to do it myself as it will take me much longer.
Jeff it sounds like you have it clearer in your head?
James?
We need a decision here, about if we can push the first
6 patches ASAP. and than Matthew's 2 patches that I will send soon, after we decide.
That is, if Matthew's patchset is to go in NOW. Other wise, there is no rush and it can stay in the order they are now, which is easiest for me.
Thanks everyone, I'm awaiting all your comments to proceed. Boaz
Re: [PATCH 16/16] gdth: !use_sg cleanup and use of scsi accessors
In reply to Boaz HarroshQuoted 7 lines · Boaz Harrosh
gdth_execute()will issue an internal, none scsi-standard commands onto__gdth_queuecommand(). Since it is not recommended to set structscsi_cmndIO members in llds, gdth now uses internal IO members for IO. In the case ofgdth_execute()these members will be set properly. In case the command was issued from scsi-ml (bygdth_queuecommand) they will be set from scsi IO accessors.
Quoted 6 lines
* define gdth IO accessors and use them throughout the driver.
* use an sg-of-one ingdth_execute()and fixgdth_special_cmd()accordingly.
* Clean the notuse_sgcode path and companySigned-off-by Boaz Harrosh <[email protected]>
OK My usual bug in this one. I woke up in the middle of the night with this in my head.
drivers/scsi/gdth.c +1 -0
@@ -517,4 +517,5 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,sg_init_one (&one_sg, gdtcmd,sizeof (*gdtcmd));gdth_set_sglist (scp, &one_sg); +gdth_set_sg_count (scp,1 );gdth_set_bufflen (scp,sizeof (*gdtcmd)); scp->cmd_len =12 ;
I will resend the patch as reply to this one
Boaz
PATCH 16/16 gdth: !use_sg cleanup and use of scsi accessors
In reply to Boaz Harrosh gdth_execute() will issue an internal, none scsi-standard commands onto __gdth_queuecommand(). Since it is not recommended to set struct scsi_cmnd IO members in llds, gdth now uses internal IO members for IO. In the case of gdth_execute() these members will be set properly. In case the command was issued from scsi-ml (by gdth_queuecommand) they will be set from scsi IO accessors.
* define gdth IO accessors and use them throughout the driver.
* use an sg-of-one in gdth_execute() and fix gdth_special_cmd() accordingly.
* Clean the not use_sg code path and company
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 228 ++++++++++++++++++++++++-------------------------- drivers/scsi/gdth.h | 7 -- 2 files changed, 109 insertions(+), 126 deletions(-)
drivers/scsi/gdth.c +109 -119
@@ -85,11 +85,11 @@/* The meaning of the Scsi_Pointer members in this driver is as follows: * ptr: Chaining -* this_residual: unused -* buffer: unused -* dma_handle: will drop in !use_sg patch. -* buffers_residual: unused -* Status: DMA mem. mappings (FIXME: drop in !use_sg patch.) +* this_residual: gdth_bufflen +* buffer: gdth_sglist +* dma_handle: unused +* buffers_residual: gdth_sg_count +* Status: unused * Message: unused * have_data_in: unused * sent_command: unused
@@ -132,6 +132,7 @@#include <asm/uaccess.h> #include <linux/spinlock.h> #include <linux/blkdev.h> +#include <linux/scatterlist.h> #include "scsi.h" #include <scsi/scsi_host.h>
@@ -157,7 +158,7 @@ static void gdth_readapp_event(gdth_ha_str *ha, unchar application,static void gdth_clear_events (void );static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp, -char *buffer,ushort count); +char *buffer,ushort count,int to_buffer);static int gdth_internal_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp);static int gdth_fill_cache_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,ushort hdrive);
@@ -379,6 +380,47 @@ static const struct file_operations gdth_fops = { .release = gdth_close, }; +/* +* gdth scsi_command access wrappers. +* below 6 functions are used throughout the driver to access scsi_command's +* io parameters. The reason we do not use the regular accessors from +* scsi_cmnd.h is because of gdth_execute(). Since it is unrecommended for +* llds to directly set scsi_cmnd's IO members. This driver will use SCp +* members for IO parameters, and will copy scsi_cmnd's members to Scp +* members in queuecommand. For internal commands through gdth_execute() +* SCp's members will be set directly. +*/ +static inline unsigned gdth_bufflen (struct scsi_cmnd *cmd) +{ +return (unsigned )cmd->SCp.this_residual; +} + +static inline void gdth_set_bufflen (struct scsi_cmnd *cmd,unsigned bufflen) +{ + cmd->SCp.this_residual = bufflen; +} + +static inline unsigned gdth_sg_count (struct scsi_cmnd *cmd) +{ +return (unsigned )cmd->SCp.buffers_residual; +} + +static inline void gdth_set_sg_count (struct scsi_cmnd *cmd,unsigned sg_count) +{ + cmd->SCp.buffers_residual = sg_count; +} + +static inline struct scatterlist *gdth_sglist (struct scsi_cmnd *cmd) +{ +return cmd->SCp.buffer; +} + +static inline void gdth_set_sglist (struct scsi_cmnd *cmd, +struct scatterlist *sglist) +{ + cmd->SCp.buffer = sglist; +} +#include "gdth_proc.h" #include "gdth_proc.c"
@@ -458,6 +500,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,gdth_ha_str *ha =shost_priv (sdev->host);Scsi_Cmnd *scp;struct gdth_cmndinfo cmndinfo; +struct scatterlist one_sg;DECLARE_COMPLETION_ONSTACK (wait);int rval;
@@ -471,7 +514,10 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,/* use request field to save the ptr. to completion struct. */ scp->request = (struct request *)&wait; scp->timeout_per_command = timeout*HZ ; - scp->request_buffer = gdtcmd; +sg_init_one (&one_sg, gdtcmd,sizeof (*gdtcmd)); +gdth_set_sglist (scp, &one_sg); +gdth_set_sg_count (scp,1 ); +gdth_set_bufflen (scp,sizeof (*gdtcmd)); scp->cmd_len =12 ;memcpy (scp->cmnd, cmnd,12 ); cmndinfo.priority =IOCTL_PRI ;
@@ -2309,24 +2355,28 @@ static void gdth_next(gdth_ha_str *ha) ha->hanum, cmd_index); } } - + +/* +* gdth_copy_internal_data() - copy to/from a buffer onto a scsi_cmnd's +* buffers, kmap_atomic() as needed. +*/ static void gdth_copy_internal_data (gdth_ha_str *ha,Scsi_Cmnd *scp, -char *buffer,ushort count) +char *buffer,ushort count,int to_buffer) { -ushort cpcount,i; +ushort cpcount,i, max_sg =gdth_sg_count (scp);ushort cpsum,cpnow;struct scatterlist *sl;char *address; - cpcount = count<=(ushort )scp->request_bufflen ? count:(ushort )scp->request_bufflen; + cpcount =min_t (ushort, count,gdth_bufflen (scp)); -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; -for (i=0 ,cpsum=0 ; i<scp->use_sg; ++i,++sl) { +if (cpcount) { + cpsum=0 ; +scsi_for_each_sg (scp, sl, max_sg, i) {unsigned long flags; cpnow = (ushort )sl->length;TRACE (("copy_internal() now %d sum %d count %d %d\n" , - cpnow,cpsum,cpcount,(ushort )scp->bufflen)); + cpnow, cpsum, cpcount,gdth_bufflen (scp)));if (cpsum+cpnow > cpcount) cpnow = cpcount - cpsum; cpsum += cpnow;
@@ -2337,7 +2387,10 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp, }local_irq_save (flags); address =kmap_atomic (sl->page,KM_BIO_SRC_IRQ ) + sl->offset; -memcpy (address,buffer,cpnow); +if (to_buffer) +memcpy (buffer, address, cpnow); +else +memcpy (address, buffer, cpnow);flush_dcache_page (sl->page);kunmap_atomic (address,KM_BIO_SRC_IRQ );local_irq_restore (flags);
@@ -2345,9 +2398,10 @@ static void gdth_copy_internal_data(gdth_ha_str *ha, Scsi_Cmnd *scp,break ; buffer += cpnow; } - }else { -TRACE (("copy_internal() count %d\n" ,cpcount)); -memcpy ((char *)scp->request_buffer,buffer,cpcount); + }else if (count) { +printk ("GDT-HA %d: SCSI command with no buffers but data transfer expected!\n" , + ha->hanum); +WARN_ON (1 ); } }
@@ -2390,7 +2444,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)strcpy (inq.vendor,ha->oem_name);sprintf (inq.product,"Host Drive #%02d" ,t);strcpy (inq.revision," " ); -gdth_copy_internal_data (ha, scp, (char *)&inq,sizeof (gdth_inq_data)); +gdth_copy_internal_data (ha, scp, (char *)&inq,sizeof (gdth_inq_data),0 );break ;case REQUEST_SENSE :
@@ -2400,7 +2454,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) sd.key =NO_SENSE ; sd.info =0 ; sd.add_length=0 ; -gdth_copy_internal_data (ha, scp, (char *)&sd,sizeof (gdth_sense_data)); +gdth_copy_internal_data (ha, scp, (char *)&sd,sizeof (gdth_sense_data),0 );break ;case MODE_SENSE :
@@ -2412,7 +2466,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) mpd.bd.block_length[0 ] = (SECTOR_SIZE &0x00ff0000 ) >>16 ; mpd.bd.block_length[1 ] = (SECTOR_SIZE &0x0000ff00 ) >>8 ; mpd.bd.block_length[2 ] = (SECTOR_SIZE &0x000000ff ); -gdth_copy_internal_data (ha, scp, (char *)&mpd,sizeof (gdth_modep_data)); +gdth_copy_internal_data (ha, scp, (char *)&mpd,sizeof (gdth_modep_data),0 );break ;case READ_CAPACITY :
@@ -2422,7 +2476,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)else rdc.last_block_no =cpu_to_be32 (ha->hdr[t].size-1 ); rdc.block_length =cpu_to_be32 (SECTOR_SIZE ); -gdth_copy_internal_data (ha, scp, (char *)&rdc,sizeof (gdth_rdcap_data)); +gdth_copy_internal_data (ha, scp, (char *)&rdc,sizeof (gdth_rdcap_data),0 );break ;case SERVICE_ACTION_IN :
@@ -2434,7 +2488,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) rdc16.last_block_no =cpu_to_be64 (ha->hdr[t].size-1 ); rdc16.block_length =cpu_to_be32 (SECTOR_SIZE );gdth_copy_internal_data (ha, scp, (char *)&rdc16, -sizeof (gdth_rdcap16_data)); +sizeof (gdth_rdcap16_data),0 ); }else { scp->result =DID_ABORT <<16 ; }
@@ -2457,13 +2511,9 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) { registergdth_cmd_str *cmdp;struct gdth_cmndinfo *cmndinfo =gdth_cmnd_priv (scp); -struct scatterlist *sl;ulong32 cnt, blockcnt;ulong64 no, blockno; -dma_addr_t phys_addr;int i, cmd_index, read_write, sgcnt, mode64; -struct page *page; -ulong offset; cmdp = ha->pccb; TRACE(("gdth_fill_cache_cmd() cmd 0x%x cmdsize %d hdrive %d\n",
@@ -2552,17 +2602,17 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) cmdp->u.cache.BlockCnt = blockcnt; } -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; - sgcnt = scp->use_sg; - scp->SCp.Status =GDTH_MAP_SG ; +if (gdth_bufflen (scp)) { cmndinfo->dma_dir = (read_write ==1 ?PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); - sgcnt =pci_map_sg (ha->pdev, sl, scp->use_sg, cmndinfo->dma_dir); + sgcnt =pci_map_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir);if (mode64) { +struct scatterlist *sl; + cmdp->u.cache64.DestAddr= (ulong64)-1 ; cmdp->u.cache64.sg_canz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.cache64.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS if (cmdp->u.cache64.sg_lst[i].sg_ptr > (ulong64 )0xffffffff )
@@ -2573,9 +2623,11 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) cmdp->u.cache64.sg_lst[i].sg_len =sg_dma_len (sl); } }else { +struct scatterlist *sl; + cmdp->u.cache.DestAddr=0xffffffff ; cmdp->u.cache.sg_canz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.cache.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS ha->dma32_cnt++;
@@ -2591,38 +2643,6 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive) }#endif - }else if (scp->request_bufflen) { - scp->SCp.Status =GDTH_MAP_SINGLE ; - cmndinfo->dma_dir = (read_write ==1 ? -PCI_DMA_TODEVICE :PCI_DMA_FROMDEVICE ); - page =virt_to_page (scp->request_buffer); - offset = (ulong )scp->request_buffer & ~PAGE_MASK ; - phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen, cmndinfo->dma_dir); - scp->SCp.dma_handle = phys_addr; -if (mode64) { -if (ha->cache_feat &SCATTER_GATHER ) { - cmdp->u.cache64.DestAddr = (ulong64)-1 ; - cmdp->u.cache64.sg_canz =1 ; - cmdp->u.cache64.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.cache64.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.cache64.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.cache64.DestAddr = phys_addr; - cmdp->u.cache64.sg_canz=0 ; - } - }else { -if (ha->cache_feat &SCATTER_GATHER ) { - cmdp->u.cache.DestAddr =0xffffffff ; - cmdp->u.cache.sg_canz =1 ; - cmdp->u.cache.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.cache.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.cache.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.cache.DestAddr = phys_addr; - cmdp->u.cache.sg_canz=0 ; - } - } } }/* evaluate command size, check space */
@@ -2665,9 +2685,8 @@ static int gdth_fill_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, ushort hdrive)static int gdth_fill_raw_cmd (gdth_ha_str *ha,Scsi_Cmnd *scp,unchar b) { registergdth_cmd_str *cmdp; -struct scatterlist *sl;ushort i; -dma_addr_t phys_addr, sense_paddr; +dma_addr_t sense_paddr;int cmd_index, sgcnt, mode64;unchar t,l;struct page *page;
@@ -2733,7 +2752,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw64.lun = l; cmdp->u.raw64.bus = b; cmdp->u.raw64.priority =0 ; - cmdp->u.raw64.sdlen = scp->request_bufflen; + cmdp->u.raw64.sdlen =gdth_bufflen (scp); cmdp->u.raw64.sense_len =16 ; cmdp->u.raw64.sense_data = sense_paddr; cmdp->u.raw64.direction =
@@ -2750,7 +2769,7 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw.bus = b; cmdp->u.raw.priority =0 ; cmdp->u.raw.link_p =0 ; - cmdp->u.raw.sdlen = scp->request_bufflen; + cmdp->u.raw.sdlen =gdth_bufflen (scp); cmdp->u.raw.sense_len =16 ; cmdp->u.raw.sense_data = sense_paddr; cmdp->u.raw.direction =
@@ -2759,16 +2778,16 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw.sg_ranz =0 ; } -if (scp->use_sg) { - sl = (struct scatterlist *)scp->request_buffer; - sgcnt = scp->use_sg; - scp->SCp.Status =GDTH_MAP_SG ; +if (gdth_bufflen (scp)) { cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; - sgcnt =pci_map_sg (ha->pdev,sl, scp->use_sg, cmndinfo->dma_dir); + sgcnt =pci_map_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir);if (mode64) { +struct scatterlist *sl; + cmdp->u.raw64.sdata = (ulong64)-1 ; cmdp->u.raw64.sg_ranz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.raw64.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS if (cmdp->u.raw64.sg_lst[i].sg_ptr > (ulong64 )0xffffffff )
@@ -2779,9 +2798,11 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) cmdp->u.raw64.sg_lst[i].sg_len =sg_dma_len (sl); } }else { +struct scatterlist *sl; + cmdp->u.raw.sdata =0xffffffff ; cmdp->u.raw.sg_ranz = sgcnt; -for (i=0 ; i<sgcnt; ++i,++sl) { +scsi_for_each_sg (scp, sl, sgcnt, i) { cmdp->u.raw.sg_lst[i].sg_ptr =sg_dma_address (sl);#ifdef GDTH_DMA_STATISTICS ha->dma32_cnt++;
@@ -2797,38 +2818,6 @@ static int gdth_fill_raw_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp, unchar b) }#endif - }else if (scp->request_bufflen) { - scp->SCp.Status =GDTH_MAP_SINGLE ; - cmndinfo->dma_dir =PCI_DMA_BIDIRECTIONAL ; - page =virt_to_page (scp->request_buffer); - offset = (ulong )scp->request_buffer & ~PAGE_MASK ; - phys_addr =pci_map_page (ha->pdev,page,offset, - scp->request_bufflen, cmndinfo->dma_dir); - scp->SCp.dma_handle = phys_addr; - -if (mode64) { -if (ha->raw_feat &SCATTER_GATHER ) { - cmdp->u.raw64.sdata = (ulong64)-1 ; - cmdp->u.raw64.sg_ranz=1 ; - cmdp->u.raw64.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.raw64.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.raw64.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.raw64.sdata = phys_addr; - cmdp->u.raw64.sg_ranz=0 ; - } - }else { -if (ha->raw_feat &SCATTER_GATHER ) { - cmdp->u.raw.sdata =0xffffffff ; - cmdp->u.raw.sg_ranz=1 ; - cmdp->u.raw.sg_lst[0 ].sg_ptr = phys_addr; - cmdp->u.raw.sg_lst[0 ].sg_len = scp->request_bufflen; - cmdp->u.raw.sg_lst[1 ].sg_len =0 ; - }else { - cmdp->u.raw.sdata = phys_addr; - cmdp->u.raw.sg_ranz=0 ; - } - } }if (mode64) { TRACE(("raw cmd: addr. %x sganz %x sgptr0 %x sglen0 %x\n",
@@ -2877,7 +2866,7 @@ static int gdth_special_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)if (ha->type==GDT_EISA && ha->cmd_cnt>0 )return 0 ; -memcpy ( cmdp, scp->request_buffer,sizeof (gdth_cmd_str)); +gdth_copy_internal_data (ha, scp, (char *)cmdp,sizeof (gdth_cmd_str),1 ); cmdp->RequestBuffer = scp;/* search free command index */
@@ -3406,12 +3395,10 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index,/* retry */ return 2 ; } -if (scp->SCp.Status ==GDTH_MAP_SG ) -pci_unmap_sg (ha->pdev,scp->request_buffer, - scp->use_sg, cmndinfo->dma_dir); -else if (scp->SCp.Status ==GDTH_MAP_SINGLE ) -pci_unmap_page (ha->pdev,scp->SCp.dma_handle, - scp->request_bufflen, cmndinfo->dma_dir); +if (gdth_bufflen (scp)) +pci_unmap_sg (ha->pdev,gdth_sglist (scp),gdth_sg_count (scp), + cmndinfo->dma_dir); +if (cmndinfo->sense_paddr)pci_unmap_page (ha->pdev, cmndinfo->sense_paddr,16 ,PCI_DMA_FROMDEVICE );
@@ -4048,6 +4035,11 @@ static int gdth_queuecommand(struct scsi_cmnd *scp, scp->scsi_done = done;gdth_update_timeout (scp, scp->timeout_per_command *6 ); cmndinfo->priority =DEFAULT_PRI ; + +gdth_set_bufflen (scp,scsi_bufflen (scp)); +gdth_set_sg_count (scp,scsi_sg_count (scp)); +gdth_set_sglist (scp,scsi_sglist (scp)); +return __gdth_queuecommand (ha, scp, cmndinfo); }
@@ -4058,7 +4050,6 @@ static int __gdth_queuecommand(gdth_ha_str *ha, struct scsi_cmnd *scp, cmndinfo->wait_for_completion =1 ; cmndinfo->phase =-1 ; cmndinfo->OpCode =-1 ; - scp->SCp.Status =GDTH_MAP_NONE ;#ifdef GDTH_STATISTICS ++act_ios;
@@ -4628,7 +4619,6 @@ static int gdth_ioctl(struct inode *inode, struct file *filep,return -ENOMEM ; scp->device = ha->sdev; scp->cmd_len =12 ; - scp->use_sg =0 ; scp->device->channel = res.number; rval =gdth_eh_bus_reset (scp); res.status = (rval ==SUCCESS ?S_OK :S_GENERR );
drivers/scsi/gdth.h +0 -7
@@ -303,15 +303,8 @@#define MAILBOXREG 0x0c90/* mailbox reg. (16 bytes) */ #define EISAREG 0x0cc0/* EISA configuration */ -/* DMA memory mappings */ -#define GDTH_MAP_NONE 0 -#define GDTH_MAP_SINGLE 1 -#define GDTH_MAP_SG 2 -#define GDTH_MAP_IOCTL 3 -/* other defines */ #define LINUX_OS 8/* used for cache optim. */ -#define SCATTER_GATHER 1/* s/g feature */ #define SECS32 0x1f/* round capacity */ #define BIOS_ID_OFFS 0x10/* offset contr-ID in ISABIOS */ #define LOCALBOARD 0/* board node always 0 */
Signature · 1 line
1.5.3.1
Re: [PATCH 13/16] gdth: Make one abuse of scsi_cmnd less obvious
In reply to Boaz HarroshQuoted 5 lines · Boaz Harrosh
- Christoph or Jeff will work on the finish up of the BUS hotplug API. I have looked at code examples elsewhere in the kernel, and Jeff's master plan sounds very good. But I would hope not to do it myself as it will take me much longer.
Jeff it sounds like you have it clearer in your head?
TBH I won't have time to look at it, though I will be quite happy to answer as many questions as you can come up with :)
In the on-going effort to kill deprecated pci_find_device (of which this gdth effort is part of), I converted several ISDN drivers to use the new ISA, PNP, and PCI APIs:
Branch 'isdn-pci' of
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git
You can look at those patches for examples.
Really, you should pat yourself on the back, you have already done 96% of the gdth work required to get us there. :)
Once you understand the key concepts of the new hotplug-style APIs, the code changes themselves are easy. They are...
* reference HBA information via per-instance pointers stored in scsi_host->hostdata. Global variables relating to per-HBA information are to be avoided.
* in the API's ->probe() hook,
* detect a single card/device
* allocate and init a single scsi_host and gdth_ha_str
* destroy a single gdth_ha_str in the API's ->remove() hook
* shut down a single card/device
* destroy one scsi_host and gdth_ha_str
In practice, this tends to mean converting code like
while ((pdev = pci_find_device(...)) != NULL) {
alloc, init one PCI device
}to
static int gdth_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) {
alloc, init one PCI devoce
}because, as you can see, the loop has been moved to generic code. Also, it should be self-evident that this new API allows devices to be attached (hotplugged) long after the module initialization completes, and other gdth devices are running.
Jeff
Quoted 4 lines · Jeff Garzik
BTW, when reposting the patches of others, its nice to add a From:
header to the very first line of the email body. Andrew does that a lot, and the git tools are aware of this convention.
Thanks, yes I was not aware of that at all. Apparently git-am will make me the author of the patch, but adding a From: like you said will preserve the original author. Awaiting comments, I will resend all of these, fixed.
Quoted 3 lines
Also, hey, if you like our patches, I think you should add your own Signed-off-by line (assuming/hoping you reviewed it....).
I wanted to, but I thought only if I change something than I'm suppose to put the Signed-off-by. But yes I have reviewed all these patches and am confident in their content. Will fix in next round.
Quoted 1 line
Jeff
Boaz
Re: [PATCH 10/16] gdth: gdth_get_status() return pointer to host not its index
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Quoted 4 lines · Boaz Harrosh
- Return the interrupting host and not it's index. NULL if intr is not by gdth.
- fix calling site
Quoted 9 lines
Quoted 5 lines
FIXME:
Why are we looping on all cards? the passeddev_idcan be used for pinpointing the exact interrupting card. The kernel is already looping on all sharing cards so this code makes it O(n^2).This is just pre-historic code that makes no sense whatover in a modern kernel. I'd much prefer to stop doing this and use
dev_idproperly.
OK I'm attempting just that but please look in with me on the code I have some questions.
Quoted 7 lines
Quoted 3 lines
What is that polling mode? can we pass
dev_idtogdth_get_status()and do a poll only ifdev_idis NULL?Just loop over all host adapters in
gdth_waitinstead and pass in the ha pointer.
[Issue 1]
In gdth_get_status() the first check is if(ha->irq == passed_in_irq) if not than no status read is attempted and 0 is returned. In this case gdth_interrupt() will return with out doing any advancement of states.
Now gdth_wait() calls with gdth_interrupt(ha->irq, ha) so it means that in effect current code will loop on all devices but will actually read the status of only the waiting on card.
[Q1] So am I safe in just dropping the loop even from gdth_wait() ? [Q2] When gdth_interrupt() is called by the kernel am I guaranteed that irq will match the ha->irq that is passed as dev_id? (Since that is what I registered as my interrupt routine)
[Issue 2]
In gdth_wait() and gdth_interrupt() the globals "gdth_from_wait", "wait_hanum" and "wait_index" give me the creeps. We are talking about hotplug API and proper lucking of adapter's list and this thing is just plain don't work with more than one card.
[Q1] Do you understand all that business with gdth_polling and gdth_wait()?
It looks like if you do gdth_polling==true than you can have only one card. Is that true?
[Q2] Should I fix that? I thought of doing a __gdth_interrupt() that is called
by gdth_interrupt() and passes all these members on the stack as parameters to __gdth_interrupt().
(Actually most of them will be dropped they will not be needed)
Boaz
Re: [PATCH 10/16] gdth: gdth_get_status() return pointer to host not its index
Quoted 52 lines · Boaz Harrosh
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Boaz Harrosh
- Return the interrupting host and not it's index. NULL if intr is not by gdth.
- fix calling siteQuoted 8 lines
Quoted 5 lines
FIXME:
Why are we looping on all cards? the passeddev_idcan be used for pinpointing the exact interrupting card. The kernel is already looping on all sharing cards so this code makes it O(n^2).This is just pre-historic code that makes no sense whatover in a modern kernel. I'd much prefer to stop doing this and use
dev_idproperly.OK I'm attempting just that but please look in with me on the code I have some questions.
Quoted 6 lines
Quoted 3 lines
What is that polling mode? can we pass
dev_idtogdth_get_status()and do a poll only ifdev_idis NULL?Just loop over all host adapters in
gdth_waitinstead and pass in the ha pointer.[Issue 1]
Ingdth_get_status()the first check isif(ha->irq == passed_in_irq)if not than no status read is attempted and 0 is returned. In this casegdth_interrupt()will return with out doing any advancement of states.Now
gdth_wait()calls withgdth_interrupt(ha->irq, ha)so it means that in effect current code will loop on all devices but will actually read the status of only the waiting on card.[Q1] So am I safe in just dropping the loop even from
gdth_wait()? [Q2] Whengdth_interrupt()is called by the kernel am I guaranteed that irq will match theha->irqthat is passed asdev_id? (Since that is what I registered as my interrupt routine)[Issue 2]
Ingdth_wait()andgdth_interrupt()the globals "gdth_from_wait", "wait_hanum" and "wait_index" give me the creeps. We are talking about hotplug API and proper lucking of adapter's list and this thing is just plain don't work with more than one card.[Q1] Do you understand all that business with
gdth_pollingandgdth_wait()?
It looks like if you do gdth_polling==true than you can have only one card. Is that true?
[Q2] Should I fix that? I thought of doing a__gdth_interrupt()that is called
bygdth_interrupt()and passes all these members on the stack as parameters to__gdth_interrupt().
(Actually most of them will be dropped they will not be needed)
Quoted 1 line
Boaz
I've attempted a fix below. Christoph please review this is delicate stuff
Subject: [PATCH] gdth: gdth_interrupt gdth_get_status & gdth_wait fixes
- gdth_get_status() returns a single device interrupt IStatus
- gdth_interrupt split to __gdth_interrupt() that receives flags if is called from gdth_wait().
- Use dev_id passed from kernel and do not loop on all controllers.
- gdth_wait(), get read of all global variables and call the new __gdth_interrupt with these variables on the stack
Signed-off-by Boaz Harrosh <[email protected]>
--- drivers/scsi/gdth.c | 93 +++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 50 deletions(-)
drivers/scsi/gdth.c +43 -50
@@ -139,6 +139,8 @@static void gdth_delay (int milliseconds);static void gdth_eval_mapping (ulong32 size,ulong32 *cyls,int *heads,int *secs);static irqreturn_t gdth_interrupt (int irq,void *dev_id); +static irqreturn_t __gdth_interrupt (gdth_ha_str *ha,int irq, +int gdth_from_wait,int * pIndex);static int gdth_sync_event (gdth_ha_str *ha,int service,unchar index,Scsi_Cmnd *scp);static int gdth_async_event (gdth_ha_str *ha);
@@ -171,7 +173,7 @@ static int gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha);static int gdth_init_pci (gdth_pci_str *pcistr,gdth_ha_str *ha);static void gdth_enable_int (gdth_ha_str *ha); -static int gdth_get_status (unchar *pIStatus,int irq); +static unchar gdth_get_status (gdth_ha_str *ha,int irq);static int gdth_test_busy (gdth_ha_str *ha);static int gdth_get_cmd_index (gdth_ha_str *ha);static void gdth_release_event (gdth_ha_str *ha);
@@ -301,8 +303,6 @@ static struct timer_list gdth_timer;static unchar gdth_drq_tab[4 ] = {5 ,6 ,7 ,7 };/* DRQ table */ static unchar gdth_irq_tab[6 ] = {0 ,10 ,11 ,12 ,14 ,0 };/* IRQ table */ static unchar gdth_polling;/* polling if TRUE */ -static unchar gdth_from_wait = FALSE;/* gdth_wait() */ -static int wait_index,wait_hanum;/* gdth_wait() */ static int gdth_ctr_count =0 ;/* controller count */ static int gdth_ctr_released =0 ;/* gdth_release() */ static struct Scsi_Host *gdth_ctr_tab[MAXHA ];/* controller table */
@@ -1244,41 +1244,32 @@ static void __init gdth_enable_int(gdth_ha_str *ha)spin_unlock_irqrestore (&ha->smp_lock, flags); } - -static int gdth_get_status (unchar *pIStatus,int irq) +/* return IStatus if interrupt was from this card else 0 */ +static unchar gdth_get_status (gdth_ha_str *ha,int irq) { - registergdth_ha_str *ha; -int i; +unchar IStatus =0 ; + +TRACE (("gdth_get_status() irq %d ctr_count %d\n" , irq, gdth_ctr_count)); -TRACE (("gdth_get_status() irq %d ctr_count %d\n" , - irq,gdth_ctr_count)); - - *pIStatus =0 ; -for (i=0 ; i<gdth_ctr_count; ++i) { - ha =shost_priv (gdth_ctr_tab[i]);if (ha->irq != (unchar )irq)/* check IRQ */ -continue ; +return false;if (ha->type ==GDT_EISA ) - *pIStatus =inb ((ushort )ha->bmic +EDOORREG ); + IStatus =inb ((ushort )ha->bmic +EDOORREG );else if (ha->type ==GDT_ISA ) - *pIStatus = + IStatus =readb (&((gdt2_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index);else if (ha->type ==GDT_PCI ) - *pIStatus = + IStatus =readb (&((gdt6_dpram_str __iomem *)ha->brd)->u.ic.Cmd_Index);else if (ha->type ==GDT_PCINEW ) - *pIStatus =inb (PTR2USHORT (&ha->plx->edoor_reg)); + IStatus =inb (PTR2USHORT (&ha->plx->edoor_reg));else if (ha->type ==GDT_PCIMPR ) - *pIStatus = + IStatus =readb (&((gdt6m_dpram_str __iomem *)ha->brd)->i960r.edoor_reg); - -if (*pIStatus) -return i;/* board found */ - } -return -1 ; + +return IStatus; } - - +static int gdth_test_busy (gdth_ha_str *ha) { registerint gdtsema0 =0 ;
@@ -1435,22 +1426,21 @@ static void gdth_release_event(gdth_ha_str *ha)static int gdth_wait (gdth_ha_str *ha,int index,ulong32 time) {int answer_found = FALSE; +int wait_index =0 ;TRACE (("gdth_wait() hanum %d index %d time %d\n" , ha->hanum, index, time));if (index ==0 )return 1 ;/* no wait required */ - gdth_from_wait = TRUE;do { -gdth_interrupt ((int )ha->irq,ha); -if (wait_hanum==ha->hanum && wait_index==index) { +__gdth_interrupt (ha, (int )ha->irq, true, &wait_index); +if (wait_index == index) { answer_found = TRUE;break ; }gdth_delay (1 ); }while (--time); - gdth_from_wait = FALSE;while (gdth_test_busy (ha))gdth_delay (0 );
@@ -3009,15 +2999,14 @@ static void gdth_clear_events(void)/* SCSI interface functions */ -static irqreturn_t gdth_interrupt (int irq,void *dev_id) +static irqreturn_t __gdth_interrupt (gdth_ha_str *ha,int irq, +int gdth_from_wait,int * pIndex) { -gdth_ha_str *ha2 = (gdth_ha_str *)dev_id; - registergdth_ha_str *ha;gdt6m_dpram_str __iomem *dp6m_ptr =NULL ;gdt6_dpram_str __iomem *dp6_ptr;gdt2_dpram_str __iomem *dp2_ptr;Scsi_Cmnd *scp; -int hanum, rval, i; +int rval, i;unchar IStatus;ushort Service;ulong flags =0 ;
@@ -3038,17 +3027,15 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) }if (!gdth_polling) -spin_lock_irqsave (&ha2->smp_lock, flags); - wait_index =0 ; +spin_lock_irqsave (&ha->smp_lock, flags);/* search controller */ -if ((hanum =gdth_get_status (&IStatus,irq)) ==-1 ) { +if (0 == (IStatus =gdth_get_status (ha, irq))) {/* spurious interrupt */ if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); -return IRQ_HANDLED ; +spin_unlock_irqrestore (&ha->smp_lock, flags); +return IRQ_HANDLED ; } - ha =shost_priv (gdth_ctr_tab[hanum]);#ifdef GDTH_STATISTICS ++act_ints;
@@ -3180,7 +3167,7 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) }else {TRACE2 (("gdth_interrupt() unknown controller type\n" ));if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);return IRQ_HANDLED ; }
@@ -3188,15 +3175,14 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id) IStatus,ha->status,ha->info));if (gdth_from_wait) { - wait_hanum = hanum; - wait_index = (int )IStatus; + *pIndex = (int )IStatus; }if (IStatus ==ASYNCINDEX ) {TRACE2 (("gdth_interrupt() async. event\n" ));gdth_async_event (ha);if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);gdth_next (ha);return IRQ_HANDLED ; }
@@ -3204,10 +3190,10 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (IStatus ==SPEZINDEX ) {TRACE2 (("Service unknown or not initialized !\n" )); ha->dvr.size =sizeof (ha->dvr.eu.driver); - ha->dvr.eu.driver.ionode = hanum; + ha->dvr.eu.driver.ionode = ha->hanum;gdth_store_event (ha,ES_DRIVER ,4 , &ha->dvr);if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);return IRQ_HANDLED ; } scp = ha->cmd_tab[IStatus-2 ].cmnd;
@@ -3216,24 +3202,24 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)if (scp ==UNUSED_CMND ) {TRACE2 (("gdth_interrupt() index to unused command (%d)\n" ,IStatus)); ha->dvr.size =sizeof (ha->dvr.eu.driver); - ha->dvr.eu.driver.ionode = hanum; + ha->dvr.eu.driver.ionode = ha->hanum; ha->dvr.eu.driver.index = IStatus;gdth_store_event (ha,ES_DRIVER ,1 , &ha->dvr);if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);return IRQ_HANDLED ; }if (scp ==INTERNAL_CMND ) {TRACE (("gdth_interrupt() answer to internal command\n" ));if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);return IRQ_HANDLED ; }TRACE (("gdth_interrupt() sync. status\n" )); rval =gdth_sync_event (ha,Service,IStatus,scp);if (!gdth_polling) -spin_unlock_irqrestore (&ha2->smp_lock, flags); +spin_unlock_irqrestore (&ha->smp_lock, flags);if (rval ==2 ) {gdth_putq (ha, scp,scp->SCp.this_residual); }else if (rval ==1 ) {
@@ -3269,6 +3255,13 @@ static irqreturn_t gdth_interrupt(int irq,void *dev_id)return IRQ_HANDLED ; } +static irqreturn_t gdth_interrupt (int irq,void *dev_id) +{ +gdth_ha_str *ha = (gdth_ha_str *)dev_id; + +return __gdth_interrupt (ha, irq, false,NULL ); +} +static int gdth_sync_event (gdth_ha_str *ha,int service,unchar index,Scsi_Cmnd *scp) {
Signature · 1 line
1.5.3.1
Re: [PATCH 2/16] gdth: split out eisa probing
In reply to Boaz HarroshQuoted 74 lines · Boaz Harrosh
Split eisa probing into it's own helper, and do proper error unwinding. Protect EISA probind by the proper
CONFIG_EISAsymbol.Signed-off-by Christoph Hellwig <[email protected]>drivers/scsi/gdth.c +65
-0@@ -5694,6 +5582,148 @@ static int gdth_isa_probe_one(struct scsi_host_template *shtp, ulong32 isa_bios) }#endif /* CONFIG_ISA */ +#ifdef CONFIG_EISA +static int gdth_eisa_probe_one (struct scsi_host_template *shtp, +ushort eisa_slot) +{ +struct Scsi_Host *shp; +gdth_ha_str *ha; +dma_addr_t scratch_dma_handle =0 ; +int error, hanum, i; +u8 b; + +if (!gdth_search_eisa (eisa_slot)) +return -ENXIO ; + + shp =scsi_register (shtp,sizeof (gdth_ext_str)); +if (!shp) +return -ENOMEM ; + ha =HADATA (shp); + + error = -ENODEV ; +if (!gdth_init_eisa (eisa_slot,ha)) + goto out_host_put; + +/* controller found and initialized */ +printk ("Configuring GDT-EISA HA at Slot %d IRQ %u\n" , + eisa_slot >>12 , ha->irq); + + error =request_irq (ha->irq, gdth_interrupt,IRQF_DISABLED ,"gdth" , ha); +if (error) { +printk ("GDT-EISA: Unable to allocate IRQ\n" ); + goto out_host_put; + } + + shp->unchecked_isa_dma =0 ; + shp->irq = ha->irq; + shp->dma_channel =0xff ; + hanum = gdth_ctr_count; + gdth_ctr_tab[gdth_ctr_count++] = shp; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum=0 ; +TRACE2 (("EISA detect Bus 0: hanum %d\n" , +NUMDATA (shp)->hanum)); + + ha->pccb =CMDDATA (shp); + ha->ccb_phys =0L ; + + error = -ENOMEM ; + + ha->pdev =NULL ; + ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , + &scratch_dma_handle); +if (!ha->pscratch) + goto out_free_irq; + ha->scratch_phys = scratch_dma_handle; + + ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), + &scratch_dma_handle); +if (!ha->pmsg) + goto out_free_pscratch; + ha->msg_phys = scratch_dma_handle; + +#ifdef INT_COAL + ha->coal_stat = pci_alloc_consistent(ha->pdev, + sizeof(gdth_coal_status) * MAXOFFSETS,
drivers/scsi/gdth.c static int gdth_isa_probe_one(struct · line 5659
Quoted 10 lines
drivers/scsi/gdth.c +10
-0+ &scratch_dma_handle); +if (!ha->coal_stat) + goto out_free_pmsg; + ha->coal_stat_phys = scratch_dma_handle; +#endif + + ha->ccb_phys =pci_map_single (ha->pdev,ha->pccb, +sizeof (gdth_cmd_str),PCI_DMA_BIDIRECTIONAL ); +if (!ha->ccb_phys) + goto out_free_coal_stat;
Same thing as in ISA patch: this is not PCI and we should not hide what we're doing so dma_alloc_consistent(NULL, ...) is better IMHO.
Eike
Re: [PATCH 1/16] gdth: split out isa probing
In reply to Boaz HarroshQuoted 9 lines · Boaz Harrosh
(note: this is ontop of Jeff's pci cleanup patch)
Split out isa probing into a helper of it's own. Error handling is cleaned up, but errors are not propagated yet. Also enclose the isa probe under the proper
CONFIG_ISAsymbol instead of the !IA64 hack.Signed-off-by Christoph Hellwig <[email protected]>
drivers/scsi/gdth.c int __init option_setup(char *str) · line 4286
Quoted 7 lines
drivers/scsi/gdth.c +1
-0@@ -4277,6 +4280,7 @@ int __init option_setup(char *str)return 1 ; } +#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,0 )static int __init gdth_detect (struct scsi_host_template *shtp) #else
Extra newline for nothing?
Quoted 69 lines
drivers/scsi/gdth.c +64
-0@@ -5668,6 +5552,149 @@ static Scsi_Host_Template driver_template = {#endif }; +#ifdef CONFIG_ISA +static int gdth_isa_probe_one (struct scsi_host_template *shtp,ulong32 isa_bios) +{ +struct Scsi_Host *shp; +gdth_ha_str *ha; +dma_addr_t scratch_dma_handle =0 ; +int error, hanum, i; +u8 b; + +if (!gdth_search_isa (isa_bios)) +return -ENXIO ; + + shp =scsi_register (shtp,sizeof (gdth_ext_str)); +if (!shp) +return -ENOMEM ; + ha =HADATA (shp); + + error = -ENODEV ; +if (!gdth_init_isa (isa_bios,ha)) + goto out_host_put; + +/* controller found and initialized */ +printk ("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n" , + isa_bios, ha->irq, ha->drq); + + error =request_irq (ha->irq, gdth_interrupt,IRQF_DISABLED ,"gdth" , ha); +if (error) { +printk ("GDT-ISA: Unable to allocate IRQ\n" ); + goto out_host_put; + } + + error =request_dma (ha->drq,"gdth" ); +if (error) { +printk ("GDT-ISA: Unable to allocate DMA channel\n" ); + goto out_free_irq; + } + +set_dma_mode (ha->drq,DMA_MODE_CASCADE ); +enable_dma (ha->drq); + shp->unchecked_isa_dma =1 ; + shp->irq = ha->irq; + shp->dma_channel = ha->drq; + hanum = gdth_ctr_count; + gdth_ctr_tab[gdth_ctr_count++] = shp; + gdth_ctr_vtab[gdth_ctr_vcount++] = shp; + +NUMDATA (shp)->hanum = (ushort )hanum; +NUMDATA (shp)->busnum=0 ; + + ha->pccb =CMDDATA (shp); + ha->ccb_phys =0L ; + ha->pdev =NULL ; + + error = -ENOMEM ; + + ha->pscratch =pci_alloc_consistent (ha->pdev,GDTH_SCRATCH , + &scratch_dma_handle); +if (!ha->pscratch) + goto out_dec_counters; + ha->scratch_phys = scratch_dma_handle; + + ha->pmsg =pci_alloc_consistent (ha->pdev,sizeof (gdth_msg_str), + &scratch_dma_handle); +if (!ha->pmsg) + goto out_free_pscratch;
drivers/scsi/gdth.c static Scsi_Host_Template driver_template = { · line 5629
Quoted 10 lines
drivers/scsi/gdth.c +10
-0+ ha->msg_phys = scratch_dma_handle; + +#ifdef INT_COAL + ha->coal_stat =pci_alloc_consistent (ha->pdev, +sizeof (gdth_coal_status) *MAXOFFSETS , + &scratch_dma_handle); +if (!ha->coal_stat) + goto out_free_pmsg; + ha->coal_stat_phys = scratch_dma_handle; +#endif
What we have here is cleanly not PCI memory as it's ISA initialisation. And for making things obvious passing NULL as first argument of dma_alloc_consistent() is IMHO the better way.
Greetings,
Eike
Re: [PATCH 15/16] gdth: Move members from SCp to gdth_cmndinfo, stage 2
In reply to Boaz HarroshQuoted 6 lines · Boaz Harrosh
- Cleanup the rest of the scsi_cmnd-SCp members and move them to
gdth_cmndinfo:SCp.have_data_in => volatile
wait_for_completionSigned-off-by Boaz Harrosh <[email protected]>
volatile here is probably nonsense. Either you need proper locking on this struct in case there may be side-effects between different callers or it's unneeded at all. This looks really suspicious:
drivers/scsi/gdth_proc.c +0 -0
@@ -728,20 +728,22 @@ static void gdth_wait_completion(gdth_ha_str *ha, int
busnum, int id)
ulong flags;
int i;
Scsi_Cmnd *scp;
+ struct gdth_cmndinfo *cmndinfo;
unchar b, t;
spin_lock_irqsave(&ha->smp_lock, flags);
for (i = 0; i < GDTH_MAXCMDS; ++i) {
scp = ha->cmd_tab[i].cmnd;+ cmndinfo = gdth_cmnd_priv(scp);
b = scp->device->channel;
t = scp->device->id;
if (!SPECIAL_SCP(scp) && t == (unchar)id &&
b == (unchar)busnum) {
- scp->SCp.have_data_in = 0;
+ cmndinfo->wait_for_completion = 0;
spin_unlock_irqrestore(&ha->smp_lock, flags);
- while (!scp->SCp.have_data_in)
+ while (!cmndinfo->wait_for_completion)
barrier();I haven't checked for locking around the other accesses, but they look racy. This looks like wasting CPU cycles by busy-looping for a change. And for things like these
@@ -3511,8 +3514,8 @@ static int gdth_sync_event(gdth_ha_str *ha, int service, unchar index,
}
}
}- if (!scp->SCp.have_data_in)
- scp->SCp.have_data_in++;
+ if (!cmndinfo->wait_for_completion)
+ cmndinfo->wait_for_completion++;
probably atomic_inc_not_zero() should be used if it is really needed at all.
Greetings,
Eike
Re: [PATCH 1/16] gdth: split out isa probing
In reply to Rolf Eike BeerQuoted 1 line · Rolf Eike Beer
What we have here is cleanly not PCI memory as it's ISA initialisation. And for making things obvious passing NULL as first argument of
dma_alloc_consistent()is IMHO the better way.
While this is true, this is largely a code movement patch.
It's up to Boaz/Christoph whether they want to include another cleanup in this patch, or move that to separate patch that switches the driver to dma_xxx
Jeff
Re: [PATCH 2/16] gdth: split out eisa probing
In reply to Rolf Eike BeerQuoted 2 lines · Rolf Eike Beer
Same thing as in ISA patch: this is not PCI and we should not hide what we're doing so
dma_alloc_consistent(NULL, ...)is better IMHO.
passing NULL is the documented way to deal with ISA/EISA devices with the old pci dma api. Any change to these APIs should be a different patch, and there's about 100 more important things in gdth right now.
Re: [PATCH 2/16] gdth: split out eisa probing
Quoted 7 lines · Christoph Hellwig
Quoted 2 lines · Rolf Eike Beer
Same thing as in ISA patch: this is not PCI and we should not hide what we're doing so
dma_alloc_consistent(NULL, ...)is better IMHO.passing NULL is the documented way to deal with ISA/EISA devices with the old pci dma api. Any change to these APIs should be a different patch, and there's about 100 more important things in gdth right now.
It's not about passing NULL there. We need to do that. But we should call it with NULL as argument and not with ha->pdev to make this obvious.
Eike
Re: [PATCH 2/16] gdth: split out eisa probing
Quoted 2 lines · Rolf Eike Beer
It's not about passing NULL there. We need to do that. But we should call it with NULL as argument and not with
ha->pdevto make this obvious.
Feel free to send your cleanup patches once we've finished doing the important heavy lifting on gdth.
Re: [PATCH 2/16] gdth: split out eisa probing
Quoted 5 lines · Christoph Hellwig
Quoted 1 line · Rolf Eike Beer
It's not about passing NULL there. We need to do that. But we should call it with NULL as argument and not with
ha->pdevto make this obvious.Feel free to send your cleanup patches once we've finished doing the important heavy lifting on gdth.
Come on. The patches were posted for comments, and Rolf commented. Don't give him a hard time for a valid comment.
Jeff
Re: [PATCH 2/16] gdth: split out eisa probing
Quoted 2 lines · Jeff Garzik
Come on. The patches were posted for comments, and Rolf commented. Don't give him a hard time for a valid comment.
Sorry, but these comments are utterly useless. It's not like we're doing anything related to dma mapping, but just moving some init code around. If we actually did a major change in how dma mapping is handled the comment would be apropinquate and a switchover should happen as part of the patch series.
Re: [PATCH 2/16] gdth: split out eisa probing
Quoted 8 lines · Christoph Hellwig
Quoted 1 line · Jeff Garzik
Come on. The patches were posted for comments, and Rolf commented. Don't give him a hard time for a valid comment.
Sorry, but these comments are utterly useless. It's not like we're doing anything related to dma mapping, but just moving some init code around. If we actually did a major change in how dma mapping is handled the comment would be apropinquate and a switchover should happen as part of the patch series.
A comment noting a useful improvement is always helpful, even if it cannot be addressed immediately. Please don't push reviewers away. That severely demotivates other reviewers, when they see such treatment.
We talked about this at the Kernel Summit.
Jeff
Re: [PATCH 15/16] gdth: Move members from SCp to gdth_cmndinfo, stage 2
In reply to Rolf Eike BeerQuoted 3 lines · Rolf Eike Beer
volatile here is probably nonsense. Either you need proper locking on this struct in case there may be side-effects between different callers or it's unneeded at all. This looks really suspicious:
Yes, it's most likely wrong. But for now there's a really huge plate of patches already, and we'd rather keep behaviour similar. Once we've managed to actually test this big pile we can move on to cleaning up things like that. And I suspect part of the right solution will be to get rid of this busy loop entirely.