Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git] / drivers / scsi / ncr53c8xx.c
index 0f814ca..22f9131 100644 (file)
 **     Low PCI traffic for command handling when on-chip RAM is present.
 **     Aggressive SCSI SCRIPTS optimizations.
 **
+**  2005 by Matthew Wilcox and James Bottomley
+**     PCI-ectomy.  This driver now supports only the 720 chip (see the
+**     NCR_Q720 and zalon drivers for the bus probe logic).
+**
 *******************************************************************************
 */
 
 **
 **     Supported NCR/SYMBIOS chips:
 **             53C720          (Wide,   Fast SCSI-2, intfly problems)
-**
-**     Other features:
-**             Memory mapped IO (linux-1.3.X and above only)
-**             Module
-**             Shared IRQ (since linux-1.3.72)
 */
 
 /* Name and version of the driver */
-#define SCSI_NCR_DRIVER_NAME   "ncr53c8xx-3.4.3f"
+#define SCSI_NCR_DRIVER_NAME   "ncr53c8xx-3.4.3g"
 
 #define SCSI_NCR_DEBUG_FLAGS   (0)
 
-/*==========================================================
-**
-**      Include files
-**
-**==========================================================
-*/
-
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
-#include "scsi.h"
-#include <scsi/scsi_host.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
 
 #include "ncr53c8xx.h"
 
+#define NAME53C8XX             "ncr53c8xx"
+
+/*==========================================================
+**
+**     Debugging tags
+**
+**==========================================================
+*/
+
+#define DEBUG_ALLOC    (0x0001)
+#define DEBUG_PHASE    (0x0002)
+#define DEBUG_QUEUE    (0x0008)
+#define DEBUG_RESULT   (0x0010)
+#define DEBUG_POINTER  (0x0020)
+#define DEBUG_SCRIPT   (0x0040)
+#define DEBUG_TINY     (0x0080)
+#define DEBUG_TIMING   (0x0100)
+#define DEBUG_NEGO     (0x0200)
+#define DEBUG_TAGS     (0x0400)
+#define DEBUG_SCATTER  (0x0800)
+#define DEBUG_IC        (0x1000)
+
 /*
-**     Donnot compile integrity checking code for Linux-2.3.0 
-**     and above since SCSI data structures are not ready yet.
+**    Enable/Disable debug messages.
+**    Can be changed at runtime too.
 */
-/* #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) */
-#if 0
-#define        SCSI_NCR_INTEGRITY_CHECKING
+
+#ifdef SCSI_NCR_DEBUG_INFO_SUPPORT
+static int ncr_debug = SCSI_NCR_DEBUG_FLAGS;
+       #define DEBUG_FLAGS ncr_debug
+#else
+       #define DEBUG_FLAGS     SCSI_NCR_DEBUG_FLAGS
 #endif
 
-#define NAME53C                        "ncr53c"
-#define NAME53C8XX             "ncr53c8xx"
-#define DRIVER_SMP_LOCK                ncr53c8xx_lock
+static inline struct list_head *ncr_list_pop(struct list_head *head)
+{
+       if (!list_empty(head)) {
+               struct list_head *elem = head->next;
 
-#include "sym53c8xx_comm.h"
+               list_del(elem);
+               return elem;
+       }
+
+       return NULL;
+}
+
+/*==========================================================
+**
+**     Simple power of two buddy-like allocator.
+**
+**     This simple code is not intended to be fast, but to 
+**     provide power of 2 aligned memory allocations.
+**     Since the SCRIPTS processor only supplies 8 bit 
+**     arithmetic, this allocator allows simple and fast 
+**     address calculations  from the SCRIPTS code.
+**     In addition, cache line alignment is guaranteed for 
+**     power of 2 cache line size.
+**     Enhanced in linux-2.3.44 to provide a memory pool 
+**     per pcidev to support dynamic dma mapping. (I would 
+**     have preferred a real bus astraction, btw).
+**
+**==========================================================
+*/
+
+#define MEMO_SHIFT     4       /* 16 bytes minimum memory chunk */
+#if PAGE_SIZE >= 8192
+#define MEMO_PAGE_ORDER        0       /* 1 PAGE  maximum */
+#else
+#define MEMO_PAGE_ORDER        1       /* 2 PAGES maximum */
+#endif
+#define MEMO_FREE_UNUSED       /* Free unused pages immediately */
+#define MEMO_WARN      1
+#define MEMO_GFP_FLAGS GFP_ATOMIC
+#define MEMO_CLUSTER_SHIFT     (PAGE_SHIFT+MEMO_PAGE_ORDER)
+#define MEMO_CLUSTER_SIZE      (1UL << MEMO_CLUSTER_SHIFT)
+#define MEMO_CLUSTER_MASK      (MEMO_CLUSTER_SIZE-1)
+
+typedef u_long m_addr_t;       /* Enough bits to bit-hack addresses */
+typedef struct device *m_bush_t;       /* Something that addresses DMAable */
+
+typedef struct m_link {                /* Link between free memory chunks */
+       struct m_link *next;
+} m_link_s;
+
+typedef struct m_vtob {                /* Virtual to Bus address translation */
+       struct m_vtob *next;
+       m_addr_t vaddr;
+       m_addr_t baddr;
+} m_vtob_s;
+#define VTOB_HASH_SHIFT                5
+#define VTOB_HASH_SIZE         (1UL << VTOB_HASH_SHIFT)
+#define VTOB_HASH_MASK         (VTOB_HASH_SIZE-1)
+#define VTOB_HASH_CODE(m)      \
+       ((((m_addr_t) (m)) >> MEMO_CLUSTER_SHIFT) & VTOB_HASH_MASK)
+
+typedef struct m_pool {                /* Memory pool of a given kind */
+       m_bush_t bush;
+       m_addr_t (*getp)(struct m_pool *);
+       void (*freep)(struct m_pool *, m_addr_t);
+       int nump;
+       m_vtob_s *(vtob[VTOB_HASH_SIZE]);
+       struct m_pool *next;
+       struct m_link h[PAGE_SHIFT-MEMO_SHIFT+MEMO_PAGE_ORDER+1];
+} m_pool_s;
+
+static void *___m_alloc(m_pool_s *mp, int size)
+{
+       int i = 0;
+       int s = (1 << MEMO_SHIFT);
+       int j;
+       m_addr_t a;
+       m_link_s *h = mp->h;
+
+       if (size > (PAGE_SIZE << MEMO_PAGE_ORDER))
+               return NULL;
+
+       while (size > s) {
+               s <<= 1;
+               ++i;
+       }
+
+       j = i;
+       while (!h[j].next) {
+               if (s == (PAGE_SIZE << MEMO_PAGE_ORDER)) {
+                       h[j].next = (m_link_s *)mp->getp(mp);
+                       if (h[j].next)
+                               h[j].next->next = NULL;
+                       break;
+               }
+               ++j;
+               s <<= 1;
+       }
+       a = (m_addr_t) h[j].next;
+       if (a) {
+               h[j].next = h[j].next->next;
+               while (j > i) {
+                       j -= 1;
+                       s >>= 1;
+                       h[j].next = (m_link_s *) (a+s);
+                       h[j].next->next = NULL;
+               }
+       }
+#ifdef DEBUG
+       printk("___m_alloc(%d) = %p\n", size, (void *) a);
+#endif
+       return (void *) a;
+}
+
+static void ___m_free(m_pool_s *mp, void *ptr, int size)
+{
+       int i = 0;
+       int s = (1 << MEMO_SHIFT);
+       m_link_s *q;
+       m_addr_t a, b;
+       m_link_s *h = mp->h;
+
+#ifdef DEBUG
+       printk("___m_free(%p, %d)\n", ptr, size);
+#endif
+
+       if (size > (PAGE_SIZE << MEMO_PAGE_ORDER))
+               return;
+
+       while (size > s) {
+               s <<= 1;
+               ++i;
+       }
+
+       a = (m_addr_t) ptr;
+
+       while (1) {
+#ifdef MEMO_FREE_UNUSED
+               if (s == (PAGE_SIZE << MEMO_PAGE_ORDER)) {
+                       mp->freep(mp, a);
+                       break;
+               }
+#endif
+               b = a ^ s;
+               q = &h[i];
+               while (q->next && q->next != (m_link_s *) b) {
+                       q = q->next;
+               }
+               if (!q->next) {
+                       ((m_link_s *) a)->next = h[i].next;
+                       h[i].next = (m_link_s *) a;
+                       break;
+               }
+               q->next = q->next->next;
+               a = a & b;
+               s <<= 1;
+               ++i;
+       }
+}
+
+static DEFINE_SPINLOCK(ncr53c8xx_lock);
+
+static void *__m_calloc2(m_pool_s *mp, int size, char *name, int uflags)
+{
+       void *p;
+
+       p = ___m_alloc(mp, size);
+
+       if (DEBUG_FLAGS & DEBUG_ALLOC)
+               printk ("new %-10s[%4d] @%p.\n", name, size, p);
+
+       if (p)
+               memset(p, 0, size);
+       else if (uflags & MEMO_WARN)
+               printk (NAME53C8XX ": failed to allocate %s[%d]\n", name, size);
+
+       return p;
+}
+
+#define __m_calloc(mp, s, n)   __m_calloc2(mp, s, n, MEMO_WARN)
+
+static void __m_free(m_pool_s *mp, void *ptr, int size, char *name)
+{
+       if (DEBUG_FLAGS & DEBUG_ALLOC)
+               printk ("freeing %-10s[%4d] @%p.\n", name, size, ptr);
+
+       ___m_free(mp, ptr, size);
+
+}
+
+/*
+ * With pci bus iommu support, we use a default pool of unmapped memory 
+ * for memory we donnot need to DMA from/to and one pool per pcidev for 
+ * memory accessed by the PCI chip. `mp0' is the default not DMAable pool.
+ */
+
+static m_addr_t ___mp0_getp(m_pool_s *mp)
+{
+       m_addr_t m = __get_free_pages(MEMO_GFP_FLAGS, MEMO_PAGE_ORDER);
+       if (m)
+               ++mp->nump;
+       return m;
+}
+
+static void ___mp0_freep(m_pool_s *mp, m_addr_t m)
+{
+       free_pages(m, MEMO_PAGE_ORDER);
+       --mp->nump;
+}
+
+static m_pool_s mp0 = {NULL, ___mp0_getp, ___mp0_freep};
+
+/*
+ * DMAable pools.
+ */
+
+/*
+ * With pci bus iommu support, we maintain one pool per pcidev and a 
+ * hashed reverse table for virtual to bus physical address translations.
+ */
+static m_addr_t ___dma_getp(m_pool_s *mp)
+{
+       m_addr_t vp;
+       m_vtob_s *vbp;
+
+       vbp = __m_calloc(&mp0, sizeof(*vbp), "VTOB");
+       if (vbp) {
+               dma_addr_t daddr;
+               vp = (m_addr_t) dma_alloc_coherent(mp->bush,
+                                               PAGE_SIZE<<MEMO_PAGE_ORDER,
+                                               &daddr, GFP_ATOMIC);
+               if (vp) {
+                       int hc = VTOB_HASH_CODE(vp);
+                       vbp->vaddr = vp;
+                       vbp->baddr = daddr;
+                       vbp->next = mp->vtob[hc];
+                       mp->vtob[hc] = vbp;
+                       ++mp->nump;
+                       return vp;
+               }
+       }
+       if (vbp)
+               __m_free(&mp0, vbp, sizeof(*vbp), "VTOB");
+       return 0;
+}
+
+static void ___dma_freep(m_pool_s *mp, m_addr_t m)
+{
+       m_vtob_s **vbpp, *vbp;
+       int hc = VTOB_HASH_CODE(m);
+
+       vbpp = &mp->vtob[hc];
+       while (*vbpp && (*vbpp)->vaddr != m)
+               vbpp = &(*vbpp)->next;
+       if (*vbpp) {
+               vbp = *vbpp;
+               *vbpp = (*vbpp)->next;
+               dma_free_coherent(mp->bush, PAGE_SIZE<<MEMO_PAGE_ORDER,
+                                 (void *)vbp->vaddr, (dma_addr_t)vbp->baddr);
+               __m_free(&mp0, vbp, sizeof(*vbp), "VTOB");
+               --mp->nump;
+       }
+}
+
+static inline m_pool_s *___get_dma_pool(m_bush_t bush)
+{
+       m_pool_s *mp;
+       for (mp = mp0.next; mp && mp->bush != bush; mp = mp->next);
+       return mp;
+}
+
+static m_pool_s *___cre_dma_pool(m_bush_t bush)
+{
+       m_pool_s *mp;
+       mp = __m_calloc(&mp0, sizeof(*mp), "MPOOL");
+       if (mp) {
+               memset(mp, 0, sizeof(*mp));
+               mp->bush = bush;
+               mp->getp = ___dma_getp;
+               mp->freep = ___dma_freep;
+               mp->next = mp0.next;
+               mp0.next = mp;
+       }
+       return mp;
+}
+
+static void ___del_dma_pool(m_pool_s *p)
+{
+       struct m_pool **pp = &mp0.next;
+
+       while (*pp && *pp != p)
+               pp = &(*pp)->next;
+       if (*pp) {
+               *pp = (*pp)->next;
+               __m_free(&mp0, p, sizeof(*p), "MPOOL");
+       }
+}
+
+static void *__m_calloc_dma(m_bush_t bush, int size, char *name)
+{
+       u_long flags;
+       struct m_pool *mp;
+       void *m = NULL;
+
+       spin_lock_irqsave(&ncr53c8xx_lock, flags);
+       mp = ___get_dma_pool(bush);
+       if (!mp)
+               mp = ___cre_dma_pool(bush);
+       if (mp)
+               m = __m_calloc(mp, size, name);
+       if (mp && !mp->nump)
+               ___del_dma_pool(mp);
+       spin_unlock_irqrestore(&ncr53c8xx_lock, flags);
+
+       return m;
+}
+
+static void __m_free_dma(m_bush_t bush, void *m, int size, char *name)
+{
+       u_long flags;
+       struct m_pool *mp;
+
+       spin_lock_irqsave(&ncr53c8xx_lock, flags);
+       mp = ___get_dma_pool(bush);
+       if (mp)
+               __m_free(mp, m, size, name);
+       if (mp && !mp->nump)
+               ___del_dma_pool(mp);
+       spin_unlock_irqrestore(&ncr53c8xx_lock, flags);
+}
+
+static m_addr_t __vtobus(m_bush_t bush, void *m)
+{
+       u_long flags;
+       m_pool_s *mp;
+       int hc = VTOB_HASH_CODE(m);
+       m_vtob_s *vp = NULL;
+       m_addr_t a = ((m_addr_t) m) & ~MEMO_CLUSTER_MASK;
+
+       spin_lock_irqsave(&ncr53c8xx_lock, flags);
+       mp = ___get_dma_pool(bush);
+       if (mp) {
+               vp = mp->vtob[hc];
+               while (vp && (m_addr_t) vp->vaddr != a)
+                       vp = vp->next;
+       }
+       spin_unlock_irqrestore(&ncr53c8xx_lock, flags);
+       return vp ? vp->baddr + (((m_addr_t) m) - a) : 0;
+}
+
+#define _m_calloc_dma(np, s, n)                __m_calloc_dma(np->dev, s, n)
+#define _m_free_dma(np, p, s, n)       __m_free_dma(np->dev, p, s, n)
+#define m_calloc_dma(s, n)             _m_calloc_dma(np, s, n)
+#define m_free_dma(p, s, n)            _m_free_dma(np, p, s, n)
+#define _vtobus(np, p)                 __vtobus(np->dev, p)
+#define vtobus(p)                      _vtobus(np, p)
+
+/*
+ *  Deal with DMA mapping/unmapping.
+ */
+
+/* To keep track of the dma mapping (sg/single) that has been set */
+#define __data_mapped  SCp.phase
+#define __data_mapping SCp.have_data_in
+
+static void __unmap_scsi_data(struct device *dev, struct scsi_cmnd *cmd)
+{
+       switch(cmd->__data_mapped) {
+       case 2:
+               dma_unmap_sg(dev, cmd->buffer, cmd->use_sg,
+                               cmd->sc_data_direction);
+               break;
+       case 1:
+               dma_unmap_single(dev, cmd->__data_mapping,
+                                cmd->request_bufflen,
+                                cmd->sc_data_direction);
+               break;
+       }
+       cmd->__data_mapped = 0;
+}
+
+static u_long __map_scsi_single_data(struct device *dev, struct scsi_cmnd *cmd)
+{
+       dma_addr_t mapping;
+
+       if (cmd->request_bufflen == 0)
+               return 0;
+
+       mapping = dma_map_single(dev, cmd->request_buffer,
+                                cmd->request_bufflen,
+                                cmd->sc_data_direction);
+       cmd->__data_mapped = 1;
+       cmd->__data_mapping = mapping;
+
+       return mapping;
+}
+
+static int __map_scsi_sg_data(struct device *dev, struct scsi_cmnd *cmd)
+{
+       int use_sg;
+
+       if (cmd->use_sg == 0)
+               return 0;
+
+       use_sg = dma_map_sg(dev, cmd->buffer, cmd->use_sg,
+                       cmd->sc_data_direction);
+       cmd->__data_mapped = 2;
+       cmd->__data_mapping = use_sg;
+
+       return use_sg;
+}
+
+#define unmap_scsi_data(np, cmd)       __unmap_scsi_data(np->dev, cmd)
+#define map_scsi_single_data(np, cmd)  __map_scsi_single_data(np->dev, cmd)
+#define map_scsi_sg_data(np, cmd)      __map_scsi_sg_data(np->dev, cmd)
+
+/*==========================================================
+**
+**     Driver setup.
+**
+**     This structure is initialized from linux config 
+**     options. It can be overridden at boot-up by the boot 
+**     command line.
+**
+**==========================================================
+*/
+static struct ncr_driver_setup
+       driver_setup                    = SCSI_NCR_DRIVER_SETUP;
+
+#ifdef SCSI_NCR_BOOT_COMMAND_LINE_SUPPORT
+static struct ncr_driver_setup
+       driver_safe_setup __initdata    = SCSI_NCR_DRIVER_SAFE_SETUP;
+#endif
+
+#define initverbose (driver_setup.verbose)
+#define bootverbose (np->verbose)
+
+
+/*===================================================================
+**
+**     Driver setup from the boot command line
+**
+**===================================================================
+*/
+
+#ifdef MODULE
+#define        ARG_SEP ' '
+#else
+#define        ARG_SEP ','
+#endif
+
+#define OPT_TAGS               1
+#define OPT_MASTER_PARITY      2
+#define OPT_SCSI_PARITY                3
+#define OPT_DISCONNECTION      4
+#define OPT_SPECIAL_FEATURES   5
+#define OPT_UNUSED_1           6
+#define OPT_FORCE_SYNC_NEGO    7
+#define OPT_REVERSE_PROBE      8
+#define OPT_DEFAULT_SYNC       9
+#define OPT_VERBOSE            10
+#define OPT_DEBUG              11
+#define OPT_BURST_MAX          12
+#define OPT_LED_PIN            13
+#define OPT_MAX_WIDE           14
+#define OPT_SETTLE_DELAY       15
+#define OPT_DIFF_SUPPORT       16
+#define OPT_IRQM               17
+#define OPT_PCI_FIX_UP         18
+#define OPT_BUS_CHECK          19
+#define OPT_OPTIMIZE           20
+#define OPT_RECOVERY           21
+#define OPT_SAFE_SETUP         22
+#define OPT_USE_NVRAM          23
+#define OPT_EXCLUDE            24
+#define OPT_HOST_ID            25
+
+#ifdef SCSI_NCR_IARB_SUPPORT
+#define OPT_IARB               26
+#endif
+
+static char setup_token[] __initdata = 
+       "tags:"   "mpar:"
+       "spar:"   "disc:"
+       "specf:"  "ultra:"
+       "fsn:"    "revprob:"
+       "sync:"   "verb:"
+       "debug:"  "burst:"
+       "led:"    "wide:"
+       "settle:" "diff:"
+       "irqm:"   "pcifix:"
+       "buschk:" "optim:"
+       "recovery:"
+       "safe:"   "nvram:"
+       "excl:"   "hostid:"
+#ifdef SCSI_NCR_IARB_SUPPORT
+       "iarb:"
+#endif
+       ;       /* DONNOT REMOVE THIS ';' */
+
+#ifdef MODULE
+#define        ARG_SEP ' '
+#else
+#define        ARG_SEP ','
+#endif
+
+static int __init get_setup_token(char *p)
+{
+       char *cur = setup_token;
+       char *pc;
+       int i = 0;
+
+       while (cur != NULL && (pc = strchr(cur, ':')) != NULL) {
+               ++pc;
+               ++i;
+               if (!strncmp(p, cur, pc - cur))
+                       return i;
+               cur = pc;
+       }
+       return 0;
+}
+
+
+static int __init sym53c8xx__setup(char *str)
+{
+#ifdef SCSI_NCR_BOOT_COMMAND_LINE_SUPPORT
+       char *cur = str;
+       char *pc, *pv;
+       int i, val, c;
+       int xi = 0;
+
+       while (cur != NULL && (pc = strchr(cur, ':')) != NULL) {
+               char *pe;
+
+               val = 0;
+               pv = pc;
+               c = *++pv;
+
+               if      (c == 'n')
+                       val = 0;
+               else if (c == 'y')
+                       val = 1;
+               else
+                       val = (int) simple_strtoul(pv, &pe, 0);
+
+               switch (get_setup_token(cur)) {
+               case OPT_TAGS:
+                       driver_setup.default_tags = val;
+                       if (pe && *pe == '/') {
+                               i = 0;
+                               while (*pe && *pe != ARG_SEP && 
+                                       i < sizeof(driver_setup.tag_ctrl)-1) {
+                                       driver_setup.tag_ctrl[i++] = *pe++;
+                               }
+                               driver_setup.tag_ctrl[i] = '\0';
+                       }
+                       break;
+               case OPT_MASTER_PARITY:
+                       driver_setup.master_parity = val;
+                       break;
+               case OPT_SCSI_PARITY:
+                       driver_setup.scsi_parity = val;
+                       break;
+               case OPT_DISCONNECTION:
+                       driver_setup.disconnection = val;
+                       break;
+               case OPT_SPECIAL_FEATURES:
+                       driver_setup.special_features = val;
+                       break;
+               case OPT_FORCE_SYNC_NEGO:
+                       driver_setup.force_sync_nego = val;
+                       break;
+               case OPT_REVERSE_PROBE:
+                       driver_setup.reverse_probe = val;
+                       break;
+               case OPT_DEFAULT_SYNC:
+                       driver_setup.default_sync = val;
+                       break;
+               case OPT_VERBOSE:
+                       driver_setup.verbose = val;
+                       break;
+               case OPT_DEBUG:
+                       driver_setup.debug = val;
+                       break;
+               case OPT_BURST_MAX:
+                       driver_setup.burst_max = val;
+                       break;
+               case OPT_LED_PIN:
+                       driver_setup.led_pin = val;
+                       break;
+               case OPT_MAX_WIDE:
+                       driver_setup.max_wide = val? 1:0;
+                       break;
+               case OPT_SETTLE_DELAY:
+                       driver_setup.settle_delay = val;
+                       break;
+               case OPT_DIFF_SUPPORT:
+                       driver_setup.diff_support = val;
+                       break;
+               case OPT_IRQM:
+                       driver_setup.irqm = val;
+                       break;
+               case OPT_PCI_FIX_UP:
+                       driver_setup.pci_fix_up = val;
+                       break;
+               case OPT_BUS_CHECK:
+                       driver_setup.bus_check = val;
+                       break;
+               case OPT_OPTIMIZE:
+                       driver_setup.optimize = val;
+                       break;
+               case OPT_RECOVERY:
+                       driver_setup.recovery = val;
+                       break;
+               case OPT_USE_NVRAM:
+                       driver_setup.use_nvram = val;
+                       break;
+               case OPT_SAFE_SETUP:
+                       memcpy(&driver_setup, &driver_safe_setup,
+                               sizeof(driver_setup));
+                       break;
+               case OPT_EXCLUDE:
+                       if (xi < SCSI_NCR_MAX_EXCLUDES)
+                               driver_setup.excludes[xi++] = val;
+                       break;
+               case OPT_HOST_ID:
+                       driver_setup.host_id = val;
+                       break;
+#ifdef SCSI_NCR_IARB_SUPPORT
+               case OPT_IARB:
+                       driver_setup.iarb = val;
+                       break;
+#endif
+               default:
+                       printk("sym53c8xx_setup: unexpected boot option '%.*s' ignored\n", (int)(pc-cur+1), cur);
+                       break;
+               }
+
+               if ((cur = strchr(cur, ARG_SEP)) != NULL)
+                       ++cur;
+       }
+#endif /* SCSI_NCR_BOOT_COMMAND_LINE_SUPPORT */
+       return 1;
+}
+
+/*===================================================================
+**
+**     Get device queue depth from boot command line.
+**
+**===================================================================
+*/
+#define DEF_DEPTH      (driver_setup.default_tags)
+#define ALL_TARGETS    -2
+#define NO_TARGET      -1
+#define ALL_LUNS       -2
+#define NO_LUN         -1
+
+static int device_queue_depth(int unit, int target, int lun)
+{
+       int c, h, t, u, v;
+       char *p = driver_setup.tag_ctrl;
+       char *ep;
+
+       h = -1;
+       t = NO_TARGET;
+       u = NO_LUN;
+       while ((c = *p++) != 0) {
+               v = simple_strtoul(p, &ep, 0);
+               switch(c) {
+               case '/':
+                       ++h;
+                       t = ALL_TARGETS;
+                       u = ALL_LUNS;
+                       break;
+               case 't':
+                       if (t != target)
+                               t = (target == v) ? v : NO_TARGET;
+                       u = ALL_LUNS;
+                       break;
+               case 'u':
+                       if (u != lun)
+                               u = (lun == v) ? v : NO_LUN;
+                       break;
+               case 'q':
+                       if (h == unit &&
+                               (t == ALL_TARGETS || t == target) &&
+                               (u == ALL_LUNS    || u == lun))
+                               return v;
+                       break;
+               case '-':
+                       t = ALL_TARGETS;
+                       u = ALL_LUNS;
+                       break;
+               default:
+                       break;
+               }
+               p = ep;
+       }
+       return DEF_DEPTH;
+}
 
 
 /*==========================================================
@@ -316,10 +1033,6 @@ typedef u32 tagmap_t;
 
 #define ScsiResult(host_code, scsi_code) (((host_code) << 16) + ((scsi_code) & 0x7f))
 
-static void ncr53c8xx_timeout(unsigned long np);
-static int ncr53c8xx_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,
-                       int length, int func);
-
 #define initverbose (driver_setup.verbose)
 #define bootverbose (np->verbose)
 
@@ -413,31 +1126,6 @@ static int ncr53c8xx_proc_info(struct Scsi_Host *host, char *buffer, char **star
 #define NS_WIDE                (2)
 #define NS_PPR         (4)
 
-/*==========================================================
-**
-**     "Special features" of targets.
-**     quirks field            of struct tcb.
-**     actualquirks field      of struct ccb.
-**
-**==========================================================
-*/
-
-#define        QUIRK_AUTOSAVE  (0x01)
-#define        QUIRK_NOMSG     (0x02)
-#define QUIRK_NOSYNC   (0x10)
-#define QUIRK_NOWIDE16 (0x20)
-
-/*==========================================================
-**
-**     Capability bits in Inquire response byte 7.
-**
-**==========================================================
-*/
-
-#define        INQ7_QUEUE      (0x02)
-#define        INQ7_SYNC       (0x10)
-#define        INQ7_WIDE16     (0x20)
-
 /*==========================================================
 **
 **     Misc.
@@ -454,6 +1142,8 @@ static int ncr53c8xx_proc_info(struct Scsi_Host *host, char *buffer, char **star
 **==========================================================
 */
 
