patch-2.2.18 linux/drivers/scsi/gdth.c
Next file: linux/drivers/scsi/gdth.h
Previous file: linux/drivers/scsi/esp.c
Back to the patch index
Back to the overall index
- Lines: 1644
- Date:
Mon Jul 24 10:32:20 2000
- Orig file:
v2.2.17/drivers/scsi/gdth.c
- Orig date:
Fri Apr 21 12:46:28 2000
diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/scsi/gdth.c linux/drivers/scsi/gdth.c
@@ -20,9 +20,46 @@
* along with this kernel; if not, write to the Free Software *
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
* *
- * Tested with Linux 1.2.13, ..., 2.2.12 *
+ * Tested with Linux 1.2.13, ..., 2.2.16, ..., 2.4.0-test4 *
* *
* $Log: gdth.c,v $
+ * 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
@@ -143,7 +180,7 @@
* Initial revision
*
************************************************************************/
-#ident "$Id: gdth.c,v 1.30 1999/11/02 13:42:39 achim Exp $"
+#ident "$Id: gdth.c,v 1.42 2000/07/20 09:04:50 achim Exp $"
/* All GDT Disk Array Controllers are fully supported by this driver.
* This includes the PCI/EISA/ISA SCSI Disk Array Controllers and the
@@ -170,10 +207,12 @@
* 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
*
- * The default value is: "gdth=disable:N,reserve_mode:1,reverse_scan:N,
- * max_ids:127,rescan:N,hdr_channel:0".
+ * The default values are: "gdth=disable:N,reserve_mode:1,reverse_scan:N,
+ * max_ids:127,rescan:N,virt_ctr:N,hdr_channel:0".
* 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.
@@ -183,7 +222,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 hdr_channel=0"
+ * max_ids=127 rescan=0 virt_ctr=0 hdr_channel=0"
* The other example: "modprobe gdth reserve_list=0,1,2,0,0,1,3,0 rescan=1".
*/
@@ -204,6 +243,9 @@
#include <linux/proc_fs.h>
#include <linux/time.h>
#include <linux/timer.h>
+#ifdef GDTH_RTC
+#include <linux/mc146818rtc.h>
+#endif
#if LINUX_VERSION_CODE >= 0x020100
#include <linux/reboot.h>
#else
@@ -213,7 +255,9 @@
#include <asm/dma.h>
#include <asm/system.h>
#include <asm/io.h>
-#if LINUX_VERSION_CODE >= 0x02015F
+#if LINUX_VERSION_CODE >= 0x020322
+#include <linux/spinlock.h>
+#elif LINUX_VERSION_CODE >= 0x02015F
#include <asm/spinlock.h>
#endif
@@ -236,7 +280,7 @@
static void gdth_interrupt(int irq,struct pt_regs *regs);
#endif
static int gdth_sync_event(int hanum,int service,unchar index,Scsi_Cmnd *scp);
-static int gdth_async_event(int hanum,int service);
+static int gdth_async_event(int hanum);
static void gdth_log_event(gdth_evt_data *dvr, char *buffer);
static void gdth_putq(int hanum,Scsi_Cmnd *scp,unchar priority);
@@ -271,6 +315,7 @@
static int gdth_internal_cmd(int hanum,unchar service,ushort opcode,ulong32 p1,
ulong32 p2,ulong32 p3);
static int gdth_search_drives(int hanum);
+static int gdth_analyse_hdrive(int hanum, ushort hdrive);
static void *gdth_mmap(ulong paddr, ulong size);
static void gdth_munmap(void *addr);
@@ -289,8 +334,6 @@
#ifdef DEBUG_GDTH
static unchar DebugState = DEBUG_GDTH;
-extern int sys_syslog(int,char*,int);
-#define LOGEN sys_syslog(7,NULL,0)
#ifdef __SERIAL__
#define MAX_SERBUF 160
@@ -359,9 +402,9 @@
#define TRACE3(a) {if (DebugState!=0) {ser_printk a;}}
#else /* !__SERIAL__ */
-#define TRACE(a) {if (DebugState==1) {LOGEN;printk a;}}
-#define TRACE2(a) {if (DebugState==1 || DebugState==2) {LOGEN;printk a;}}
-#define TRACE3(a) {if (DebugState!=0) {LOGEN;printk a;}}
+#define TRACE(a) {if (DebugState==1) {printk a;}}
+#define TRACE2(a) {if (DebugState==1 || DebugState==2) {printk a;}}
+#define TRACE3(a) {if (DebugState!=0) {printk a;}}
#endif
#else /* !DEBUG */
@@ -441,7 +484,7 @@
#define gdth_readl(addr) (ulong32)readl((ulong)(addr))
#define gdth_writeb(b,addr) writeb((b),(ulong)(addr))
#define gdth_writew(b,addr) writew((b),(ulong)(addr))
-#define gdth_writel(b,addr) writel((b),(ulong)(addr))
+#define gdth_writel(b,addr) writel((ulong32)(b),(ulong)(addr))
#else
static void *gdth_mmap(ulong paddr, ulong size)
@@ -457,7 +500,7 @@
#define gdth_readl(addr) (ulong32)readl((ulong)(addr))
#define gdth_writeb(b,addr) writeb((b),(ulong)(addr))
#define gdth_writew(b,addr) writew((b),(ulong)(addr))
-#define gdth_writel(b,addr) writel((b),(ulong)(addr))
+#define gdth_writel(b,addr) writel((ulong32)(b),(ulong)(addr))
#endif
@@ -493,17 +536,21 @@
DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,
DUN,DUN,DUN,DUN,DUN,DNO,DNO,DUN,DIN,DNO,DOU,DUN,DNO,DUN,DOU,DOU,
DOU,DOU,DOU,DNO,DUN,DIN,DOU,DIN,DIN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,
- DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,
+ DUN,DUN,DOU,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,
DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,
DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DOU,DUN,DUN,DUN,DUN,DUN,
DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN,DUN
};
/* __initfunc, __initdata macros */
-#if LINUX_VERSION_CODE >= 0x020126
+#if LINUX_VERSION_CODE >= 0x020322
+#define GDTH_INITFUNC(type, func) type __init func
+#include <linux/init.h>
+#elif LINUX_VERSION_CODE >= 0x020126
+#define GDTH_INITFUNC(type, func) __initfunc(type func)
#include <linux/init.h>
#else
-#define __initfunc(A) A
+#define GDTH_INITFUNC(type, func) type func
#define __initdata
#define __init
#endif
@@ -550,6 +597,8 @@
static int max_ids = MAXID;
/* rescan all IDs */
static int rescan = 0;
+/* map channels to virtual controllers */
+static int virt_ctr = 0;
#ifdef MODULE
#if LINUX_VERSION_CODE >= 0x02011A
@@ -562,6 +611,7 @@
MODULE_PARM(hdr_channel, "i");
MODULE_PARM(max_ids, "i");
MODULE_PARM(rescan, "i");
+MODULE_PARM(virt_ctr, "i");
MODULE_AUTHOR("Achim Leubner");
#endif
#endif
@@ -569,10 +619,12 @@
/* /proc support */
#if LINUX_VERSION_CODE >= 0x010300
#include <linux/stat.h>
+#if LINUX_VERSION_CODE < 0x020322
struct proc_dir_entry proc_scsi_gdth = {
PROC_SCSI_GDTH, 4, "gdth",
S_IFDIR | S_IRUGO | S_IXUGO, 2
};
+#endif
#include "gdth_proc.h"
#include "gdth_proc.c"
#endif
@@ -621,7 +673,7 @@
/* controller search and initialization functions */
-__initfunc (static int gdth_search_eisa(ushort eisa_adr))
+GDTH_INITFUNC(static int, gdth_search_eisa(ushort eisa_adr))
{
ulong32 id;
@@ -639,7 +691,7 @@
}
-__initfunc (static int gdth_search_isa(ulong32 bios_adr))
+GDTH_INITFUNC(static int, gdth_search_isa(ulong32 bios_adr))
{
void *addr;
ulong32 id;
@@ -655,9 +707,9 @@
}
-__initfunc (static int gdth_search_pci(gdth_pci_str *pcistr))
+GDTH_INITFUNC(static int, gdth_search_pci(gdth_pci_str *pcistr))
{
- ulong32 base0, base1, base2;
+ ulong base0, base1, base2;
ushort device_id, cnt;
#if LINUX_VERSION_CODE >= 0x2015C
struct pci_dev *pdev;
@@ -674,7 +726,43 @@
if (device_id > PCI_DEVICE_ID_VORTEX_GDT6555 &&
device_id < PCI_DEVICE_ID_VORTEX_GDT6x17RP)
continue;
-#if LINUX_VERSION_CODE >= 0x2015C
+#if LINUX_VERSION_CODE >= 0x20363
+ pdev = NULL;
+ while ((pdev = pci_find_device(PCI_VENDOR_ID_VORTEX,device_id,pdev))
+ != NULL) {
+ if (pci_enable_device(pdev))
+ continue;
+ if (cnt >= MAXHA)
+ return cnt;
+ /* GDT PCI controller found, resources are already in pdev */
+ pcistr[cnt].pdev = pdev;
+ pcistr[cnt].device_id = device_id;
+ pcistr[cnt].bus = pdev->bus->number;
+ pcistr[cnt].device_fn = pdev->devfn;
+ pcistr[cnt].irq = pdev->irq;
+ base0 = pci_resource_flags(pdev, 0);
+ base1 = pci_resource_flags(pdev, 1);
+ base2 = pci_resource_flags(pdev, 2);
+ if (device_id <= PCI_DEVICE_ID_VORTEX_GDT6000B || /* GDT6000/B */
+ device_id >= PCI_DEVICE_ID_VORTEX_GDT6x17RP) { /* MPR */
+ if (!(base0 & IORESOURCE_MEM))
+ continue;
+ pcistr[cnt].dpmem = pci_resource_start(pdev, 0);
+ } else { /* GDT6110, GDT6120, .. */
+ if (!(base0 & IORESOURCE_MEM) ||
+ !(base2 & IORESOURCE_MEM) ||
+ !(base1 & IORESOURCE_IO))
+ continue;
+ pcistr[cnt].dpmem = pci_resource_start(pdev, 2);
+ pcistr[cnt].io_mm = pci_resource_start(pdev, 0);
+ pcistr[cnt].io = pci_resource_start(pdev, 1);
+ }
+ TRACE2(("Controller found at %d/%d, irq %d, dpmem 0x%lx\n",
+ pcistr[cnt].bus, PCI_SLOT(pcistr[cnt].device_fn),
+ pcistr[cnt].irq, pcistr[cnt].dpmem));
+ cnt++;
+ }
+#elif LINUX_VERSION_CODE >= 0x2015C
pdev = NULL;
while ((pdev = pci_find_device(PCI_VENDOR_ID_VORTEX,device_id,pdev))
!= NULL) {
@@ -695,7 +783,7 @@
PCI_BASE_ADDRESS_SPACE_MEMORY)
continue;
pcistr[cnt].dpmem = base0 & PCI_BASE_ADDRESS_MEM_MASK;
- } else { /* GDT6110, GDT6120, .. */
+ } else { /* GDT6110, GDT6120, .. */
if ((base0 & PCI_BASE_ADDRESS_SPACE) !=
PCI_BASE_ADDRESS_SPACE_MEMORY ||
(base2 & PCI_BASE_ADDRESS_SPACE) !=
@@ -707,9 +795,9 @@
pcistr[cnt].io_mm = base0 & PCI_BASE_ADDRESS_MEM_MASK;
pcistr[cnt].io = base1 & PCI_BASE_ADDRESS_IO_MASK;
}
- TRACE2(("Controller found at %d/%d, irq %d, dpmem 0x%x\n",
+ TRACE2(("Controller found at %d/%d, irq %d, dpmem 0x%lx\n",
pcistr[cnt].bus, PCI_SLOT(pcistr[cnt].device_fn),
- pcistr[cnt].irq, (int)pcistr[cnt].dpmem));
+ pcistr[cnt].irq, pcistr[cnt].dpmem));
cnt++;
}
#else
@@ -762,7 +850,7 @@
pcistr[cnt].io_mm = base0 & PCI_BASE_ADDRESS_MEM_MASK;
pcistr[cnt].io = base1 & PCI_BASE_ADDRESS_IO_MASK;
}
- TRACE2(("Controller found at %d/%d, irq %d, dpmem 0x%x\n",
+ TRACE2(("Controller found at %d/%d, irq %d, dpmem 0x%lx\n",
pcistr[cnt].bus, PCI_SLOT(pcistr[cnt].device_fn),
pcistr[cnt].irq, pcistr[cnt].dpmem));
cnt++;
@@ -773,7 +861,7 @@
}
-__initfunc (static void gdth_sort_pci(gdth_pci_str *pcistr, int cnt))
+GDTH_INITFUNC(static void, gdth_sort_pci(gdth_pci_str *pcistr, int cnt))
{
gdth_pci_str temp;
int i, changed;
@@ -811,7 +899,7 @@
}
-__initfunc (static int gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha))
+GDTH_INITFUNC(static int, gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha))
{
ulong32 retries,id;
unchar prot_ver,eisacf,i,irq_found;
@@ -900,7 +988,7 @@
}
-__initfunc (static int gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha))
+GDTH_INITFUNC(static int, gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha))
{
register gdt2_dpram_str *dp2_ptr;
int i;
@@ -997,7 +1085,7 @@
}
-__initfunc (static int gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha))
+GDTH_INITFUNC(static int, gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha))
{
register gdt6_dpram_str *dp6_ptr;
register gdt6c_dpram_str *dp6c_ptr;
@@ -1165,7 +1253,18 @@
}
/* manipulate config. space to enable DPMEM, start RP controller */
-#if LINUX_VERSION_CODE >= 0x2015C
+#if LINUX_VERSION_CODE >= 0x20363
+ pci_read_config_word(pcistr->pdev, PCI_COMMAND, &command);
+ command |= 6;
+ pci_write_config_word(pcistr->pdev, PCI_COMMAND, command);
+ if (pci_resource_start(pcistr->pdev, 8) == 1UL)
+ pci_resource_start(pcistr->pdev, 8) = 0UL;
+ i = 0xFEFF0001UL;
+ pci_write_config_dword(pcistr->pdev, PCI_ROM_ADDRESS, i);
+ gdth_delay(1);
+ pci_write_config_dword(pcistr->pdev, PCI_ROM_ADDRESS,
+ pci_resource_start(pcistr->pdev, 8));
+#elif LINUX_VERSION_CODE >= 0x2015C
pci_read_config_word(pcistr->pdev, PCI_COMMAND, &command);
command |= 6;
pci_write_config_word(pcistr->pdev, PCI_COMMAND, command);
@@ -1193,13 +1292,13 @@
pcibios_write_config_dword(pcistr->bus, pcistr->device_fn,
PCI_ROM_ADDRESS, rom_addr);
#endif
-
+
/* check and reset interface area */
dp6m_ptr = (gdt6m_dpram_str *)ha->brd;
gdth_writel(DPMEM_MAGIC, &dp6m_ptr->u);
if (gdth_readl(&dp6m_ptr->u) != DPMEM_MAGIC) {
- printk("GDT-PCI: Cannot access DPMEM at 0x%x (shadowed?)\n",
- (int)pcistr->dpmem);
+ printk("GDT-PCI: Cannot access DPMEM at 0x%lx (shadowed?)\n",
+ pcistr->dpmem);
found = FALSE;
for (i = 0xC8000; i < 0xE8000; i += 0x4000) {
gdth_munmap(ha->brd);
@@ -1298,7 +1397,7 @@
/* controller protocol functions */
-__initfunc (static void gdth_enable_int(int hanum))
+GDTH_INITFUNC(static void, gdth_enable_int(int hanum))
{
gdth_ha_str *ha;
ulong flags;
@@ -1609,6 +1708,12 @@
cmd_ptr->u.raw.bus = (unchar)p2;
cmd_ptr->u.raw.target = (unchar)p3;
cmd_ptr->u.raw.lun = (unchar)(p3 >> 8);
+ } else if (service == SCREENSERVICE) {
+ if (opcode == GDT_REALTIME) {
+ *(ulong32 *)&cmd_ptr->u.screen.su.data[0] = p1;
+ *(ulong32 *)&cmd_ptr->u.screen.su.data[4] = p2;
+ *(ulong32 *)&cmd_ptr->u.screen.su.data[8] = p3;
+ }
}
ha->cmd_len = sizeof(gdth_cmd_str);
ha->cmd_offs_dpmem = 0;
@@ -1631,20 +1736,21 @@
/* search for devices */
-__initfunc (static int gdth_search_drives(int hanum))
+GDTH_INITFUNC(static int, gdth_search_drives(int hanum))
{
register gdth_ha_str *ha;
ushort cdev_cnt, i;
- int drv_cyls, drv_hds, drv_secs;
- ulong32 bus_no;
- ulong32 drv_cnt, drv_no, j;
+ ulong32 bus_no, drv_cnt, drv_no, j;
gdth_getch_str *chn;
gdth_drlist_str *drl;
gdth_iochan_str *ioc;
gdth_raw_iochan_str *iocr;
gdth_arcdl_str *alst;
gdth_alist_str *alst2;
-
+#ifdef GDTH_RTC
+ unchar rtc[12];
+#endif
+
TRACE(("gdth_search_drives() hanum %d\n",hanum));
ha = HADATA(gdth_ctr_tab[hanum]);
@@ -1655,7 +1761,28 @@
return 0;
}
TRACE2(("gdth_search_drives(): SCREENSERVICE initialized\n"));
-
+
+#ifdef GDTH_RTC
+ /* read realtime clock info, send to controller */
+ /* 1. wait for the falling edge of update flag */
+ for (j = 0; j < 1000000; ++j)
+ if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
+ break;
+ for (j = 0; j < 1000000; ++j)
+ if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
+ break;
+ /* 2. read info */
+ do {
+ for (j = 0; j < 12; ++j)
+ rtc[j] = CMOS_READ(j);
+ } while (rtc[0] != CMOS_READ(0));
+ 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],
+ *(ulong32 *)&rtc[4], *(ulong32 *)&rtc[8]);
+#endif
+
/* initialize cache service */
if (!gdth_internal_cmd(hanum,CACHESERVICE,GDT_INIT,LINUX_OS,0,0)) {
printk("GDT: Initialization error cache service (code %d)\n",
@@ -1664,6 +1791,7 @@
}
TRACE2(("gdth_search_drives(): CACHESERVICE initialized\n"));
cdev_cnt = (ushort)ha->info;
+ ha->fw_vers = ha->service;
/* detect number of buses - try new IOCTL */
iocr = (gdth_raw_iochan_str *)ha->pscratch;
@@ -1723,7 +1851,8 @@
ha->more_proc = FALSE;
if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_IOCTL,BOARD_INFO,
INVALID_CHANNEL,sizeof(gdth_binfo_str))) {
- ha->binfo = *(gdth_binfo_str *)ha->pscratch;
+ memcpy(&ha->binfo, (gdth_binfo_str *)ha->pscratch,
+ sizeof(gdth_binfo_str));
if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_IOCTL,BOARD_FEATURES,
INVALID_CHANNEL,sizeof(gdth_bfeat_str))) {
TRACE2(("BOARD_INFO/BOARD_FEATURES supported\n"));
@@ -1798,14 +1927,14 @@
}
}
}
- alst = (gdth_arcdl_str *)ha->pscratch;
- alst->entries_avail = MAX_LDRIVES;
- alst->first_entry = 0;
- alst->list_offset = GDTOFFSOF(gdth_arcdl_str, list[0]);
+ alst = (gdth_arcdl_str *)ha->pscratch;
+ 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,
ARRAY_DRV_LIST2 | LA_CTRL_PATTERN,
INVALID_CHANNEL, sizeof(gdth_arcdl_str) +
- (alst->entries_avail-1) * sizeof(gdth_alist_str))) {
+ (alst->entries_avail-1) * sizeof(gdth_alist_str))) {
for (j = 0; j < alst->entries_init; ++j) {
ha->hdr[j].is_arraydrv = alst->list[j].is_arrayd;
ha->hdr[j].is_master = alst->list[j].is_master;
@@ -1813,9 +1942,9 @@
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,
- ARRAY_DRV_LIST | LA_CTRL_PATTERN,
- 0, 35 * sizeof(gdth_alist_str))) {
+ } else if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_IOCTL,
+ ARRAY_DRV_LIST | LA_CTRL_PATTERN,
+ 0, 35 * sizeof(gdth_alist_str))) {
for (j = 0; j < 35; ++j) {
alst2 = &((gdth_alist_str *)ha->pscratch)[j];
ha->hdr[j].is_arraydrv = alst2->is_arrayd;
@@ -1881,60 +2010,70 @@
}
}
- /* scanning for cache devices */
- for (i=0; i<cdev_cnt && i<MAX_HDRIVES; ++i) {
- TRACE(("gdth_search_drives() cachedev. %d\n",i));
- if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_INFO,i,0,0)) {
- ha->hdr[i].present = TRUE;
- ha->hdr[i].size = ha->info;
-
- /* evaluate mapping (sectors per head, heads per cylinder) */
- ha->hdr[i].size &= ~SECS32;
- if (ha->info2 == 0) {
- gdth_eval_mapping(ha->hdr[i].size,&drv_cyls,&drv_hds,&drv_secs);
- } else {
- drv_hds = ha->info2 & 0xff;
- drv_secs = (ha->info2 >> 8) & 0xff;
- drv_cyls = ha->hdr[i].size /drv_hds/drv_secs;
- }
- ha->hdr[i].heads = (unchar)drv_hds;
- ha->hdr[i].secs = (unchar)drv_secs;
- /* round size */
- ha->hdr[i].size = drv_cyls * drv_hds * drv_secs;
- TRACE2(("gdth_search_dr() cdr. %d size %d hds %d scs %d\n",
- i,ha->hdr[i].size,drv_hds,drv_secs));
-
- /* get informations about device */
- if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_DEVTYPE,i,
- 0,0)) {
- TRACE2(("gdth_search_dr() cache drive %d devtype %d\n",
- i,ha->info));
- ha->hdr[i].devtype = (ushort)ha->info;
- }
+ /* scanning for host drives */
+ for (i = 0; i < cdev_cnt; ++i)
+ gdth_analyse_hdrive(hanum,i);
+
+ TRACE(("gdth_search_drives() OK\n"));
+ return 1;
+}
- /* cluster info */
- if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_CLUST_INFO,i,
- 0,0)) {
- TRACE2(("gdth_search_dr() cache drive %d cluster info %d\n",
- i,ha->info));
- ha->hdr[i].cluster_type = (unchar)ha->info;
- } else {
- ha->hdr[i].cluster_type = 0;
- }
+static int gdth_analyse_hdrive(int hanum,ushort hdrive)
+{
+ register gdth_ha_str *ha;
+ int drv_cyls, drv_hds, drv_secs;
- /* R/W attributes */
- if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_RW_ATTRIBS,i,
- 0,0)) {
- TRACE2(("gdth_search_dr() cache drive %d r/w attrib. %d\n",
- i,ha->info));
- ha->hdr[i].rw_attribs = (unchar)ha->info;
- } else {
- ha->hdr[i].rw_attribs = 0;
- }
- }
+ TRACE(("gdth_analyse_hdrive() hanum %d drive %d\n",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))
+ return 0;
+ ha->hdr[hdrive].present = TRUE;
+ ha->hdr[hdrive].size = ha->info;
+
+ /* evaluate mapping (sectors per head, heads per cylinder) */
+ ha->hdr[hdrive].size &= ~SECS32;
+ if (ha->info2 == 0) {
+ gdth_eval_mapping(ha->hdr[hdrive].size,&drv_cyls,&drv_hds,&drv_secs);
+ } else {
+ drv_hds = ha->info2 & 0xff;
+ drv_secs = (ha->info2 >> 8) & 0xff;
+ drv_cyls = ha->hdr[hdrive].size /drv_hds/drv_secs;
+ }
+ ha->hdr[hdrive].heads = (unchar)drv_hds;
+ ha->hdr[hdrive].secs = (unchar)drv_secs;
+ /* round size */
+ ha->hdr[hdrive].size = drv_cyls * drv_hds * drv_secs;
+ TRACE2(("gdth_search_dr() cdr. %d size %d hds %d scs %d\n",
+ hdrive,ha->hdr[hdrive].size,drv_hds,drv_secs));
+
+ /* get informations about device */
+ if (gdth_internal_cmd(hanum,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;
}
- TRACE(("gdth_search_drives() OK\n"));
+ /* cluster info */
+ if (gdth_internal_cmd(hanum,CACHESERVICE,GDT_CLUST_INFO,hdrive,0,0)) {
+ TRACE2(("gdth_search_dr() cache drive %d cluster info %d\n",
+ hdrive,ha->info));
+ ha->hdr[hdrive].cluster_type = (unchar)ha->info;
+ } else {
+ ha->hdr[hdrive].cluster_type = 0;
+ }
+
+ /* R/W attributes */
+ if (gdth_internal_cmd(hanum,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;
+ } else {
+ ha->hdr[hdrive].rw_attribs = 0;
+ }
+
return 1;
}
@@ -1954,11 +2093,7 @@
GDTH_LOCK_HA(ha, flags);
scp->SCp.this_residual = (int)priority;
-#if LINUX_VERSION_CODE >= 0x020000
- b = scp->channel;
-#else
- b = NUMDATA(nscp->host)->busnum;
-#endif
+ b = virt_ctr ? NUMDATA(scp->host)->busnum : scp->channel;
t = scp->target;
#if LINUX_VERSION_CODE >= 0x010300
if (priority >= DEFAULT_PRI) {
@@ -2019,11 +2154,7 @@
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 LINUX_VERSION_CODE >= 0x020000
- b = nscp->channel;
-#else
- b = NUMDATA(nscp->host)->busnum;
-#endif
+ b = virt_ctr ? NUMDATA(nscp->host)->busnum : nscp->channel;
t = nscp->target;
if (nscp->SCp.this_residual >= DEFAULT_PRI) {
if ((b != ha->virt_bus && ha->raw[BUS_L2P(ha,b)].lock) ||
@@ -2085,21 +2216,8 @@
if (b == ha->virt_bus && nscp->cmnd[0] != INQUIRY &&
nscp->cmnd[0] != READ_CAPACITY && nscp->cmnd[0] != MODE_SENSE &&
(ha->hdr[t].cluster_type & CLUSTER_DRIVE)) {
- if (!(ha->hdr[t].cluster_type & CLUSTER_MOUNTED)) {
- /* cluster drive NOT MOUNTED */
- if (!(ha->hdr[t].cluster_type & CLUSTER_RESERVED)) {
- /* cluster drive NOT RESERVED */
- nscp->SCp.Status = GDT_MOUNT;
- } else {
- /* cluster drive RESERVED (on the other node) */
- nscp->SCp.Status = GDT_CLUST_INFO;
- }
- } else {
- if (!(ha->hdr[t].cluster_type & CLUSTER_RESERVED)) {
- /* cluster drive MOUNTED and not RESERVED */
- nscp->SCp.Status = GDT_CLUST_INFO;
- }
- }
+ /* always GDT_CLUST_INFO! */
+ nscp->SCp.Status = GDT_CLUST_INFO;
}
}
}
@@ -2177,6 +2295,7 @@
if ( (nscp->cmnd[4]&1) && !(ha->hdr[t].devtype&1) ) {
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++;
else {
@@ -2353,6 +2472,7 @@
break;
}
scp->result = DID_OK << 16;
+ scp->sense_buffer[0] = 0;
if (!scp->SCp.have_data_in)
scp->SCp.have_data_in++;
@@ -2545,7 +2665,7 @@
cmdp->u.raw.sense_len = 16;
cmdp->u.raw.sense_data = virt_to_bus(scp->sense_buffer);
cmdp->u.raw.direction =
- gdth_direction_tab[scp->cmnd[0]]==DOU ? DATA_OUT : DATA_IN;
+ gdth_direction_tab[scp->cmnd[0]]==DOU ? GDTH_DATA_OUT:GDTH_DATA_IN;
memcpy(cmdp->u.raw.cmd,scp->cmnd,12);
if (scp->use_sg) {
@@ -2677,8 +2797,12 @@
if (ebuffer[elastidx].event_source == source &&
ebuffer[elastidx].event_idx == idx &&
- !memcmp((char *)&ebuffer[elastidx].event_data.eu,
- (char *)&evt->eu, evt->size)) {
+ ((evt->size != 0 && ebuffer[elastidx].event_data.size != 0 &&
+ !memcmp((char *)&ebuffer[elastidx].event_data.eu,
+ (char *)&evt->eu, evt->size)) ||
+ (evt->size == 0 && ebuffer[elastidx].event_data.size == 0 &&
+ !strcmp((char *)&ebuffer[elastidx].event_data.event_string,
+ (char *)&evt->event_string)))) {
e = &ebuffer[elastidx];
do_gettimeofday(&tv);
e->last_stamp = tv.tv_sec;
@@ -2791,11 +2915,9 @@
gdt6_dpram_str *dp6_ptr;
gdt2_dpram_str *dp2_ptr;
Scsi_Cmnd *scp;
- int hanum, rval;
+ int hanum, rval, i;
unchar IStatus;
- ushort CmdStatus, Service = 0;
- ulong32 InfoBytes, InfoBytes2 = 0;
- gdth_evt_data dvr;
+ ushort Service;
ulong flags = 0;
TRACE(("gdth_interrupt() IRQ %d\n",irq));
@@ -2813,9 +2935,7 @@
/* search controller */
if ((hanum = gdth_get_status(&IStatus,irq)) == -1) {
- /*
- TRACE2(("gdth_interrupt(): Spurious interrupt received\n"));
- */
+ /* spurious interrupt */
if (!gdth_polling)
GDTH_UNLOCK_HA((gdth_ha_str *)dev_id,flags);
return;
@@ -2829,34 +2949,28 @@
if (ha->type == GDT_EISA) {
if (IStatus & 0x80) { /* error flag */
IStatus &= ~0x80;
- CmdStatus = inw(ha->bmic + MAILBOXREG+8);
- TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,CmdStatus));
- if (IStatus == ASYNCINDEX) { /* async. event ? */
- Service = inw(ha->bmic + MAILBOXREG+10);
- InfoBytes2 = inl(ha->bmic + MAILBOXREG+4);
- }
+ ha->status = inw(ha->bmic + MAILBOXREG+8);
+ TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,ha->status));
} else /* no error */
- CmdStatus = S_OK;
- InfoBytes = inl(ha->bmic + MAILBOXREG+12);
- if (gdth_polling) /* init. -> more info */
- InfoBytes2 = inl(ha->bmic + MAILBOXREG+4);
+ ha->status = S_OK;
+ ha->info = inl(ha->bmic + MAILBOXREG+12);
+ ha->service = inw(ha->bmic + MAILBOXREG+10);
+ ha->info2 = inl(ha->bmic + MAILBOXREG+4);
+
outb(0xff, ha->bmic + EDOORREG); /* acknowledge interrupt */
outb(0x00, ha->bmic + SEMA1REG); /* reset status semaphore */
} else if (ha->type == GDT_ISA) {
dp2_ptr = (gdt2_dpram_str *)ha->brd;
if (IStatus & 0x80) { /* error flag */
IStatus &= ~0x80;
- CmdStatus = gdth_readw(&dp2_ptr->u.ic.Status);
- TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,CmdStatus));
- if (IStatus == ASYNCINDEX) { /* async. event ? */
- Service = gdth_readw(&dp2_ptr->u.ic.Service);
- InfoBytes2 = gdth_readl(&dp2_ptr->u.ic.Info[1]);
- }
+ ha->status = gdth_readw(&dp2_ptr->u.ic.Status);
+ TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,ha->status));
} else /* no error */
- CmdStatus = S_OK;
- InfoBytes = gdth_readl(&dp2_ptr->u.ic.Info[0]);
- if (gdth_polling) /* init. -> more info */
- InfoBytes2 = gdth_readl(&dp2_ptr->u.ic.Info[1]);
+ 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]);
+
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 */
@@ -2864,52 +2978,56 @@
dp6_ptr = (gdt6_dpram_str *)ha->brd;
if (IStatus & 0x80) { /* error flag */
IStatus &= ~0x80;
- CmdStatus = gdth_readw(&dp6_ptr->u.ic.Status);
- TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,CmdStatus));
- if (IStatus == ASYNCINDEX) { /* async. event ? */
- Service = gdth_readw(&dp6_ptr->u.ic.Service);
- InfoBytes2 = gdth_readl(&dp6_ptr->u.ic.Info[1]);
- }
+ ha->status = gdth_readw(&dp6_ptr->u.ic.Status);
+ TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,ha->status));
} else /* no error */
- CmdStatus = S_OK;
- InfoBytes = gdth_readl(&dp6_ptr->u.ic.Info[0]);
- if (gdth_polling) /* init. -> more info */
- InfoBytes2 = gdth_readl(&dp6_ptr->u.ic.Info[1]);
+ 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]);
+
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 */
} else if (ha->type == GDT_PCINEW) {
if (IStatus & 0x80) { /* error flag */
IStatus &= ~0x80;
- CmdStatus = inw(PTR2USHORT(&ha->plx->status));
- TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,CmdStatus));
- if (IStatus == ASYNCINDEX) { /* async. event ? */
- Service = inw(PTR2USHORT(&ha->plx->service));
- InfoBytes2 = inl(PTR2USHORT(&ha->plx->info[1]));
- }
+ ha->status = inw(PTR2USHORT(&ha->plx->status));
+ TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,ha->status));
} else
- CmdStatus = S_OK;
+ ha->status = S_OK;
+ ha->info = inl(PTR2USHORT(&ha->plx->info[0]));
+ ha->service = inw(PTR2USHORT(&ha->plx->service));
+ ha->info2 = inl(PTR2USHORT(&ha->plx->info[1]));
- InfoBytes = inl(PTR2USHORT(&ha->plx->info[0]));
- if (gdth_polling) /* init. -> more info */
- InfoBytes2 = inl(PTR2USHORT(&ha->plx->info[1]));
outb(0xff, PTR2USHORT(&ha->plx->edoor_reg));
outb(0x00, PTR2USHORT(&ha->plx->sema1_reg));
} else if (ha->type == GDT_PCIMPR) {
dp6m_ptr = (gdt6m_dpram_str *)ha->brd;
if (IStatus & 0x80) { /* error flag */
IStatus &= ~0x80;
- CmdStatus = gdth_readw(&dp6m_ptr->i960r.status);
- TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,CmdStatus));
- if (IStatus == ASYNCINDEX) { /* async. event ? */
- Service = gdth_readw(&dp6m_ptr->i960r.service);
- InfoBytes2 = gdth_readl(&dp6m_ptr->i960r.info[1]);
- }
+ ha->status = gdth_readw(&dp6m_ptr->i960r.status);
+ TRACE2(("gdth_interrupt() error %d/%d\n",IStatus,ha->status));
} else /* no error */
- CmdStatus = S_OK;
- InfoBytes = gdth_readl(&dp6m_ptr->i960r.info[0]);
- if (gdth_polling) /* init. -> more info */
- InfoBytes2 = gdth_readl(&dp6m_ptr->i960r.info[1]);
+ ha->status = S_OK;
+ 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]);
+
+ /* event string */
+ if (IStatus == ASYNCINDEX) {
+ if (ha->service != SCREENSERVICE &&
+ (ha->fw_vers & 0xff) >= 0x1a) {
+ ha->dvr.severity =
+ gdth_readb(&((gdt6m_dpram_str *)ha->brd)->i960r.severity);
+ for (i = 0; i < 256; ++i) {
+ ha->dvr.event_string[i] = gdth_readb
+ (&((gdt6m_dpram_str *)ha->brd)->i960r.evt_str[i]);
+ if (ha->dvr.event_string[i] == 0)
+ break;
+ }
+ }
+ }
gdth_writeb(0xff, &dp6m_ptr->i960r.edoor_reg);
gdth_writeb(0, &dp6m_ptr->i960r.sema1_reg);
} else {
@@ -2920,10 +3038,7 @@
}
TRACE(("gdth_interrupt() index %d stat %d info %d\n",
- IStatus,CmdStatus,InfoBytes));
- ha->status = CmdStatus;
- ha->info = InfoBytes;
- ha->info2 = InfoBytes2;
+ IStatus,ha->status,ha->info));
if (gdth_from_wait) {
wait_hanum = hanum;
@@ -2932,7 +3047,7 @@
if (IStatus == ASYNCINDEX) {
TRACE2(("gdth_interrupt() async. event\n"));
- gdth_async_event(hanum,Service);
+ gdth_async_event(hanum);
if (!gdth_polling)
GDTH_UNLOCK_HA((gdth_ha_str *)dev_id,flags);
gdth_next(hanum);
@@ -2941,9 +3056,9 @@
if (IStatus == SPEZINDEX) {
TRACE2(("Service unknown or not initialized !\n"));
- dvr.size = sizeof(dvr.eu.driver);
- dvr.eu.driver.ionode = hanum;
- gdth_store_event(ha, ES_DRIVER, 4, &dvr);
+ ha->dvr.size = sizeof(ha->dvr.eu.driver);
+ ha->dvr.eu.driver.ionode = hanum;
+ gdth_store_event(ha, ES_DRIVER, 4, &ha->dvr);
if (!gdth_polling)
GDTH_UNLOCK_HA((gdth_ha_str *)dev_id,flags);
return;
@@ -2953,10 +3068,10 @@
ha->cmd_tab[IStatus-2].cmnd = UNUSED_CMND;
if (scp == UNUSED_CMND) {
TRACE2(("gdth_interrupt() index to unused command (%d)\n",IStatus));
- dvr.size = sizeof(dvr.eu.driver);
- dvr.eu.driver.ionode = hanum;
- dvr.eu.driver.index = IStatus;
- gdth_store_event(ha, ES_DRIVER, 1, &dvr);
+ ha->dvr.size = sizeof(ha->dvr.eu.driver);
+ ha->dvr.eu.driver.ionode = hanum;
+ ha->dvr.eu.driver.index = IStatus;
+ gdth_store_event(ha, ES_DRIVER, 1, &ha->dvr);
if (!gdth_polling)
GDTH_UNLOCK_HA((gdth_ha_str *)dev_id,flags);
return;
@@ -2987,9 +3102,7 @@
register gdth_ha_str *ha;
gdth_msg_str *msg;
gdth_cmd_str *cmdp;
- char c='\r';
- ushort i;
- gdth_evt_data dvr;
+ unchar b;
ha = HADATA(gdth_ctr_tab[hanum]);
cmdp = ha->pccb;
@@ -3017,11 +3130,11 @@
cmdp->OpCode = GDT_READ;
cmdp->BoardNode = LOCALBOARD;
cmdp->u.screen.reserved = 0;
- cmdp->u.screen.msg_handle= msg->msg_handle;
- cmdp->u.screen.msg_addr = virt_to_bus(msg);
+ cmdp->u.screen.su.msg.msg_handle= msg->msg_handle;
+ cmdp->u.screen.su.msg.msg_addr = virt_to_bus(msg);
ha->scratch_busy = TRUE;
ha->cmd_offs_dpmem = 0;
- ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.msg_addr)
+ ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.su.msg.msg_addr)
+ sizeof(ulong32);
ha->cmd_cnt = 0;
gdth_copy_command(hanum);
@@ -3030,22 +3143,19 @@
}
if (msg->msg_answer && msg->msg_alen) {
- for (i=0; i<msg->msg_alen && i<MSGLEN; ++i) {
- /* getchar() ?? */
- /* .. */
- if (c == '\r')
- break;
- msg->msg_text[i] = c;
- }
- msg->msg_alen -= i;
- if (c!='\r' && msg->msg_alen!=0) {
- msg->msg_answer = 1;
- msg->msg_ext = 1;
+ /* default answers (getchar() not possible) */
+ if (msg->msg_alen == 1) {
+ msg->msg_alen = 0;
+ msg->msg_len = 1;
+ msg->msg_text[0] = 0;
} else {
- msg->msg_ext = 0;
- msg->msg_answer = 0;
+ msg->msg_alen -= 2;
+ msg->msg_len = 2;
+ msg->msg_text[0] = 1;
+ msg->msg_text[1] = 0;
}
- msg->msg_len = i;
+ msg->msg_ext = 0;
+ msg->msg_answer = 0;
while (gdth_test_busy(hanum))
gdth_delay(0);
cmdp->Service = SCREENSERVICE;
@@ -3055,11 +3165,11 @@
cmdp->OpCode = GDT_WRITE;
cmdp->BoardNode = LOCALBOARD;
cmdp->u.screen.reserved = 0;
- cmdp->u.screen.msg_handle= msg->msg_handle;
- cmdp->u.screen.msg_addr = virt_to_bus(msg);
+ cmdp->u.screen.su.msg.msg_handle= msg->msg_handle;
+ cmdp->u.screen.su.msg.msg_addr = virt_to_bus(msg);
ha->scratch_busy = TRUE;
ha->cmd_offs_dpmem = 0;
- ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.msg_addr)
+ ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.su.msg.msg_addr)
+ sizeof(ulong32);
ha->cmd_cnt = 0;
gdth_copy_command(hanum);
@@ -3069,8 +3179,9 @@
printk("\n");
} else {
- if (scp->SCp.Status == -1 && scp->channel != ha->virt_bus) {
- ha->raw[BUS_L2P(ha,scp->channel)].io_cnt[scp->target]--;
+ b = virt_ctr ? NUMDATA(scp->host)->busnum : scp->channel;
+ if (scp->SCp.Status == -1 && b != ha->virt_bus) {
+ ha->raw[BUS_L2P(ha,b)].io_cnt[scp->target]--;
}
/* cache or raw service */
if (ha->status == S_OK) {
@@ -3107,6 +3218,7 @@
scp->sense_buffer[0] = 0x70;
scp->sense_buffer[2] = UNIT_ATTENTION;
scp->result = (DID_OK << 16) | (CHECK_CONDITION << 1);
+ scp->SCp.Message = (int)(ha->info<<16|S_BSY);
} else {
scp->SCp.Status = -1;
/* retry */
@@ -3121,6 +3233,7 @@
ha->hdr[scp->target].cluster_type &= ~CLUSTER_RESERVED;
}
scp->result = DID_OK << 16;
+ scp->sense_buffer[0] = 0;
}
} else if (ha->status == S_BSY) {
TRACE2(("Controller busy -> retry !\n"));
@@ -3131,9 +3244,6 @@
return 2;
} else {
scp->SCp.Message = (int)((ha->info<<16)|ha->status);
- memset((char*)scp->sense_buffer,0,16);
- scp->sense_buffer[0] = 0x70;
- scp->sense_buffer[2] = NOT_READY;
if (scp->SCp.Status != -1) {
TRACE2(("gdth_sync_event(): special cmd 0x%x error 0x%x\n",
@@ -3145,34 +3255,44 @@
scp->SCp.this_residual = HIGH_PRI;
return 2;
}
+ memset((char*)scp->sense_buffer,0,16);
+ scp->sense_buffer[0] = 0x70;
+ scp->sense_buffer[2] = NOT_READY;
scp->result = (DID_OK << 16) | (CHECK_CONDITION << 1);
} else if (scp->cmnd[0] == RESERVE ||
scp->cmnd[0] == RELEASE) {
+ memset((char*)scp->sense_buffer,0,16);
+ scp->sense_buffer[0] = 0x70;
+ scp->sense_buffer[2] = NOT_READY;
scp->result = (DID_OK << 16) | (CHECK_CONDITION << 1);
} else if (service == CACHESERVICE) {
- if (ha->status == S_CACHE_UNKNOWN &&
- (ha->hdr[scp->target].cluster_type &
- CLUSTER_RESERVE_STATE) == CLUSTER_RESERVE_STATE) {
- /* bus reset -> force GDT_CLUST_INFO */
- ha->hdr[scp->target].cluster_type &= ~CLUSTER_RESERVED;
- }
+ if (ha->status == S_CACHE_UNKNOWN &&
+ (ha->hdr[scp->target].cluster_type &
+ CLUSTER_RESERVE_STATE) == CLUSTER_RESERVE_STATE) {
+ /* bus reset -> force GDT_CLUST_INFO */
+ ha->hdr[scp->target].cluster_type &= ~CLUSTER_RESERVED;
+ }
+ memset((char*)scp->sense_buffer,0,16);
+ scp->sense_buffer[0] = 0x70;
+ scp->sense_buffer[2] = NOT_READY;
scp->result = (DID_OK << 16) | (CHECK_CONDITION << 1);
#if LINUX_VERSION_CODE >= 0x010300
if (scp->done != gdth_scsi_done)
#endif
{
- dvr.size = sizeof(dvr.eu.sync);
- dvr.eu.sync.ionode = hanum;
- dvr.eu.sync.service = service;
- dvr.eu.sync.status = ha->status;
- dvr.eu.sync.info = ha->info;
- dvr.eu.sync.hostdrive = scp->target;
+ ha->dvr.size = sizeof(ha->dvr.eu.sync);
+ ha->dvr.eu.sync.ionode = hanum;
+ ha->dvr.eu.sync.service = service;
+ ha->dvr.eu.sync.status = ha->status;
+ ha->dvr.eu.sync.info = ha->info;
+ ha->dvr.eu.sync.hostdrive = scp->target;
if (ha->status >= 0x8000)
- gdth_store_event(ha, ES_SYNC, 0, &dvr);
+ gdth_store_event(ha, ES_SYNC, 0, &ha->dvr);
else
- gdth_store_event(ha, ES_SYNC, service, &dvr);
+ gdth_store_event(ha, ES_SYNC, service, &ha->dvr);
}
} else {
+ /* sense buffer filled from controller firmware (DMA) */
if (ha->status!=S_RAW_SCSI || ha->info>=0x100) {
scp->result = DID_BAD_TARGET << 16;
} else {
@@ -3336,12 +3456,17 @@
"GDT HA %u, Uncorrectable DRAM error detected with ECC",
/*72*/ "\011\000\002\012\001\013\001\014\001"
"GDT HA %u, SCSI bus %u, ID %u, LUN %u: reassigning block",
+/*73*/ "\005\000\002\006\002"
+ "GDT HA %u, Host drive %u resetted locally",
+/*74*/ "\005\000\002\006\002"
+ "GDT HA %u, Host drive %u resetted remotely",
+/*75*/ "\003\000\002"
+ "GDT HA %u, async. status 75 unknown",
};
-static int gdth_async_event(int hanum,int service)
+static int gdth_async_event(int hanum)
{
- gdth_evt_data dvr;
gdth_ha_str *ha;
gdth_msg_str *msg;
gdth_cmd_str *cmdp;
@@ -3351,9 +3476,9 @@
cmdp= ha->pccb;
msg = (gdth_msg_str *)ha->pscratch;
TRACE2(("gdth_async_event() ha %d serv %d\n",
- hanum,service));
+ hanum,ha->service));
- if (service == SCREENSERVICE) {
+ if (ha->service == SCREENSERVICE) {
if (ha->status == MSG_REQUEST) {
while (gdth_test_busy(hanum))
gdth_delay(0);
@@ -3364,11 +3489,11 @@
cmdp->OpCode = GDT_READ;
cmdp->BoardNode = LOCALBOARD;
cmdp->u.screen.reserved = 0;
- cmdp->u.screen.msg_handle= MSG_INV_HANDLE;
- cmdp->u.screen.msg_addr = virt_to_bus(msg);
+ cmdp->u.screen.su.msg.msg_handle= MSG_INV_HANDLE;
+ cmdp->u.screen.su.msg.msg_addr = virt_to_bus(msg);
ha->scratch_busy = TRUE;
ha->cmd_offs_dpmem = 0;
- ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.msg_addr)
+ ha->cmd_len = GDTOFFSOF(gdth_cmd_str,u.screen.su.msg.msg_addr)
+ sizeof(ulong32);
ha->cmd_cnt = 0;
gdth_copy_command(hanum);
@@ -3383,14 +3508,29 @@
}
} else {
- dvr.size = sizeof(dvr.eu.async);
- dvr.eu.async.ionode = hanum;
- dvr.eu.async.service = service;
- dvr.eu.async.status = ha->status;
- dvr.eu.async.info = ha->info;
- *(ulong32 *)dvr.eu.async.scsi_coord = ha->info2;
- gdth_store_event(ha, ES_ASYNC, service, &dvr);
- gdth_log_event( &dvr, NULL );
+ if (ha->type == GDT_PCIMPR &&
+ (ha->fw_vers & 0xff) >= 0x1a) {
+ ha->dvr.size = 0;
+ ha->dvr.eu.async.ionode = 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.service = ha->service;
+ ha->dvr.eu.async.status = ha->status;
+ ha->dvr.eu.async.info = ha->info;
+ *(ulong32 *)ha->dvr.eu.async.scsi_coord = ha->info2;
+ }
+ gdth_store_event( ha, ES_ASYNC, ha->service, &ha->dvr );
+ gdth_log_event( &ha->dvr, NULL );
+
+ /* new host drive from expand? */
+ if (ha->service == CACHESERVICE && ha->status == 56) {
+ TRACE2(("gdth_async_event(): new host drive %d created\n",
+ (ushort)ha->info));
+ gdth_analyse_hdrive(hanum, (ushort)ha->info);
+ }
}
return 1;
}
@@ -3402,7 +3542,14 @@
int i,j;
TRACE2(("gdth_log_event()\n"));
- if (dvr->eu.async.service == CACHESERVICE &&
+ if (dvr->size == 0) {
+ if (buffer == NULL) {
+ printk("Adapter %d: %s\n",dvr->eu.async.ionode,dvr->event_string);
+ } else {
+ sprintf(buffer,"Adapter %d: %s\n",
+ dvr->eu.async.ionode,dvr->event_string);
+ }
+ } else if (dvr->eu.async.service == CACHESERVICE &&
INDEX_OK(dvr->eu.async.status, async_cache_tab)) {
TRACE2(("GDT: Async. event cache service, event no.: %d\n",
dvr->eu.async.status));
@@ -3474,7 +3621,7 @@
#endif
-__initfunc (int gdth_detect(Scsi_Host_Template *shtp))
+GDTH_INITFUNC(int, gdth_detect(Scsi_Host_Template *shtp))
{
struct Scsi_Host *shp;
gdth_ha_str *ha;
@@ -3522,6 +3669,9 @@
scsi_unregister(shp);
continue;
}
+#ifdef __ia64__
+ 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);
@@ -3559,7 +3709,12 @@
NUMDATA(shp)->busnum= 0;
ha->pccb = CMDDATA(shp);
+#if LINUX_VERSION_CODE >= 0x020322
+ ha->pscratch = (void *) __get_free_pages(GFP_ATOMIC | GFP_DMA,
+ GDTH_SCRATCH_ORD);
+#else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
+#endif
ha->scratch_busy = FALSE;
ha->req_first = NULL;
ha->tid_cnt = MAX_HDRIVES;
@@ -3574,7 +3729,11 @@
--gdth_ctr_count;
--gdth_ctr_vcount;
if (ha->pscratch != NULL)
+#if LINUX_VERSION_CODE >= 0x020322
+ free_pages((unsigned long)ha->pscratch, GDTH_SCRATCH_ORD);
+#else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
+#endif
#if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,NULL);
#else
@@ -3590,21 +3749,26 @@
#if LINUX_VERSION_CODE >= 0x020000
shp->max_id = ha->tid_cnt;
shp->max_lun = MAXLUN;
- shp->max_channel = ha->bus_cnt;
-#else
- /* 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;
- }
+ shp->max_channel = virt_ctr ? 0 : ha->bus_cnt;
+ if (virt_ctr)
#endif
+ {
+ 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_INIT_LOCK_HA(ha);
gdth_enable_int(hanum);
+#endif /* !__ia64__ */
}
}
@@ -3646,7 +3810,12 @@
NUMDATA(shp)->hanum));
ha->pccb = CMDDATA(shp);
+#if LINUX_VERSION_CODE >= 0x020322
+ ha->pscratch = (void *) __get_free_pages(GFP_ATOMIC | GFP_DMA,
+ GDTH_SCRATCH_ORD);
+#else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
+#endif
ha->scratch_busy = FALSE;
ha->req_first = NULL;
ha->tid_cnt = MAX_HDRIVES;
@@ -3661,7 +3830,11 @@
--gdth_ctr_count;
--gdth_ctr_vcount;
if (ha->pscratch != NULL)
+#if LINUX_VERSION_CODE >= 0x020322
+ free_pages((unsigned long)ha->pscratch, GDTH_SCRATCH_ORD);
+#else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
+#endif
#if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,NULL);
#else
@@ -3677,22 +3850,23 @@
#if LINUX_VERSION_CODE >= 0x020000
shp->max_id = ha->tid_cnt;
shp->max_lun = MAXLUN;
- shp->max_channel = ha->bus_cnt;
-#else
- /* 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;
- TRACE2(("EISA detect Bus %d: shp %x hanum %d\n",
- NUMDATA(shp)->busnum,(ulong32)shp,
- NUMDATA(shp)->hanum));
- }
+ shp->max_channel = virt_ctr ? 0 : ha->bus_cnt;
+ if (virt_ctr)
#endif
+ {
+ 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_INIT_LOCK_HA(ha);
gdth_enable_int(hanum);
}
@@ -3745,7 +3919,12 @@
NUMDATA(shp)->busnum= 0;
ha->pccb = CMDDATA(shp);
+#if LINUX_VERSION_CODE >= 0x020322
+ ha->pscratch = (void *) __get_free_pages(GFP_ATOMIC | GFP_DMA,
+ GDTH_SCRATCH_ORD);
+#else
ha->pscratch = scsi_init_malloc(GDTH_SCRATCH, GFP_ATOMIC | GFP_DMA);
+#endif
ha->scratch_busy = FALSE;
ha->req_first = NULL;
ha->tid_cnt = pcistr[ctr].device_id >= 0x200 ? MAXID : MAX_HDRIVES;
@@ -3760,7 +3939,11 @@
--gdth_ctr_count;
--gdth_ctr_vcount;
if (ha->pscratch != NULL)
+#if LINUX_VERSION_CODE >= 0x020322
+ free_pages((unsigned long)ha->pscratch, GDTH_SCRATCH_ORD);
+#else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
+#endif
#if LINUX_VERSION_CODE >= 0x010346
free_irq(ha->irq,NULL);
#else
@@ -3776,19 +3959,23 @@
#if LINUX_VERSION_CODE >= 0x020000
shp->max_id = ha->tid_cnt;
shp->max_lun = MAXLUN;
- shp->max_channel = ha->bus_cnt;
-#else
- /* 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;
- }
+ shp->max_channel = virt_ctr ? 0 : ha->bus_cnt;
+ if (virt_ctr)
#endif
+ {
+ 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_INIT_LOCK_HA(ha);
gdth_enable_int(hanum);
}
@@ -3833,10 +4020,16 @@
free_irq(shp->irq);
#endif
}
+#ifndef __ia64__
if (shp->dma_channel != 0xff) {
free_dma(shp->dma_channel);
}
+#endif
+#if LINUX_VERSION_CODE >= 0x020322
+ free_pages((unsigned long)ha->pscratch, GDTH_SCRATCH_ORD);
+#else
scsi_init_free((void *)ha->pscratch, GDTH_SCRATCH);
+#endif
gdth_ctr_released++;
TRACE2(("gdth_release(): HA %d of %d\n",
gdth_ctr_released, gdth_ctr_count));
@@ -3937,26 +4130,26 @@
gdth_ha_str *ha;
ulong flags;
Scsi_Cmnd *cmnd;
+ unchar b;
TRACE2(("gdth_eh_bus_reset()\n"));
hanum = NUMDATA(scp->host)->hanum;
+ b = virt_ctr ? NUMDATA(scp->host)->busnum : scp->channel;
ha = HADATA(gdth_ctr_tab[hanum]);
/* clear command tab */
GDTH_LOCK_HA(ha, flags);
for (i = 0; i < GDTH_MAXCMDS; ++i) {
cmnd = ha->cmd_tab[i].cmnd;
- if (!SPECIAL_SCP(cmnd) && cmnd->channel == scp->channel)
+ if (!SPECIAL_SCP(cmnd) && cmnd->channel == b)
ha->cmd_tab[i].cmnd = UNUSED_CMND;
}
GDTH_UNLOCK_HA(ha, flags);
- if (scp->channel == ha->virt_bus) {
+ if (b == ha->virt_bus) {
/* host drives */
for (i = 0; i < MAX_HDRIVES; ++i) {
- if (ha->hdr[i].present &&
- (ha->hdr[i].cluster_type & CLUSTER_RESERVED)
- == CLUSTER_RESERVED) {
+ if (ha->hdr[i].present) {
GDTH_LOCK_HA(ha, flags);
gdth_polling = TRUE;
while (gdth_test_busy(hanum))
@@ -3972,12 +4165,12 @@
/* raw devices */
GDTH_LOCK_HA(ha, flags);
for (i = 0; i < MAXID; ++i)
- ha->raw[BUS_L2P(ha,scp->channel)].io_cnt[i] = 0;
+ ha->raw[BUS_L2P(ha,b)].io_cnt[i] = 0;
gdth_polling = TRUE;
while (gdth_test_busy(hanum))
gdth_delay(0);
gdth_internal_cmd(hanum, SCSIRAWSERVICE, GDT_RESET_BUS,
- BUS_L2P(ha,scp->channel), 0, 0);
+ BUS_L2P(ha,b), 0, 0);
gdth_polling = FALSE;
GDTH_UNLOCK_HA(ha, flags);
}
@@ -3997,17 +4190,17 @@
int gdth_bios_param(Disk *disk,int dev,int *ip)
#endif
{
- unchar t;
+ unchar b, t;
int hanum;
gdth_ha_str *ha;
hanum = NUMDATA(disk->device->host)->hanum;
+ b = virt_ctr ? NUMDATA(disk->device->host)->busnum : disk->device->channel;
t = disk->device->id;
- TRACE2(("gdth_bios_param() ha %d bus %d target %d\n",
- hanum, disk->device->channel, t));
+ TRACE2(("gdth_bios_param() ha %d bus %d target %d\n", hanum, b, t));
ha = HADATA(gdth_ctr_tab[hanum]);
- if (disk->device->channel != ha->virt_bus || ha->hdr[t].heads == 0) {
+ if (b != ha->virt_bus || ha->hdr[t].heads == 0) {
/* raw device or host drive without mapping information */
TRACE2(("Evaluate mapping\n"));
gdth_eval_mapping(disk->capacity,&ip[2],&ip[0],&ip[1]);
@@ -4075,19 +4268,32 @@
{
int i;
gdth_ha_str *ha;
+ gdth_cmd_str gdtcmd;
+#if LINUX_VERSION_CODE >= 0x020322
+ Scsi_Cmnd *scp;
+ Scsi_Device *sdev;
+#else
Scsi_Cmnd scp;
Scsi_Device sdev;
- gdth_cmd_str gdtcmd;
- char cmnd[12];
+#endif
+ char cmnd[MAX_COMMAND_SIZE];
+ memset(cmnd, 0xff, 12);
TRACE2(("gdth_flush() hanum %d\n",hanum));
ha = HADATA(gdth_ctr_tab[hanum]);
+
+#if LINUX_VERSION_CODE >= 0x020322
+ sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
+ scp = scsi_allocate_device(sdev, 1, FALSE);
+ scp->cmd_len = 12;
+ scp->use_sg = 0;
+#else
memset(&sdev,0,sizeof(Scsi_Device));
memset(&scp, 0,sizeof(Scsi_Cmnd));
- memset(cmnd, 0xff, 12);
sdev.host = scp.host = gdth_ctr_tab[hanum];
sdev.id = scp.target = sdev.host->this_id;
scp.device = &sdev;
+#endif
for (i = 0; i < MAX_HDRIVES; ++i) {
if (ha->hdr[i].present) {
@@ -4098,9 +4304,17 @@
gdtcmd.u.cache.BlockNo = 1;
gdtcmd.u.cache.sg_canz = 0;
TRACE2(("gdth_flush(): flush ha %d drive %d\n", hanum, i));
+#if LINUX_VERSION_CODE >= 0x020322
+ gdth_do_cmd(scp, &gdtcmd, cmnd, 30);
+#else
gdth_do_cmd(&scp, &gdtcmd, cmnd, 30);
+#endif
}
}
+#if LINUX_VERSION_CODE >= 0x020322
+ scsi_release_command(scp);
+ scsi_free_host_dev(sdev);
+#endif
}
/* shutdown routine */
@@ -4112,10 +4326,15 @@
{
int hanum;
#ifndef __alpha__
+ gdth_cmd_str gdtcmd;
+#if LINUX_VERSION_CODE >= 0x020322
+ Scsi_Cmnd *scp;
+ Scsi_Device *sdev;
+#else
Scsi_Cmnd scp;
Scsi_Device sdev;
- gdth_cmd_str gdtcmd;
- char cmnd[12];
+#endif
+ char cmnd[MAX_COMMAND_SIZE];
#endif
#if LINUX_VERSION_CODE >= 0x020100
@@ -4136,19 +4355,32 @@
#ifndef __alpha__
/* controller reset */
+ memset(cmnd, 0xff, 12);
+#if LINUX_VERSION_CODE >= 0x020322
+ sdev = scsi_get_host_dev(gdth_ctr_tab[hanum]);
+ scp = scsi_allocate_device(sdev, 1, FALSE);
+ scp->cmd_len = 12;
+ scp->use_sg = 0;
+#else
memset(&sdev,0,sizeof(Scsi_Device));
memset(&scp, 0,sizeof(Scsi_Cmnd));
- memset(cmnd, 0xff, 12);
sdev.host = scp.host = gdth_ctr_tab[hanum];
sdev.id = scp.target = sdev.host->this_id;
scp.device = &sdev;
+#endif
gdtcmd.BoardNode = LOCALBOARD;
gdtcmd.Service = CACHESERVICE;
gdtcmd.OpCode = GDT_RESET;
TRACE2(("gdth_halt(): reset controller %d\n", hanum));
+#if LINUX_VERSION_CODE >= 0x020322
+ gdth_do_cmd(scp, &gdtcmd, cmnd, 10);
+ scsi_release_command(scp);
+ scsi_free_host_dev(sdev);
+#else
gdth_do_cmd(&scp, &gdtcmd, cmnd, 10);
#endif
+#endif
}
printk("Done.\n");
@@ -4156,7 +4388,9 @@
del_timer(&gdth_timer);
#endif
#if LINUX_VERSION_CODE >= 0x020100
+#if LINUX_VERSION_CODE < 0x020322
unregister_reboot_notifier(&gdth_notifier);
+#endif
return NOTIFY_OK;
#endif
}
@@ -4164,7 +4398,7 @@
/* called from init/main.c */
-__initfunc (void gdth_setup(char *str,int *ints))
+GDTH_INITFUNC(void, gdth_setup(char *str,int *ints))
{
int i, argc;
char *cur_str, *argv;
@@ -4207,6 +4441,8 @@
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, "reserve_list:", 13)) {
reserve_list[0] = val;
for (i = 1; i < MAX_RES_ARGS; i++) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)