Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

12 files changed, 122 insertions, 428 deletions

diff --git a/drivers/scsi/sym53c8xx_2/sym_defs.h b/drivers/scsi/sym53c8xx_2/sym_defs.h
index 2d9437d7242b..3659dd7b9d76 100644
--- a/drivers/scsi/sym53c8xx_2/sym_defs.h
+++ b/drivers/scsi/sym53c8xx_2/sym_defs.h
@@ -40,7 +40,7 @@
 #ifndef SYM_DEFS_H
 #define SYM_DEFS_H
 
-#define SYM_VERSION "2.2.1"
+#define SYM_VERSION "2.2.2"
 #define SYM_DRIVER_NAME "sym-" SYM_VERSION
 
 /*
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw.c b/drivers/scsi/sym53c8xx_2/sym_fw.c
index fd36cf9858cb..9916a2a22558 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw.c
+++ b/drivers/scsi/sym53c8xx_2/sym_fw.c
@@ -37,11 +37,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef __FreeBSD__
-#include <dev/sym/sym_glue.h>
-#else
 #include "sym_glue.h"
-#endif
 
 /*
  *  Macros used for all firmwares.
@@ -60,19 +56,12 @@
 #define SYM_FWA_SCR             sym_fw1a_scr
 #define SYM_FWB_SCR             sym_fw1b_scr
 #define SYM_FWZ_SCR             sym_fw1z_scr
-#ifdef __FreeBSD__
-#include <dev/sym/sym_fw1.h>
-#else
 #include "sym_fw1.h"
-#endif
 static struct sym_fwa_ofs sym_fw1a_ofs = {
         SYM_GEN_FW_A(struct SYM_FWA_SCR)
 };
 static struct sym_fwb_ofs sym_fw1b_ofs = {
         SYM_GEN_FW_B(struct SYM_FWB_SCR)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        SYM_GEN_B(struct SYM_FWB_SCR, data_io)
-#endif
 };
 static struct sym_fwz_ofs sym_fw1z_ofs = {
         SYM_GEN_FW_Z(struct SYM_FWZ_SCR)
@@ -88,19 +77,12 @@ static struct sym_fwz_ofs sym_fw1z_ofs = {
 #define SYM_FWA_SCR             sym_fw2a_scr
 #define SYM_FWB_SCR             sym_fw2b_scr
 #define SYM_FWZ_SCR             sym_fw2z_scr
-#ifdef __FreeBSD__
-#include <dev/sym/sym_fw2.h>
-#else
 #include "sym_fw2.h"
-#endif
 static struct sym_fwa_ofs sym_fw2a_ofs = {
         SYM_GEN_FW_A(struct SYM_FWA_SCR)
 };
 static struct sym_fwb_ofs sym_fw2b_ofs = {
         SYM_GEN_FW_B(struct SYM_FWB_SCR)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        SYM_GEN_B(struct SYM_FWB_SCR, data_io)
-#endif
         SYM_GEN_B(struct SYM_FWB_SCR, start64)
         SYM_GEN_B(struct SYM_FWB_SCR, pm_handle)
 };
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw.h b/drivers/scsi/sym53c8xx_2/sym_fw.h
index 43f6810a4045..66ec35beab5b 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw.h
@@ -92,9 +92,6 @@ struct sym_fwa_ofs {
 };
 struct sym_fwb_ofs {
         SYM_GEN_FW_B(u_short)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        SYM_GEN_B(u_short, data_io)
-#endif
         SYM_GEN_B(u_short, start64)
         SYM_GEN_B(u_short, pm_handle)
 };
@@ -111,9 +108,6 @@ struct sym_fwa_ba {
 };
 struct sym_fwb_ba {
         SYM_GEN_FW_B(u32)
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        SYM_GEN_B(u32, data_io)
-#endif
         SYM_GEN_B(u32, start64);
         SYM_GEN_B(u32, pm_handle);
 };
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h
index cdd92d82f4b2..7b39f4a35e98 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw1.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h
@@ -197,12 +197,6 @@ struct SYM_FWB_SCR {
         u32 bad_status          [  7];
         u32 wsr_ma_helper       [  4];
 
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        /* Unknown direction handling */
-        u32 data_io             [  2];
-        u32 data_io_com         [  8];
-        u32 data_io_out         [  7];
-#endif
         /* Data area */
         u32 zero                [  1];
         u32 scratch             [  1];