+static struct scsi_transport_template *ncr53c8xx_transport_template = NULL;
+
 struct tcb;
 struct lcb;
 struct ccb;
@@ -531,8 +1221,6 @@ struct tcb {
        */
        struct link     jump_lcb[4];    /* JUMPs for reselection        */
        struct lcb *    lp[MAX_LUN];    /* The lcb's of this tcb        */
-       u_char          inq_done;       /* Target capabilities received */
-       u_char          inq_byte7;      /* Contains these capabilities  */
 
        /*----------------------------------------------------------------
        **      Pointer to the ccb used for negotiation.
@@ -571,18 +1259,12 @@ struct tcb {
 /*3*/  u_char  wval;
 #endif
 
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-       u_char  ic_min_sync;
-       u_char  ic_max_width;
-       u_char  ic_maximums_set;
-       u_char  ic_done;
-#endif
-
        /* User settable limits and options.  */
        u_char  usrsync;
        u_char  usrwide;
        u_char  usrtags;
        u_char  usrflag;
+       struct scsi_target *starget;
 };
 
 /*========================================================================
@@ -626,10 +1308,10 @@ struct lcb {
        **      CCB queue management.
        **----------------------------------------------------------------
        */
-       XPT_QUEHEAD     free_ccbq;      /* Queue of available CCBs      */
-       XPT_QUEHEAD     busy_ccbq;      /* Queue of busy CCBs           */
-       XPT_QUEHEAD     wait_ccbq;      /* Queue of waiting for IO CCBs */
-       XPT_QUEHEAD     skip_ccbq;      /* Queue of skipped CCBs        */
+       struct list_head free_ccbq;     /* Queue of available CCBs      */
+       struct list_head busy_ccbq;     /* Queue of busy CCBs           */
+       struct list_head wait_ccbq;     /* Queue of waiting for IO CCBs */
+       struct list_head skip_ccbq;     /* Queue of skipped CCBs        */
        u_char          actccbs;        /* Number of allocated CCBs     */
        u_char          busyccbs;       /* CCBs busy for this lun       */
        u_char          queuedccbs;     /* CCBs queued to the controller*/
@@ -649,7 +1331,6 @@ struct lcb {
        u_char          usetags;        /* Command queuing is active    */
        u_char          maxtags;        /* Max nr of tags asked by user */
        u_char          numtags;        /* Current number of tags       */
-       u_char          inq_byte7;      /* Store unit CmdQ capabitility */
 
        /*----------------------------------------------------------------
        **      QUEUE FULL control and ORDERED tag control.
@@ -920,7 +1601,7 @@ struct ccb {
        u_char          queued;
        u_char          auto_sense;
        struct ccb *    link_ccb;       /* Host adapter CCB chain       */
-       XPT_QUEHEAD     link_ccbq;      /* Link to unit CCB queue       */
+       struct list_head link_ccbq;     /* Link to unit CCB queue       */
        u32             startp;         /* Initial data pointer         */
        u_long          magic;          /* Free / busy  CCB flag        */
 };
@@ -997,11 +1678,11 @@ struct ncb {
        **      Virtual and physical bus addresses of the chip.
        **----------------------------------------------------------------
        */
-       vm_offset_t     vaddr;          /* Virtual and bus address of   */
-       vm_offset_t     paddr;          /*  chip's IO registers.        */
-       vm_offset_t     paddr2;         /* On-chip RAM bus address.     */
+       void __iomem *vaddr;            /* Virtual and bus address of   */
+       unsigned long   paddr;          /*  chip's IO registers.        */
+       unsigned long   paddr2;         /* On-chip RAM bus address.     */
        volatile                        /* Pointer to volatile for      */
-       struct ncr_reg  *reg;           /*  memory mapped IO.           */
+       struct ncr_reg  __iomem *reg;   /*  memory mapped IO.           */
 
        /*----------------------------------------------------------------
        **      SCRIPTS virtual and physical bus addresses.
@@ -1096,17 +1777,6 @@ struct ncb {
        struct ccb      *ccb;           /* Global CCB                   */
        struct usrcmd   user;           /* Command from user            */
        volatile u_char release_stage;  /* Synchronisation stage on release  */
-
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-       /*----------------------------------------------------------------
-       **      Fields that are used for integrity check
-       **----------------------------------------------------------------
-       */
-       unsigned char check_integrity; /* Enable midlayer integ.check on
-                                       * bus scan. */
-       unsigned char check_integ_par;  /* Set if par or Init. Det. error
-                                        * used only during integ check */
-#endif
 };
 
 #define NCB_SCRIPT_PHYS(np,lbl)         (np->p_script  + offsetof (struct script, lbl))
@@ -1186,7 +1856,7 @@ struct script {
 #endif
        ncrcmd  save_dp         [  7];
        ncrcmd  restore_dp      [  5];
-       ncrcmd  disconnect      [ 17];
+       ncrcmd  disconnect      [ 10];
        ncrcmd  msg_out         [  9];
        ncrcmd  msg_out_done    [  7];
        ncrcmd  idle            [  2];
@@ -1274,11 +1944,10 @@ static  void    ncr_free_ccb    (struct ncb *np, struct ccb *cp);
 static void    ncr_init_ccb    (struct ncb *np, struct ccb *cp);
 static void    ncr_init_tcb    (struct ncb *np, u_char tn);
 static struct lcb *    ncr_alloc_lcb   (struct ncb *np, u_char tn, u_char ln);
-static struct lcb *    ncr_setup_lcb   (struct ncb *np, u_char tn, u_char ln,
-                                u_char *inq_data);
+static struct lcb *    ncr_setup_lcb   (struct ncb *np, struct scsi_device *sdev);
 static void    ncr_getclock    (struct ncb *np, int mult);
 static void    ncr_selectclock (struct ncb *np, u_char scntl3);
-static struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln);
+static struct ccb *ncr_get_ccb (struct ncb *np, struct scsi_cmnd *cmd);
 static void    ncr_chip_reset  (struct ncb *np, int delay);
 static void    ncr_init        (struct ncb *np, int reset, char * msg, u_long code);
 static int     ncr_int_sbmc    (struct ncb *np);
@@ -1286,12 +1955,8 @@ static   int     ncr_int_par     (struct ncb *np);
 static void    ncr_int_ma      (struct ncb *np);
 static void    ncr_int_sir     (struct ncb *np);
 static  void    ncr_int_sto     (struct ncb *np);
-static u_long  ncr_lookup      (char* id);
 static void    ncr_negotiate   (struct ncb* np, struct tcb* tp);
 static int     ncr_prepare_nego(struct ncb *np, struct ccb *cp, u_char *msgptr);
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-static int     ncr_ic_nego(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd, u_char *msgptr);
-#endif
 
 static void    ncr_script_copy_and_bind
                                (struct ncb *np, ncrcmd *src, ncrcmd *dst, int len);
@@ -1299,10 +1964,8 @@ static  void    ncr_script_fill (struct script * scr, struct scripth * scripth);
 static int     ncr_scatter     (struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd);
 static void    ncr_getsync     (struct ncb *np, u_char sfac, u_char *fakp, u_char *scntl3p);
 static void    ncr_setsync     (struct ncb *np, struct ccb *cp, u_char scntl3, u_char sxfer);
-static void    ncr_setup_tags  (struct ncb *np, u_char tn, u_char ln);
+static void    ncr_setup_tags  (struct ncb *np, struct scsi_device *sdev);
 static void    ncr_setwide     (struct ncb *np, struct ccb *cp, u_char wide, u_char ack);
-static int     ncr_show_msg    (u_char * msg);
-static  void    ncr_print_msg   (struct ccb *cp, char *label, u_char *msg);
 static int     ncr_snooptest   (struct ncb *np);
 static void    ncr_timeout     (struct ncb *np);
 static  void    ncr_wakeup      (struct ncb *np, u_long code);
