Skip to content

L
linux
Commit ad4341e7 authored by Achim Leubner's avatar Achim Leubner Committed by Linus Torvalds
Browse files
Options

[PATCH] gdth driver update 

- Maintainers email address and copyright messages updated
- Scanning for EISA and ISA controllers disabled due to a resource conflict
  with the Adaptec aic driver
- Switch "probe_eisa_isa" added to give the possibility to enable the
  EISA/ISA scan if required
- Driver version increased to 2.08
parent fcdcae94
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 223 deletions
CREDITS
View file @ ad4341e7
...@@ -1869,9 +1869,9 @@ S: D53424 Remagen ...@@ -1869,9 +1869,9 @@ S: D53424 Remagen
S: Germany S: Germany
N: Achim Leubner N: Achim Leubner
E: achim.leubner@intel.com E: achim_leubner@adaptec.com
D: GDT Disk Array Controller/Storage RAID controller driver D: GDT Disk Array Controller/Storage RAID controller driver
S: ICP vortex GmbH, an Intel company S: ICP vortex GmbH
S: Neckarsulm S: Neckarsulm
S: Germany S: Germany
......
MAINTAINERS
View file @ ad4341e7
...@@ -814,7 +814,7 @@ S: Odd fixes (e.g., new signatures) ...@@ -814,7 +814,7 @@ S: Odd fixes (e.g., new signatures)
GDT SCSI DISK ARRAY CONTROLLER DRIVER GDT SCSI DISK ARRAY CONTROLLER DRIVER
P: Achim Leubner P: Achim Leubner
M: achim.leubner@intel.com M: achim_leubner@adaptec.com
L: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
W: http://www.icp-vortex.com/ W: http://www.icp-vortex.com/
S: Supported S: Supported
......
drivers/scsi/Kconfig
View file @ ad4341e7
...@@ -556,7 +556,7 @@ config SCSI_GDTH ...@@ -556,7 +556,7 @@ config SCSI_GDTH
Formerly called GDT SCSI Disk Array Controller Support. Formerly called GDT SCSI Disk Array Controller Support.
This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI) This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI)
manufactured by Intel/ICP vortex (an Intel Company). It is documented manufactured by Intel Corporation/ICP vortex GmbH. It is documented
in the kernel source in <file:drivers/scsi/gdth.c> and in the kernel source in <file:drivers/scsi/gdth.c> and
<file:drivers/scsi/gdth.h.> <file:drivers/scsi/gdth.h.>
......
drivers/scsi/gdth.c
View file @ ad4341e7
...@@ -4,11 +4,14 @@ ...@@ -4,11 +4,14 @@
* Intel Corporation: Storage RAID Controllers * * Intel Corporation: Storage RAID Controllers *
* * * *
* gdth.c * * gdth.c *
* Copyright (C) 1995-03 ICP vortex, an Intel company, Achim Leubner * * Copyright (C) 1995-03 ICP vortex GmbH, Achim Leubner *
* <achim.leubner@intel.com> * * Copyright (C) 2002-03 Intel Corporation *
* Copyright (C) 2003 Adaptec Inc. *
* <achim_leubner@adaptec.com> *
* * * *
* Additions/Fixes: Boji Tony Kannanthanam * * Additions/Fixes: *
* <boji.t.kannanthanam@intel.com> * * Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com> *
* Johannes Dinner <johannes_dinner@adaptec.com> *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published * * it under the terms of the GNU General Public License as published *
...@@ -24,9 +27,13 @@ ...@@ -24,9 +27,13 @@
* along with this kernel; if not, write to the Free Software * * along with this kernel; if not, write to the Free Software *
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
* * * *
* Tested with Linux 1.2.13, ..., 2.2.20, ..., 2.4.20 * * Tested with Linux 1.2.13, ..., 2.2.20, ..., 2.4.22 *
* * * *
* $Log: gdth.c,v $ * $Log: gdth.c,v $
* 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 <bellucda@tiscali.it> * Revision 1.63 2003/07/12 14:01:00 Daniele Bellucci <bellucda@tiscali.it>
* Minor cleanups in gdth_ioctl. * Minor cleanups in gdth_ioctl.
* *
...@@ -257,7 +264,7 @@ ...@@ -257,7 +264,7 @@
* Initial revision * Initial revision
* *
************************************************************************/ ************************************************************************/
#ident "$Id: gdth.c,v 1.62 2003/02/27 15:01:59 achim Exp $" #ident "$Id: gdth.c,v 1.64 2003/09/17 08:30:26 achim Exp $"
/* All GDT Disk Array Controllers are fully supported by this driver. /* All GDT Disk Array Controllers are fully supported by this driver.
* This includes the PCI/EISA/ISA SCSI Disk Array Controllers and the * This includes the PCI/EISA/ISA SCSI Disk Array Controllers and the
...@@ -291,10 +298,12 @@ ...@@ -291,10 +298,12 @@
* access a shared resource from several nodes, * access a shared resource from several nodes,
* appropiate controller firmware required * appropiate controller firmware required
* shared_access:N enable driver reserve/release protocol * shared_access:N enable driver reserve/release protocol
* probe_eisa_isa:Y scan for EISA/ISA controllers
* probe_eisa_isa:N do not scan for EISA/ISA controllers
* *
* The default values are: "gdth=disable:N,reserve_mode:1,reverse_scan:N, * 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,virt_ctr:N,hdr_channel:0,
* shared_access:Y". * shared_access:Y,probe_eisa_isa:N".
* Here is another example: "gdth=reserve_list:0,1,2,0,0,1,3,0,rescan:Y". * Here is another example: "gdth=reserve_list:0,1,2,0,0,1,3,0,rescan:Y".
* *
* When loading the gdth driver as a module, the same options are available. * When loading the gdth driver as a module, the same options are available.
...@@ -304,7 +313,8 @@ ...@@ -304,7 +313,8 @@
* '1' in place of 'Y' and '0' in place of 'N'. * '1' in place of 'Y' and '0' in place of 'N'.
* *
* Default: "modprobe gdth disable=0 reserve_mode=1 reverse_scan=0 * 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 virt_ctr=0 hdr_channel=0 shared_access=0
* probe_eisa_isa=0"
* The other example: "modprobe gdth reserve_list=0,1,2,0,0,1,3,0 rescan=1". * The other example: "modprobe gdth reserve_list=0,1,2,0,0,1,3,0 rescan=1".
*/ */
...@@ -719,6 +729,8 @@ static int rescan = 0; ...@@ -719,6 +729,8 @@ static int rescan = 0;
static int virt_ctr = 0; static int virt_ctr = 0;
/* shared access */ /* shared access */
static int shared_access = 1; static int shared_access = 1;
/* enable support for EISA and ISA controllers */
static int probe_eisa_isa = 0;
#ifdef MODULE #ifdef MODULE
#if LINUX_VERSION_CODE >= 0x02011A #if LINUX_VERSION_CODE >= 0x02011A
...@@ -733,6 +745,7 @@ MODULE_PARM(max_ids, "i"); ...@@ -733,6 +745,7 @@ MODULE_PARM(max_ids, "i");
MODULE_PARM(rescan, "i"); MODULE_PARM(rescan, "i");
MODULE_PARM(virt_ctr, "i"); MODULE_PARM(virt_ctr, "i");
MODULE_PARM(shared_access, "i"); MODULE_PARM(shared_access, "i");
MODULE_PARM(probe_eisa_isa, "i");
MODULE_AUTHOR("Achim Leubner"); MODULE_AUTHOR("Achim Leubner");
#endif #endif
#if LINUX_VERSION_CODE >= 0x02040B #if LINUX_VERSION_CODE >= 0x02040B
...@@ -4133,6 +4146,8 @@ GDTH_INITFUNC(void, internal_setup(char *str,int *ints)) ...@@ -4133,6 +4146,8 @@ GDTH_INITFUNC(void, internal_setup(char *str,int *ints))
virt_ctr = val; virt_ctr = val;
else if (!strncmp(argv, "shared_access:", 14)) else if (!strncmp(argv, "shared_access:", 14))
shared_access = val; shared_access = val;
else if (!strncmp(argv, "probe_eisa_isa:", 15))
probe_eisa_isa = val;
else if (!strncmp(argv, "reserve_list:", 13)) { else if (!strncmp(argv, "reserve_list:", 13)) {
reserve_list[0] = val; reserve_list[0] = val;
for (i = 1; i < MAX_RES_ARGS; i++) { for (i = 1; i < MAX_RES_ARGS; i++) {
...@@ -4213,249 +4228,250 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp)) ...@@ -4213,249 +4228,250 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp))
gdth_polling = TRUE; b = 0; gdth_polling = TRUE; b = 0;
gdth_clear_events(); gdth_clear_events();
/* scanning for controllers, at first: ISA controller */ /* As default we do not probe for EISA or ISA controllers */
for (isa_bios=0xc8000UL; isa_bios<=0xd8000UL; isa_bios+=0x8000UL) { if (probe_eisa_isa) {
/* scanning for controllers, at first: ISA controller */
dma_addr_t scratch_dma_handle; for (isa_bios=0xc8000UL; isa_bios<=0xd8000UL; isa_bios+=0x8000UL) {
dma_addr_t scratch_dma_handle;
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_ctr_count >= MAXHA)
if (!gdth_init_isa(isa_bios,ha)) { break;
scsi_unregister(shp); if (gdth_search_isa(isa_bios)) { /* controller found */
continue; 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 __ia64__
break; break;
#else #else
/* controller found and initialized */ /* controller found and initialized */
printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n", printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n",
isa_bios,ha->irq,ha->drq); isa_bios,ha->irq,ha->drq);
#if LINUX_VERSION_CODE >= 0x010346 #if LINUX_VERSION_CODE >= 0x010346
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha))
#else #else
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth")) if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth"))
#endif #endif
{ {
printk("GDT-ISA: Unable to allocate IRQ\n"); printk("GDT-ISA: Unable to allocate IRQ\n");
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
} }
if (request_dma(ha->drq,"gdth")) { if (request_dma(ha->drq,"gdth")) {
printk("GDT-ISA: Unable to allocate DMA channel\n"); printk("GDT-ISA: Unable to allocate DMA channel\n");
#if LINUX_VERSION_CODE >= 0x010346 #if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,ha); free_irq(ha->irq,ha);
#else #else
free_irq(ha->irq); free_irq(ha->irq);
#endif #endif
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
} }
set_dma_mode(ha->drq,DMA_MODE_CASCADE); set_dma_mode(ha->drq,DMA_MODE_CASCADE);
enable_dma(ha->drq); enable_dma(ha->drq);
shp->unchecked_isa_dma = 1; shp->unchecked_isa_dma = 1;
shp->irq = ha->irq; shp->irq = ha->irq;
shp->dma_channel = ha->drq; shp->dma_channel = ha->drq;
hanum = gdth_ctr_count; hanum = gdth_ctr_count;
gdth_ctr_tab[gdth_ctr_count++] = shp; gdth_ctr_tab[gdth_ctr_count++] = shp;
gdth_ctr_vtab[gdth_ctr_vcount++] = shp; gdth_ctr_vtab[gdth_ctr_vcount++] = shp;
NUMDATA(shp)->hanum = (ushort)hanum; NUMDATA(shp)->hanum = (ushort)hanum;
NUMDATA(shp)->busnum= 0; NUMDATA(shp)->busnum= 0;
ha->pccb = CMDDATA(shp); ha->pccb = CMDDATA(shp);
ha->ccb_phys = 0L; ha->ccb_phys = 0L;
#if LINUX_VERSION_CODE >= 0x020400 #if LINUX_VERSION_CODE >= 0x020400
ha->pdev = NULL; ha->pdev = NULL;
ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH, ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH,
&scratch_dma_handle); &scratch_dma_handle);
ha->scratch_phys = (ulong32)scratch_dma_handle; ha->scratch_phys = (ulong32)scratch_dma_handle;
#else #else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA); ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
if (ha->pscratch) if (ha->pscratch)
ha->scratch_phys = virt_to_bus(ha->pscratch); ha->scratch_phys = virt_to_bus(ha->pscratch);
#endif #endif
ha->scratch_busy = FALSE; ha->scratch_busy = FALSE;
ha->req_first = NULL; ha->req_first = NULL;
ha->tid_cnt = MAX_HDRIVES; ha->tid_cnt = MAX_HDRIVES;
if (max_ids > 0 && max_ids < ha->tid_cnt) if (max_ids > 0 && max_ids < ha->tid_cnt)
ha->tid_cnt = max_ids; ha->tid_cnt = max_ids;
for (i=0; i<GDTH_MAXCMDS; ++i) for (i=0; i<GDTH_MAXCMDS; ++i)
ha->cmd_tab[i].cmnd = UNUSED_CMND; ha->cmd_tab[i].cmnd = UNUSED_CMND;
ha->scan_mode = rescan ? 0x10 : 0; ha->scan_mode = rescan ? 0x10 : 0;
if (ha->pscratch == NULL || !gdth_search_drives(hanum)) { if (ha->pscratch == NULL || !gdth_search_drives(hanum)) {
printk("GDT-ISA: Error during device scan\n"); printk("GDT-ISA: Error during device scan\n");
--gdth_ctr_count; --gdth_ctr_count;
--gdth_ctr_vcount; --gdth_ctr_vcount;
if (ha->pscratch != NULL) { if (ha->pscratch != NULL) {
#if LINUX_VERSION_CODE >= 0x020400 #if LINUX_VERSION_CODE >= 0x020400
pci_free_consistent(ha->pdev, GDTH_SCRATCH, pci_free_consistent(ha->pdev, GDTH_SCRATCH,
ha->pscratch, ha->scratch_phys); ha->pscratch, ha->scratch_phys);
#else #else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH); scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
#endif #endif
} }
#if LINUX_VERSION_CODE >= 0x010346 #if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,ha); free_irq(ha->irq,ha);
#else #else
free_irq(ha->irq); free_irq(ha->irq);
#endif #endif
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
} }
if (hdr_channel < 0 || hdr_channel > ha->bus_cnt) if (hdr_channel < 0 || hdr_channel > ha->bus_cnt)
hdr_channel = ha->bus_cnt; hdr_channel = ha->bus_cnt;
ha->virt_bus = hdr_channel; ha->virt_bus = hdr_channel;
#if LINUX_VERSION_CODE >= 0x020000 #if LINUX_VERSION_CODE >= 0x020000
shp->max_id = ha->tid_cnt; shp->max_id = ha->tid_cnt;
shp->max_lun = MAXLUN; shp->max_lun = MAXLUN;
shp->max_channel = virt_ctr ? 0 : ha->bus_cnt; shp->max_channel = virt_ctr ? 0 : ha->bus_cnt;
if (virt_ctr) if (virt_ctr)
#endif #endif
{ {
virt_ctr = 1; virt_ctr = 1;
/* register addit. SCSI channels as virtual controllers */ /* register addit. SCSI channels as virtual controllers */
for (b = 1; b < ha->bus_cnt + 1; ++b) { for (b = 1; b < ha->bus_cnt + 1; ++b) {
shp = scsi_register(shtp,sizeof(gdth_num_str)); shp = scsi_register(shtp,sizeof(gdth_num_str));
shp->unchecked_isa_dma = 1; shp->unchecked_isa_dma = 1;
shp->irq = ha->irq; shp->irq = ha->irq;
shp->dma_channel = ha->drq; shp->dma_channel = ha->drq;
gdth_ctr_vtab[gdth_ctr_vcount++] = shp; gdth_ctr_vtab[gdth_ctr_vcount++] = shp;
NUMDATA(shp)->hanum = (ushort)hanum; NUMDATA(shp)->hanum = (ushort)hanum;
NUMDATA(shp)->busnum = b; NUMDATA(shp)->busnum = b;
} }
} }
GDTH_INIT_LOCK_HA(ha); GDTH_INIT_LOCK_HA(ha);
gdth_enable_int(hanum); gdth_enable_int(hanum);
#endif /* !__ia64__ */ #endif /* !__ia64__ */
}
} }
}
/* scanning for EISA controllers */ /* scanning for EISA controllers */
for (eisa_slot=0x1000; eisa_slot<=0x8000; eisa_slot+=0x1000) { for (eisa_slot=0x1000; eisa_slot<=0x8000; eisa_slot+=0x1000) {
dma_addr_t scratch_dma_handle;
dma_addr_t scratch_dma_handle;
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_ctr_count >= MAXHA)
if (!gdth_init_eisa(eisa_slot,ha)) { break;
scsi_unregister(shp); if (gdth_search_eisa(eisa_slot)) { /* controller found */
continue; shp = scsi_register(shtp,sizeof(gdth_ext_str));
} if (shp == NULL)
/* controller found and initialized */ continue;
printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n",
eisa_slot>>12,ha->irq); 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 LINUX_VERSION_CODE >= 0x010346 #if LINUX_VERSION_CODE >= 0x010346
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha)) if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth",ha))
#else #else
if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth")) if (request_irq(ha->irq,gdth_interrupt,SA_INTERRUPT,"gdth"))
#endif #endif
{ {
printk("GDT-EISA: Unable to allocate IRQ\n"); printk("GDT-EISA: Unable to allocate IRQ\n");
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
} }
shp->unchecked_isa_dma = 0; shp->unchecked_isa_dma = 0;
shp->irq = ha->irq; shp->irq = ha->irq;
shp->dma_channel = 0xff; shp->dma_channel = 0xff;
hanum = gdth_ctr_count; hanum = gdth_ctr_count;
gdth_ctr_tab[gdth_ctr_count++] = shp; gdth_ctr_tab[gdth_ctr_count++] = shp;
gdth_ctr_vtab[gdth_ctr_vcount++] = shp; gdth_ctr_vtab[gdth_ctr_vcount++] = shp;
NUMDATA(shp)->hanum = (ushort)hanum; NUMDATA(shp)->hanum = (ushort)hanum;
NUMDATA(shp)->busnum= 0; NUMDATA(shp)->busnum= 0;
TRACE2(("EISA detect Bus 0: hanum %d\n", TRACE2(("EISA detect Bus 0: hanum %d\n",
NUMDATA(shp)->hanum)); NUMDATA(shp)->hanum));
ha->pccb = CMDDATA(shp); ha->pccb = CMDDATA(shp);
ha->ccb_phys = 0L; ha->ccb_phys = 0L;
#if LINUX_VERSION_CODE >= 0x020400 #if LINUX_VERSION_CODE >= 0x020400
ha->pdev = NULL; ha->pdev = NULL;
ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH, ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH,
&scratch_dma_handle); &scratch_dma_handle);
ha->scratch_phys = (ulong32) scratch_dma_handle; ha->scratch_phys = (ulong32) scratch_dma_handle;
ha->ccb_phys = ha->ccb_phys =
pci_map_single(ha->pdev,ha->pccb, pci_map_single(ha->pdev,ha->pccb,
sizeof(gdth_cmd_str),PCI_DMA_BIDIRECTIONAL); sizeof(gdth_cmd_str),PCI_DMA_BIDIRECTIONAL);
#else #else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA); ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
if (ha->pscratch) if (ha->pscratch)
ha->scratch_phys = virt_to_bus(ha->pscratch); ha->scratch_phys = virt_to_bus(ha->pscratch);
ha->ccb_phys = virt_to_bus(ha->pccb); ha->ccb_phys = virt_to_bus(ha->pccb);
#endif #endif
ha->scratch_busy = FALSE; ha->scratch_busy = FALSE;
ha->req_first = NULL; ha->req_first = NULL;
ha->tid_cnt = MAX_HDRIVES; ha->tid_cnt = MAX_HDRIVES;
if (max_ids > 0 && max_ids < ha->tid_cnt) if (max_ids > 0 && max_ids < ha->tid_cnt)
ha->tid_cnt = max_ids; ha->tid_cnt = max_ids;
for (i=0; i<GDTH_MAXCMDS; ++i) for (i=0; i<GDTH_MAXCMDS; ++i)
ha->cmd_tab[i].cmnd = UNUSED_CMND; ha->cmd_tab[i].cmnd = UNUSED_CMND;
ha->scan_mode = rescan ? 0x10 : 0; ha->scan_mode = rescan ? 0x10 : 0;
if (ha->pscratch == NULL || !gdth_search_drives(hanum)) { if (ha->pscratch == NULL || !gdth_search_drives(hanum)) {
printk("GDT-EISA: Error during device scan\n"); printk("GDT-EISA: Error during device scan\n");
--gdth_ctr_count; --gdth_ctr_count;
--gdth_ctr_vcount; --gdth_ctr_vcount;
if (ha->pscratch != NULL) { if (ha->pscratch != NULL) {
#if LINUX_VERSION_CODE >= 0x020400 #if LINUX_VERSION_CODE >= 0x020400
pci_free_consistent(ha->pdev, GDTH_SCRATCH, pci_free_consistent(ha->pdev, GDTH_SCRATCH,
ha->pscratch, ha->scratch_phys); ha->pscratch, ha->scratch_phys);
pci_unmap_single(ha->pdev,ha->ccb_phys, pci_unmap_single(ha->pdev,ha->ccb_phys,
sizeof(gdth_cmd_str),PCI_DMA_BIDIRECTIONAL); sizeof(gdth_cmd_str),PCI_DMA_BIDIRECTIONAL);
#else #else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH); scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
#endif #endif
} }
#if LINUX_VERSION_CODE >= 0x010346 #if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,ha); free_irq(ha->irq,ha);
#else #else
free_irq(ha->irq); free_irq(ha->irq);
#endif #endif
scsi_unregister(shp); scsi_unregister(shp);
continue; continue;
} }
if (hdr_channel < 0 || hdr_channel > ha->bus_cnt) if (hdr_channel < 0 || hdr_channel > ha->bus_cnt)
hdr_channel = ha->bus_cnt; hdr_channel = ha->bus_cnt;
ha->virt_bus = hdr_channel; ha->virt_bus = hdr_channel;
#if LINUX_VERSION_CODE >= 0x020000 #if LINUX_VERSION_CODE >= 0x020000
shp->max_id = ha->tid_cnt; shp->max_id = ha->tid_cnt;
shp->max_lun = MAXLUN; shp->max_lun = MAXLUN;
shp->max_channel = virt_ctr ? 0 : ha->bus_cnt; shp->max_channel = virt_ctr ? 0 : ha->bus_cnt;
if (virt_ctr) if (virt_ctr)
#endif #endif
{ {
virt_ctr = 1; virt_ctr = 1;
/* register addit. SCSI channels as virtual controllers */ /* register addit. SCSI channels as virtual controllers */
for (b = 1; b < ha->bus_cnt + 1; ++b) { for (b = 1; b < ha->bus_cnt + 1; ++b) {
shp = scsi_register(shtp,sizeof(gdth_num_str)); shp = scsi_register(shtp,sizeof(gdth_num_str));
shp->unchecked_isa_dma = 0; shp->unchecked_isa_dma = 0;
shp->irq = ha->irq; shp->irq = ha->irq;
shp->dma_channel = 0xff; shp->dma_channel = 0xff;
gdth_ctr_vtab[gdth_ctr_vcount++] = shp; gdth_ctr_vtab[gdth_ctr_vcount++] = shp;
NUMDATA(shp)->hanum = (ushort)hanum; NUMDATA(shp)->hanum = (ushort)hanum;
NUMDATA(shp)->busnum = b; NUMDATA(shp)->busnum = b;
} }
} }
GDTH_INIT_LOCK_HA(ha); GDTH_INIT_LOCK_HA(ha);
gdth_enable_int(hanum); gdth_enable_int(hanum);
}
} }
} }
...@@ -4470,8 +4486,7 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp)) ...@@ -4470,8 +4486,7 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp))
printk("GDT: Found %d PCI Storage RAID Controllers\n",cnt); printk("GDT: Found %d PCI Storage RAID Controllers\n",cnt);
gdth_sort_pci(pcistr,cnt); gdth_sort_pci(pcistr,cnt);
for (ctr = 0; ctr < cnt; ++ctr) { for (ctr = 0; ctr < cnt; ++ctr) {
dma_addr_t scratch_dma_handle;
dma_addr_t scratch_dma_handle;
if (gdth_ctr_count >= MAXHA) if (gdth_ctr_count >= MAXHA)
break; break;
...@@ -4514,7 +4529,7 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp)) ...@@ -4514,7 +4529,7 @@ GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp))
ha->ccb_phys = 0L; ha->ccb_phys = 0L;
#if LINUX_VERSION_CODE >= 0x020400 #if LINUX_VERSION_CODE >= 0x020400
ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH, ha->pscratch = pci_alloc_consistent(ha->pdev, GDTH_SCRATCH,
&scratch_dma_handle); &scratch_dma_handle);
ha->scratch_phys = (ulong32)scratch_dma_handle; ha->scratch_phys = (ulong32)scratch_dma_handle;
#else #else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA); ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
......
drivers/scsi/gdth.h
View file @ ad4341e7
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
/* /*
* Header file for the GDT Disk Array/Storage RAID controllers driver for Linux * Header file for the GDT Disk Array/Storage RAID controllers driver for Linux
* *
* gdth.h Copyright (C) 1995-02 ICP vortex, an Intel company, Achim Leubner * gdth.h Copyright (C) 1995-03 ICP vortex, Achim Leubner
* See gdth.c for further informations and * See gdth.c for further informations and
* below for supported controller types * below for supported controller types
* *
* <achim.leubner@intel.com> * <achim_leubner@adaptec.com>
* *
* $Id: gdth.h,v 1.48 2003/02/27 14:58:22 achim Exp $ * $Id: gdth.h,v 1.50 2003/09/17 08:29:58 achim Exp $
*/ */
#include <linux/version.h> #include <linux/version.h>
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
/* defines, macros */ /* defines, macros */
/* driver version */ /* driver version */
#define GDTH_VERSION_STR "2.07" #define GDTH_VERSION_STR "2.08"
#define GDTH_VERSION 2 #define GDTH_VERSION 2
#define GDTH_SUBVERSION 7 #define GDTH_SUBVERSION 8
/* protocol version */ /* protocol version */
#define PROTOCOL_VERSION 1 #define PROTOCOL_VERSION 1
......
drivers/scsi/gdth_proc.c
View file @ ad4341e7
/* gdth_proc.c /* gdth_proc.c
* $Id: gdth_proc.c,v 1.35 2003/02/27 15:00:44 achim Exp $ * $Id: gdth_proc.c,v 1.37 2003/09/17 08:31:53 achim Exp $
*/ */
#if LINUX_VERSION_CODE >= 0x020407 #if LINUX_VERSION_CODE >= 0x020407
......
drivers/scsi/gdth_proc.h
View file @ ad4341e7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _GDTH_PROC_H #define _GDTH_PROC_H
/* gdth_proc.h /* gdth_proc.h
* $Id: gdth_proc.h,v 1.13 2003/02/27 14:59:25 achim Exp $ * $Id: gdth_proc.h,v 1.14 2003/08/27 11:37:35 achim Exp $
*/ */
static int gdth_set_info(char *buffer,int length,int hanum,int busnum); static int gdth_set_info(char *buffer,int length,int hanum,int busnum);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7