@@ -1747,48 +1741,6 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
         SCR_JUMP,
                 PADDR_A (dispatch),
 
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-}/*-------------------------< DATA_IO >--------------------------*/,{
-        /*
-         *  We jump here if the data direction was unknown at the 
-         *  time we had to queue the command to the scripts processor.
-         *  Pointers had been set as follow in this situation:
-         *    savep   -->   DATA_IO
-         *    lastp   -->   start pointer when DATA_IN
-         *    wlastp  -->   start pointer when DATA_OUT
-         *  This script sets savep and lastp according to the 
-         *  direction chosen by the target.
-         */
-        SCR_JUMP ^ IFTRUE (WHEN (SCR_DATA_OUT)),
-                PADDR_B (data_io_out),
-}/*-------------------------< DATA_IO_COM >----------------------*/,{
-        /*
-         *  Direction is DATA IN.
-         */
-        SCR_COPY  (4),
-                HADDR_1 (ccb_head.lastp),
-                HADDR_1 (ccb_head.savep),
-        /*
-         *  Jump to the SCRIPTS according to actual direction.
-         */
-        SCR_COPY  (4),
-                HADDR_1 (ccb_head.savep),
-                RADDR_1 (temp),
-        SCR_RETURN,
-                0,
-}/*-------------------------< DATA_IO_OUT >----------------------*/,{
-        /*
-         *  Direction is DATA OUT.
-         */
-        SCR_REG_REG (HF_REG, SCR_AND, (~HF_DATA_IN)),
-                0,
-        SCR_COPY  (4),
-                HADDR_1 (ccb_head.wlastp),
-                HADDR_1 (ccb_head.lastp),
-        SCR_JUMP,
-                PADDR_B(data_io_com),
-#endif /* SYM_OPT_HANDLE_DIR_UNKNOWN */
-
 }/*-------------------------< ZERO >-----------------------------*/,{
         SCR_DATA_ZERO,
 }/*-------------------------< SCRATCH >--------------------------*/,{
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index 7ea7151f5d1d..851f2706f220 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -191,13 +191,6 @@ struct SYM_FWB_SCR {
         u32 pm_wsr_handle       [ 38];
         u32 wsr_ma_helper       [  4];
 
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-        /* Unknown direction handling */
-        u32 data_io             [  2];
-        u32 data_io_in          [  2];
-        u32 data_io_com         [  6];
-        u32 data_io_out         [  8];
-#endif
         /* Data area */
         u32 zero                [  1];
         u32 scratch             [  1];
@@ -1838,51 +1831,6 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
         SCR_JUMP,
                 PADDR_A (dispatch),
 
-#ifdef SYM_OPT_HANDLE_DIR_UNKNOWN
-}/*-------------------------< DATA_IO >--------------------------*/,{
-        /*
-         *  We jump here if the data direction was unknown at the 
-         *  time we had to queue the command to the scripts processor.
-         *  Pointers had been set as follow in this situation:
-         *    savep   -->   DATA_IO
-         *    lastp   -->   start pointer when DATA_IN
-         *    wlastp  -->   start pointer when DATA_OUT
-         *  This script sets savep and lastp according to the 
-         *  direction chosen by the target.
-         */
-        SCR_JUMP ^ IFTRUE (WHEN (SCR_DATA_OUT)),
-                PADDR_B (data_io_out),
-}/*-------------------------< DATA_IO_IN >-----------------------*/,{
-        /*
-         *  Direction is DATA IN.
-         */
-        SCR_LOAD_REL  (scratcha, 4),
-                offsetof (struct sym_ccb, phys.head.lastp),
-}/*-------------------------< DATA_IO_COM >----------------------*/,{
-        SCR_STORE_REL (scratcha, 4),
-                offsetof (struct sym_ccb, phys.head.savep),
-
-        /*
-         *  Jump to the SCRIPTS according to actual direction.
-         */
-        SCR_LOAD_REL  (temp, 4),
-                offsetof (struct sym_ccb, phys.head.savep),
-        SCR_RETURN,
-                0,
-}/*-------------------------< DATA_IO_OUT >----------------------*/,{
-        /*
-         *  Direction is DATA OUT.
-         */
-        SCR_REG_REG (HF_REG, SCR_AND, (~HF_DATA_IN)),
-                0,
-        SCR_LOAD_REL  (scratcha, 4),
-                offsetof (struct sym_ccb, phys.head.wlastp),
-        SCR_STORE_REL (scratcha, 4),
-                offsetof (struct sym_ccb, phys.head.lastp),
-        SCR_JUMP,
-                PADDR_B(data_io_com),
-#endif /* SYM_OPT_HANDLE_DIR_UNKNOWN */
-
 }/*-------------------------< ZERO >-----------------------------*/,{
         SCR_DATA_ZERO,
 }/*-------------------------< SCRATCH >--------------------------*/,{
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 7fc0b97173e1..1fffd2b3c654 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -514,9 +514,10 @@ static inline int sym_setup_cdb(struct sym_hcb *np, struct scsi_cmnd *cmd, struc
  */
 int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct sym_ccb *cp)
 {
-        int dir;
         struct sym_tcb *tp = &np->target[cp->target];
         struct sym_lcb *lp = sym_lp(tp, cp->lun);
+        u32 lastp, goalp;
+        int dir;
 
         /*
          *  Build the CDB.
@@ -534,15 +535,47 @@ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct s
                         sym_set_cam_status(cmd, DID_ERROR);
                         goto out_abort;
                 }
+
+                /*
+                 *  No segments means no data.
+                 */
+                if (!cp->segments)
+                        dir = DMA_NONE;
         } else {
                 cp->data_len = 0;
                 cp->segments = 0;
         }
 
         /*
-         *  Set data pointers.
+         *  Set the data pointer.
          */
-        sym_setup_data_pointers(np, cp, dir);
+        switch (dir) {
+        case DMA_BIDIRECTIONAL:
+                printk("%s: got DMA_BIDIRECTIONAL command", sym_name(np));
+                sym_set_cam_status(cmd, DID_ERROR);
+                goto out_abort;
+        case DMA_TO_DEVICE:
+                goalp = SCRIPTA_BA(np, data_out2) + 8;
+                lastp = goalp - 8 - (cp->segments * (2*4));
+                break;
+        case DMA_FROM_DEVICE:
+                cp->host_flags |= HF_DATA_IN;
+                goalp = SCRIPTA_BA(np, data_in2) + 8;
+                lastp = goalp - 8 - (cp->segments * (2*4));
+                break;
+        case DMA_NONE:
+        default:
+                lastp = goalp = SCRIPTB_BA(np, no_data);
+                break;
+        }
+
+        /*
+         *  Set all pointers values needed by SCRIPTS.
+         */
+        cp->phys.head.lastp = cpu_to_scr(lastp);
+        cp->phys.head.savep = cpu_to_scr(lastp);
+        cp->startp          = cp->phys.head.savep;
+        cp->goalp           = cpu_to_scr(goalp);
 
         /*
          *  When `#ifed 1', the code below makes the driver 
@@ -563,10 +596,7 @@ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct s
         /*
          *      activate this job.
          */
-        if (lp)
-                sym_start_next_ccbs(np, lp, 2);
-        else
-                sym_put_start_queue(np, cp);
+        sym_start_next_ccbs(np, lp, 2);
         return 0;
 
 out_abort:
@@ -981,15 +1011,14 @@ static int device_queue_depth(struct sym_hcb *np, int target, int lun)
 
 static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
 {
-        struct sym_hcb *np;
-        struct sym_tcb *tp;
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_tcb *tp = &np->target[sdev->id];
+        struct sym_lcb *lp;
 
         if (sdev->id >= SYM_CONF_MAX_TARGET || sdev->lun >= SYM_CONF_MAX_LUN)
                 return -ENXIO;
 
-        np = sym_get_hcb(sdev->host);
-        tp = &np->target[sdev->id];
-
+        tp->starget = sdev->sdev_target;
         /*
          * Fail the device init if the device is flagged NOSCAN at BOOT in
          * the NVRAM.  This may speed up boot and maintain coherency with
@@ -999,35 +1028,41 @@ static int sym53c8xx_slave_alloc(struct scsi_device *sdev)
          * lun devices behave badly when asked for a non zero LUN.
          */
 
-        if ((tp->usrflags & SYM_SCAN_BOOT_DISABLED) ||
-            ((tp->usrflags & SYM_SCAN_LUNS_DISABLED) && sdev->lun != 0)) {
+        if (tp->usrflags & SYM_SCAN_BOOT_DISABLED) {
                 tp->usrflags &= ~SYM_SCAN_BOOT_DISABLED;
+                starget_printk(KERN_INFO, tp->starget,
+                                "Scan at boot disabled in NVRAM\n");
                 return -ENXIO;
         }
 
-        tp->starget = sdev->sdev_target;
+        if (tp->usrflags & SYM_SCAN_LUNS_DISABLED) {
+                if (sdev->lun != 0)
+                        return -ENXIO;
+                starget_printk(KERN_INFO, tp->starget,
+                                "Multiple LUNs disabled in NVRAM\n");
+        }
+
+        lp = sym_alloc_lcb(np, sdev->id, sdev->lun);
+        if (!lp)
+                return -ENOMEM;
+
+        spi_min_period(tp->starget) = tp->usr_period;
+        spi_max_width(tp->starget) = tp->usr_width;
+
         return 0;
 }
 
 /*
  * Linux entry point for device queue sizing.
  */
-static int sym53c8xx_slave_configure(struct scsi_device *device)
+static int sym53c8xx_slave_configure(struct scsi_device *sdev)
 {
-        struct sym_hcb *np = sym_get_hcb(device->host);
-        struct sym_tcb *tp = &np->target[device->id];
-        struct sym_lcb *lp;
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_tcb *tp = &np->target[sdev->id];
+        struct sym_lcb *lp = sym_lp(tp, sdev->lun);
         int reqtags, depth_to_use;
 
         /*
-         *  Allocate the LCB if not yet.
-         *  If it fail, we may well be in the sh*t. :)
-         */
-        lp = sym_alloc_lcb(np, device->id, device->lun);
-        if (!lp)
-                return -ENOMEM;
-
-        /*
          *  Get user flags.
          */
         lp->curr_flags = lp->user_flags;
@@ -1038,10 +1073,10 @@ static int sym53c8xx_slave_configure(struct scsi_device *device)
          *  Use at least 2.
          *  Donnot use more than our maximum.
          */
-        reqtags = device_queue_depth(np, device->id, device->lun);
+        reqtags = device_queue_depth(np, sdev->id, sdev->lun);
         if (reqtags > tp->usrtags)
                 reqtags = tp->usrtags;
-        if (!device->tagged_supported)
+        if (!sdev->tagged_supported)
                 reqtags = 0;
 #if 1 /* Avoid to locally queue commands for no good reasons */
         if (reqtags > SYM_CONF_MAX_TAG)
@@ -1050,19 +1085,30 @@ static int sym53c8xx_slave_configure(struct scsi_device *device)
 #else
         depth_to_use = (reqtags ? SYM_CONF_MAX_TAG : 2);
 #endif
-        scsi_adjust_queue_depth(device,
-                                (device->tagged_supported ?
+        scsi_adjust_queue_depth(sdev,
+                                (sdev->tagged_supported ?
                                  MSG_SIMPLE_TAG : 0),
                                 depth_to_use);
         lp->s.scdev_depth = depth_to_use;
-        sym_tune_dev_queuing(tp, device->lun, reqtags);
+        sym_tune_dev_queuing(tp, sdev->lun, reqtags);
 
-        if (!spi_initial_dv(device->sdev_target))
-                spi_dv_device(device);
+        if (!spi_initial_dv(sdev->sdev_target))
+                spi_dv_device(sdev);
 
         return 0;
 }
 
+static void sym53c8xx_slave_destroy(struct scsi_device *sdev)
+{
+        struct sym_hcb *np = sym_get_hcb(sdev->host);
+        struct sym_lcb *lp = sym_lp(&np->target[sdev->id], sdev->lun);
+
+        if (lp->itlq_tbl)
+                sym_mfree_dma(lp->itlq_tbl, SYM_CONF_MAX_TASK * 4, "ITLQ_TBL");
+        kfree(lp->cb_tags);
+        sym_mfree_dma(lp, sizeof(*lp), "LCB");
+}
+
 /*
  *  Linux entry point for info() function
  */
@@ -1497,7 +1543,7 @@ static int sym_setup_bus_dma_mask(struct sym_hcb *np)
 {
 #if SYM_CONF_DMA_ADDRESSING_MODE > 0
 #if   SYM_CONF_DMA_ADDRESSING_MODE == 1
-#define DMA_DAC_MASK    0x000000ffffffffffULL /* 40-bit */
+#define DMA_DAC_MASK    DMA_40BIT_MASK
 #elif SYM_CONF_DMA_ADDRESSING_MODE == 2
 #define DMA_DAC_MASK    DMA_64BIT_MASK
 #endif
@@ -1926,6 +1972,7 @@ static struct scsi_host_template sym2_template = {
         .queuecommand           = sym53c8xx_queue_command,
         .slave_alloc            = sym53c8xx_slave_alloc,
         .slave_configure        = sym53c8xx_slave_configure,
+        .slave_destroy          = sym53c8xx_slave_destroy,
         .eh_abort_handler       = sym53c8xx_eh_abort_handler,
         .eh_device_reset_handler = sym53c8xx_eh_device_reset_handler,
         .eh_bus_reset_handler   = sym53c8xx_eh_bus_reset_handler,
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h
index d3d52f14d7c0..cc92d0c70cd7 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.h
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.h
@@ -68,7 +68,6 @@
  */
 #define SYM_CONF_TIMER_INTERVAL         ((HZ+1)/2)
 
-#define SYM_OPT_HANDLE_DIR_UNKNOWN
 #define SYM_OPT_HANDLE_DEVICE_QUEUEING
 #define SYM_OPT_LIMIT_COMMAND_REORDERING
 
@@ -268,6 +267,5 @@ void sym_xpt_async_bus_reset(struct sym_hcb *np);
 void sym_xpt_async_sent_bdr(struct sym_hcb *np, int target);
 int  sym_setup_data_and_start (struct sym_hcb *np, struct scsi_cmnd *csio, struct sym_ccb *cp);
 void sym_log_bus_error(struct sym_hcb *np);
-void sym_sniff_inquiry(struct sym_hcb *np, struct scsi_cmnd *cmd, int resid);
 
 #endif /* SYM_GLUE_H */
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 1564ca203a3e..8260f040d39c 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -40,6 +40,7 @@
 
 #include <linux/slab.h>
 #include <asm/param.h>          /* for timeouts in units of HZ */
+#include <scsi/scsi_dbg.h>
 
 #include "sym_glue.h"
 #include "sym_nvram.h"
@@ -70,32 +71,12 @@ static void sym_printl_hex(u_char *p, int n)
         printf (".\n");
 }
 
-/*
- *  Print out the content of a SCSI message.
- */
-static int sym_show_msg (u_char * msg)
-{
-        u_char i;
-        printf ("%x",*msg);
-        if (*msg==M_EXTENDED) {
-                for (i=1;i<8;i++) {
-                        if (i-1>msg[1]) break;
-                        printf ("-%x",msg[i]);
-                }
-                return (i+1);
-        } else if ((*msg & 0xf0) == 0x20) {
-                printf ("-%x",msg[1]);
-                return (2);
-        }
-        return (1);
-}
-
 static void sym_print_msg(struct sym_ccb *cp, char *label, u_char *msg)
 {
         sym_print_addr(cp->cmd, "%s: ", label);
 
-        sym_show_msg(msg);
-        printf(".\n");
+        spi_print_msg(msg);
+        printf("\n");
 }
 
 static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_char *msg)
@@ -103,8 +84,8 @@ static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_ch
         struct sym_tcb *tp = &np->target[target];
         dev_info(&tp->starget->dev, "%s: ", label);
 
-        sym_show_msg(msg);
-        printf(".\n");
+        spi_print_msg(msg);
+        printf("\n");
 }
 
 /*
@@ -635,29 +616,6 @@ static __inline void sym_init_burst(struct sym_hcb *np, u_char bc)
         }
 }
 
-
-/*
- * Print out the list of targets that have some flag disabled by user.
- */
-static void sym_print_targets_flag(struct sym_hcb *np, int mask, char *msg)
-{
-        int cnt;
-        int i;
-
-        for (cnt = 0, i = 0 ; i < SYM_CONF_MAX_TARGET ; i++) {
-                if (i == np->myaddr)
-                        continue;
-                if (np->target[i].usrflags & mask) {
-                        if (!cnt++)
-                                printf("%s: %s disabled for targets",
-                                        sym_name(np), msg);
-                        printf(" %d", i);
-                }
-        }
-        if (cnt)
-                printf(".\n");
-}
-
 /*
  *  Save initial settings of some IO registers.
  *  Assumed to have been set by BIOS.
@@ -962,7 +920,7 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru
                 tp->usrflags |= (SYM_DISC_ENABLED | SYM_TAGS_ENABLED);
                 tp->usrtags = SYM_SETUP_MAX_TAG;
 
-                sym_nvram_setup_target(np, i, nvram);
+                sym_nvram_setup_target(tp, i, nvram);
 
                 if (!tp->usrtags)
                         tp->usrflags &= ~SYM_TAGS_ENABLED;
@@ -1005,13 +963,6 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru
                         sym_name(np), np->rv_scntl3, np->rv_dmode, np->rv_dcntl,
                         np->rv_ctest3, np->rv_ctest4, np->rv_ctest5);
         }
-        /*
-         *  Let user be aware of targets that have some disable flags set.
-         */
-        sym_print_targets_flag(np, SYM_SCAN_BOOT_DISABLED, "SCAN AT BOOT");
-        if (sym_verbose)
-                sym_print_targets_flag(np, SYM_SCAN_LUNS_DISABLED,
-                                       "SCAN FOR LUNS");
 
         return 0;
 }
@@ -1523,7 +1474,7 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp
 /*
  *  Insert a job into the start queue.
  */
-void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp)
+static void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp)
 {
         u_short qidx;
 
@@ -3654,7 +3605,7 @@ static int sym_evaluate_dp(struct sym_hcb *np, struct sym_ccb *cp, u32 scr, int
          *  If result is dp_sg = SYM_CONF_MAX_SG, then we are at the 
          *  end of the data.
          */
-        tmp = scr_to_cpu(sym_goalp(cp));
+        tmp = scr_to_cpu(cp->goalp);
         dp_sg = SYM_CONF_MAX_SG;
         if (dp_scr != tmp)
                 dp_sg -= (tmp - 8 - (int)dp_scr) / (2*4);
@@ -3761,7 +3712,7 @@ static void sym_modify_dp(struct sym_hcb *np, struct sym_tcb *tp, struct sym_ccb
          *  And our alchemy:) allows to easily calculate the data 
          *  script address we want to return for the next data phase.
          */
-        dp_ret = cpu_to_scr(sym_goalp(cp));
+        dp_ret = cpu_to_scr(cp->goalp);
         dp_ret = dp_ret - 8 - (SYM_CONF_MAX_SG - dp_sg) * (2*4);
 
         /*
@@ -3857,7 +3808,7 @@ int sym_compute_residual(struct sym_hcb *np, struct sym_ccb *cp)
          *  If all data has been transferred,
          *  there is no residual.
          */
-        if (cp->phys.head.lastp == sym_goalp(cp))
+        if (cp->phys.head.lastp == cp->goalp)
                 return resid;
 
         /*
@@ -4664,30 +4615,7 @@ struct sym_ccb *sym_get_ccb (struct sym_hcb *np, struct scsi_cmnd *cmd, u_char t
                 goto out;
         cp = sym_que_entry(qp, struct sym_ccb, link_ccbq);
 
-#ifndef SYM_OPT_HANDLE_DEVICE_QUEUEING
-        /*
-         *  If the LCB is not yet available and the LUN
-         *  has been probed ok, try to allocate the LCB.
-         */
-        if (!lp && sym_is_bit(tp->lun_map, ln)) {
-                lp = sym_alloc_lcb(np, tn, ln);
-                if (!lp)
-                        goto out_free;
-        }
-#endif
-
-        /*
-         *  If the LCB is not available here, then the 
-         *  logical unit is not yet discovered. For those 
-         *  ones only accept 1 SCSI IO per logical unit, 
-         *  since we cannot allow disconnections.
-         */
-        if (!lp) {
-                if (!sym_is_bit(tp->busy0_map, ln))
-                        sym_set_bit(tp->busy0_map, ln);
-                else
-                        goto out_free;
-        } else {
+        {
                 /*
                  *  If we have been asked for a tagged command.
                  */
@@ -4840,12 +4768,6 @@ void sym_free_ccb (struct sym_hcb *np, struct sym_ccb *cp)
                         lp->head.resel_sa =
                                 cpu_to_scr(SCRIPTB_BA(np, resel_bad_lun));
         }
-        /*
-         *  Otherwise, we only accept 1 IO per LUN.
-         *  Clear the bit that keeps track of this IO.
-         */
-        else
-                sym_clr_bit(tp->busy0_map, cp->lun);
 
         /*
          *  We donnot queue more than 1 ccb per target 
@@ -4997,20 +4919,7 @@ static void sym_init_tcb (struct sym_hcb *np, u_char tn)
 struct sym_lcb *sym_alloc_lcb (struct sym_hcb *np, u_char tn, u_char ln)
 {
         struct sym_tcb *tp = &np->target[tn];
-        struct sym_lcb *lp = sym_lp(tp, ln);
-
-        /*
-         *  Already done, just return.
-         */
-        if (lp)
-                return lp;
-
-        /*
-         *  Donnot allow LUN control block 
-         *  allocation for not probed LUNs.
-         */
-        if (!sym_is_bit(tp->lun_map, ln))
-                return NULL;
+        struct sym_lcb *lp = NULL;
 
         /*
          *  Initialize the target control block if not yet.
@@ -5082,13 +4991,7 @@ struct sym_lcb *sym_alloc_lcb (struct sym_hcb *np, u_char tn, u_char ln)
         lp->started_max   = SYM_CONF_MAX_TASK;
         lp->started_limit = SYM_CONF_MAX_TASK;
 #endif
-        /*
-         *  If we are busy, count the IO.
-         */
-        if (sym_is_bit(tp->busy0_map, ln)) {
-                lp->busy_itl = 1;
-                sym_clr_bit(tp->busy0_map, ln);
-        }
+
 fail:
         return lp;
 }
@@ -5103,12 +5006,6 @@ static void sym_alloc_lcb_tags (struct sym_hcb *np, u_char tn, u_char ln)
         int i;
 
         /*
-         *  If LCB not available, try to allocate it.
-         */
-        if (!lp && !(lp = sym_alloc_lcb(np, tn, ln)))
-                goto fail;
-
-        /*
          *  Allocate the task table and and the tag allocation 
          *  circular buffer. We want both or none.
          */
@@ -5481,8 +5378,7 @@ finish:
         /*
          *  Donnot start more than 1 command after an error.
          */
-        if (lp)
-                sym_start_next_ccbs(np, lp, 1);
+        sym_start_next_ccbs(np, lp, 1);
 #endif
 }
 
@@ -5521,17 +5417,11 @@ void sym_complete_ok (struct sym_hcb *np, struct sym_ccb *cp)
         lp = sym_lp(tp, cp->lun);
 
         /*
-         *  Assume device discovered on first success.
-         */
-        if (!lp)
-                sym_set_bit(tp->lun_map, cp->lun);
-
-        /*
          *  If all data have been transferred, given than no
          *  extended error did occur, there is no residual.
          */
         resid = 0;
-        if (cp->phys.head.lastp != sym_goalp(cp))
+        if (cp->phys.head.lastp != cp->goalp)
                 resid = sym_compute_residual(np, cp);
 
         /*
@@ -5551,15 +5441,6 @@ if (resid)
          */
         sym_set_cam_result_ok(cp, cmd, resid);
 
-#ifdef  SYM_OPT_SNIFF_INQUIRY
-        /*
-         *  On standard INQUIRY response (EVPD and CmDt 
-         *  not set), sniff out device capabilities.
-         */
-        if (cp->cdb_buf[0] == INQUIRY && !(cp->cdb_buf[1] & 0x3))
-                sym_sniff_inquiry(np, cmd, resid);
-#endif
-
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
         /*
          *  If max number of started ccbs had been reduced,
@@ -5587,7 +5468,7 @@ if (resid)
         /*
          *  Requeue a couple of awaiting scsi commands.
          */
-        if (lp && !sym_que_empty(&lp->waiting_ccbq))
+        if (!sym_que_empty(&lp->waiting_ccbq))
                 sym_start_next_ccbs(np, lp, 2);
 #endif
         /*
@@ -5830,8 +5711,7 @@ void sym_hcb_free(struct sym_hcb *np)
         SYM_QUEHEAD *qp;
         struct sym_ccb *cp;
         struct sym_tcb *tp;
-        struct sym_lcb *lp;
-        int target, lun;
+        int target;
 
         if (np->scriptz0)
                 sym_mfree_dma(np->scriptz0, np->scriptz_sz, "SCRIPTZ0");
@@ -5857,16 +5737,6 @@ void sym_hcb_free(struct sym_hcb *np)
 
         for (target = 0; target < SYM_CONF_MAX_TARGET ; target++) {
                 tp = &np->target[target];
-                for (lun = 0 ; lun < SYM_CONF_MAX_LUN ; lun++) {
-                        lp = sym_lp(tp, lun);
-                        if (!lp)
-                                continue;
-                        if (lp->itlq_tbl)
-                                sym_mfree_dma(lp->itlq_tbl, SYM_CONF_MAX_TASK*4,
-                                       "ITLQ_TBL");
-                        kfree(lp->cb_tags);
-                        sym_mfree_dma(lp, sizeof(*lp), "LCB");
-                }
 #if SYM_CONF_MAX_LUN > 1
                 kfree(tp->lunmp);
 #endif 
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index 3a264a408216..2456090bb241 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -48,12 +48,6 @@
  *  They may be defined in platform specific headers, if they 
  *  are useful.
  *
- *    SYM_OPT_HANDLE_DIR_UNKNOWN
- *        When this option is set, the SCRIPTS used by the driver 
- *        are able to handle SCSI transfers with direction not 
- *        supplied by user.
- *        (set for Linux-2.0.X)
- *
  *    SYM_OPT_HANDLE_DEVICE_QUEUEING
  *        When this option is set, the driver will use a queue per 
  *        device and handle QUEUE FULL status requeuing internally.
@@ -64,7 +58,6 @@
  *        (set for Linux)
  */
 #if 0
-#define SYM_OPT_HANDLE_DIR_UNKNOWN
 #define SYM_OPT_HANDLE_DEVICE_QUEUEING
 #define SYM_OPT_LIMIT_COMMAND_REORDERING
 #endif
@@ -416,19 +409,6 @@ struct sym_tcb {
         struct sym_lcb **lunmp;         /* Other LCBs [1..MAX_LUN]      */
 #endif
 
-        /*
-         *  Bitmap that tells about LUNs that succeeded at least 
-         *  1 IO and therefore assumed to be a real device.
-         *  Avoid useless allocation of the LCB structure.
-         */
-        u32     lun_map[(SYM_CONF_MAX_LUN+31)/32];
-
-        /*
-         *  Bitmap that tells about LUNs that haven't yet an LCB 
-         *  allocated (not discovered or LCB allocation failed).
-         */
-        u32     busy0_map[(SYM_CONF_MAX_LUN+31)/32];
-
 #ifdef  SYM_HAVE_STCB
         /*
          *  O/S specific data structure.
@@ -454,8 +434,10 @@ struct sym_tcb {
          *  Other user settable limits and options.
          *  These limits are read from the NVRAM if present.
          */
-        u_char  usrflags;
-        u_short usrtags;
+        unsigned char   usrflags;
+        unsigned char   usr_period;
+        unsigned char   usr_width;
+        unsigned short  usrtags;
         struct scsi_target *starget;
 };
 
@@ -672,9 +654,6 @@ struct sym_ccbh {
          */
         u32     savep;          /* Jump address to saved data pointer   */
         u32     lastp;          /* SCRIPTS address at end of data       */
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        u32     wlastp;
-#endif
 
         /*
          *  Status fields.
@@ -804,9 +783,6 @@ struct sym_ccb {
         SYM_QUEHEAD link_ccbq;  /* Link to free/busy CCB queue  */
         u32     startp;         /* Initial data pointer         */
         u32     goalp;          /* Expected last data pointer   */
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        u32     wgoalp;
-#endif
         int     ext_sg;         /* Extreme data pointer, used   */
         int     ext_ofs;        /*  to calculate the residual.  */
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
@@ -821,12 +797,6 @@ struct sym_ccb {
 
 #define CCB_BA(cp,lbl)  cpu_to_scr(cp->ccb_ba + offsetof(struct sym_ccb, lbl))
 
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-#define sym_goalp(cp) ((cp->host_flags & HF_DATA_IN) ? cp->goalp : cp->wgoalp)
-#else
-#define sym_goalp(cp) (cp->goalp)
-#endif
-
 typedef struct device *m_pool_ident_t;
 
 /*
@@ -1077,7 +1047,6 @@ char *sym_driver_name(void);
 void sym_print_xerr(struct scsi_cmnd *cmd, int x_status);
 int sym_reset_scsi_bus(struct sym_hcb *np, int enab_int);
 struct sym_chip *sym_lookup_chip_table(u_short device_id, u_char revision);
-void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp);
 #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
 void sym_start_next_ccbs(struct sym_hcb *np, struct sym_lcb *lp, int maxn);
 #endif
@@ -1136,71 +1105,6 @@ bad:
 #endif
 
 /*
- *  Set up data pointers used by SCRIPTS.
- *  Called from O/S specific code.
- */
-static inline void sym_setup_data_pointers(struct sym_hcb *np,
-                struct sym_ccb *cp, int dir)
-{
-        u32 lastp, goalp;
-
-        /*
-         *  No segments means no data.
-         */
-        if (!cp->segments)
-                dir = DMA_NONE;
-
-        /*
-         *  Set the data pointer.
-         */
-        switch(dir) {
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        case DMA_BIDIRECTIONAL:
-#endif
-        case DMA_TO_DEVICE:
-                goalp = SCRIPTA_BA(np, data_out2) + 8;
-                lastp = goalp - 8 - (cp->segments * (2*4));
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-                cp->wgoalp = cpu_to_scr(goalp);
-                if (dir != DMA_BIDIRECTIONAL)
-                        break;
-                cp->phys.head.wlastp = cpu_to_scr(lastp);
-                /* fall through */
-#else
-                break;
-#endif
-        case DMA_FROM_DEVICE:
-                cp->host_flags |= HF_DATA_IN;
-                goalp = SCRIPTA_BA(np, data_in2) + 8;
-                lastp = goalp - 8 - (cp->segments * (2*4));
-                break;
-        case DMA_NONE:
-        default:
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-                cp->host_flags |= HF_DATA_IN;
-#endif
-                lastp = goalp = SCRIPTB_BA(np, no_data);
-                break;
-        }
-
-        /*
-         *  Set all pointers values needed by SCRIPTS.
-         */
-        cp->phys.head.lastp = cpu_to_scr(lastp);
-        cp->phys.head.savep = cpu_to_scr(lastp);
-        cp->startp          = cp->phys.head.savep;
-        cp->goalp           = cpu_to_scr(goalp);
-
-#ifdef  SYM_OPT_HANDLE_DIR_UNKNOWN
-        /*
-         *  If direction is unknown, start at data_io.
-         */
-        if (dir == DMA_BIDIRECTIONAL)
-                cp->phys.head.savep = cpu_to_scr(SCRIPTB_BA(np, data_io));
-#endif
-}
-
-/*
  *  MEMORY ALLOCATOR.
  */
 
diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c
index a34d403ccc6c..92bf9b14a7a2 100644
--- a/drivers/scsi/sym53c8xx_2/sym_malloc.c
+++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c
@@ -37,11 +37,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef __FreeBSD__
-#include <dev/sym/sym_glue.h>
-#else
 #include "sym_glue.h"
-#endif
 
 /*
  *  Simple power of two buddy-like generic allocator.
diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.c b/drivers/scsi/sym53c8xx_2/sym_nvram.c
index 994b7566bcac..15d69298ab6e 100644
--- a/drivers/scsi/sym53c8xx_2/sym_nvram.c
+++ b/drivers/scsi/sym53c8xx_2/sym_nvram.c
@@ -92,29 +92,32 @@ void sym_nvram_setup_host(struct Scsi_Host *shost, struct sym_hcb *np, struct sy
  *  Get target set-up from Symbios format NVRAM.
  */
 static void
-sym_Symbios_setup_target(struct sym_hcb *np, int target, Symbios_nvram *nvram)
+sym_Symbios_setup_target(struct sym_tcb *tp, int target, Symbios_nvram *nvram)
 {
-        struct sym_tcb *tp = &np->target[target];
         Symbios_target *tn = &nvram->target[target];
 
-        tp->usrtags =
-                (tn->flags & SYMBIOS_QUEUE_TAGS_ENABLED)? SYM_SETUP_MAX_TAG : 0;
-
+        if (!(tn->flags & SYMBIOS_QUEUE_TAGS_ENABLED))
+                tp->usrtags = 0;
         if (!(tn->flags & SYMBIOS_DISCONNECT_ENABLE))
                 tp->usrflags &= ~SYM_DISC_ENABLED;
         if (!(tn->flags & SYMBIOS_SCAN_AT_BOOT_TIME))
                 tp->usrflags |= SYM_SCAN_BOOT_DISABLED;
         if (!(tn->flags & SYMBIOS_SCAN_LUNS))
                 tp->usrflags |= SYM_SCAN_LUNS_DISABLED;
+        tp->usr_period = (tn->sync_period + 3) / 4;
+        tp->usr_width = (tn->bus_width == 0x8) ? 0 : 1;
 }
 
+static const unsigned char Tekram_sync[16] = {
+        25, 31, 37, 43, 50, 62, 75, 125, 12, 15, 18, 21, 6, 7, 9, 10
+};
+
 /*
  *  Get target set-up from Tekram format NVRAM.
  */
 static void
-sym_Tekram_setup_target(struct sym_hcb *np, int target, Tekram_nvram *nvram)
+sym_Tekram_setup_target(struct sym_tcb *tp, int target, Tekram_nvram *nvram)
 {
-        struct sym_tcb *tp = &np->target[target];
         struct Tekram_target *tn = &nvram->target[target];
 
         if (tn->flags & TEKRAM_TAGGED_COMMANDS) {
@@ -124,22 +127,22 @@ sym_Tekram_setup_target(struct sym_hcb *np, int target, Tekram_nvram *nvram)
         if (tn->flags & TEKRAM_DISCONNECT_ENABLE)
                 tp->usrflags |= SYM_DISC_ENABLED;
  
-        /* If any device does not support parity, we will not use this option */
-        if (!(tn->flags & TEKRAM_PARITY_CHECK))
-                np->rv_scntl0  &= ~0x0a; /* SCSI parity checking disabled */
+        if (tn->flags & TEKRAM_SYNC_NEGO)
+                tp->usr_period = Tekram_sync[tn->sync_index & 0xf];
+        tp->usr_width = (tn->flags & TEKRAM_WIDE_NEGO) ? 1 : 0;
 }
 
 /*
  *  Get target setup from NVRAM.
  */
-void sym_nvram_setup_target(struct sym_hcb *np, int target, struct sym_nvram *nvp)
+void sym_nvram_setup_target(struct sym_tcb *tp, int target, struct sym_nvram *nvp)
 {
         switch (nvp->type) {
         case SYM_SYMBIOS_NVRAM:
-                sym_Symbios_setup_target(np, target, &nvp->data.Symbios);
+                sym_Symbios_setup_target(tp, target, &nvp->data.Symbios);
                 break;
         case SYM_TEKRAM_NVRAM:
-                sym_Tekram_setup_target(np, target, &nvp->data.Tekram);
+                sym_Tekram_setup_target(tp, target, &nvp->data.Tekram);
                 break;
         default:
                 break;
diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.h b/drivers/scsi/sym53c8xx_2/sym_nvram.h
index 1538bede5277..bdfbbb083b69 100644
--- a/drivers/scsi/sym53c8xx_2/sym_nvram.h
+++ b/drivers/scsi/sym53c8xx_2/sym_nvram.h
@@ -194,12 +194,12 @@ struct sym_nvram {
 
 #if SYM_CONF_NVRAM_SUPPORT
 void sym_nvram_setup_host(struct Scsi_Host *shost, struct sym_hcb *np, struct sym_nvram *nvram);
-void sym_nvram_setup_target (struct sym_hcb *np, int target, struct sym_nvram *nvp);
+void sym_nvram_setup_target (struct sym_tcb *tp, int target, struct sym_nvram *nvp);
 int sym_read_nvram (struct sym_device *np, struct sym_nvram *nvp);
 char *sym_nvram_type(struct sym_nvram *nvp);
 #else
 static inline void sym_nvram_setup_host(struct Scsi_Host *shost, struct sym_hcb *np, struct sym_nvram *nvram) { }
-static inline void sym_nvram_setup_target(struct sym_hcb *np, struct sym_nvram *nvram) { }
+static inline void sym_nvram_setup_target(struct sym_tcb *tp, struct sym_nvram *nvram) { }
 static inline int sym_read_nvram(struct sym_device *np, struct sym_nvram *nvp)
 {
         nvp->type = 0;