@@ -1444,7 +2107,7 @@ static    struct script script0 __initdata = {
        */
 
        /*
-       **      The M_REJECT problem seems to be due to a selection 
+       **      The MESSAGE_REJECT problem seems to be due to a selection 
        **      timing problem.
        **      Wait immediately for the selection to complete. 
        **      (2.5x behaves so)
@@ -1495,7 +2158,7 @@ static    struct script script0 __initdata = {
        /*
        **      Selection complete.
        **      Send the IDENTIFY and SIMPLE_TAG messages
-       **      (and the M_X_SYNC_REQ message)
+       **      (and the EXTENDED_SDTR message)
        */
        SCR_MOVE_TBL ^ SCR_MSG_OUT,
                offsetof (struct dsb, smsg),
@@ -1524,7 +2187,7 @@ static    struct script script0 __initdata = {
        /*
        **      Initialize the msgout buffer with a NOOP message.
        */
-       SCR_LOAD_REG (scratcha, M_NOOP),
+       SCR_LOAD_REG (scratcha, NOP),
                0,
        SCR_COPY (1),
                RADDR (scratcha),
@@ -1676,21 +2339,21 @@ static  struct script script0 __initdata = {
        /*
        **      Handle this message.
        */
-       SCR_JUMP ^ IFTRUE (DATA (M_COMPLETE)),
+       SCR_JUMP ^ IFTRUE (DATA (COMMAND_COMPLETE)),
                PADDR (complete),
-       SCR_JUMP ^ IFTRUE (DATA (M_DISCONNECT)),
+       SCR_JUMP ^ IFTRUE (DATA (DISCONNECT)),
                PADDR (disconnect),
-       SCR_JUMP ^ IFTRUE (DATA (M_SAVE_DP)),
+       SCR_JUMP ^ IFTRUE (DATA (SAVE_POINTERS)),
                PADDR (save_dp),
-       SCR_JUMP ^ IFTRUE (DATA (M_RESTORE_DP)),
+       SCR_JUMP ^ IFTRUE (DATA (RESTORE_POINTERS)),
                PADDR (restore_dp),
-       SCR_JUMP ^ IFTRUE (DATA (M_EXTENDED)),
+       SCR_JUMP ^ IFTRUE (DATA (EXTENDED_MESSAGE)),
                PADDRH (msg_extended),
-       SCR_JUMP ^ IFTRUE (DATA (M_NOOP)),
+       SCR_JUMP ^ IFTRUE (DATA (NOP)),
                PADDR (clrack),
-       SCR_JUMP ^ IFTRUE (DATA (M_REJECT)),
+       SCR_JUMP ^ IFTRUE (DATA (MESSAGE_REJECT)),
                PADDRH (msg_reject),
-       SCR_JUMP ^ IFTRUE (DATA (M_IGN_RESIDUE)),
+       SCR_JUMP ^ IFTRUE (DATA (IGNORE_WIDE_RESIDUE)),
                PADDRH (msg_ign_residue),
        /*
        **      Rest of the messages left as
@@ -1705,7 +2368,7 @@ static    struct script script0 __initdata = {
        */
        SCR_INT,
                SIR_REJECT_SENT,
-       SCR_LOAD_REG (scratcha, M_REJECT),
+       SCR_LOAD_REG (scratcha, MESSAGE_REJECT),
                0,
 }/*-------------------------< SETMSG >----------------------*/,{
        SCR_COPY (1),
@@ -1882,21 +2545,6 @@ static   struct script script0 __initdata = {
        */
        SCR_LOAD_REG (HS_REG, HS_DISCONNECT),
                0,
-       /*
-       **      If QUIRK_AUTOSAVE is set,
-       **      do an "save pointer" operation.
-       */
-       SCR_FROM_REG (QU_REG),
-               0,
-       SCR_JUMP ^ IFFALSE (MASK (QUIRK_AUTOSAVE, QUIRK_AUTOSAVE)),
-               PADDR (cleanup_ok),
-       /*
-       **      like SAVE_DP message:
-       **      Copy TEMP register to SAVEP in header.
-       */
-       SCR_COPY (4),
-               RADDR (temp),
-               NADDR (header.savep),
        SCR_JUMP,
                PADDR (cleanup_ok),
 
@@ -1912,7 +2560,7 @@ static    struct script script0 __initdata = {
        /*
        **      If it was no ABORT message ...
        */
-       SCR_JUMP ^ IFTRUE (DATA (M_ABORT)),
+       SCR_JUMP ^ IFTRUE (DATA (ABORT_TASK_SET)),
                PADDRH (msg_out_abort),
        /*
        **      ... wait for the next phase
@@ -1924,7 +2572,7 @@ static    struct script script0 __initdata = {
        /*
        **      ... else clear the message ...
        */
-       SCR_LOAD_REG (scratcha, M_NOOP),
+       SCR_LOAD_REG (scratcha, NOP),
                0,
        SCR_COPY (4),
                RADDR (scratcha),
@@ -2383,7 +3031,7 @@ static    struct scripth scripth0 __initdata = {
        */
        SCR_MOVE_ABS (1) ^ SCR_MSG_IN,
                NADDR (msgin[2]),
-       SCR_JUMP ^ IFTRUE (DATA (M_X_WIDE_REQ)),
+       SCR_JUMP ^ IFTRUE (DATA (EXTENDED_WDTR)),
                PADDRH (msg_wdtr),
        /*
        **      unknown extended message
@@ -2417,7 +3065,7 @@ static    struct scripth scripth0 __initdata = {
 
 }/*-------------------------< SEND_WDTR >----------------*/,{
        /*
-       **      Send the M_X_WIDE_REQ
+       **      Send the EXTENDED_WDTR
        */
        SCR_MOVE_ABS (4) ^ SCR_MSG_OUT,
                NADDR (msgout),
@@ -2437,7 +3085,7 @@ static    struct scripth scripth0 __initdata = {
        */
        SCR_MOVE_ABS (1) ^ SCR_MSG_IN,
                NADDR (msgin[2]),
-       SCR_JUMP ^ IFTRUE (DATA (M_X_SYNC_REQ)),
+       SCR_JUMP ^ IFTRUE (DATA (EXTENDED_SDTR)),
                PADDRH (msg_sdtr),
        /*
        **      unknown extended message
@@ -2472,7 +3120,7 @@ static    struct scripth scripth0 __initdata = {
 
 }/*-------------------------< SEND_SDTR >-------------*/,{
        /*
-       **      Send the M_X_SYNC_REQ
+       **      Send the EXTENDED_SDTR
        */
        SCR_MOVE_ABS (5) ^ SCR_MSG_OUT,
                NADDR (msgout),
@@ -2550,10 +3198,10 @@ static  struct scripth scripth0 __initdata = {
 
 }/*-------------------------< RESET >----------------------*/,{
        /*
-       **      Send a M_RESET message if bad IDENTIFY 
+       **      Send a TARGET_RESET message if bad IDENTIFY 
        **      received on reselection.
        */
-       SCR_LOAD_REG (scratcha, M_ABORT_TAG),
+       SCR_LOAD_REG (scratcha, ABORT_TASK),
                0,
        SCR_JUMP,
                PADDRH (abort_resel),
@@ -2561,7 +3209,7 @@ static    struct scripth scripth0 __initdata = {
        /*
        **      Abort a wrong tag received on reselection.
        */
-       SCR_LOAD_REG (scratcha, M_ABORT_TAG),
+       SCR_LOAD_REG (scratcha, ABORT_TASK),
                0,
        SCR_JUMP,
                PADDRH (abort_resel),
@@ -2569,7 +3217,7 @@ static    struct scripth scripth0 __initdata = {
        /*
        **      Abort a reselection when no active CCB.
        */
-       SCR_LOAD_REG (scratcha, M_ABORT),
+       SCR_LOAD_REG (scratcha, ABORT_TASK_SET),
                0,
 }/*-------------------------< ABORT_RESEL >----------------*/,{
        SCR_COPY (1),
@@ -2681,7 +3329,7 @@ static    struct scripth scripth0 __initdata = {
        **      Read the message, since we got it directly 
        **      from the SCSI BUS data lines.
        **      Signal problem to C code for logging the event.
-       **      Send a M_ABORT to clear all pending tasks.
+       **      Send an ABORT_TASK_SET to clear all pending tasks.
        */
        SCR_INT,
                SIR_RESEL_BAD_LUN,
@@ -2693,7 +3341,7 @@ static    struct scripth scripth0 __initdata = {
        /*
        **      We donnot have a task for that I_T_L.
        **      Signal problem to C code for logging the event.
-       **      Send a M_ABORT message.
+       **      Send an ABORT_TASK_SET message.
        */
        SCR_INT,
                SIR_RESEL_BAD_I_T_L,
@@ -2703,7 +3351,7 @@ static    struct scripth scripth0 __initdata = {
        /*
        **      We donnot have a task that matches the tag.
        **      Signal problem to C code for logging the event.
-       **      Send a M_ABORTTAG message.
+       **      Send an ABORT_TASK message.
        */
        SCR_INT,
                SIR_RESEL_BAD_I_T_L_Q,
@@ -2714,7 +3362,7 @@ static    struct scripth scripth0 __initdata = {
        **      We donnot know the target that reselected us.
        **      Grab the first message if any (IDENTIFY).
        **      Signal problem to C code for logging the event.
-       **      M_RESET message.
+       **      TARGET_RESET message.
        */
        SCR_INT,
                SIR_RESEL_BAD_TARGET,
@@ -2824,9 +3472,9 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
        for (i=0; i<MAX_START; i++) {
                *p++ =SCR_CALL;
                *p++ =PADDR (idle);
-       };
+       }
 
-       assert ((u_long)p == (u_long)&scrh->tryloop + sizeof (scrh->tryloop));
+       BUG_ON((u_long)p != (u_long)&scrh->tryloop + sizeof (scrh->tryloop));
 
 #ifdef SCSI_NCR_CCB_DONE_SUPPORT
 
@@ -2839,7 +3487,7 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (done_end);
        }
 
-       assert ((u_long)p ==(u_long)&scrh->done_queue+sizeof(scrh->done_queue));
+       BUG_ON((u_long)p != (u_long)&scrh->done_queue+sizeof(scrh->done_queue));
 
 #endif /* SCSI_NCR_CCB_DONE_SUPPORT */
 
@@ -2849,8 +3497,9 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN;
                *p++ =offsetof (struct dsb, data[i]);
-       };
-       assert ((u_long)p == (u_long)&scrh->hdata_in + sizeof (scrh->hdata_in));
+       }
+
+       BUG_ON((u_long)p != (u_long)&scrh->hdata_in + sizeof (scrh->hdata_in));
 
        p = scr->data_in;
        for (i=MAX_SCATTERH; i<MAX_SCATTERH+MAX_SCATTERL; i++) {
@@ -2858,8 +3507,9 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_IN;
                *p++ =offsetof (struct dsb, data[i]);
-       };
-       assert ((u_long)p == (u_long)&scr->data_in + sizeof (scr->data_in));
+       }
+
+       BUG_ON((u_long)p != (u_long)&scr->data_in + sizeof (scr->data_in));
 
        p = scrh->hdata_out;
        for (i=0; i<MAX_SCATTERH; i++) {
@@ -2867,8 +3517,9 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT;
                *p++ =offsetof (struct dsb, data[i]);
-       };
-       assert ((u_long)p==(u_long)&scrh->hdata_out + sizeof (scrh->hdata_out));
+       }
+
+       BUG_ON((u_long)p != (u_long)&scrh->hdata_out + sizeof (scrh->hdata_out));
 
        p = scr->data_out;
        for (i=MAX_SCATTERH; i<MAX_SCATTERH+MAX_SCATTERL; i++) {
@@ -2876,9 +3527,9 @@ void __init ncr_script_fill (struct script * scr, struct scripth * scrh)
                *p++ =PADDR (dispatch);
                *p++ =SCR_MOVE_TBL ^ SCR_DATA_OUT;
                *p++ =offsetof (struct dsb, data[i]);
-       };
+       }
 
-       assert ((u_long)p == (u_long)&scr->data_out + sizeof (scr->data_out));
+       BUG_ON((u_long) p != (u_long)&scr->data_out + sizeof (scr->data_out));
 }
 
 /*==========================================================
@@ -2916,8 +3567,8 @@ ncr_script_copy_and_bind (struct ncb *np, ncrcmd *src, ncrcmd *dst, int len)
                if (opcode == 0) {
                        printk (KERN_ERR "%s: ERROR0 IN SCRIPT at %d.\n",
                                ncr_name(np), (int) (src-start-1));
-                       MDELAY (1000);
-               };
+                       mdelay(1000);
+               }
 
                if (DEBUG_FLAGS & DEBUG_SCRIPT)
                        printk (KERN_DEBUG "%p:  <%x>\n",
@@ -2946,7 +3597,7 @@ ncr_script_copy_and_bind (struct ncb *np, ncrcmd *src, ncrcmd *dst, int len)
                        if ((tmp1 ^ tmp2) & 3) {
                                printk (KERN_ERR"%s: ERROR1 IN SCRIPT at %d.\n",
                                        ncr_name(np), (int) (src-start-1));
-                               MDELAY (1000);
+                               mdelay(1000);
                        }
                        /*
                        **      If PREFETCH feature not enabled, remove 
@@ -2986,7 +3637,7 @@ ncr_script_copy_and_bind (struct ncb *np, ncrcmd *src, ncrcmd *dst, int len)
                default:
                        relocs = 0;
                        break;
-               };
+               }
 
                if (relocs) {
                        while (relocs--) {
@@ -3033,49 +3684,25 @@ ncr_script_copy_and_bind (struct ncb *np, ncrcmd *src, ncrcmd *dst, int len)
                } else
                        *dst++ = cpu_to_scr(*src++);
 
-       };
-}
-
-/*==========================================================
-**
-**
-**      Auto configuration:  attach and init a host adapter.
-**
-**
-**==========================================================
-*/
+       }
+}
 
 /*
 **     Linux host data structure
-**
-**     The script area is allocated in the host data structure
-**     because kmalloc() returns NULL during scsi initialisations
-**     with Linux 1.2.X
 */
 
 struct host_data {
      struct ncb *ncb;
 };
 
-/*
-**     Print something which allows to retrieve the controller type, unit,
-**     target, lun concerned by a kernel message.
-*/
-
-static void PRINT_TARGET(struct ncb *np, int target)
-{
-       printk(KERN_INFO "%s-<%d,*>: ", ncr_name(np), target);
-}
+#define PRINT_ADDR(cmd, arg...) dev_info(&cmd->device->sdev_gendev , ## arg)
 
-static void PRINT_LUN(struct ncb *np, int target, int lun)
+static void ncr_print_msg(struct ccb *cp, char *label, u_char *msg)
 {
-       printk(KERN_INFO "%s-<%d,%d>: ", ncr_name(np), target, lun);
-}
+       PRINT_ADDR(cp->cmd, "%s: ", label);
 
-static void PRINT_ADDR(struct scsi_cmnd *cmd)
-{
-       struct host_data *host_data = (struct host_data *) cmd->device->host->hostdata;
-       PRINT_LUN(host_data->ncb, cmd->device->id, cmd->device->lun);
+       spi_print_msg(msg);
+       printk("\n");
 }
 
 /*==========================================================
@@ -3368,6 +3995,7 @@ static void __init ncr_prepare_setting(struct ncb *np)
                tp->usrsync = driver_setup.default_sync;
                tp->usrwide = driver_setup.max_wide;
                tp->usrtags = MAX_TAGS;
+               tp->period = 0xffff;
                if (!driver_setup.disconnection)
                        np->target[i].usrflag = UF_NODISC;
        }
@@ -3436,182 +4064,6 @@ static inline void ncr_flush_done_cmds(struct scsi_cmnd *lcmd)
        }
 }
 
-/*==========================================================
-**
-**
-**     Prepare the next negotiation message for integrity check,
-**     if needed.
-**
-**     Fill in the part of message buffer that contains the 
-**     negotiation and the nego_status field of the CCB.
-**     Returns the size of the message in bytes.
-**
-**
-**==========================================================
-*/
-
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-static int ncr_ic_nego(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd, u_char *msgptr)
-{
-       struct tcb *tp = &np->target[cp->target];
-       int msglen = 0;
-       int nego = 0;
-       u_char no_increase;
-
-       if (tp->inq_done) {
-
-               if (!tp->ic_maximums_set) {
-                       tp->ic_maximums_set = 1;
-
-                       /* check target and host adapter capabilities */
-                       if ( (tp->inq_byte7 & INQ7_WIDE16) && 
-                                       np->maxwide && tp->usrwide ) 
-                               tp->ic_max_width = 1;
-                       else
-                               tp->ic_max_width = 0;
-
-                       if ((tp->inq_byte7 & INQ7_SYNC) && tp->maxoffs) {
-                               tp->ic_min_sync   = (tp->minsync < np->minsync) ?
-                                                       np->minsync : tp->minsync;
-                       }
-                       else 
-                               tp->ic_min_sync   = 255;
-                       
-                       tp->period   = 1;
-                       tp->widedone = 1;
-               }
-
-               if (DEBUG_FLAGS & DEBUG_IC) {
-                       printk("%s: cmd->ic_nego %d, 1st byte 0x%2X\n",
-                               ncr_name(np), cmd->ic_nego, cmd->cmnd[0]);
-               }
-
-               /* First command from integrity check routine will request
-                * a PPR message.  Disable.
-                */
-               if ((cmd->ic_nego & NS_PPR) == NS_PPR)
-                       cmd->ic_nego &= ~NS_PPR;
-               /* Previous command recorded a parity or an initiator
-                * detected error condition. Force bus to narrow for this
-                * target. Clear flag. Negotation on request sense.
-                * Note: kernel forces 2 bus resets :o( but clears itself out.
-                * Minor bug? in scsi_obsolete.c (ugly)
-                */
-               if (np->check_integ_par) {
-                       printk("%s: Parity Error. Target set to narrow.\n",
-                               ncr_name(np));
-                       tp->ic_max_width = 0;
-                       tp->widedone = tp->period = 0;
-               }
-               
-               /* In case of a bus reset, ncr_negotiate will reset 
-                * the flags tp->widedone and tp->period to 0, forcing
-                * a new negotiation. 
-                */
-               no_increase = 0;
-               if (tp->widedone == 0) {
-                       cmd->ic_nego = NS_WIDE;
-                       tp->widedone = 1;
-                       no_increase = 1;
-               }
-               else if (tp->period == 0) {
-                       cmd->ic_nego = NS_SYNC;
-                       tp->period = 1;
-                       no_increase = 1;
-               }
-                       
-               switch (cmd->ic_nego) {
-               case NS_WIDE:
-                       /*
-                       **      negotiate wide transfers ?
-                       **      Do NOT negotiate if device only supports
-                       **      narrow. 
-                       */
-                       if (tp->ic_max_width | np->check_integ_par) {
-                               nego = NS_WIDE;
-
-                               msgptr[msglen++] = M_EXTENDED;
-                               msgptr[msglen++] = 2;
-                               msgptr[msglen++] = M_X_WIDE_REQ;
-                               msgptr[msglen++] = cmd->ic_nego_width & tp->ic_max_width;
-                       }
-                       else
-                               cmd->ic_nego_width &= tp->ic_max_width;
-
-                       break;
-
-               case NS_SYNC:
-                       /*
-                       **      negotiate synchronous transfers?
-                       **      Target must support sync transfers.
-                       **
-                       **      If period becomes longer than max, reset to async
-                       */
-
-                       if (tp->inq_byte7 & INQ7_SYNC) {
-
-                               nego = NS_SYNC;
-
-                               msgptr[msglen++] = M_EXTENDED;
-                               msgptr[msglen++] = 3;
-                               msgptr[msglen++] = M_X_SYNC_REQ;
-
-                               switch (cmd->ic_nego_sync) {
-                               case 2: /* increase the period */
-                                       if (!no_increase) {
-                                         if (tp->ic_min_sync <= 0x0A)
-                                             tp->ic_min_sync = 0x0C;
-                                         else if (tp->ic_min_sync <= 0x0C)
-                                             tp->ic_min_sync = 0x19;
-                                         else if (tp->ic_min_sync <= 0x19)
-                                             tp->ic_min_sync *= 2;
-                                         else {
-                                               tp->ic_min_sync = 255;
-                                               cmd->ic_nego_sync = 0;
-                                               tp->maxoffs = 0;
-                                          }
-                                       }
-                                       msgptr[msglen++] = tp->maxoffs?tp->ic_min_sync:0;
-                                       msgptr[msglen++] = tp->maxoffs;
-                                       break;
-
-                               case 1: /* nego. to maximum */
-                                       msgptr[msglen++] = tp->maxoffs?tp->ic_min_sync:0;
-                                       msgptr[msglen++] = tp->maxoffs;
-                                       break;
-
-                               case 0: /* nego to async */
-                               default:
-                                       msgptr[msglen++] = 0;
-                                       msgptr[msglen++] = 0;
-                                       break;
-                               };
-                       }
-                       else
-                               cmd->ic_nego_sync = 0;
-                       break;
-
-               case NS_NOCHANGE:
-               default:
-                       break;
-               };
-       };
-
-       cp->nego_status = nego;
-       np->check_integ_par = 0;
-
-       if (nego) {
-               tp->nego_cp = cp;
-               if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       ncr_print_msg(cp, nego == NS_WIDE ?
-                         "wide/narrow msgout": "sync/async msgout", msgptr);
-               };
-       };
-
-       return msglen;
-}
-#endif /* SCSI_NCR_INTEGRITY_CHECKING */
-
 /*==========================================================
 **
 **
@@ -3631,60 +4083,35 @@ static int ncr_prepare_nego(struct ncb *np, struct ccb *cp, u_char *msgptr)
        struct tcb *tp = &np->target[cp->target];
        int msglen = 0;
        int nego = 0;
+       struct scsi_target *starget = tp->starget;
 
-       if (tp->inq_done) {
-
-               /*
-               **      negotiate wide transfers ?
-               */
-
-               if (!tp->widedone) {
-                       if (tp->inq_byte7 & INQ7_WIDE16) {
-                               nego = NS_WIDE;
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-                               if (tp->ic_done)
-                                        tp->usrwide &= tp->ic_max_width;
-#endif
-                       } else
-                               tp->widedone=1;
-
-               };
-
-               /*
-               **      negotiate synchronous transfers?
-               */
+       /* negotiate wide transfers ?  */
+       if (!tp->widedone) {
+               if (spi_support_wide(starget)) {
+                       nego = NS_WIDE;
+               } else
+                       tp->widedone=1;
+       }
 
-               if (!nego && !tp->period) {
-                       if (tp->inq_byte7 & INQ7_SYNC) {
-                               nego = NS_SYNC;
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-                               if ((tp->ic_done) &&
-                                             (tp->minsync < tp->ic_min_sync))
-                                        tp->minsync = tp->ic_min_sync;
-#endif
-                       } else {
-                               tp->period  =0xffff;
-                               PRINT_TARGET(np, cp->target);
-                               printk ("target did not report SYNC.\n");
-                       };
-               };
-       };
+       /* negotiate synchronous transfers?  */
+       if (!nego && !tp->period) {
+               if (spi_support_sync(starget)) {
+                       nego = NS_SYNC;
+               } else {
+                       tp->period  =0xffff;
+                       dev_info(&starget->dev, "target did not report SYNC.\n");
+               }
+       }
 
        switch (nego) {
        case NS_SYNC:
-               msgptr[msglen++] = M_EXTENDED;
-               msgptr[msglen++] = 3;
-               msgptr[msglen++] = M_X_SYNC_REQ;
-               msgptr[msglen++] = tp->maxoffs ? tp->minsync : 0;
-               msgptr[msglen++] = tp->maxoffs;
+               msglen += spi_populate_sync_msg(msgptr + msglen,
+                               tp->maxoffs ? tp->minsync : 0, tp->maxoffs);
                break;
        case NS_WIDE:
-               msgptr[msglen++] = M_EXTENDED;
-               msgptr[msglen++] = 2;
-               msgptr[msglen++] = M_X_WIDE_REQ;
-               msgptr[msglen++] = tp->usrwide;
+               msglen += spi_populate_width_msg(msgptr + msglen, tp->usrwide);
                break;
-       };
+       }
 
        cp->nego_status = nego;
 
@@ -3693,8 +4120,8 @@ static int ncr_prepare_nego(struct ncb *np, struct ccb *cp, u_char *msgptr)
                if (DEBUG_FLAGS & DEBUG_NEGO) {
                        ncr_print_msg(cp, nego == NS_WIDE ?
                                          "wide msgout":"sync_msgout", msgptr);
-               };
-       };
+               }
+       }
 
        return msglen;
 }
