[PATCH 4/4] [SCSI]stex: minor cleanup and version update

[PATCH 4/4] [SCSI]stex: minor cleanup and version update

[Ed Lin]

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>
---
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 9465f35..5a10cfa 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -32,11 +32,12 @@ #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
+#include <scsi/scsi_dbg.h>
 
 #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_MINOR 		1
+#define ST_VER_MINOR 		6
 #define ST_OEM 			0
 #define ST_BUILD_VER 		1
 
@@ -1007,6 +1008,11 @@ static int stex_abort(struct scsi_cmnd *
 	u32 data;
 	int result = SUCCESS;
 	unsigned long flags;
+
+	printk(KERN_INFO DRV_NAME
+		"(%s): aborting command\n", pci_name(hba->pdev));
+	scsi_print_command(cmd);
+
 	base = hba->mmio_base;
 	spin_lock_irqsave(host->host_lock, flags);
 	if (tag < host->can_queue && hba->ccb[tag].cmd == cmd)
@@ -1092,6 +1098,10 @@ static int stex_reset(struct scsi_cmnd *
 	unsigned long before;
 	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;
 
 	if (hba->cardtype == st_shasta)
@@ -1211,7 +1221,7 @@ stex_probe(struct pci_dev *pdev, const s
 		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));
 	if ( !hba->mmio_base) {
 		printk(KERN_ERR DRV_NAME "(%s): memory map failed\n",

Re: [PATCH 4/4] [SCSI]stex: minor cleanup and version update

[Brian King]

Ed Lin wrote:
> @@ -1007,6 +1008,11 @@ static int stex_abort(struct scsi_cmnd *
>  	u32 data;
>  	int result = SUCCESS;
>  	unsigned long flags;
> +
> +	printk(KERN_INFO DRV_NAME
> +		"(%s): aborting command\n", pci_name(hba->pdev));
> +	scsi_print_command(cmd);
> +

scmd_printk is probably what you want here rather than just a printk.

scmd_printk(KERN_ERR, cmd, "aborting command\n");


> @@ -1092,6 +1098,10 @@ static int stex_reset(struct scsi_cmnd *
>  	unsigned long before;
>  	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);
> +

Same here.

Brian

-- 
Brian King
eServer Storage I/O
IBM Linux Technology Center

RE: [PATCH 4/4] [SCSI]stex: minor cleanup and version update

[Ed Lin]

> -----Original Message-----
> From: Brian King [mailto:brking@us.ibm.com] 
> Sent: Monday, April 02, 2007 9:05 AM
> To: Ed Lin
> Cc: linux-scsi; linux-kernel; james.Bottomley; jeff; Promise_Linux
> Subject: Re: [PATCH 4/4] [SCSI]stex: minor cleanup and version update
> 
> 
> Ed Lin wrote:
> > @@ -1007,6 +1008,11 @@ static int stex_abort(struct scsi_cmnd *
> >  	u32 data;
> >  	int result = SUCCESS;
> >  	unsigned long flags;
> > +
> > +	printk(KERN_INFO DRV_NAME
> > +		"(%s): aborting command\n", pci_name(hba->pdev));
> > +	scsi_print_command(cmd);
> > +
> 
> scmd_printk is probably what you want here rather than just a printk.
> 
> scmd_printk(KERN_ERR, cmd, "aborting command\n");
> 
> 
> > @@ -1092,6 +1098,10 @@ static int stex_reset(struct scsi_cmnd *
> >  	unsigned long before;
> >  	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);
> > +
> 
> Same here.

Well it's just because printk with pci_name stuff is used across
the driver, and I didn't want to break the rule...