lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] stex: minor cleanup and version update

Browse Source 
Add debug information into abort and host_reset routine.
Change ioremap to ioremap_nocache.
Version updated to 3.6.0000.1.

Signed-off-by: Ed Lin <ed.lin@promise.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Ed Lin
2007-05-09 20:50:42 -08:00
committed by James Bottomley
parent d116a7bc6a
commit c25da0afa7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/stex.c
View File

@@ -32,11 +32,12 @@
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_tcq.h> #include <scsi/scsi_tcq.h>
#include <scsi/scsi_dbg.h>
#define DRV_NAME "stex" #define DRV_NAME "stex"
#define ST_DRIVER_VERSION "3.1.0.1" #define ST_DRIVER_VERSION "3.6.0000.1"
#define ST_VER_MAJOR 3 #define ST_VER_MAJOR 3
#define ST_VER_MINOR 1 #define ST_VER_MINOR 6
#define ST_OEM 0 #define ST_OEM 0
#define ST_BUILD_VER 1 #define ST_BUILD_VER 1
@@ -992,6 +993,11 @@ static int stex_abort(struct scsi_cmnd *cmd)
u32 data; u32 data;
int result = SUCCESS; int result = SUCCESS;
unsigned long flags; unsigned long flags;
printk(KERN_INFO DRV_NAME
"(%s): aborting command\n", pci_name(hba->pdev));
scsi_print_command(cmd);
base = hba->mmio_base; base = hba->mmio_base;
spin_lock_irqsave(host->host_lock, flags); spin_lock_irqsave(host->host_lock, flags);
if (tag < host->can_queue && hba->ccb[tag].cmd == cmd) if (tag < host->can_queue && hba->ccb[tag].cmd == cmd)
@@ -1077,6 +1083,10 @@ static int stex_reset(struct scsi_cmnd *cmd)
unsigned long before; unsigned long before;
hba = (struct st_hba *) &cmd->device->host->hostdata[0]; hba = (struct st_hba *) &cmd->device->host->hostdata[0];
printk(KERN_INFO DRV_NAME
"(%s): resetting host\n", pci_name(hba->pdev));
scsi_print_command(cmd);
hba->mu_status = MU_STATE_RESETTING; hba->mu_status = MU_STATE_RESETTING;
if (hba->cardtype == st_shasta) if (hba->cardtype == st_shasta)
@@ -1196,7 +1206,7 @@ stex_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto out_scsi_host_put; goto out_scsi_host_put;
} }
hba->mmio_base = ioremap(pci_resource_start(pdev, 0), hba->mmio_base = ioremap_nocache(pci_resource_start(pdev, 0),
pci_resource_len(pdev, 0)); pci_resource_len(pdev, 0));
if ( !hba->mmio_base) { if ( !hba->mmio_base) {
printk(KERN_ERR DRV_NAME "(%s): memory map failed\n", printk(KERN_ERR DRV_NAME "(%s): memory map failed\n",