@@ -3712,9 +4139,9 @@ static int ncr_prepare_nego(struct ncb *np, struct ccb *cp, u_char *msgptr)
 */
 static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
 {
-/*     struct scsi_device        *device    = cmd->device; */
-       struct tcb *tp                      = &np->target[cmd->device->id];
-       struct lcb *lp                = tp->lp[cmd->device->lun];
+       struct scsi_device *sdev = cmd->device;
+       struct tcb *tp = &np->target[sdev->id];
+       struct lcb *lp = tp->lp[sdev->lun];
        struct ccb *cp;
 
        int     segments;
@@ -3729,9 +4156,9 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **
        **---------------------------------------------
        */
-       if ((cmd->device->id == np->myaddr        ) ||
-               (cmd->device->id >= MAX_TARGET) ||
-               (cmd->device->lun    >= MAX_LUN   )) {
+       if ((sdev->id == np->myaddr       ) ||
+               (sdev->id >= MAX_TARGET) ||
+               (sdev->lun    >= MAX_LUN   )) {
                return(DID_BAD_TARGET);
        }
 
@@ -3751,8 +4178,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        }
 
        if (DEBUG_FLAGS & DEBUG_TINY) {
-               PRINT_ADDR(cmd);
-               printk ("CMD=%x ", cmd->cmnd[0]);
+               PRINT_ADDR(cmd, "CMD=%x ", cmd->cmnd[0]);
        }
 
        /*---------------------------------------------------
@@ -3766,12 +4192,12 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **----------------------------------------------------
        */
        if (np->settle_time && cmd->timeout_per_command >= HZ) {
-               u_long tlimit = ktime_get(cmd->timeout_per_command - HZ);
-               if (ktime_dif(np->settle_time, tlimit) > 0)
+               u_long tlimit = jiffies + cmd->timeout_per_command - HZ;
+               if (time_after(np->settle_time, tlimit))
                        np->settle_time = tlimit;
        }
 
-       if (np->settle_time || !(cp=ncr_get_ccb (np, cmd->device->id, cmd->device->lun))) {
+       if (np->settle_time || !(cp=ncr_get_ccb (np, cmd))) {
                insert_into_waiting_list(np, cmd);
                return(DID_OK);
        }
@@ -3784,7 +4210,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **----------------------------------------------------
        */
 
-       idmsg = M_IDENTIFY | cmd->device->lun;
+       idmsg = IDENTIFY(0, sdev->lun);
 
        if (cp ->tag != NO_TAG ||
                (cp != np->ccb && np->disc && !(tp->usrflag & UF_NODISC)))
@@ -3801,15 +4227,15 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
                **      Force ordered tag if necessary to avoid timeouts 
                **      and to preserve interactivity.
                */
-               if (lp && ktime_exp(lp->tags_stime)) {
+               if (lp && time_after(jiffies, lp->tags_stime)) {
                        if (lp->tags_smap) {
-                               order = M_ORDERED_TAG;
+                               order = ORDERED_QUEUE_TAG;
                                if ((DEBUG_FLAGS & DEBUG_TAGS)||bootverbose>2){ 
-                                       PRINT_ADDR(cmd);
-                                       printk("ordered tag forced.\n");
+                                       PRINT_ADDR(cmd,
+                                               "ordered tag forced.\n");
                                }
                        }
-                       lp->tags_stime = ktime_get(3*HZ);
+                       lp->tags_stime = jiffies + 3*HZ;
                        lp->tags_smap = lp->tags_umap;
                }
 
@@ -3821,10 +4247,10 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
                        case 0x08:  /* READ_SMALL (6) */
                        case 0x28:  /* READ_BIG  (10) */
                        case 0xa8:  /* READ_HUGE (12) */
-                               order = M_SIMPLE_TAG;
+                               order = SIMPLE_QUEUE_TAG;
                                break;
                        default:
-                               order = M_ORDERED_TAG;
+                               order = ORDERED_QUEUE_TAG;
                        }
                }
                msgptr[msglen++] = order;
@@ -3843,8 +4269,8 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **----------------------------------------------------
        */
 
-       direction = scsi_data_direction(cmd);
-       if (direction != SCSI_DATA_NONE) {
+       direction = cmd->sc_data_direction;
+       if (direction != DMA_NONE) {
                segments = ncr_scatter(np, cp, cp->cmd);
                if (segments < 0) {
                        ncr_free_ccb(np, cp);
@@ -3867,72 +4293,9 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
 
        cp->nego_status = 0;
 
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-       if ((np->check_integrity && tp->ic_done) || !np->check_integrity) {
-                if ((!tp->widedone || !tp->period) && !tp->nego_cp && lp) {
-                       msglen += ncr_prepare_nego (np, cp, msgptr + msglen);
-                }
-       }
-       else if (np->check_integrity && (cmd->ic_in_progress)) { 
-               msglen += ncr_ic_nego (np, cp, cmd, msgptr + msglen);
-       }
-       else if (np->check_integrity && cmd->ic_complete) {
-               /*
-                * Midlayer signal to the driver that all of the scsi commands
-                * for the integrity check have completed. Save the negotiated
-                * parameters (extracted from sval and wval). 
-                */ 
-
-               {
-                       u_char idiv;
-                       idiv = (tp->wval>>4) & 0x07;
-                       if ((tp->sval&0x1f) && idiv )
-                               tp->period = (((tp->sval>>5)+4)  
-                                               *div_10M[idiv-1])/np->clock_khz;
-                       else
-                               tp->period = 0xffff;
-               }
-               /*
-                * tp->period contains 10 times the transfer period, 
-                * which itself is 4 * the requested negotiation rate.
-                */
-               if      (tp->period <= 250)     tp->ic_min_sync = 10;
-               else if (tp->period <= 303)     tp->ic_min_sync = 11;
-               else if (tp->period <= 500)     tp->ic_min_sync = 12;
-               else                            
-                               tp->ic_min_sync = (tp->period + 40 - 1) / 40;
-
-
-               /*
-                * Negotiation for this target it complete.
-                */
-               tp->ic_max_width =  (tp->wval & EWS) ? 1: 0;
-               tp->ic_done = 1;
-               tp->widedone = 1;
-
-               printk("%s: Integrity Check Complete: \n", ncr_name(np)); 
-
-               printk("%s: %s %s SCSI", ncr_name(np), 
-                               (tp->sval&0x1f)?"SYNC":"ASYNC",
-                               tp->ic_max_width?"WIDE":"NARROW");
-
-               if (tp->sval&0x1f) {
-                       u_long mbs = 10000 * (tp->ic_max_width + 1);
-
-                       printk(" %d.%d  MB/s", (int) (mbs / tp->period),
-                                       (int) (mbs % tp->period));
-
-                       printk(" (%d ns, %d offset)\n", 
-                                 tp->period/10, tp->sval&0x1f);
-               } else {
-                       printk(" %d MB/s. \n ", (tp->ic_max_width+1)*5);
-               }
-       }
-#else
        if ((!tp->widedone || !tp->period) && !tp->nego_cp && lp) {
                msglen += ncr_prepare_nego (np, cp, msgptr + msglen);
        }
-#endif /* SCSI_NCR_INTEGRITY_CHECKING */
 
        /*----------------------------------------------------
        **
@@ -3941,17 +4304,17 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **----------------------------------------------------
        */
        if (!cp->data_len)
-               direction = SCSI_DATA_NONE;
+               direction = DMA_NONE;
 
        /*
-       **      If data direction is UNKNOWN, speculate DATA_READ 
-       **      but prepare alternate pointers for WRITE in case 
+       **      If data direction is BIDIRECTIONAL, speculate FROM_DEVICE
+       **      but prepare alternate pointers for TO_DEVICE in case 
        **      of our speculation will be just wrong.
        **      SCRIPTS will swap values if needed.
        */
        switch(direction) {
-       case SCSI_DATA_UNKNOWN:
-       case SCSI_DATA_WRITE:
+       case DMA_BIDIRECTIONAL:
+       case DMA_TO_DEVICE:
                goalp = NCB_SCRIPT_PHYS (np, data_out2) + 8;
                if (segments <= MAX_SCATTERL)
                        lastp = goalp - 8 - (segments * 16);
@@ -3959,12 +4322,12 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
                        lastp = NCB_SCRIPTH_PHYS (np, hdata_out2);
                        lastp -= (segments - MAX_SCATTERL) * 16;
                }
-               if (direction != SCSI_DATA_UNKNOWN)
+               if (direction != DMA_BIDIRECTIONAL)
                        break;
                cp->phys.header.wgoalp  = cpu_to_scr(goalp);
                cp->phys.header.wlastp  = cpu_to_scr(lastp);
                /* fall through */
-       case SCSI_DATA_READ:
+       case DMA_FROM_DEVICE:
                goalp = NCB_SCRIPT_PHYS (np, data_in2) + 8;
                if (segments <= MAX_SCATTERL)
                        lastp = goalp - 8 - (segments * 16);
@@ -3974,7 +4337,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
                }
                break;
        default:
-       case SCSI_DATA_NONE:
+       case DMA_NONE:
                lastp = goalp = NCB_SCRIPT_PHYS (np, no_data);
                break;
        }
@@ -3986,7 +4349,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        cp->phys.header.lastp = cpu_to_scr(lastp);
        cp->phys.header.goalp = cpu_to_scr(goalp);
 
-       if (direction == SCSI_DATA_UNKNOWN)
+       if (direction == DMA_BIDIRECTIONAL)
                cp->phys.header.savep = 
                        cpu_to_scr(NCB_SCRIPTH_PHYS (np, data_io));
        else
@@ -4017,7 +4380,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        /*
        **      select
        */
-       cp->phys.select.sel_id          = cmd->device->id;
+       cp->phys.select.sel_id          = sdev_id(sdev);
        cp->phys.select.sel_scntl3      = tp->wval;
        cp->phys.select.sel_sxfer       = tp->sval;
        /*
@@ -4036,7 +4399,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        /*
        **      status
        */
-       cp->actualquirks                = tp->quirks;
+       cp->actualquirks                = 0;
        cp->host_status                 = cp->nego_status ? HS_NEGOTIATE : HS_BUSY;
        cp->scsi_status                 = S_ILLEGAL;
        cp->parity_status               = 0;
@@ -4054,9 +4417,7 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        **----------------------------------------------------
        */
 
-       /*
-       **      activate this job.
-       */
+       /* activate this job.  */
        cp->magic               = CCB_MAGIC;
 
        /*
@@ -4069,11 +4430,9 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
        else
                ncr_put_start_queue(np, cp);
 
-       /*
-       **      Command is successfully queued.
-       */
+       /* Command is successfully queued.  */
 
-       return(DID_OK);
+       return DID_OK;
 }
 
 
@@ -4089,19 +4448,19 @@ static int ncr_queue_command (struct ncb *np, struct scsi_cmnd *cmd)
 
 static void ncr_start_next_ccb(struct ncb *np, struct lcb *lp, int maxn)
 {
-       XPT_QUEHEAD *qp;
+       struct list_head *qp;
        struct ccb *cp;
 
        if (lp->held_ccb)
                return;
 
        while (maxn-- && lp->queuedccbs < lp->queuedepth) {
-               qp = xpt_remque_head(&lp->wait_ccbq);
+               qp = ncr_list_pop(&lp->wait_ccbq);
                if (!qp)
                        break;
                ++lp->queuedccbs;
-               cp = xpt_que_entry(qp, struct ccb, link_ccbq);
-               xpt_insque_tail(qp, &lp->busy_ccbq);
+               cp = list_entry(qp, struct ccb, link_ccbq);
+               list_add_tail(qp, &lp->busy_ccbq);
                lp->jump_ccb[cp->tag == NO_TAG ? 0 : cp->tag] =
                        cpu_to_scr(CCB_PHYS (cp, restart));
                ncr_put_start_queue(np, cp);
@@ -4144,7 +4503,7 @@ static int ncr_reset_scsi_bus(struct ncb *np, int enab_int, int settle_delay)
        u32 term;
        int retv = 0;
 
-       np->settle_time = ktime_get(settle_delay * HZ);
+       np->settle_time = jiffies + settle_delay * HZ;
 
        if (bootverbose > 1)
                printk("%s: resetting, "
@@ -4152,7 +4511,7 @@ static int ncr_reset_scsi_bus(struct ncb *np, int enab_int, int settle_delay)
                        ncr_name(np), settle_delay);
 
        ncr_chip_reset(np, 100);
-       UDELAY (2000);  /* The 895 needs time for the bus mode to settle */
+       udelay(2000);   /* The 895 needs time for the bus mode to settle */
        if (enab_int)
                OUTW (nc_sien, RST);
        /*
@@ -4161,7 +4520,7 @@ static int ncr_reset_scsi_bus(struct ncb *np, int enab_int, int settle_delay)
        */
        OUTB (nc_stest3, TE);
        OUTB (nc_scntl1, CRST);
-       UDELAY (200);
+       udelay(200);
 
        if (!driver_setup.bus_check)
                goto out;
@@ -4280,6 +4639,7 @@ static int ncr_reset_bus (struct ncb *np, struct scsi_cmnd *cmd, int sync_reset)
        return SUCCESS;
 }
 
+#if 0 /* unused and broken.. */
 /*==========================================================
 **
 **
@@ -4360,17 +4720,7 @@ static int ncr_abort_command (struct ncb *np, struct scsi_cmnd *cmd)
 
        return retv;
 }
-
-/*==========================================================
-**
-**     Linux release module stuff.
-**
-**     Called before unloading the module
-**     Detach the host.
-**     We have to free resources and halt the NCR chip
-**
-**==========================================================
-*/
+#endif
 
 static void ncr_detach(struct ncb *np)
 {
@@ -4395,7 +4745,8 @@ static void ncr_detach(struct ncb *np)
        printk("%s: stopping the timer\n", ncr_name(np));
 #endif
        np->release_stage = 1;
-       for (i = 50 ; i && np->release_stage != 2 ; i--) MDELAY (100);
+       for (i = 50 ; i && np->release_stage != 2 ; i--)
+               mdelay(100);
        if (np->release_stage != 2)
                printk("%s: the timer seems to be already stopped\n", ncr_name(np));
        else np->release_stage = 2;
@@ -4520,7 +4871,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        */
 
        if (cp == tp->nego_cp)
-               tp->nego_cp = 0;
+               tp->nego_cp = NULL;
 
        /*
        **      If auto-sense performed, change scsi status.
@@ -4536,9 +4887,8 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
 
        if (lp && lp->held_ccb) {
                if (cp == lp->held_ccb) {
-                       xpt_que_splice(&lp->skip_ccbq, &lp->wait_ccbq);
-                       xpt_que_init(&lp->skip_ccbq);
-                       lp->held_ccb = 0;
+                       list_splice_init(&lp->skip_ccbq, &lp->wait_ccbq);
+                       lp->held_ccb = NULL;
                }
        }
 
@@ -4547,8 +4897,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        */
 
        if (cp->parity_status > 1) {
-               PRINT_ADDR(cmd);
-               printk ("%d parity error(s).\n",cp->parity_status);
+               PRINT_ADDR(cmd, "%d parity error(s).\n",cp->parity_status);
        }
 
        /*
@@ -4556,16 +4905,16 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        */
 
        if (cp->xerr_status != XE_OK) {
-               PRINT_ADDR(cmd);
                switch (cp->xerr_status) {
                case XE_EXTRA_DATA:
-                       printk ("extraneous data discarded.\n");
+                       PRINT_ADDR(cmd, "extraneous data discarded.\n");
                        break;
                case XE_BAD_PHASE:
-                       printk ("invalid scsi phase (4/5).\n");
+                       PRINT_ADDR(cmd, "invalid scsi phase (4/5).\n");
                        break;
                default:
-                       printk ("extended error %d.\n", cp->xerr_status);
+                       PRINT_ADDR(cmd, "extended error %d.\n",
+                                       cp->xerr_status);
                        break;
                }
                if (cp->host_status==HS_COMPLETE)
@@ -4577,9 +4926,9 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        */
        if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) {
                if (cp->host_status!=HS_COMPLETE || cp->scsi_status!=S_GOOD) {
-                       PRINT_ADDR(cmd);
-                       printk ("ERROR: cmd=%x host_status=%x scsi_status=%x\n",
-                               cmd->cmnd[0], cp->host_status, cp->scsi_status);
+                       PRINT_ADDR(cmd, "ERROR: cmd=%x host_status=%x "
+                                       "scsi_status=%x\n", cmd->cmnd[0],
+                                       cp->host_status, cp->scsi_status);
                }
        }
 
@@ -4609,19 +4958,6 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
                if (!lp)
                        ncr_alloc_lcb (np, cmd->device->id, cmd->device->lun);
 
-               /*
-               **      On standard INQUIRY response (EVPD and CmDt 
-               **      not set), setup logical unit according to 
-               **      announced capabilities (we need the 1rst 7 bytes).
-               */
-               if (cmd->cmnd[0] == 0x12 && !(cmd->cmnd[1] & 0x3) &&
-                   cmd->cmnd[4] >= 7 && !cmd->use_sg) {
-                       sync_scsi_data_for_cpu(np, cmd);        /* SYNC the data */
-                       ncr_setup_lcb (np, cmd->device->id, cmd->device->lun,
-                                      (char *) cmd->request_buffer);
-                       sync_scsi_data_for_device(np, cmd);     /* SYNC the data */
-               }
-
                tp->bytes     += cp->data_len;
                tp->transfers ++;
 
@@ -4634,7 +4970,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
                        if (lp->num_good >= 1000) {
                                lp->num_good = 0;
                                ++lp->numtags;
-                               ncr_setup_tags (np, cmd->device->id, cmd->device->lun);
+                               ncr_setup_tags (np, cmd->device);
                        }
                }
        } else if ((cp->host_status == HS_COMPLETE)
@@ -4653,8 +4989,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
                if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) {
                        u_char * p = (u_char*) & cmd->sense_buffer;
                        int i;
-                       PRINT_ADDR(cmd);
-                       printk ("sense data:");
+                       PRINT_ADDR(cmd, "sense data:");
                        for (i=0; i<14; i++) printk (" %x", *p++);
                        printk (".\n");
                }
@@ -4701,8 +5036,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
                /*
                **  Other protocol messes
                */
-               PRINT_ADDR(cmd);
-               printk ("COMMAND FAILED (%x %x) @%p.\n",
+               PRINT_ADDR(cmd, "COMMAND FAILED (%x %x) @%p.\n",
                        cp->host_status, cp->scsi_status, cp);
 
                cmd->result = ScsiResult(DID_ERROR, cp->scsi_status);
@@ -4715,8 +5049,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        if (tp->usrflag & UF_TRACE) {
                u_char * p;
                int i;
-               PRINT_ADDR(cmd);
-               printk (" CMD:");
+               PRINT_ADDR(cmd, " CMD:");
                p = (u_char*) &cmd->cmnd[0];
                for (i=0; i<cmd->cmd_len; i++) printk (" %x", *p++);
 
@@ -4748,7 +5081,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
        **      requeue awaiting scsi commands for this lun.
        */
        if (lp && lp->queuedccbs < lp->queuedepth &&
-           !xpt_que_empty(&lp->wait_ccbq))
+           !list_empty(&lp->wait_ccbq))
                ncr_start_next_ccb(np, lp, 2);
 
        /*
@@ -4785,8 +5118,8 @@ static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp)
                cp->host_status &= ~HS_SKIPMASK;
                cp->start.schedule.l_paddr = 
                        cpu_to_scr(NCB_SCRIPT_PHYS (np, select));
-               xpt_remque(&cp->link_ccbq);
-               xpt_insque_tail(&cp->link_ccbq, &lp->skip_ccbq);
+               list_del(&cp->link_ccbq);
+               list_add_tail(&cp->link_ccbq, &lp->skip_ccbq);
                if (cp->queued) {
                        --lp->queuedccbs;
                }
@@ -4871,7 +5204,7 @@ void ncr_wakeup (struct ncb *np, u_long code)
 static void ncr_chip_reset(struct ncb *np, int delay)
 {
        OUTB (nc_istat,  SRST);
-       UDELAY (delay);
+       udelay(delay);
        OUTB (nc_istat,  0   );
 
        if (np->features & FE_EHP)
@@ -4900,7 +5233,7 @@ void ncr_init (struct ncb *np, int reset, char * msg, u_long code)
 
        if (reset) {
                OUTB (nc_istat,  SRST);
-               UDELAY (100);
+               udelay(100);
        }
        else {
                OUTB (nc_stest3, TE|CSF);
@@ -5024,12 +5357,11 @@ void ncr_init (struct ncb *np, int reset, char * msg, u_long code)
                        }
                        else
                                tp->usrsync = 255;
-               };
+               }
 
                if (tp->usrwide > np->maxwide)
                        tp->usrwide = np->maxwide;
 
-               ncr_negotiate (np, tp);
        }
 
        /*
@@ -5084,8 +5416,11 @@ static void ncr_negotiate (struct ncb* np, struct tcb* tp)
        if (minsync > np->maxsync)
                minsync = 255;
 
+       if (tp->maxoffs > np->maxoffs)
+               tp->maxoffs = np->maxoffs;
+
        tp->minsync = minsync;
-       tp->maxoffs = (minsync<255 ? np->maxoffs : 0);
+       tp->maxoffs = (minsync<255 ? tp->maxoffs : 0);
 
        /*
        **      period=0: has to negotiate sync transfer
@@ -5196,14 +5531,14 @@ static void ncr_set_sync_wide_status (struct ncb *np, u_char target)
        */
        for (cp = np->ccb; cp; cp = cp->link_ccb) {
                if (!cp->cmd) continue;
-               if (cp->cmd->device->id != target) continue;
+               if (scmd_id(cp->cmd) != target) continue;
 #if 0
                cp->sync_status = tp->sval;
                cp->wide_status = tp->wval;
 #endif
                cp->phys.select.sel_scntl3 = tp->wval;
                cp->phys.select.sel_sxfer  = tp->sval;
-       };
+       }
 }
 
 /*==========================================================
@@ -5215,18 +5550,12 @@ static void ncr_set_sync_wide_status (struct ncb *np, u_char target)
 
 static void ncr_setsync (struct ncb *np, struct ccb *cp, u_char scntl3, u_char sxfer)
 {
-       struct scsi_cmnd *cmd;
+       struct scsi_cmnd *cmd = cp->cmd;
        struct tcb *tp;
        u_char target = INB (nc_sdid) & 0x0f;
        u_char idiv;
 
-       assert (cp && cp->cmd);
-       if (!cp) return;
-
-       cmd = cp->cmd;
-       if (!cmd) return;
-
-       assert (target == (cmd->device->id & 0xf));
+       BUG_ON(target != (scmd_id(cmd) & 0xf));
 
        tp = &np->target[target];
 
@@ -5245,40 +5574,19 @@ static void ncr_setsync (struct ncb *np, struct ccb *cp, u_char scntl3, u_char s
        else
                tp->period = 0xffff;
 
-       /*
-       **       Stop there if sync parameters are unchanged
-       */
-       if (tp->sval == sxfer && tp->wval == scntl3) return;
+       /* Stop there if sync parameters are unchanged */
+       if (tp->sval == sxfer && tp->wval == scntl3)
+               return;
        tp->sval = sxfer;
        tp->wval = scntl3;
 
