Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.(none)>2002-02-09 11:23:57 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2002-02-09 11:23:57 -0500
commitfdd91bc1a18f9ec6afe5ad3f12057cf9cebee726 (patch)
tree8c98f352828ca84d75b5f9a7944c22d8339cd6a3
parent36c69833aea4b670611696c6bd2813c7502c7a19 (diff)
Various bugfixes to sync with 2.4 version:
- Fix bug in scripts that was causing CDRW hang - add sense buffer length initialisation - update lasi700 to new driver model and fix rmmod hang - add correct MCA reporting to D700 driver
-rw-r--r--Makefile2
-rw-r--r--drivers/scsi/53c700.c17
-rw-r--r--drivers/scsi/53c700.h10
-rw-r--r--drivers/scsi/53c700.scr2
-rw-r--r--drivers/scsi/NCR_D700.c7
-rw-r--r--drivers/scsi/lasi700.c9
6 files changed, 31 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index f1c5436e490a..35676cac9483 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ CLEAN_FILES = \
drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
drivers/scsi/aic7xxx/aicasm/y.tab.h \
drivers/scsi/aic7xxx/aicasm/aicasm \
- drivers/scsi/53c700-mem.c \
+ drivers/scsi/53c700_d.h \
net/khttpd/make_times_h \
net/khttpd/times.h \
submenu*
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index f4da7117c667..14f8e55fcecb 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -51,6 +51,14 @@
/* CHANGELOG
*
+ * Version 2.7
+ *
+ * Fixed scripts problem which caused certain devices (notably CDRWs)
+ * to hang on initial INQUIRY. Updated NCR_700_readl/writel to use
+ * __raw_readl/writel for parisc compatibility (Thomas
+ * Bogendoerfer). Added missing SCp->request_bufflen initialisation
+ * for sense requests (Ryan Bradetich).
+ *
* Version 2.6
*
* Following test of the 64 bit parisc kernel by Richard Hirst,
@@ -96,7 +104,7 @@
* Initial modularisation from the D700. See NCR_D700.c for the rest of
* the changelog.
* */
-#define NCR_700_VERSION "2.6"
+#define NCR_700_VERSION "2.7"
#include <linux/config.h>
#include <linux/version.h>
@@ -310,7 +318,6 @@ NCR_700_detect(Scsi_Host_Template *tpnt,
hostdata->pScript = pScript;
NCR_700_dma_cache_wback((unsigned long)script, sizeof(SCRIPT));
hostdata->state = NCR_700_HOST_FREE;
- spin_lock_init(&hostdata->lock);
hostdata->cmd = NULL;
host->max_id = 7;
host->max_lun = NCR_700_MAX_LUNS;
@@ -1048,6 +1055,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, Scsi_Cmnd *SCp,
slot->pCmd,
SCp->cmd_len,
PCI_DMA_TODEVICE);
+ SCp->request_bufflen = sizeof(SCp->sense_buffer);
slot->dma_handle = pci_map_single(hostdata->pci_dev, SCp->sense_buffer, sizeof(SCp->sense_buffer), PCI_DMA_FROMDEVICE);
slot->SG[0].ins = bS_to_host(SCRIPT_MOVE_DATA_IN | sizeof(SCp->sense_buffer));
slot->SG[0].pAddr = bS_to_host(slot->dma_handle);
@@ -1508,6 +1516,11 @@ NCR_700_intr(int irq, void *dev_id, struct pt_regs *regs)
__u8 pun = 0xff, lun = 0xff;
unsigned long flags;
+ /* Use the host lock to serialise acess to the 53c700
+ * hardware. Note: In future, we may need to take the queue
+ * lock to enter the done routines. When that happens, we
+ * need to ensure that for this driver, the host lock and the
+ * queue lock point to the same thing. */
spin_lock_irqsave(host->host_lock, flags);
if((istat = NCR_700_readb(host, ISTAT_REG))
& (SCSI_INT_PENDING | DMA_INT_PENDING)) {
diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h
index 66721ea238ae..c106937d2037 100644
--- a/drivers/scsi/53c700.h
+++ b/drivers/scsi/53c700.h
@@ -210,7 +210,7 @@ struct NCR_700_command_slot {
struct NCR_700_Host_Parameters {
/* These must be filled in by the calling driver */
int clock; /* board clock speed in MHz */
- __u32 base; /* the base for the port (copied to host) */
+ unsigned long base; /* the base for the port (copied to host) */
struct pci_dev *pci_dev;
__u32 dmode_extra; /* adjustable bus settings */
__u32 differential:1; /* if we are differential */
@@ -234,10 +234,6 @@ struct NCR_700_Host_Parameters {
__u32 *script; /* pointer to script location */
__u32 pScript; /* physical mem addr of script */
- /* This will be the host lock. Unfortunately, we can't use it
- * at the moment because of the necessity of holding the
- * io_request_lock */
- spinlock_t lock;
enum NCR_700_Host_State state; /* protected by state lock */
Scsi_Cmnd *cmd;
/* Note: pScript contains the single consistent block of
@@ -503,7 +499,7 @@ NCR_700_readb(struct Scsi_Host *host, __u32 reg)
static inline __u32
NCR_700_readl(struct Scsi_Host *host, __u32 reg)
{
- __u32 value = readl(host->base + reg);
+ __u32 value = __raw_readl(host->base + reg);
const struct NCR_700_Host_Parameters *hostdata __attribute__((unused))
= (struct NCR_700_Host_Parameters *)host->hostdata[0];
#if 1
@@ -536,7 +532,7 @@ NCR_700_writel(__u32 value, struct Scsi_Host *host, __u32 reg)
BUG();
#endif
- writel(bS_to_host(value), host->base + reg);
+ __raw_writel(bS_to_host(value), host->base + reg);
}
#elif defined(CONFIG_53C700_IO_MAPPED)
static inline __u8
diff --git a/drivers/scsi/53c700.scr b/drivers/scsi/53c700.scr
index 737c3c7e1e46..a064a092c604 100644
--- a/drivers/scsi/53c700.scr
+++ b/drivers/scsi/53c700.scr
@@ -242,7 +242,7 @@ SendMessageWithATN:
SendIdentifyMsg:
CALL SendMessage
- JUMP SendCommand
+ CLEAR ATN
IgnoreMsgBeforeCommand:
CLEAR ACK
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index 80a6c1d52f1e..810d81ea6f9d 100644
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -36,6 +36,10 @@
/* CHANGELOG
*
+ * Version 2.2
+ *
+ * Added mca_set_adapter_name().
+ *
* Version 2.1
*
* Modularise the driver into a Board piece (this file) and a chip
@@ -86,7 +90,7 @@
* disconnections and reselections are being processed correctly.
* */
-#define NCR_D700_VERSION "2.1"
+#define NCR_D700_VERSION "2.2"
#include <linux/config.h>
#include <linux/version.h>
@@ -299,6 +303,7 @@ D700_detect(Scsi_Host_Template *tpnt)
continue;
}
found++;
+ mca_set_adapter_name(slot, "NCR D700 SCSI Adapter (version " NCR_D700_VERSION ")");
}
}
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index b678ced62f9b..e61e7310eeab 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -136,7 +136,6 @@ static int __init
lasi700_driver_callback(struct parisc_device *dev)
{
unsigned long base = dev->hpa + LASI_SCSI_CORE_OFFSET;
- int irq = busdevice_alloc_irq(dev);
char *driver_name;
struct Scsi_Host *host;
struct NCR_700_Host_Parameters *hostdata =
@@ -170,14 +169,15 @@ lasi700_driver_callback(struct parisc_device *dev)
hostdata->chip710 = 1;
hostdata->dmode_extra = DMODE_FC2;
}
+ hostdata->pci_dev = ccio_get_fake(dev);
if((host = NCR_700_detect(host_tpnt, hostdata)) == NULL) {
kfree(hostdata);
release_mem_region(host->base, 64);
return 1;
}
- host->irq = irq;
- if(request_irq(irq, NCR_700_intr, SA_SHIRQ, driver_name, host)) {
- printk(KERN_ERR "%s: irq problem, detatching\n",
+ host->irq = dev->irq;
+ if(request_irq(dev->irq, NCR_700_intr, SA_SHIRQ, driver_name, host)) {
+ printk(KERN_ERR "%s: irq problem, detaching\n",
driver_name);
scsi_unregister(host);
NCR_700_release(host);
@@ -197,6 +197,7 @@ lasi700_release(struct Scsi_Host *host)
kfree(hostdata);
free_irq(host->irq, host);
release_mem_region(host->base, 64);
+ unregister_parisc_driver(&lasi700_driver);
return 1;
}