-       /*
-       **      Bells and whistles   ;-)
-       */
-       PRINT_TARGET(np, target);
        if (sxfer & 0x01f) {
-               unsigned f10 = 100000 << (tp->widedone ? tp->widedone -1 : 0);
-               unsigned mb10 = (f10 + tp->period/2) / tp->period;
-               char *scsi;
-
-               /*
-               **  Disable extended Sreq/Sack filtering
-               */
-               if (tp->period <= 2000) OUTOFFB (nc_stest2, EXT);
-
-               /*
-               **      Bells and whistles   ;-)
-               */
-               if      (tp->period < 500)      scsi = "FAST-40";
-               else if (tp->period < 1000)     scsi = "FAST-20";
-               else if (tp->period < 2000)     scsi = "FAST-10";
-               else                            scsi = "FAST-5";
-
-               printk ("%s %sSCSI %d.%d MB/s (%d ns, offset %d)\n", scsi,
-                       tp->widedone > 1 ? "WIDE " : "",
-                       mb10 / 10, mb10 % 10, tp->period / 10, sxfer & 0x1f);
-       } else
-               printk ("%sasynchronous.\n", tp->widedone > 1 ? "wide " : "");
+               /* Disable extended Sreq/Sack filtering */
+               if (tp->period <= 2000)
+                       OUTOFFB(nc_stest2, EXT);
+       }
+       spi_display_xfer_agreement(tp->starget);
 
        /*
        **      set actual value and sync_status
@@ -5299,19 +5607,13 @@ static void ncr_setsync (struct ncb *np, struct ccb *cp, u_char scntl3, u_char s
 
 static void ncr_setwide (struct ncb *np, struct ccb *cp, u_char wide, u_char ack)
 {
-       struct scsi_cmnd *cmd;
+       struct scsi_cmnd *cmd = cp->cmd;
        u16 target = INB (nc_sdid) & 0x0f;
        struct tcb *tp;
        u_char  scntl3;
        u_char  sxfer;
 
-       assert (cp && cp->cmd);
-       if (!cp) return;
-
-       cmd = cp->cmd;
-       if (!cmd) return;
-
-       assert (target == (cmd->device->id & 0xf));
+       BUG_ON(target != (scmd_id(cmd) & 0xf));
 
        tp = &np->target[target];
        tp->widedone  =  wide+1;
@@ -5330,11 +5632,8 @@ static void ncr_setwide (struct ncb *np, struct ccb *cp, u_char wide, u_char ack
        **      Bells and whistles   ;-)
        */
        if (bootverbose >= 2) {
-               PRINT_TARGET(np, target);
-               if (scntl3 & EWS)
-                       printk ("WIDE SCSI (16 bit) enabled.\n");
-               else
-                       printk ("WIDE SCSI disabled.\n");
+               dev_info(&cmd->device->sdev_target->dev, "WIDE SCSI %sabled.\n",
+                               (scntl3 & EWS) ? "en" : "dis");
        }
 
        /*
@@ -5351,8 +5650,9 @@ static void ncr_setwide (struct ncb *np, struct ccb *cp, u_char wide, u_char ack
 **==========================================================
 */
 
-static void ncr_setup_tags (struct ncb *np, u_char tn, u_char ln)
+static void ncr_setup_tags (struct ncb *np, struct scsi_device *sdev)
 {
+       unsigned char tn = sdev->id, ln = sdev->lun;
        struct tcb *tp = &np->target[tn];
        struct lcb *lp = tp->lp[ln];
        u_char   reqtags, maxdepth;
@@ -5360,7 +5660,7 @@ static void ncr_setup_tags (struct ncb *np, u_char tn, u_char ln)
        /*
        **      Just in case ...
        */
-       if ((!tp) || (!lp))
+       if ((!tp) || (!lp) || !sdev)
                return;
 
        /*
@@ -5384,11 +5684,11 @@ static void ncr_setup_tags (struct ncb *np, u_char tn, u_char ln)
        **      only devices capable of tagged commands
        **      only if enabled by user ..
        */
-       if ((lp->inq_byte7 & INQ7_QUEUE) && lp->numtags > 1) {
+       if (sdev->tagged_supported && lp->numtags > 1) {
                reqtags = lp->numtags;
        } else {
                reqtags = 1;
-       };
+       }
 
        /*
        **      Update max number of tags
@@ -5428,96 +5728,17 @@ static void ncr_setup_tags (struct ncb *np, u_char tn, u_char ln)
        **      Announce change to user.
        */
        if (bootverbose) {
-               PRINT_LUN(np, tn, ln);
                if (lp->usetags) {
-                       printk("tagged command queue depth set to %d\n", reqtags);
-               }
-               else {
-                       printk("tagged command queueing disabled\n");
+                       dev_info(&sdev->sdev_gendev,
+                               "tagged command queue depth set to %d\n",
+                               reqtags);
+               } else {
+                       dev_info(&sdev->sdev_gendev,
+                                       "tagged command queueing disabled\n");
                }
        }
 }
 
-/*----------------------------------------------------
-**
-**     handle user commands
-**
-**----------------------------------------------------
-*/
-
-#ifdef SCSI_NCR_USER_COMMAND_SUPPORT
-
-static void ncr_usercmd (struct ncb *np)
-{
-       u_char t;
-       struct tcb *tp;
-
-       switch (np->user.cmd) {
-
-       case 0: return;
-
-       case UC_SETSYNC:
-               for (t=0; t<MAX_TARGET; t++) {
-                       if (!((np->user.target>>t)&1)) continue;
-                       tp = &np->target[t];
-                       tp->usrsync = np->user.data;
-                       ncr_negotiate (np, tp);
-               };
-               break;
-
-       case UC_SETTAGS:
-               for (t=0; t<MAX_TARGET; t++) {
-                       int ln;
-                       if (!((np->user.target>>t)&1)) continue;
-                       np->target[t].usrtags = np->user.data;
-                       for (ln = 0; ln < MAX_LUN; ln++) {
-                               struct lcb *lp = np->target[t].lp[ln];
-                               if (!lp)
-                                       continue;
-                               lp->maxtags = lp->numtags = np->user.data;
-                               ncr_setup_tags (np, t, ln);
-                       }
-               };
-               break;
-
-       case UC_SETDEBUG:
-#ifdef SCSI_NCR_DEBUG_INFO_SUPPORT
-               ncr_debug = np->user.data;
-#endif
-               break;
-
-       case UC_SETORDER:
-               np->order = np->user.data;
-               break;
-
-       case UC_SETVERBOSE:
-               np->verbose = np->user.data;
-               break;
-
-       case UC_SETWIDE:
-               for (t=0; t<MAX_TARGET; t++) {
-                       u_long size;
-                       if (!((np->user.target>>t)&1)) continue;
-                       tp = &np->target[t];
-                       size = np->user.data;
-                       if (size > np->maxwide) size=np->maxwide;
-                       tp->usrwide = size;
-                       ncr_negotiate (np, tp);
-               };
-               break;
-
-       case UC_SETFLAG:
-               for (t=0; t<MAX_TARGET; t++) {
-                       if (!((np->user.target>>t)&1)) continue;
-                       tp = &np->target[t];
-                       tp->usrflag = np->user.data;
-               };
-               break;
-       }
-       np->user.cmd=0;
-}
-#endif
-
 /*==========================================================
 **
 **
@@ -5534,7 +5755,7 @@ static void ncr_usercmd (struct ncb *np)
 
 static void ncr_timeout (struct ncb *np)
 {
-       u_long  thistime = ktime_get(0);
+       u_long  thistime = jiffies;
 
        /*
        **      If release process in progress, let's go
@@ -5547,7 +5768,7 @@ static void ncr_timeout (struct ncb *np)
                return;
        }
 
-       np->timer.expires = ktime_get(SCSI_NCR_TIMER_INTERVAL);
+       np->timer.expires = jiffies + SCSI_NCR_TIMER_INTERVAL;
        add_timer(&np->timer);
 
        /*
@@ -5646,7 +5867,7 @@ static void ncr_log_hard_error(struct ncb *np, u16 sist, u_char dstat)
        } else {
                script_ofs      = dsp;
                script_size     = 0;
-               script_base     = 0;
+               script_base     = NULL;
                script_name     = "mem";
        }
 
@@ -5719,7 +5940,7 @@ void ncr_exception (struct ncb *np)
                istat = INB (nc_istat);
                if (DEBUG_FLAGS & DEBUG_TINY) printk ("F ");
                ncr_wakeup_done (np);
-       };
+       }
 
        if (!(istat & (SIP|DIP)))
                return;
@@ -5780,7 +6001,7 @@ void ncr_exception (struct ncb *np)
                }
                OUTONB_STD ();
                return;
-       };
+       }
 
        /*========================================================
        **      Now, interrupts that need some fixing up.
@@ -5800,7 +6021,7 @@ void ncr_exception (struct ncb *np)
        if (sist & RST) {
                ncr_init (np, 1, bootverbose ? "scsi reset" : NULL, HS_RESET);
                return;
-       };
+       }
 
        if ((sist & STO) &&
                !(dstat & (MDPE|BF|ABRT))) {
@@ -5811,7 +6032,7 @@ void ncr_exception (struct ncb *np)
 
                ncr_int_sto (np);
                return;
-       };
+       }
 
        /*=========================================================
        **      Now, interrupts we are not able to recover cleanly.
@@ -5826,13 +6047,13 @@ void ncr_exception (struct ncb *np)
        **=========================================================
        */
 
-       if (ktime_exp(np->regtime)) {
-               np->regtime = ktime_get(10*HZ);
+       if (time_after(jiffies, np->regtime)) {
+               np->regtime = jiffies + 10*HZ;
                for (i = 0; i<sizeof(np->regdump); i++)
                        ((char*)&np->regdump)[i] = INB_OFF(i);
                np->regdump.nc_dstat = dstat;
                np->regdump.nc_sist  = sist;
-       };
+       }
 
        ncr_log_hard_error(np, sist, dstat);
 
@@ -5844,20 +6065,20 @@ void ncr_exception (struct ncb *np)
                (dstat & (MDPE|BF|ABRT|IID))) {
                ncr_start_reset(np);
                return;
-       };
+       }
 
        if (sist & HTH) {
                printk ("%s: handshake timeout\n", ncr_name(np));
                ncr_start_reset(np);
                return;
-       };
+       }
 
        if (sist & UDC) {
                printk ("%s: unexpected disconnect\n", ncr_name(np));
                OUTB (HS_PRT, HS_UNEXPECTED);
                OUTL_DSP (NCB_SCRIPT_PHYS (np, cleanup));
                return;
-       };
+       }
 
        /*=========================================================
        **      We just miss the cause of the interrupt. :(
@@ -5901,7 +6122,7 @@ void ncr_int_sto (struct ncb *np)
        if (cp) {
                cp-> host_status = HS_SEL_TIMEOUT;
                ncr_complete (np, cp);
-       };
+       }
 
        /*
        **      repair start queue and jump to start point.
@@ -5943,7 +6164,7 @@ static int ncr_int_sbmc (struct ncb *np)
                **      Suspend command processing for 1 second and 
                **      reinitialize all except the chip.
                */
-               np->settle_time = ktime_get(1*HZ);
+               np->settle_time = jiffies + HZ;
                ncr_init (np, 0, bootverbose ? "scsi mode change" : NULL, HS_RESET);
                return 1;
        }
@@ -5998,17 +6219,10 @@ static int ncr_int_par (struct ncb *np)
        if (!(dbc & 0xc0000000))
                phase = (dbc >> 24) & 7;
        if (phase == 7)
-               msg = M_PARITY;
+               msg = MSG_PARITY_ERROR;
        else
-               msg = M_ID_ERROR;
+               msg = INITIATOR_ERROR;
 
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-       /*
-       **      Save error message. For integrity check use only.
-       */
-       if (np->check_integrity)
-               np->check_integ_par = msg;
-#endif
 
        /*
         *      If the NCR stopped on a MOVE ^ DATA_IN, we jump to a 
@@ -6099,7 +6313,7 @@ static void ncr_int_ma (struct ncb *np)
                        ss2 = INB (nc_sstat2);
                        if (ss2 & OLF1) rest++;
                        if (ss2 & ORF1) rest++;
-               };
+               }
 
                if (DEBUG_FLAGS & (DEBUG_TINY|DEBUG_PHASE))
                        printk ("P%x%x RL=%d D=%d SS0=%x ", cmd&7, sbcl&7,
@@ -6125,7 +6339,7 @@ static void ncr_int_ma (struct ncb *np)
        if (!(cmd & 6)) {
                cp = np->header.cp;
                if (CCB_PHYS(cp, phys) != dsa)
-                       cp = 0;
+                       cp = NULL;
        } else {
                cp  = np->ccb;
                while (cp && (CCB_PHYS (cp, phys) != dsa))
@@ -6136,7 +6350,7 @@ static void ncr_int_ma (struct ncb *np)
        **      try to find the interrupted script command,
        **      and the address at which to continue.
        */
-       vdsp    = 0;
+       vdsp    = NULL;
        nxtdsp  = 0;
        if      (dsp >  np->p_script &&
                 dsp <= np->p_script + sizeof(struct script)) {
@@ -6168,7 +6382,7 @@ static void ncr_int_ma (struct ncb *np)
                        cp, np->header.cp,
                        (unsigned)dsp,
                        (unsigned)nxtdsp, vdsp, cmd);
-       };
+       }
 
        /*
        **      cp=0 means that the DSA does not point to a valid control 
@@ -6196,7 +6410,7 @@ static void ncr_int_ma (struct ncb *np)
        } else {
                tblp = (u32 *) 0;
                olen = scr_to_cpu(vdsp[0]) & 0xffffff;
-       };
+       }
 
        if (DEBUG_FLAGS & DEBUG_PHASE) {
                printk ("OCMD=%x\nTBLP=%p OLEN=%x OADR=%x\n",
@@ -6204,16 +6418,15 @@ static void ncr_int_ma (struct ncb *np)
                        tblp,
                        (unsigned) olen,
                        (unsigned) oadr);
-       };
+       }
 
        /*
        **      check cmd against assumed interrupted script command.
        */
 
        if (cmd != (scr_to_cpu(vdsp[0]) >> 24)) {
-               PRINT_ADDR(cp->cmd);
-               printk ("internal error: cmd=%02x != %02x=(vdsp[0] >> 24)\n",
-                       (unsigned)cmd, (unsigned)scr_to_cpu(vdsp[0]) >> 24);
+               PRINT_ADDR(cp->cmd, "internal error: cmd=%02x != %02x=(vdsp[0] "
+                               ">> 24)\n", cmd, scr_to_cpu(vdsp[0]) >> 24);
 
                goto reset_all;
        }
@@ -6235,12 +6448,11 @@ static void ncr_int_ma (struct ncb *np)
        */
 
        if (cmd & 0x06) {
-               PRINT_ADDR(cp->cmd);
-               printk ("phase change %x-%x %d@%08x resid=%d.\n",
+               PRINT_ADDR(cp->cmd, "phase change %x-%x %d@%08x resid=%d.\n",
                        cmd&7, sbcl&7, (unsigned)olen,
                        (unsigned)oadr, (unsigned)rest);
                goto unexpected_phase;
-       };
+       }
 
        /*
        **      choose the correct patch area.
@@ -6264,8 +6476,7 @@ static void ncr_int_ma (struct ncb *np)
        newcmd[3] = cpu_to_scr(nxtdsp);
 
        if (DEBUG_FLAGS & DEBUG_PHASE) {
-               PRINT_ADDR(cp->cmd);
-               printk ("newcmd[%d] %x %x %x %x.\n",
+               PRINT_ADDR(cp->cmd, "newcmd[%d] %x %x %x %x.\n",
                        (int) (newcmd - cp->patch),
                        (unsigned)scr_to_cpu(newcmd[0]),
                        (unsigned)scr_to_cpu(newcmd[1]),
@@ -6353,7 +6564,7 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
        struct scsi_cmnd *cmd   = cp->cmd;
        struct tcb *tp  = &np->target[cmd->device->id];
        struct lcb *lp  = tp->lp[cmd->device->lun];
-       XPT_QUEHEAD     *qp;
+       struct list_head *qp;
        struct ccb *    cp2;
        int             disc_cnt = 0;
        int             busy_cnt = 0;
@@ -6367,10 +6578,10 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
        **      are before cp and busy ones after.
        */
        if (lp) {
-               qp = lp->busy_ccbq.blink;
+               qp = lp->busy_ccbq.prev;
                while (qp != &lp->busy_ccbq) {
-                       cp2 = xpt_que_entry(qp, struct ccb, link_ccbq);
-                       qp  = qp->blink;
+                       cp2 = list_entry(qp, struct ccb, link_ccbq);
+                       qp  = qp->prev;
                        ++busy_cnt;
                        if (cp2 == cp)
                                break;
@@ -6391,14 +6602,13 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
                if (!lp)
                        goto out;
                if (bootverbose >= 1) {
-                       PRINT_ADDR(cmd);
-                       printk ("QUEUE FULL! %d busy, %d disconnected CCBs\n",
-                               busy_cnt, disc_cnt);
+                       PRINT_ADDR(cmd, "QUEUE FULL! %d busy, %d disconnected "
+                                       "CCBs\n", busy_cnt, disc_cnt);
                }
                if (disc_cnt < lp->numtags) {
                        lp->numtags     = disc_cnt > 2 ? disc_cnt : 2;
                        lp->num_good    = 0;
-                       ncr_setup_tags (np, cmd->device->id, cmd->device->lun);
+                       ncr_setup_tags (np, cmd->device);
                }
                /*
                **      Requeue the command to the start queue.
@@ -6430,7 +6640,7 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
                **
                **      identify message
                */
-               cp->scsi_smsg2[0]       = M_IDENTIFY | cmd->device->lun;
+               cp->scsi_smsg2[0]       = IDENTIFY(0, cmd->device->lun);
                cp->phys.smsg.addr      = cpu_to_scr(CCB_PHYS (cp, scsi_smsg2));
                cp->phys.smsg.size      = cpu_to_scr(1);
 
@@ -6450,7 +6660,7 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
                /*
                **      sense data
                */
-               bzero(cp->sense_buf, sizeof(cp->sense_buf));
+               memset(cp->sense_buf, 0, sizeof(cp->sense_buf));
                cp->phys.sense.addr     = cpu_to_scr(CCB_PHYS(cp,sense_buf[0]));
                cp->phys.sense.size     = cpu_to_scr(sizeof(cp->sense_buf));
 
@@ -6475,7 +6685,7 @@ static void ncr_sir_to_redo(struct ncb *np, int num, struct ccb *cp)
                /*
                **      Select without ATN for quirky devices.
                */
-               if (tp->quirks & QUIRK_NOMSG)
+               if (cmd->device->select_no_atn)
                        cp->start.schedule.l_paddr =
                        cpu_to_scr(NCB_SCRIPTH_PHYS (np, select_no_atn));
 
@@ -6500,43 +6710,16 @@ out:
 **==========================================================
 */
 
-static int ncr_show_msg (u_char * msg)
-{
-       u_char i;
-       printk ("%x",*msg);
-       if (*msg==M_EXTENDED) {
-               for (i=1;i<8;i++) {
-                       if (i-1>msg[1]) break;
-                       printk ("-%x",msg[i]);
-               };
-               return (i+1);
-       } else if ((*msg & 0xf0) == 0x20) {
-               printk ("-%x",msg[1]);
-               return (2);
-       };
-       return (1);
-}
-
-static void ncr_print_msg ( struct ccb *cp, char *label, u_char *msg)
-{
-       if (cp)
-               PRINT_ADDR(cp->cmd);
-       if (label)
-               printk("%s: ", label);
-       
-       (void) ncr_show_msg (msg);
-       printk(".\n");
-}
-
 void ncr_int_sir (struct ncb *np)
 {
        u_char scntl3;
        u_char chg, ofs, per, fak, wide;
        u_char num = INB (nc_dsps);
-       struct ccb *cp=0;
+       struct ccb *cp=NULL;
        u_long  dsa    = INL (nc_dsa);
        u_char  target = INB (nc_sdid) & 0x0f;
        struct tcb *tp     = &np->target[target];
+       struct scsi_target *starget = tp->starget;
 
        if (DEBUG_FLAGS & DEBUG_TINY) printk ("I#%d", num);
 
@@ -6591,7 +6774,8 @@ void ncr_int_sir (struct ncb *np)
                while (cp && (CCB_PHYS (cp, phys) != dsa))
                        cp = cp->link_ccb;
 
-               assert (cp && cp == np->header.cp);
+               BUG_ON(!cp);
+               BUG_ON(cp != np->header.cp);
 
                if (!cp || cp != np->header.cp)
                        goto out;
@@ -6601,6 +6785,8 @@ void ncr_int_sir (struct ncb *np)
 /*-----------------------------------------------------------------------------
 **
 **     Was Sie schon immer ueber transfermode negotiation wissen wollten ...
+**     ("Everything you've always wanted to know about transfer mode
+**       negotiation")
 **
 **     We try to negotiate sync and wide transfer only after
 **     a successful inquire command. We look at byte 7 of the
@@ -6680,10 +6866,9 @@ void ncr_int_sir (struct ncb *np)
                */
 
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("negotiation failed sir=%x status=%x.\n",
-                               num, cp->nego_status);
-               };
+                       PRINT_ADDR(cp->cmd, "negotiation failed sir=%x "
+                                       "status=%x.\n", num, cp->nego_status);
+               }
 
                /*
                **      any error in negotiation:
@@ -6692,34 +6877,26 @@ void ncr_int_sir (struct ncb *np)
                switch (cp->nego_status) {
 
                case NS_SYNC:
+                       spi_period(starget) = 0;
+                       spi_offset(starget) = 0;
                        ncr_setsync (np, cp, 0, 0xe0);
                        break;
 
                case NS_WIDE:
+                       spi_width(starget) = 0;
                        ncr_setwide (np, cp, 0, 0);
                        break;
 
-               };
-               np->msgin [0] = M_NOOP;
-               np->msgout[0] = M_NOOP;
+               }
+               np->msgin [0] = NOP;
+               np->msgout[0] = NOP;
                cp->nego_status = 0;
                break;
 
        case SIR_NEGO_SYNC:
-               /*
-               **      Synchronous request message received.
-               */
-
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("sync msgin: ");
-                       (void) ncr_show_msg (np->msgin);
-                       printk (".\n");
-               };
-
-               /*
-               **      get requested values.
-               */
+                       ncr_print_msg(cp, "sync msgin", np->msgin);
+               }
 
                chg = 0;
                per = np->msgin[3];
@@ -6731,8 +6908,8 @@ void ncr_int_sir (struct ncb *np)
                **            it CAN transfer synch.
                */
 
-               if (ofs)
-                       tp->inq_byte7 |= INQ7_SYNC;
+               if (ofs && starget)
+                       spi_support_sync(starget) = 1;
 
                /*
                **      check values against driver limits.
@@ -6765,9 +6942,8 @@ void ncr_int_sir (struct ncb *np)
                }
 
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("sync: per=%d scntl3=0x%x ofs=%d fak=%d chg=%d.\n",
-                               per, scntl3, ofs, fak, chg);
+                       PRINT_ADDR(cp->cmd, "sync: per=%d scntl3=0x%x ofs=%d "
+                               "fak=%d chg=%d.\n", per, scntl3, ofs, fak, chg);
                }
 
                if (INB (HS_PRT) == HS_NEGOTIATE) {
@@ -6775,57 +6951,50 @@ void ncr_int_sir (struct ncb *np)
                        switch (cp->nego_status) {
 
                        case NS_SYNC:
-                               /*
-                               **      This was an answer message
-                               */
+                               /* This was an answer message */
                                if (chg) {
-                                       /*
-                                       **      Answer wasn't acceptable.
-                                       */
-                                       ncr_setsync (np, cp, 0, 0xe0);
-                                       OUTL_DSP (NCB_SCRIPT_PHYS (np, msg_bad));
+                                       /* Answer wasn't acceptable.  */
+                                       spi_period(starget) = 0;
+                                       spi_offset(starget) = 0;
+                                       ncr_setsync(np, cp, 0, 0xe0);
+                                       OUTL_DSP(NCB_SCRIPT_PHYS (np, msg_bad));
                                } else {
-                                       /*
-                                       **      Answer is ok.
-                                       */
-                                       ncr_setsync (np, cp, scntl3, (fak<<5)|ofs);
-                                       OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));
-                               };
+                                       /* Answer is ok.  */
+                                       spi_period(starget) = per;
+                                       spi_offset(starget) = ofs;
+                                       ncr_setsync(np, cp, scntl3, (fak<<5)|ofs);
+                                       OUTL_DSP(NCB_SCRIPT_PHYS (np, clrack));
+                               }
                                return;
 
                        case NS_WIDE:
-                               ncr_setwide (np, cp, 0, 0);
+                               spi_width(starget) = 0;
+                               ncr_setwide(np, cp, 0, 0);
                                break;
-                       };
-               };
+                       }
+               }
 
                /*
                **      It was a request. Set value and
                **      prepare an answer message
                */
 
-               ncr_setsync (np, cp, scntl3, (fak<<5)|ofs);
-
-               np->msgout[0] = M_EXTENDED;
-               np->msgout[1] = 3;
-               np->msgout[2] = M_X_SYNC_REQ;
-               np->msgout[3] = per;
-               np->msgout[4] = ofs;
+               spi_period(starget) = per;
+               spi_offset(starget) = ofs;
+               ncr_setsync(np, cp, scntl3, (fak<<5)|ofs);
 
+               spi_populate_sync_msg(np->msgout, per, ofs);
                cp->nego_status = NS_SYNC;
 
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("sync msgout: ");
-                       (void) ncr_show_msg (np->msgout);
-                       printk (".\n");
+                       ncr_print_msg(cp, "sync msgout", np->msgout);
                }
 
                if (!ofs) {
                        OUTL_DSP (NCB_SCRIPT_PHYS (np, msg_bad));
                        return;
                }
-               np->msgin [0] = M_NOOP;
+               np->msgin [0] = NOP;
 
                break;
 
@@ -6834,11 +7003,8 @@ void ncr_int_sir (struct ncb *np)
                **      Wide request message received.
                */
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("wide msgin: ");
-                       (void) ncr_show_msg (np->msgin);
-                       printk (".\n");
-               };
+                       ncr_print_msg(cp, "wide msgin", np->msgin);
+               }
 
                /*
                **      get requested values.
@@ -6852,8 +7018,8 @@ void ncr_int_sir (struct ncb *np)
                **            it CAN transfer wide.
                */
 
-               if (wide)
-                       tp->inq_byte7 |= INQ7_WIDE16;
+               if (wide && starget)
+                       spi_support_wide(starget) = 1;
 
                /*
                **      check values against driver limits.
@@ -6863,8 +7029,8 @@ void ncr_int_sir (struct ncb *np)
                        {chg = 1; wide = tp->usrwide;}
 
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("wide: wide=%d chg=%d.\n", wide, chg);
+                       PRINT_ADDR(cp->cmd, "wide: wide=%d chg=%d.\n", wide,
+                                       chg);
                }
 
                if (INB (HS_PRT) == HS_NEGOTIATE) {
@@ -6876,47 +7042,41 @@ void ncr_int_sir (struct ncb *np)
                                **      This was an answer message
                                */
                                if (chg) {
-                                       /*
-                                       **      Answer wasn't acceptable.
-                                       */
-                                       ncr_setwide (np, cp, 0, 1);
+                                       /* Answer wasn't acceptable.  */
+                                       spi_width(starget) = 0;
+                                       ncr_setwide(np, cp, 0, 1);
                                        OUTL_DSP (NCB_SCRIPT_PHYS (np, msg_bad));
                                } else {
-                                       /*
-                                       **      Answer is ok.
-                                       */
-                                       ncr_setwide (np, cp, wide, 1);
+                                       /* Answer is ok.  */
+                                       spi_width(starget) = wide;
+                                       ncr_setwide(np, cp, wide, 1);
                                        OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));
-                               };
+                               }
                                return;
 
                        case NS_SYNC:
-                               ncr_setsync (np, cp, 0, 0xe0);
+                               spi_period(starget) = 0;
+                               spi_offset(starget) = 0;
+                               ncr_setsync(np, cp, 0, 0xe0);
                                break;
-                       };
-               };
+                       }
+               }
 
                /*
                **      It was a request, set value and
                **      prepare an answer message
                */
 
-               ncr_setwide (np, cp, wide, 1);
-
-               np->msgout[0] = M_EXTENDED;
-               np->msgout[1] = 2;
-               np->msgout[2] = M_X_WIDE_REQ;
-               np->msgout[3] = wide;
+               spi_width(starget) = wide;
+               ncr_setwide(np, cp, wide, 1);
+               spi_populate_width_msg(np->msgout, wide);
 
-               np->msgin [0] = M_NOOP;
+               np->msgin [0] = NOP;
 
                cp->nego_status = NS_WIDE;
 
                if (DEBUG_FLAGS & DEBUG_NEGO) {
-                       PRINT_ADDR(cp->cmd);
-                       printk ("wide msgout: ");
-                       (void) ncr_show_msg (np->msgin);
-                       printk (".\n");
+                       ncr_print_msg(cp, "wide msgout", np->msgin);
                }
                break;
 
@@ -6930,13 +7090,12 @@ void ncr_int_sir (struct ncb *np)
        case SIR_REJECT_RECEIVED:
                /*-----------------------------------------------
                **
-               **      We received a M_REJECT message.
+               **      We received a MESSAGE_REJECT.
                **
                **-----------------------------------------------
                */
 
-               PRINT_ADDR(cp->cmd);
-               printk ("M_REJECT received (%x:%x).\n",
+               PRINT_ADDR(cp->cmd, "MESSAGE_REJECT received (%x:%x).\n",
                        (unsigned)scr_to_cpu(np->lastmsg), np->msgout[0]);
                break;
 
@@ -6948,10 +7107,7 @@ void ncr_int_sir (struct ncb *np)
                **-----------------------------------------------
                */
 
-               PRINT_ADDR(cp->cmd);
-               printk ("M_REJECT sent for ");
-               (void) ncr_show_msg (np->msgin);
-               printk (".\n");
+               ncr_print_msg(cp, "MESSAGE_REJECT sent for", np->msgin);
                break;
 
 /*--------------------------------------------------------------------
@@ -6970,8 +7126,8 @@ void ncr_int_sir (struct ncb *np)
                **-----------------------------------------------
                */
 
-               PRINT_ADDR(cp->cmd);
-               printk ("M_IGN_RESIDUE received, but not yet implemented.\n");
+               PRINT_ADDR(cp->cmd, "IGNORE_WIDE_RESIDUE received, but not yet "
+                               "implemented.\n");
                break;
 #if 0
        case SIR_MISSING_SAVE:
@@ -6983,15 +7139,14 @@ void ncr_int_sir (struct ncb *np)
                **-----------------------------------------------
                */
 
-               PRINT_ADDR(cp->cmd);
-               printk ("M_DISCONNECT received, but datapointer not saved: "
-                       "data=%x save=%x goal=%x.\n",
+               PRINT_ADDR(cp->cmd, "DISCONNECT received, but datapointer "
+                               "not saved: data=%x save=%x goal=%x.\n",
                        (unsigned) INL (nc_temp),
                        (unsigned) scr_to_cpu(np->header.savep),
                        (unsigned) scr_to_cpu(np->header.goalp));
                break;
 #endif
-       };
+       }
 
 out:
        OUTONB_STD ();
@@ -7006,8 +7161,10 @@ out:
 **==========================================================
 */
 
-static struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln)
+static struct ccb *ncr_get_ccb(struct ncb *np, struct scsi_cmnd *cmd)
 {
+       u_char tn = cmd->device->id;
+       u_char ln = cmd->device->lun;
        struct tcb *tp = &np->target[tn];
        struct lcb *lp = tp->lp[ln];
        u_char tag = NO_TAG;
@@ -7017,7 +7174,7 @@ static    struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln)
        **      Lun structure available ?
        */
        if (lp) {
-               XPT_QUEHEAD *qp;
+               struct list_head *qp;
                /*
                **      Keep from using more tags than we can handle.
                */
@@ -7027,29 +7184,21 @@ static  struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln)
                /*
                **      Allocate a new CCB if needed.
                */
-               if (xpt_que_empty(&lp->free_ccbq))
+               if (list_empty(&lp->free_ccbq))
                        ncr_alloc_ccb(np, tn, ln);
 
-               /*
-               **      Tune tag mode if asked by user.
-               */
-               if (lp->queuedepth != lp->numtags) {
-                       ncr_setup_tags(np, tn, ln);
-               }
-                       
                /*
                **      Look for free CCB
                */
-               qp = xpt_remque_head(&lp->free_ccbq);
+               qp = ncr_list_pop(&lp->free_ccbq);
                if (qp) {
-                       cp = xpt_que_entry(qp, struct ccb, link_ccbq);
+                       cp = list_entry(qp, struct ccb, link_ccbq);
                        if (cp->magic) {
-                               PRINT_LUN(np, tn, ln);
-                               printk ("ccb free list corrupted (@%p)\n", cp);
-                               cp = 0;
-                       }
-                       else {
-                               xpt_insque_tail(qp, &lp->wait_ccbq);
+                               PRINT_ADDR(cmd, "ccb free list corrupted "
+                                               "(@%p)\n", cp);
+                               cp = NULL;
+                       } else {
+                               list_add_tail(qp, &lp->wait_ccbq);
                                ++lp->busyccbs;
                        }
                }
@@ -7080,7 +7229,7 @@ static    struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln)
                if (flags & SCSI_NOSLEEP) break;
                if (tsleep ((caddr_t)cp, PRIBIO|PCATCH, "ncr", 0))
                        break;
-       };
+       }
 #endif
 
        if (cp->magic)
@@ -7108,8 +7257,7 @@ static    struct ccb *ncr_get_ccb (struct ncb *np, u_char tn, u_char ln)
        cp->lun    = ln;
 
        if (DEBUG_FLAGS & DEBUG_TAGS) {
-               PRINT_LUN(np, tn, ln);
-               printk ("ccb @%p using tag %d.\n", cp, tag);
+               PRINT_ADDR(cmd, "ccb @%p using tag %d.\n", cp, tag);
        }
 
        return cp;
@@ -7130,8 +7278,7 @@ static void ncr_free_ccb (struct ncb *np, struct ccb *cp)
        struct lcb *lp = tp->lp[cp->lun];
 
        if (DEBUG_FLAGS & DEBUG_TAGS) {
-               PRINT_LUN(np, cp->target, cp->lun);
-               printk ("ccb @%p freeing tag %d.\n", cp, cp->tag);
+               PRINT_ADDR(cp->cmd, "ccb @%p freeing tag %d.\n", cp, cp->tag);
        }
 
        /*
@@ -7159,10 +7306,8 @@ static void ncr_free_ccb (struct ncb *np, struct ccb *cp)
        */
 
        if (lp) {
-               if (cp != np->ccb) {
-                       xpt_remque(&cp->link_ccbq);
-                       xpt_insque_head(&cp->link_ccbq, &lp->free_ccbq);
-               }
+               if (cp != np->ccb)
+                       list_move(&cp->link_ccbq, &lp->free_ccbq);
                --lp->busyccbs;
                if (cp->queued) {
                        --lp->queuedccbs;
@@ -7200,9 +7345,9 @@ static void ncr_init_ccb(struct ncb *np, struct ccb *cp)
        cp->phys.header.cp = cp;
 
        /*
-       **      This allows xpt_remque to work for the default ccb.
+       **      This allows list_del to work for the default ccb.
        */
-       xpt_que_init(&cp->link_ccbq);
+       INIT_LIST_HEAD(&cp->link_ccbq);
 
        /*
        **      Initialyze the start and restart launch script.
@@ -7232,7 +7377,7 @@ static void ncr_alloc_ccb(struct ncb *np, u_char tn, u_char ln)
 {
        struct tcb *tp = &np->target[tn];
        struct lcb *lp = tp->lp[ln];
-       struct ccb *cp = 0;
+       struct ccb *cp = NULL;
 
        /*
        **      Allocate memory for this CCB.
@@ -7246,7 +7391,7 @@ static void ncr_alloc_ccb(struct ncb *np, u_char tn, u_char ln)
        */
        lp->actccbs++;
        np->actccbs++;
-       bzero (cp, sizeof (*cp));
+       memset(cp, 0, sizeof (*cp));
        ncr_init_ccb(np, cp);
 
        /*
@@ -7256,8 +7401,7 @@ static void ncr_alloc_ccb(struct ncb *np, u_char tn, u_char ln)
        cp->link_ccb      = np->ccb->link_ccb;
        np->ccb->link_ccb = cp;
 
-       xpt_insque_head(&cp->link_ccbq, &lp->free_ccbq);
-       ncr_setup_tags (np, tn, ln);
+       list_add(&cp->link_ccbq, &lp->free_ccbq);
 }
 
 /*==========================================================
@@ -7345,15 +7489,15 @@ static void ncr_init_tcb (struct ncb *np, u_char tn)
        **      These assert's should be moved at driver initialisations.
        */
 #ifdef SCSI_NCR_BIG_ENDIAN
-       assert (( (offsetof(struct ncr_reg, nc_sxfer) ^
-               offsetof(struct tcb    , sval    )) &3) == 3);
-       assert (( (offsetof(struct ncr_reg, nc_scntl3) ^
-               offsetof(struct tcb    , wval    )) &3) == 3);
+       BUG_ON(((offsetof(struct ncr_reg, nc_sxfer) ^
+                offsetof(struct tcb    , sval    )) &3) != 3);
+       BUG_ON(((offsetof(struct ncr_reg, nc_scntl3) ^
+                offsetof(struct tcb    , wval    )) &3) != 3);
 #else
-       assert (( (offsetof(struct ncr_reg, nc_sxfer) ^
-               offsetof(struct tcb    , sval    )) &3) == 0);
-       assert (( (offsetof(struct ncr_reg, nc_scntl3) ^
-               offsetof(struct tcb    , wval    )) &3) == 0);
+       BUG_ON(((offsetof(struct ncr_reg, nc_sxfer) ^
+                offsetof(struct tcb    , sval    )) &3) != 0);
+       BUG_ON(((offsetof(struct ncr_reg, nc_scntl3) ^
+                offsetof(struct tcb    , wval    )) &3) != 0);
 #endif
 }
 
@@ -7384,7 +7528,7 @@ static struct lcb *ncr_alloc_lcb (struct ncb *np, u_char tn, u_char ln)
        lp = m_calloc_dma(sizeof(struct lcb), "LCB");
        if (!lp)
                goto fail;
-       bzero(lp, sizeof(*lp));
+       memset(lp, 0, sizeof(*lp));
        tp->lp[ln] = lp;
 
        /*
@@ -7396,10 +7540,10 @@ static struct lcb *ncr_alloc_lcb (struct ncb *np, u_char tn, u_char ln)
        /*
        **      Initialize the CCB queue headers.
        */
-       xpt_que_init(&lp->free_ccbq);
-       xpt_que_init(&lp->busy_ccbq);
-       xpt_que_init(&lp->wait_ccbq);
-       xpt_que_init(&lp->skip_ccbq);
+       INIT_LIST_HEAD(&lp->free_ccbq);
+       INIT_LIST_HEAD(&lp->busy_ccbq);
+       INIT_LIST_HEAD(&lp->wait_ccbq);
+       INIT_LIST_HEAD(&lp->skip_ccbq);
 
        /*
        **      Set max CCBs to 1 and use the default 1 entry 
@@ -7455,68 +7599,21 @@ fail:
 **     will play with CHANGE DEFINITION commands. :-)
 **------------------------------------------------------------------------
 */
-static struct lcb *ncr_setup_lcb (struct ncb *np, u_char tn, u_char ln, u_char *inq_data)
+static struct lcb *ncr_setup_lcb (struct ncb *np, struct scsi_device *sdev)
 {
+       unsigned char tn = sdev->id, ln = sdev->lun;
        struct tcb *tp = &np->target[tn];
        struct lcb *lp = tp->lp[ln];
-       u_char inq_byte7;
 
-       /*
-       **      If no lcb, try to allocate it.
-       */
+       /* If no lcb, try to allocate it.  */
        if (!lp && !(lp = ncr_alloc_lcb(np, tn, ln)))
                goto fail;
 
-       /*
-       **      Get device quirks from a speciality table.
-       */
-       tp->quirks = ncr_lookup (inq_data);
-       if (tp->quirks && bootverbose) {
-               PRINT_LUN(np, tn, ln);
-               printk ("quirks=%x.\n", tp->quirks);
-       }
-
-       /*
-       **      Evaluate trustable target/unit capabilities.
-       **      We only believe device version >= SCSI-2 that 
-       **      use appropriate response data format (2).
-       **      But it seems that some CCS devices also 
-       **      support SYNC and I donnot want to frustrate 
-       **      anybody. ;-)
-       */
-       inq_byte7 = 0;
-       if      ((inq_data[2] & 0x7) >= 2 && (inq_data[3] & 0xf) == 2)
-               inq_byte7 = inq_data[7];
-       else if ((inq_data[2] & 0x7) == 1 && (inq_data[3] & 0xf) == 1)
-               inq_byte7 = INQ7_SYNC;
-
-       /*
-       **      Throw away announced LUN capabilities if we are told 
-       **      that there is no real device supported by the logical unit.
-       */
-       if ((inq_data[0] & 0xe0) > 0x20 || (inq_data[0] & 0x1f) == 0x1f)
-               inq_byte7 &= (INQ7_SYNC | INQ7_WIDE16);
-
-       /*
-       **      If user is wanting SYNC, force this feature.
-       */
-       if (driver_setup.force_sync_nego)
-               inq_byte7 |= INQ7_SYNC;
-
-       /*
-       **      Prepare negotiation if SIP capabilities have changed.
-       */
-       tp->inq_done = 1;
-       if ((inq_byte7 ^ tp->inq_byte7) & (INQ7_SYNC | INQ7_WIDE16)) {
-               tp->inq_byte7 = inq_byte7;
-               ncr_negotiate(np, tp);
-       }
-
        /*
        **      If unit supports tagged commands, allocate the 
        **      CCB JUMP table if not yet.
        */
-       if ((inq_byte7 & INQ7_QUEUE) && lp->jump_ccb == &lp->jump_ccb_0) {
+       if (sdev->tagged_supported && lp->jump_ccb == &lp->jump_ccb_0) {
                int i;
                lp->jump_ccb = m_calloc_dma(256, "JUMP_CCB");
                if (!lp->jump_ccb) {
@@ -7530,17 +7627,10 @@ static struct lcb *ncr_setup_lcb (struct ncb *np, u_char tn, u_char ln, u_char *
                for (i = 0 ; i < MAX_TAGS ; i++)
                        lp->cb_tags[i] = i;
                lp->maxnxs = MAX_TAGS;
-               lp->tags_stime = ktime_get(3*HZ);
+               lp->tags_stime = jiffies + 3*HZ;
+               ncr_setup_tags (np, sdev);
        }
 
-       /*
-       **      Adjust tagged queueing status if needed.
-       */
-       if ((inq_byte7 ^ lp->inq_byte7) & INQ7_QUEUE) {
-               lp->inq_byte7 = inq_byte7;
-               lp->numtags   = lp->maxtags;
-               ncr_setup_tags (np, tn, ln);
-       }
 
 fail:
        return lp;
@@ -7661,7 +7751,7 @@ static int __init ncr_regtest (struct ncb* np)
                printk ("CACHE TEST FAILED: reg dstat-sstat2 readback %x.\n",
                        (unsigned) data);
                return (0x10);
-       };
+       }
        return (0);
 }
 
@@ -7714,7 +7804,7 @@ static int __init ncr_snooptest (struct ncb* np)
        if (i>=NCR_SNOOP_TIMEOUT) {
                printk ("CACHE TEST FAILED: timeout.\n");
                return (0x20);
-       };
+       }
        /*
        **      Check termination position.
        */
@@ -7724,7 +7814,7 @@ static int __init ncr_snooptest (struct ncb* np)
                        (u_long) NCB_SCRIPTH_PHYS (np, snooptest), (u_long) pc,
                        (u_long) NCB_SCRIPTH_PHYS (np, snoopend) +8);
                return (0x40);
-       };
+       }
        /*
        **      Show results.
        */
@@ -7732,74 +7822,18 @@ static int __init ncr_snooptest (struct ncb* np)
                printk ("CACHE TEST FAILED: host wrote %d, ncr read %d.\n",
                        (int) host_wr, (int) ncr_rd);
                err |= 1;
-       };
+       }
        if (host_rd != ncr_wr) {
                printk ("CACHE TEST FAILED: ncr wrote %d, host read %d.\n",
                        (int) ncr_wr, (int) host_rd);
                err |= 2;
-       };
+       }
        if (ncr_bk != ncr_wr) {
                printk ("CACHE TEST FAILED: ncr wrote %d, read back %d.\n",
                        (int) ncr_wr, (int) ncr_bk);
                err |= 4;
-       };
-       return (err);
-}
-
-/*==========================================================
-**
-**
-**     Device lookup.
-**
-**     @GENSCSI@ should be integrated to scsiconf.c
-**
-**
-**==========================================================
-*/
-
-struct table_entry {
-       char *  manufacturer;
-       char *  model;
-       char *  version;
-       u_long  info;
-};
-
-static struct table_entry device_tab[] =
-{
-#if 0
-       {"", "", "", QUIRK_NOMSG},
-#endif
-       {"SONY", "SDT-5000", "3.17", QUIRK_NOMSG},
-       {"WangDAT", "Model 2600", "01.7", QUIRK_NOMSG},
-       {"WangDAT", "Model 3200", "02.2", QUIRK_NOMSG},
-       {"WangDAT", "Model 1300", "02.4", QUIRK_NOMSG},
-       {"", "", "", 0} /* catch all: must be last entry. */
-};
-
-static u_long ncr_lookup(char * id)
-{
-       struct table_entry * p = device_tab;
-       char *d, *r, c;
-
-       for (;;p++) {
-
-               d = id+8;
-               r = p->manufacturer;
-               while ((c=*r++)) if (c!=*d++) break;
-               if (c) continue;
-
-               d = id+16;
-               r = p->model;
-               while ((c=*r++)) if (c!=*d++) break;
-               if (c) continue;
-
-               d = id+32;
-               r = p->version;
-               while ((c=*r++)) if (c!=*d++) break;
-               if (c) continue;
-
-               return (p->info);
        }
+       return (err);
 }
 
 /*==========================================================
@@ -7811,7 +7845,7 @@ static u_long ncr_lookup(char * id)
 **==========================================================
 **
 **     Note: we have to return the correct value.
-**     THERE IS NO SAVE DEFAULT VALUE.
+**     THERE IS NO SAFE DEFAULT VALUE.
 **
 **     Most NCR/SYMBIOS boards are delivered with a 40 Mhz clock.
 **     53C860 and 53C875 rev. 1 support fast20 transfers but 
@@ -7842,11 +7876,11 @@ static void ncr_selectclock(struct ncb *np, u_char scntl3)
        if (np->multiplier > 2) {  /* Poll bit 5 of stest4 for quadrupler */
                int i = 20;
                while (!(INB(nc_stest4) & LCKFRQ) && --i > 0)
-                       UDELAY (20);
+                       udelay(20);
                if (!i)
                        printk("%s: the chip cannot lock the frequency\n", ncr_name(np));
        } else                  /* Wait 20 micro-seconds for doubler    */
-               UDELAY (20);
+               udelay(20);
        OUTB(nc_stest3, HSC);           /* Halt the scsi clock          */
        OUTB(nc_scntl3, scntl3);
        OUTB(nc_stest1, (DBLEN|DBLSEL));/* Select clock multiplier      */
@@ -7887,7 +7921,7 @@ static unsigned __init ncrgetfreq (struct ncb *np, int gen)
        OUTB (nc_stime1, gen);  /* set to nominal delay of 1<<gen * 125us */
        while (!(INW(nc_sist) & GEN) && ms++ < 100000) {
                for (count = 0; count < 10; count ++)
-                       UDELAY (100);   /* count ms */
+                       udelay(100);    /* count ms */
        }
        OUTB (nc_stime1, 0);    /* disable general purpose timer */
        /*
@@ -7971,21 +8005,25 @@ static void __init ncr_getclock (struct ncb *np, int mult)
 
 /*===================== LINUX ENTRY POINTS SECTION ==========================*/
 
-/*
-**   Linux select queue depths function
-*/
+static int ncr53c8xx_slave_alloc(struct scsi_device *device)
+{
+       struct Scsi_Host *host = device->host;
+       struct ncb *np = ((struct host_data *) host->hostdata)->ncb;
+       struct tcb *tp = &np->target[device->id];
+       tp->starget = device->sdev_target;
+
+       return 0;
+}
 
-int ncr53c8xx_slave_configure(struct scsi_device *device)
+static int ncr53c8xx_slave_configure(struct scsi_device *device)
 {
        struct Scsi_Host *host = device->host;
-       struct ncb *np;
-       struct tcb *tp;
-       struct lcb *lp;
+       struct ncb *np = ((struct host_data *) host->hostdata)->ncb;
+       struct tcb *tp = &np->target[device->id];
+       struct lcb *lp = tp->lp[device->lun];
        int numtags, depth_to_use;
 
-       np = ((struct host_data *) host->hostdata)->ncb;
-       tp = &np->target[device->id];
-       lp = tp->lp[device->lun];
+       ncr_setup_lcb(np, device);
 
        /*
        **      Select queue depth from driver setup.
@@ -8013,26 +8051,29 @@ int ncr53c8xx_slave_configure(struct scsi_device *device)
        **      Since the queue depth is not tunable under Linux,
        **      we need to know this value in order not to 
        **      announce stupid things to user.
+       **
+       **      XXX(hch): As of Linux 2.6 it certainly _is_ tunable..
+       **                In fact we just tuned it, or did I miss
+       **                something important? :)
        */
        if (lp) {
                lp->numtags = lp->maxtags = numtags;
                lp->scdev_depth = depth_to_use;
        }
-       ncr_setup_tags (np, device->id, device->lun);
+       ncr_setup_tags (np, device);
 
 #ifdef DEBUG_NCR53C8XX
        printk("ncr53c8xx_select_queue_depth: host=%d, id=%d, lun=%d, depth=%d\n",
               np->unit, device->id, device->lun, depth_to_use);
 #endif
 
+       if (spi_support_sync(device->sdev_target) &&
+           !spi_initial_dv(device->sdev_target))
+               spi_dv_device(device);
        return 0;
 }
 
-/*
-**   Linux entry point of queuecommand() function
-*/
-
-int ncr53c8xx_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
+static int ncr53c8xx_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
 {
      struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
      unsigned long flags;
@@ -8047,7 +8088,7 @@ printk("ncr53c8xx_queue_command\n");
      cmd->__data_mapped = 0;
      cmd->__data_mapping = 0;
 
-     NCR_LOCK_NCB(np, flags);
+     spin_lock_irqsave(&np->smp_lock, flags);
 
      if ((sts = ncr_queue_command(np, cmd)) != DID_OK) {
          cmd->result = ScsiResult(sts, 0);
@@ -8060,24 +8101,17 @@ printk("ncr53c8xx : command not queued - result=%d\n", sts);
 printk("ncr53c8xx : command successfully queued\n");
 #endif
 
-     NCR_UNLOCK_NCB(np, flags);
+     spin_unlock_irqrestore(&np->smp_lock, flags);
 
      if (sts != DID_OK) {
           unmap_scsi_data(np, cmd);
           done(cmd);
+         sts = 0;
      }
 
      return sts;
 }
 
-/*
-**   Linux entry point of the interrupt handler.
-**   Since linux versions > 1.3.70, we trust the kernel for 
-**   passing the internal host descriptor as 'dev_id'.
-**   Otherwise, we scan the host list and call the interrupt 
-**   routine for each host that uses this IRQ.
-*/
-
 irqreturn_t ncr53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
 {
      unsigned long flags;
@@ -8092,58 +8126,42 @@ irqreturn_t ncr53c8xx_intr(int irq, void *dev_id, struct pt_regs * regs)
 
      if (DEBUG_FLAGS & DEBUG_TINY) printk ("[");
 
-     NCR_LOCK_NCB(np, flags);
+     spin_lock_irqsave(&np->smp_lock, flags);
      ncr_exception(np);
      done_list     = np->done_list;
-     np->done_list = 0;
-     NCR_UNLOCK_NCB(np, flags);
+     np->done_list = NULL;
+     spin_unlock_irqrestore(&np->smp_lock, flags);
 
      if (DEBUG_FLAGS & DEBUG_TINY) printk ("]\n");
 
-     if (done_list) {
-          NCR_LOCK_SCSI_DONE(done_list->device->host, flags);
-          ncr_flush_done_cmds(done_list);
-          NCR_UNLOCK_SCSI_DONE(done_list->device->host, flags);
-     }
+     if (done_list)
+            ncr_flush_done_cmds(done_list);
      return IRQ_HANDLED;
 }
 
-/*
-**   Linux entry point of the timer handler
-*/
-
 static void ncr53c8xx_timeout(unsigned long npref)
 {
-     struct ncb *np = (struct ncb *) npref;
-     unsigned long flags;
-     struct scsi_cmnd *done_list;
+       struct ncb *np = (struct ncb *) npref;
+       unsigned long flags;
+       struct scsi_cmnd *done_list;
 
-     NCR_LOCK_NCB(np, flags);
-     ncr_timeout(np);
-     done_list     = np->done_list;
-     np->done_list = 0;
-     NCR_UNLOCK_NCB(np, flags);
+       spin_lock_irqsave(&np->smp_lock, flags);
+       ncr_timeout(np);
+       done_list     = np->done_list;
+       np->done_list = NULL;
+       spin_unlock_irqrestore(&np->smp_lock, flags);
 
-     if (done_list) {
-          NCR_LOCK_SCSI_DONE(done_list->device->host, flags);
-          ncr_flush_done_cmds(done_list);
-          NCR_UNLOCK_SCSI_DONE(done_list->device->host, flags);
-     }
+       if (done_list)
+               ncr_flush_done_cmds(done_list);
 }
 
-/*
-**   Linux entry point of reset() function
-*/
-
-int ncr53c8xx_bus_reset(struct scsi_cmnd *cmd)
+static int ncr53c8xx_bus_reset(struct scsi_cmnd *cmd)
 {
        struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
        int sts;
        unsigned long flags;
        struct scsi_cmnd *done_list;
 
-       NCR_LOCK_NCB(np, flags);
-
        /*
         * If the mid-level driver told us reset is synchronous, it seems 
         * that we must call the done() callback for the involved command, 
@@ -8151,22 +8169,20 @@ int ncr53c8xx_bus_reset(struct scsi_cmnd *cmd)
         * before returning SUCCESS.
         */
 
+       spin_lock_irqsave(&np->smp_lock, flags);
        sts = ncr_reset_bus(np, cmd, 1);
 
        done_list     = np->done_list;
-       np->done_list = 0;
-       NCR_UNLOCK_NCB(np, flags);
+       np->done_list = NULL;
+       spin_unlock_irqrestore(&np->smp_lock, flags);
 
        ncr_flush_done_cmds(done_list);
 
        return sts;
 }
 
-/*
-**   Linux entry point of abort() function
-*/
-
-int ncr53c8xx_abort(struct scsi_cmnd *cmd)
+#if 0 /* unused and broken */
+static int ncr53c8xx_abort(struct scsi_cmnd *cmd)
 {
        struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
        int sts;
@@ -8174,34 +8190,25 @@ int ncr53c8xx_abort(struct scsi_cmnd *cmd)
        struct scsi_cmnd *done_list;
 
 #if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS
-       printk("ncr53c8xx_abort: pid=%lu serial_number=%ld serial_number_at_timeout=%ld\n",
-               cmd->pid, cmd->serial_number, cmd->serial_number_at_timeout);
+       printk("ncr53c8xx_abort: pid=%lu serial_number=%ld\n",
+               cmd->pid, cmd->serial_number);
 #else
        printk("ncr53c8xx_abort: command pid %lu\n", cmd->pid);
 #endif
 
        NCR_LOCK_NCB(np, flags);
 
-#if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS
-       /*
-        * We have to just ignore abort requests in some situations.
-        */
-       if (cmd->serial_number != cmd->serial_number_at_timeout) {
-               sts = SCSI_ABORT_NOT_RUNNING;
-               goto out;
-       }
-#endif
-
        sts = ncr_abort_command(np, cmd);
 out:
        done_list     = np->done_list;
-       np->done_list = 0;
+       np->done_list = NULL;
        NCR_UNLOCK_NCB(np, flags);
 
        ncr_flush_done_cmds(done_list);
 
        return sts;
 }
+#endif
 
 
 /*
@@ -8226,7 +8233,7 @@ static void insert_into_waiting_list(struct ncb *np, struct scsi_cmnd *cmd)
 #ifdef DEBUG_WAITING_LIST
        printk("%s: cmd %lx inserted into waiting list\n", ncr_name(np), (u_long) cmd);
 #endif
-       cmd->next_wcmd = 0;
+       cmd->next_wcmd = NULL;
        if (!(wcmd = np->waiting_list)) np->waiting_list = cmd;
        else {
                while ((wcmd->next_wcmd) != 0)
@@ -8243,7 +8250,7 @@ static struct scsi_cmnd *retrieve_from_waiting_list(int to_remove, struct ncb *n
                if (cmd == *pcmd) {
                        if (to_remove) {
                                *pcmd = (struct scsi_cmnd *) cmd->next_wcmd;
-                               cmd->next_wcmd = 0;
+                               cmd->next_wcmd = NULL;
                        }
 #ifdef DEBUG_WAITING_LIST
        printk("%s: cmd %lx retrieved from waiting list\n", ncr_name(np), (u_long) cmd);
@@ -8252,7 +8259,7 @@ static struct scsi_cmnd *retrieve_from_waiting_list(int to_remove, struct ncb *n
                }
                pcmd = (struct scsi_cmnd **) &(*pcmd)->next_wcmd;
        }
-       return 0;
+       return NULL;
 }
 
 static void process_waiting_list(struct ncb *np, int sts)
@@ -8260,14 +8267,14 @@ static void process_waiting_list(struct ncb *np, int sts)
        struct scsi_cmnd *waiting_list, *wcmd;
 
        waiting_list = np->waiting_list;
-       np->waiting_list = 0;
+       np->waiting_list = NULL;
 
 #ifdef DEBUG_WAITING_LIST
        if (waiting_list) printk("%s: waiting_list=%lx processing sts=%d\n", ncr_name(np), (u_long) waiting_list, sts);
 #endif
        while ((wcmd = waiting_list) != 0) {
                waiting_list = (struct scsi_cmnd *) wcmd->next_wcmd;
-               wcmd->next_wcmd = 0;
+               wcmd->next_wcmd = NULL;
                if (sts == DID_OK) {
 #ifdef DEBUG_WAITING_LIST
        printk("%s: cmd %lx trying to requeue\n", ncr_name(np), (u_long) wcmd);
@@ -8286,291 +8293,23 @@ static void process_waiting_list(struct ncb *np, int sts)
 
 #undef next_wcmd
 
-#ifdef SCSI_NCR_PROC_INFO_SUPPORT
-
-/*=========================================================================
-**     Proc file system stuff
-**
-**     A read operation returns profile information.
-**     A write operation is a control command.
-**     The string is parsed in the driver code and the command is passed 
-**     to the ncr_usercmd() function.
-**=========================================================================
-*/
-
-#ifdef SCSI_NCR_USER_COMMAND_SUPPORT
-
-#define is_digit(c)    ((c) >= '0' && (c) <= '9')
-#define digit_to_bin(c)        ((c) - '0')
-#define is_space(c)    ((c) == ' ' || (c) == '\t')
-
-static int skip_spaces(char *ptr, int len)
-{
-       int cnt, c;
-
-       for (cnt = len; cnt > 0 && (c = *ptr++) && is_space(c); cnt--);
-
-       return (len - cnt);
-}
-
-static int get_int_arg(char *ptr, int len, u_long *pv)
-{
-       int     cnt, c;
-       u_long  v;
-
-       for (v = 0, cnt = len; cnt > 0 && (c = *ptr++) && is_digit(c); cnt--) {
-               v = (v * 10) + digit_to_bin(c);
-       }
-
-       if (pv)
-               *pv = v;
-
-       return (len - cnt);
-}
-
-static int is_keyword(char *ptr, int len, char *verb)
-{
-       int verb_len = strlen(verb);
-
-       if (len >= strlen(verb) && !memcmp(verb, ptr, verb_len))
-               return verb_len;
-       else
-               return 0;
-
-}
-
-#define SKIP_SPACES(min_spaces)                                                \
-       if ((arg_len = skip_spaces(ptr, len)) < (min_spaces))           \
-               return -EINVAL;                                         \
-       ptr += arg_len; len -= arg_len;
-
-#define GET_INT_ARG(v)                                                 \
-       if (!(arg_len = get_int_arg(ptr, len, &(v))))                   \
-               return -EINVAL;                                         \
-       ptr += arg_len; len -= arg_len;
-
-
-/*
-**     Parse a control command
-*/
-
-static int ncr_user_command(struct ncb *np, char *buffer, int length)
-{
-       char *ptr       = buffer;
-       int len         = length;
-       struct usrcmd    *uc = &np->user;
-       int             arg_len;
-       u_long          target;
-
-       bzero(uc, sizeof(*uc));
-
-       if (len > 0 && ptr[len-1] == '\n')
-               --len;
-
-       if      ((arg_len = is_keyword(ptr, len, "setsync")) != 0)
-               uc->cmd = UC_SETSYNC;
-       else if ((arg_len = is_keyword(ptr, len, "settags")) != 0)
-               uc->cmd = UC_SETTAGS;
-       else if ((arg_len = is_keyword(ptr, len, "setorder")) != 0)
-               uc->cmd = UC_SETORDER;
-       else if ((arg_len = is_keyword(ptr, len, "setverbose")) != 0)
-               uc->cmd = UC_SETVERBOSE;
-       else if ((arg_len = is_keyword(ptr, len, "setwide")) != 0)
-               uc->cmd = UC_SETWIDE;
-       else if ((arg_len = is_keyword(ptr, len, "setdebug")) != 0)
-               uc->cmd = UC_SETDEBUG;
-       else if ((arg_len = is_keyword(ptr, len, "setflag")) != 0)
-               uc->cmd = UC_SETFLAG;
-       else
-               arg_len = 0;
-
-#ifdef DEBUG_PROC_INFO
-printk("ncr_user_command: arg_len=%d, cmd=%ld\n", arg_len, uc->cmd);
-#endif
-
-       if (!arg_len)
-               return -EINVAL;
-       ptr += arg_len; len -= arg_len;
-
-       switch(uc->cmd) {
-       case UC_SETSYNC:
-       case UC_SETTAGS:
-       case UC_SETWIDE:
-       case UC_SETFLAG:
-               SKIP_SPACES(1);
-               if ((arg_len = is_keyword(ptr, len, "all")) != 0) {
-                       ptr += arg_len; len -= arg_len;
-                       uc->target = ~0;
-               } else {
-                       GET_INT_ARG(target);
-                       uc->target = (1<<target);
-#ifdef DEBUG_PROC_INFO
-printk("ncr_user_command: target=%ld\n", target);
-#endif
-               }
-               break;
-       }
-
-       switch(uc->cmd) {
-       case UC_SETVERBOSE:
-       case UC_SETSYNC:
-       case UC_SETTAGS:
-       case UC_SETWIDE:
-               SKIP_SPACES(1);
-               GET_INT_ARG(uc->data);
-#ifdef DEBUG_PROC_INFO
-printk("ncr_user_command: data=%ld\n", uc->data);
-#endif
-               break;
-       case UC_SETORDER:
-               SKIP_SPACES(1);
-               if      ((arg_len = is_keyword(ptr, len, "simple")))
-                       uc->data = M_SIMPLE_TAG;
-               else if ((arg_len = is_keyword(ptr, len, "ordered")))
-                       uc->data = M_ORDERED_TAG;
-               else if ((arg_len = is_keyword(ptr, len, "default")))
-                       uc->data = 0;
-               else
-                       return -EINVAL;
-               break;
-       case UC_SETDEBUG:
-               while (len > 0) {
-                       SKIP_SPACES(1);
-                       if      ((arg_len = is_keyword(ptr, len, "alloc")))
-                               uc->data |= DEBUG_ALLOC;
-                       else if ((arg_len = is_keyword(ptr, len, "phase")))
-                               uc->data |= DEBUG_PHASE;
-                       else if ((arg_len = is_keyword(ptr, len, "queue")))
-                               uc->data |= DEBUG_QUEUE;
-                       else if ((arg_len = is_keyword(ptr, len, "result")))
-                               uc->data |= DEBUG_RESULT;
-                       else if ((arg_len = is_keyword(ptr, len, "scatter")))
-                               uc->data |= DEBUG_SCATTER;
-                       else if ((arg_len = is_keyword(ptr, len, "script")))
-                               uc->data |= DEBUG_SCRIPT;
-                       else if ((arg_len = is_keyword(ptr, len, "tiny")))
-                               uc->data |= DEBUG_TINY;
-                       else if ((arg_len = is_keyword(ptr, len, "timing")))
-                               uc->data |= DEBUG_TIMING;
-                       else if ((arg_len = is_keyword(ptr, len, "nego")))
-                               uc->data |= DEBUG_NEGO;
-                       else if ((arg_len = is_keyword(ptr, len, "tags")))
-                               uc->data |= DEBUG_TAGS;
-                       else
-                               return -EINVAL;
-                       ptr += arg_len; len -= arg_len;
-               }
-#ifdef DEBUG_PROC_INFO
-printk("ncr_user_command: data=%ld\n", uc->data);
-#endif
-               break;
-       case UC_SETFLAG:
-               while (len > 0) {
-                       SKIP_SPACES(1);
-                       if      ((arg_len = is_keyword(ptr, len, "trace")))
-                               uc->data |= UF_TRACE;
-                       else if ((arg_len = is_keyword(ptr, len, "no_disc")))
-                               uc->data |= UF_NODISC;
-                       else
-                               return -EINVAL;
-                       ptr += arg_len; len -= arg_len;
-               }
-               break;
-       default:
-               break;
-       }
-
-       if (len)
-               return -EINVAL;
-       else {
-               unsigned long flags;
-
-               NCR_LOCK_NCB(np, flags);
-               ncr_usercmd (np);
-               NCR_UNLOCK_NCB(np, flags);
-       }
-       return length;
-}
-
-#endif /* SCSI_NCR_USER_COMMAND_SUPPORT */
-
-
-#ifdef SCSI_NCR_USER_INFO_SUPPORT
-/*
-**     Copy formatted information into the input buffer.
-*/
-
-static int ncr_host_info(struct ncb *np, char *ptr, off_t offset, int len)
-{
-       struct info_str info;
-
-       info.buffer     = ptr;
-       info.length     = len;
-       info.offset     = offset;
-       info.pos        = 0;
-
-       copy_info(&info, "  Chip NCR53C720, revision id 0x%x, IRQ %d\n",
-                        np->revision_id, (int) np->irq);
-       copy_info(&info, "  Synchronous period factor %d, "
-                        "max commands per lun %d\n",
-                        (int) np->minsync, MAX_TAGS);
-
-       if (driver_setup.debug || driver_setup.verbose > 1) {
-               copy_info(&info, "  Debug flags 0x%x, verbosity level %d\n",
-                         driver_setup.debug, driver_setup.verbose);
-       }
-
-       return info.pos > info.offset? info.pos - info.offset : 0;
-}
-
-#endif /* SCSI_NCR_USER_INFO_SUPPORT */
-
-/*
-**     Entry point of the scsi proc fs of the driver.
-**     - func = 0 means read  (returns profile data)
-**     - func = 1 means write (parse user control command)
-*/
-
-static int ncr53c8xx_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset,
-                       int length, int func)
+static ssize_t show_ncr53c8xx_revision(struct class_device *dev, char *buf)
 {
-       struct host_data *host_data;
-       struct ncb *ncb = 0;
-       int retv;
-
-#ifdef DEBUG_PROC_INFO
-printk("ncr53c8xx_proc_info: hostno=%d, func=%d\n", host->host_no, func);
-#endif
-
-       host_data = (struct host_data *) host->hostdata;
-       ncb = host_data->ncb;
-
-       if (func) {
-#ifdef SCSI_NCR_USER_COMMAND_SUPPORT
-               retv = ncr_user_command(ncb, buffer, length);
-#else
-               retv = -EINVAL;
-#endif
-       }
-       else {
-               if (start)
-                       *start = buffer;
-#ifdef SCSI_NCR_USER_INFO_SUPPORT
-               retv = ncr_host_info(ncb, buffer, offset, length);
-#else
-               retv = -EINVAL;
-#endif
-       }
-
-       return retv;
+       struct Scsi_Host *host = class_to_shost(dev);
+       struct host_data *host_data = (struct host_data *)host->hostdata;
+  
+       return snprintf(buf, 20, "0x%x\n", host_data->ncb->revision_id);
 }
-
-/*=========================================================================
-**     End of proc file system stuff
-**=========================================================================
-*/
-#endif
-
+  
+static struct class_device_attribute ncr53c8xx_revision_attr = {
+       .attr   = { .name = "revision", .mode = S_IRUGO, },
+       .show   = show_ncr53c8xx_revision,
+};
+  
+static struct class_device_attribute *ncr53c8xx_host_attrs[] = {
+       &ncr53c8xx_revision_attr,
+       NULL
+};
 
 /*==========================================================
 **
@@ -8579,11 +8318,11 @@ printk("ncr53c8xx_proc_info: hostno=%d, func=%d\n", host->host_no, func);
 **==========================================================
 */
 #ifdef MODULE
-char *ncr53c8xx = 0;   /* command line passed by insmod */
-MODULE_PARM(ncr53c8xx, "s");
+char *ncr53c8xx;       /* command line passed by insmod */
+module_param(ncr53c8xx, charp, 0);
 #endif
 
-int __init ncr53c8xx_setup(char *str)
+static int __init ncr53c8xx_setup(char *str)
 {
        return sym53c8xx__setup(str);
 }
@@ -8592,17 +8331,6 @@ int __init ncr53c8xx_setup(char *str)
 __setup("ncr53c8xx=", ncr53c8xx_setup);
 #endif
 
-/*==========================================================
-**
-**   Entry point for info() function
-**
-**==========================================================
-*/
-const char *ncr53c8xx_info (struct Scsi_Host *host)
-{
-       return SCSI_NCR_DRIVER_NAME;
-}
-
 
 /*
  *     Host attach and initialisations.
@@ -8617,18 +8345,20 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
                                        int unit, struct ncr_device *device)
 {
        struct host_data *host_data;
-       struct ncb *np = 0;
-       struct Scsi_Host *instance = 0;
+       struct ncb *np = NULL;
+       struct Scsi_Host *instance = NULL;
        u_long flags = 0;
        int i;
 
-#ifdef SCSI_NCR_PROC_INFO_SUPPORT
-       tpnt->proc_info         = ncr53c8xx_proc_info,
-#endif
-       tpnt->info              = ncr53c8xx_info;
+       if (!tpnt->name)
+               tpnt->name      = SCSI_NCR_DRIVER_NAME;
+       if (!tpnt->shost_attrs)
+               tpnt->shost_attrs = ncr53c8xx_host_attrs;
+
        tpnt->queuecommand      = ncr53c8xx_queue_command;
        tpnt->slave_configure   = ncr53c8xx_slave_configure;
-       tpnt->eh_bus_reset_handler      = ncr53c8xx_bus_reset;
+       tpnt->slave_alloc       = ncr53c8xx_slave_alloc;
+       tpnt->eh_bus_reset_handler = ncr53c8xx_bus_reset;
        tpnt->can_queue         = SCSI_NCR_CAN_QUEUE;
        tpnt->this_id           = 7;
        tpnt->sg_tablesize      = SCSI_NCR_SG_TABLESIZE;
@@ -8649,7 +8379,7 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
        np = __m_calloc_dma(device->dev, sizeof(struct ncb), "NCB");
        if (!np)
                goto attach_error;
-       NCR_INIT_LOCK_NCB(np);
+       spin_lock_init(&np->smp_lock);
        np->dev = device->dev;
        np->p_ncb = vtobus(np);
        host_data->ncb = np;
@@ -8689,7 +8419,7 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
        if (device->slot.base_v)
                np->vaddr = device->slot.base_v;
        else
-               np->vaddr = (unsigned long)ioremap(device->slot.base_c, 128);
+               np->vaddr = ioremap(device->slot.base_c, 128);
 
        if (!np->vaddr) {
                printk(KERN_ERR
@@ -8705,7 +8435,7 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
         * OUTB OUTW OUTL macros can be used safely.
         */
 
-       np->reg = (struct ncr_reg*) np->vaddr;
+       np->reg = (struct ncr_reg __iomem *)np->vaddr;
 
        /* Do chip dependent initialization.  */
        ncr_prepare_setting(np);
@@ -8716,7 +8446,6 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
                        ncr_name(np));
        }
 
-       /* Fill Linux host instance structure */
        instance->max_channel   = 0;
        instance->this_id       = np->myaddr;
        instance->max_id        = np->maxwide ? 16 : 8;
@@ -8727,19 +8456,11 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
        instance->dma_channel   = 0;
        instance->cmd_per_lun   = MAX_TAGS;
        instance->can_queue     = (MAX_START-4);
-       scsi_set_device(instance, device->dev);
-
-#ifdef SCSI_NCR_INTEGRITY_CHECKING
-       np->check_integrity       = 0;
-       instance->check_integrity = 0;
+       /* This can happen if you forget to call ncr53c8xx_init from
+        * your module_init */
+       BUG_ON(!ncr53c8xx_transport_template);
+       instance->transportt    = ncr53c8xx_transport_template;
 
-#ifdef SCSI_NCR_ENABLE_INTEGRITY_CHECK
-       if ( !(driver_setup.bus_check & 0x04) ) {
-               np->check_integrity       = 1;
-               instance->check_integrity = 1;
-       }
-#endif
-#endif
        /* Patch script to physical addresses */
        ncr_script_fill(&script0, &scripth0);
 
@@ -8783,7 +8504,7 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
        if (ncr_snooptest(np)) {
                printk(KERN_ERR "CACHE INCORRECTLY CONFIGURED.\n");
                goto attach_error;
-       };
+       }
 
        /* Install the interrupt handler.  */
        np->irq = device->slot.irq;
@@ -8797,11 +8518,11 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
         * Process the reset exception if interrupts are not enabled yet.
         * Then enable disconnects.
         */
-       NCR_LOCK_NCB(np, flags);
+       spin_lock_irqsave(&np->smp_lock, flags);
        if (ncr_reset_scsi_bus(np, 0, driver_setup.settle_delay) != 0) {
                printk(KERN_ERR "%s: FATAL ERROR: CHECK SCSI BUS - CABLES, TERMINATION, DEVICE POWER etc.!\n", ncr_name(np));
 
-               NCR_UNLOCK_NCB(np, flags);
+               spin_unlock_irqrestore(&np->smp_lock, flags);
                goto attach_error;
        }
        ncr_exception(np);
@@ -8815,7 +8536,7 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
        if (driver_setup.settle_delay > 2) {
                printk(KERN_INFO "%s: waiting %d seconds for scsi devices to settle...\n",
                        ncr_name(np), driver_setup.settle_delay);
-               MDELAY (1000 * driver_setup.settle_delay);
+               mdelay(1000 * driver_setup.settle_delay);
        }
 
        /* start the timeout daemon */
@@ -8824,10 +8545,10 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
 
        /* use SIMPLE TAG messages by default */
 #ifdef SCSI_NCR_ALWAYS_SIMPLE_TAG
-       np->order = M_SIMPLE_TAG;
+       np->order = SIMPLE_QUEUE_TAG;
 #endif
 
-       NCR_UNLOCK_NCB(np, flags);
+       spin_unlock_irqrestore(&np->smp_lock, flags);
 
        return instance;
 
@@ -8866,3 +8587,93 @@ int ncr53c8xx_release(struct Scsi_Host *host)
                ncr_detach(host_data->ncb);
        return 1;
 }
+
+static void ncr53c8xx_set_period(struct scsi_target *starget, int period)
+{
+       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+       struct ncb *np = ((struct host_data *)shost->hostdata)->ncb;
+       struct tcb *tp = &np->target[starget->id];
+
+       if (period > np->maxsync)
+               period = np->maxsync;
+       else if (period < np->minsync)
+               period = np->minsync;
+
+       tp->usrsync = period;
+
+       ncr_negotiate(np, tp);
+}
+
+static void ncr53c8xx_set_offset(struct scsi_target *starget, int offset)
+{
+       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+       struct ncb *np = ((struct host_data *)shost->hostdata)->ncb;
+       struct tcb *tp = &np->target[starget->id];
+
+       if (offset > np->maxoffs)
+               offset = np->maxoffs;
+       else if (offset < 0)
+               offset = 0;
+
+       tp->maxoffs = offset;
+
+       ncr_negotiate(np, tp);
+}
+
+static void ncr53c8xx_set_width(struct scsi_target *starget, int width)
+{
+       struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+       struct ncb *np = ((struct host_data *)shost->hostdata)->ncb;
+       struct tcb *tp = &np->target[starget->id];
+
+       if (width > np->maxwide)
+               width = np->maxwide;
+       else if (width < 0)
+               width = 0;
+
+       tp->usrwide = width;
+
+       ncr_negotiate(np, tp);
+}
+
+static void ncr53c8xx_get_signalling(struct Scsi_Host *shost)
+{
+       struct ncb *np = ((struct host_data *)shost->hostdata)->ncb;
+       enum spi_signal_type type;
+
+       switch (np->scsi_mode) {
+       case SMODE_SE:
+               type = SPI_SIGNAL_SE;
+               break;
+       case SMODE_HVD:
+               type = SPI_SIGNAL_HVD;
+               break;
+       default:
+               type = SPI_SIGNAL_UNKNOWN;
+               break;
+       }
+       spi_signalling(shost) = type;
+}
+
+static struct spi_function_template ncr53c8xx_transport_functions =  {
+       .set_period     = ncr53c8xx_set_period,
+       .show_period    = 1,
+       .set_offset     = ncr53c8xx_set_offset,
+       .show_offset    = 1,
+       .set_width      = ncr53c8xx_set_width,
+       .show_width     = 1,
+       .get_signalling = ncr53c8xx_get_signalling,
+};
+
+int __init ncr53c8xx_init(void)
+{
+       ncr53c8xx_transport_template = spi_attach_transport(&ncr53c8xx_transport_functions);
+       if (!ncr53c8xx_transport_template)
+               return -ENODEV;
+       return 0;
+}
+
+void ncr53c8xx_exit(void)
+{
+       spi_release_transport(ncr53c8xx_transport_template);
+}