patch-2.4.22 linux-2.4.22/drivers/scsi/aic7xxx/aic7xxx_osm.h
Next file: linux-2.4.22/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
Previous file: linux-2.4.22/drivers/scsi/aic7xxx/aic7xxx_osm.c
Back to the patch index
Back to the overall index
- Lines: 948
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/scsi/aic7xxx/aic7xxx_osm.h
- Orig date:
2003-06-13 07:51:36.000000000 -0700
diff -urN linux-2.4.21/drivers/scsi/aic7xxx/aic7xxx_osm.h linux-2.4.22/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -18,9 +18,7 @@
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#82 $
- *
- * Copyright (c) 2000-2001 Adaptec Inc.
+ * Copyright (c) 2000-2003 Adaptec Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +53,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#82 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#150 $
*
*/
#ifndef _AIC7XXX_LINUX_H_
@@ -67,12 +65,11 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/pci.h>
+#include <linux/smp_lock.h>
#include <linux/version.h>
-#ifndef AHC_MODVERSION_FILE
-#define __NO_VERSION__
-#endif
#include <linux/module.h>
#include <asm/byteorder.h>
+#include <asm/io.h>
#ifndef KERNEL_VERSION
#define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
@@ -87,8 +84,9 @@
#endif
/* Core SCSI definitions */
-#include "../scsi.h"
-#include "../hosts.h"
+#define AIC_LIB_PREFIX ahc
+#include "scsi.h"
+#include "hosts.h"
/* Name space conflict with BSD queue macros */
#ifdef LIST_HEAD
@@ -98,6 +96,21 @@
#include "cam.h"
#include "queue.h"
#include "scsi_message.h"
+#include "aiclib.h"
+
+/*********************************** Debugging ********************************/
+#ifdef CONFIG_AIC7XXX_DEBUG_ENABLE
+#ifdef CONFIG_AIC7XXX_DEBUG_MASK
+#define AHC_DEBUG 1
+#define AHC_DEBUG_OPTS CONFIG_AIC7XXX_DEBUG_MASK
+#else
+/*
+ * Compile in debugging code, but do not enable any printfs.
+ */
+#define AHC_DEBUG 1
+#endif
+/* No debugging code. */
+#endif
/************************* Forward Declarations *******************************/
struct ahc_softc;
@@ -137,9 +150,10 @@
#endif /* BYTE_ORDER */
/************************* Configuration Data *********************************/
-extern int aic7xxx_no_probe;
+extern u_int aic7xxx_no_probe;
+extern u_int aic7xxx_allow_memio;
extern int aic7xxx_detect_complete;
-extern Scsi_Host_Template* aic7xxx_driver_template;
+extern Scsi_Host_Template aic7xxx_driver_template;
/***************************** Bus Space/DMA **********************************/
@@ -240,176 +254,58 @@
*/
#define ahc_dmamap_sync(ahc, dma_tag, dmamap, offset, len, op)
-/************************** SCSI Constants/Structures *************************/
-#define SCSI_REV_2 2
-#define SCSI_STATUS_OK 0x00
-#define SCSI_STATUS_CHECK_COND 0x02
-#define SCSI_STATUS_COND_MET 0x04
-#define SCSI_STATUS_BUSY 0x08
-#define SCSI_STATUS_INTERMED 0x10
-#define SCSI_STATUS_INTERMED_COND_MET 0x14
-#define SCSI_STATUS_RESERV_CONFLICT 0x18
-#define SCSI_STATUS_CMD_TERMINATED 0x22
-#define SCSI_STATUS_QUEUE_FULL 0x28
-
-/*
- * 6 byte request sense CDB format.
- */
-struct scsi_sense
-{
- uint8_t opcode;
- uint8_t byte2;
- uint8_t unused[2];
- uint8_t length;
- uint8_t control;
-};
+/************************** Timer DataStructures ******************************/
+typedef struct timer_list ahc_timer_t;
-struct scsi_sense_data
-{
- uint8_t error_code;
- uint8_t segment;
- uint8_t flags;
- uint8_t info[4];
- uint8_t extra_len;
- uint8_t cmd_spec_info[4];
- uint8_t add_sense_code;
- uint8_t add_sense_code_qual;
- uint8_t fru;
- uint8_t sense_key_spec[3];
- uint8_t extra_bytes[14];
-};
+/********************************** Includes **********************************/
+#ifdef CONFIG_AIC7XXX_REG_PRETTY_PRINT
+#define AIC_DEBUG_REGISTERS 1
+#else
+#define AIC_DEBUG_REGISTERS 0
+#endif
+#include "aic7xxx.h"
-struct scsi_inquiry
-{
- u_int8_t opcode;
- u_int8_t byte2;
-#define SI_EVPD 0x01
- u_int8_t page_code;
- u_int8_t reserved;
- u_int8_t length;
- u_int8_t control;
-};
+/***************************** Timer Facilities *******************************/
+#define ahc_timer_init init_timer
+#define ahc_timer_stop del_timer_sync
+typedef void ahc_linux_callback_t (u_long);
+static __inline void ahc_timer_reset(ahc_timer_t *timer, int usec,
+ ahc_callback_t *func, void *arg);
+static __inline void ahc_scb_timer_reset(struct scb *scb, u_int usec);
-struct scsi_inquiry_data
+static __inline void
+ahc_timer_reset(ahc_timer_t *timer, int usec, ahc_callback_t *func, void *arg)
{
- uint8_t device;
-#define SID_TYPE(inq_data) ((inq_data)->device & 0x1f)
-#define SID_QUAL(inq_data) (((inq_data)->device & 0xE0) >> 5)
-#define SID_QUAL_LU_CONNECTED 0x00 /*
- * The specified peripheral device
- * type is currently connected to
- * logical unit. If the target cannot
- * determine whether or not a physical
- * device is currently connected, it
- * shall also use this peripheral
- * qualifier when returning the INQUIRY
- * data. This peripheral qualifier
- * does not mean that the device is
- * ready for access by the initiator.
- */
-#define SID_QUAL_LU_OFFLINE 0x01 /*
- * The target is capable of supporting
- * the specified peripheral device type
- * on this logical unit; however, the
- * physical device is not currently
- * connected to this logical unit.
- */
-#define SID_QUAL_RSVD 0x02
-#define SID_QUAL_BAD_LU 0x03 /*
- * The target is not capable of
- * supporting a physical device on
- * this logical unit. For this
- * peripheral qualifier the peripheral
- * device type shall be set to 1Fh to
- * provide compatibility with previous
- * versions of SCSI. All other
- * peripheral device type values are
- * reserved for this peripheral
- * qualifier.
- */
-#define SID_QUAL_IS_VENDOR_UNIQUE(inq_data) ((SID_QUAL(inq_data) & 0x08) != 0)
- uint8_t dev_qual2;
-#define SID_QUAL2 0x7F
-#define SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & 0x80) != 0)
- uint8_t version;
-#define SID_ANSI_REV(inq_data) ((inq_data)->version & 0x07)
-#define SCSI_REV_0 0
-#define SCSI_REV_CCS 1
-#define SCSI_REV_2 2
-#define SCSI_REV_SPC 3
-#define SCSI_REV_SPC2 4
-
-#define SID_ECMA 0x38
-#define SID_ISO 0xC0
- uint8_t response_format;
-#define SID_AENC 0x80
-#define SID_TrmIOP 0x40
- uint8_t additional_length;
- uint8_t reserved[2];
- uint8_t flags;
-#define SID_SftRe 0x01
-#define SID_CmdQue 0x02
-#define SID_Linked 0x08
-#define SID_Sync 0x10
-#define SID_WBus16 0x20
-#define SID_WBus32 0x40
-#define SID_RelAdr 0x80
-#define SID_VENDOR_SIZE 8
- char vendor[SID_VENDOR_SIZE];
-#define SID_PRODUCT_SIZE 16
- char product[SID_PRODUCT_SIZE];
-#define SID_REVISION_SIZE 4
- char revision[SID_REVISION_SIZE];
- /*
- * The following fields were taken from SCSI Primary Commands - 2
- * (SPC-2) Revision 14, Dated 11 November 1999
- */
-#define SID_VENDOR_SPECIFIC_0_SIZE 20
- u_int8_t vendor_specific0[SID_VENDOR_SPECIFIC_0_SIZE];
- /*
- * An extension of SCSI Parallel Specific Values
- */
-#define SID_SPI_IUS 0x01
-#define SID_SPI_QAS 0x02
-#define SID_SPI_CLOCK_ST 0x00
-#define SID_SPI_CLOCK_DT 0x04
-#define SID_SPI_CLOCK_DT_ST 0x0C
-#define SID_SPI_MASK 0x0F
- uint8_t spi3data;
- uint8_t reserved2;
- /*
- * Version Descriptors, stored 2 byte values.
- */
- uint8_t version1[2];
- uint8_t version2[2];
- uint8_t version3[2];
- uint8_t version4[2];
- uint8_t version5[2];
- uint8_t version6[2];
- uint8_t version7[2];
- uint8_t version8[2];
-
- uint8_t reserved3[22];
+ struct ahc_softc *ahc;
-#define SID_VENDOR_SPECIFIC_1_SIZE 160
- uint8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
-};
-
-/********************************** Includes **********************************/
-/* Host template and function declarations referenced by the template. */
-#include "aic7xxx_host.h"
+ ahc = (struct ahc_softc *)arg;
+ del_timer(timer);
+ timer->data = (u_long)arg;
+ timer->expires = jiffies + (usec * HZ)/1000000;
+ timer->function = (ahc_linux_callback_t*)func;
+ add_timer(timer);
+}
-/* Core driver definitions */
-#include "aic7xxx.h"
+static __inline void
+ahc_scb_timer_reset(struct scb *scb, u_int usec)
+{
+ mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000);
+}
-/* SMP support */
+/***************************** SMP support ************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
#include <linux/spinlock.h>
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93)
#include <linux/smp.h>
#endif
-#define AIC7XXX_DRIVER_VERSION "6.2.8"
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) || defined(SCSI_HAS_HOST_LOCK))
+#define AHC_SCSI_HAS_HOST_LOCK 1
+#else
+#define AHC_SCSI_HAS_HOST_LOCK 0
+#endif
+
+#define AIC7XXX_DRIVER_VERSION "6.2.36"
/**************************** Front End Queues ********************************/
/*
@@ -444,7 +340,7 @@
/*
* A per probed device structure used to deal with some error recovery
* scenarios that the Linux mid-layer code just doesn't know how to
- * handle. The structure allocated for a device only becomes persistant
+ * handle. The structure allocated for a device only becomes persistent
* after a successfully completed inquiry command to the target when
* that inquiry data indicates a lun is present.
*/
@@ -456,8 +352,9 @@
AHC_DEV_ON_RUN_LIST = 0x08, /* Queued to be run later */
AHC_DEV_Q_BASIC = 0x10, /* Allow basic device queuing */
AHC_DEV_Q_TAGGED = 0x20, /* Allow full SCSI2 command queueing */
- AHC_DEV_PERIODIC_OTAG = 0x40 /* Send OTAG to prevent starvation */
-} ahc_dev_flags;
+ AHC_DEV_PERIODIC_OTAG = 0x40, /* Send OTAG to prevent starvation */
+ AHC_DEV_SLAVE_CONFIGURED = 0x80 /* slave_configure() has been called */
+} ahc_linux_dev_flags;
struct ahc_linux_target;
struct ahc_linux_device {
@@ -500,7 +397,7 @@
u_int tag_success_count;
#define AHC_TAG_SUCCESS_INTERVAL 50
- ahc_dev_flags flags;
+ ahc_linux_dev_flags flags;
/*
* Per device timer.
@@ -540,16 +437,54 @@
#define AHC_OTAG_THRESH 500
int lun;
+ Scsi_Device *scsi_device;
struct ahc_linux_target *target;
};
+typedef enum {
+ AHC_DV_REQUIRED = 0x01,
+ AHC_INQ_VALID = 0x02,
+ AHC_BASIC_DV = 0x04,
+ AHC_ENHANCED_DV = 0x08
+} ahc_linux_targ_flags;
+
+/* DV States */
+typedef enum {
+ AHC_DV_STATE_EXIT = 0,
+ AHC_DV_STATE_INQ_SHORT_ASYNC,
+ AHC_DV_STATE_INQ_ASYNC,
+ AHC_DV_STATE_INQ_ASYNC_VERIFY,
+ AHC_DV_STATE_TUR,
+ AHC_DV_STATE_REBD,
+ AHC_DV_STATE_INQ_VERIFY,
+ AHC_DV_STATE_WEB,
+ AHC_DV_STATE_REB,
+ AHC_DV_STATE_SU,
+ AHC_DV_STATE_BUSY
+} ahc_dv_state;
+
struct ahc_linux_target {
- struct ahc_linux_device *devices[AHC_NUM_LUNS];
- int channel;
- int target;
- int refcount;
- struct ahc_transinfo last_tinfo;
- struct ahc_softc *ahc;
+ struct ahc_linux_device *devices[AHC_NUM_LUNS];
+ int channel;
+ int target;
+ int refcount;
+ struct ahc_transinfo last_tinfo;
+ struct ahc_softc *ahc;
+ ahc_linux_targ_flags flags;
+ struct scsi_inquiry_data *inq_data;
+ /*
+ * The next "fallback" period to use for narrow/wide transfers.
+ */
+ uint8_t dv_next_narrow_period;
+ uint8_t dv_next_wide_period;
+ uint8_t dv_max_width;
+ uint8_t dv_max_ppr_options;
+ uint8_t dv_last_ppr_options;
+ u_int dv_echo_size;
+ ahc_dv_state dv_state;
+ u_int dv_state_retry;
+ char *dv_buffer;
+ char *dv_buffer1;
};
/********************* Definitions Required by the Core ***********************/
@@ -559,11 +494,26 @@
* manner and are allocated below 4GB, the number of S/G segments is
* unrestricted.
*/
-#define AHC_NSEG 128
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+/*
+ * We dynamically adjust the number of segments in pre-2.5 kernels to
+ * avoid fragmentation issues in the SCSI mid-layer's private memory
+ * allocator. See aic7xxx_osm.c ahc_linux_size_nseg() for details.
+ */
+extern u_int ahc_linux_nseg;
+#define AHC_NSEG ahc_linux_nseg
+#define AHC_LINUX_MIN_NSEG 64
+#else
+#define AHC_NSEG 128
+#endif
/*
* Per-SCB OSM storage.
*/
+typedef enum {
+ AHC_UP_EH_SEMAPHORE = 0x1
+} ahc_linux_scb_flags;
+
struct scb_platform_data {
struct ahc_linux_device *dev;
bus_addr_t buf_busaddr;
@@ -571,6 +521,8 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
uint32_t resid; /* Transfer residual */
#endif
+ uint32_t sense_resid; /* Auto-Sense residual */
+ ahc_linux_scb_flags flags;
};
/*
@@ -579,7 +531,16 @@
* alignment restrictions of the various platforms supported by
* this driver.
*/
+typedef enum {
+ AHC_DV_WAIT_SIMQ_EMPTY = 0x01,
+ AHC_DV_WAIT_SIMQ_RELEASE = 0x02,
+ AHC_DV_ACTIVE = 0x04,
+ AHC_DV_SHUTDOWN = 0x08,
+ AHC_RUN_CMPLT_Q_TIMER = 0x10
+} ahc_linux_softc_flags;
+
TAILQ_HEAD(ahc_completeq, ahc_cmd);
+
struct ahc_platform_data {
/*
* Fields accessed from interrupt context.
@@ -588,21 +549,27 @@
TAILQ_HEAD(, ahc_linux_device) device_runq;
struct ahc_completeq completeq;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
spinlock_t spin_lock;
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
struct tasklet_struct runq_tasklet;
#endif
u_int qfrozen;
+ pid_t dv_pid;
+ struct timer_list completeq_timer;
struct timer_list reset_timer;
struct semaphore eh_sem;
+ struct semaphore dv_sem;
+ struct semaphore dv_cmd_sem; /* XXX This needs to be in
+ * the target struct
+ */
+ struct scsi_device *dv_scsi_dev;
struct Scsi_Host *host; /* pointer to scsi host */
#define AHC_LINUX_NOIRQ ((uint32_t)~0)
uint32_t irq; /* IRQ for this adapter */
uint32_t bios_address;
uint32_t mem_busaddr; /* Mem Base Addr */
bus_addr_t hw_dma_mask;
+ ahc_linux_softc_flags flags;
};
/************************** OS Utility Wrappers *******************************/
@@ -635,7 +602,6 @@
static __inline uint8_t ahc_inb(struct ahc_softc * ahc, long port);
static __inline void ahc_outb(struct ahc_softc * ahc, long port, uint8_t val);
-static __inline void ahc_outb_reset(struct ahc_softc * ahc, long port, uint8_t val);
static __inline void ahc_outsb(struct ahc_softc * ahc, long port,
uint8_t *, int count);
static __inline void ahc_insb(struct ahc_softc * ahc, long port,
@@ -665,22 +631,6 @@
#ifdef MMAPIO
if (ahc->tag == BUS_SPACE_MEMIO) {
writeb(val, ahc->bsh.maddr + port);
- readb(ahc->bsh.maddr + HCNTRL); /* flush PCI posting */
- } else {
- outb(val, ahc->bsh.ioport + port);
- }
-#else
- outb(val, ahc->bsh.ioport + port);
-#endif
- mb();
-}
-
-static __inline void
-ahc_outb_reset(struct ahc_softc * ahc, long port, uint8_t val)
-{
-#ifdef MMAPIO
- if (ahc->tag == BUS_SPACE_MEMIO) {
- writeb(val, ahc->bsh.maddr + port);
} else {
outb(val, ahc->bsh.ioport + port);
}
@@ -741,6 +691,12 @@
static __inline void ahc_lock(struct ahc_softc *, unsigned long *flags);
static __inline void ahc_unlock(struct ahc_softc *, unsigned long *flags);
+/* Lock acquisition and release of the above lock in midlayer entry points. */
+static __inline void ahc_midlayer_entrypoint_lock(struct ahc_softc *,
+ unsigned long *flags);
+static __inline void ahc_midlayer_entrypoint_unlock(struct ahc_softc *,
+ unsigned long *flags);
+
/* Lock held during command compeletion to the upper layer */
static __inline void ahc_done_lockinit(struct ahc_softc *);
static __inline void ahc_done_lock(struct ahc_softc *, unsigned long *flags);
@@ -752,7 +708,6 @@
static __inline void ahc_list_lock(unsigned long *flags);
static __inline void ahc_list_unlock(unsigned long *flags);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93)
static __inline void
ahc_lockinit(struct ahc_softc *ahc)
{
@@ -762,7 +717,6 @@
static __inline void
ahc_lock(struct ahc_softc *ahc, unsigned long *flags)
{
- *flags = 0;
spin_lock_irqsave(&ahc->platform_data->spin_lock, *flags);
}
@@ -773,102 +727,73 @@
}
static __inline void
-ahc_done_lockinit(struct ahc_softc *ahc)
-{
- /* We don't own the iorequest lock, so we don't initialize it. */
-}
-
-static __inline void
-ahc_done_lock(struct ahc_softc *ahc, unsigned long *flags)
-{
- *flags = 0;
- spin_lock_irqsave(&io_request_lock, *flags);
-}
-
-static __inline void
-ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
-{
- spin_unlock_irqrestore(&io_request_lock, *flags);
-}
-
-static __inline void
-ahc_list_lockinit()
-{
- spin_lock_init(&ahc_list_spinlock);
-}
-
-static __inline void
-ahc_list_lock(unsigned long *flags)
-{
- *flags = 0;
- spin_lock_irqsave(&ahc_list_spinlock, *flags);
-}
-
-static __inline void
-ahc_list_unlock(unsigned long *flags)
+ahc_midlayer_entrypoint_lock(struct ahc_softc *ahc, unsigned long *flags)
{
- spin_unlock_irqrestore(&ahc_list_spinlock, *flags);
-}
-
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) */
-
-ahc_lockinit(struct ahc_softc *ahc)
-{
-}
-
-static __inline void
-ahc_lock(struct ahc_softc *ahc, unsigned long *flags)
-{
- *flags = 0;
- save_flags(*flags);
- cli();
+ /*
+ * In 2.5.X and some 2.4.X versions, the midlayer takes our
+ * lock just before calling us, so we avoid locking again.
+ * For other kernel versions, the io_request_lock is taken
+ * just before our entry point is called. In this case, we
+ * trade the io_request_lock for our per-softc lock.
+ */
+#if AHC_SCSI_HAS_HOST_LOCK == 0
+ spin_unlock(&io_request_lock);
+ spin_lock(&ahc->platform_data->spin_lock);
+#endif
}
static __inline void
-ahc_unlock(struct ahc_softc *ahc, unsigned long *flags)
+ahc_midlayer_entrypoint_unlock(struct ahc_softc *ahc, unsigned long *flags)
{
- restore_flags(*flags);
+#if AHC_SCSI_HAS_HOST_LOCK == 0
+ spin_unlock(&ahc->platform_data->spin_lock);
+ spin_lock(&io_request_lock);
+#endif
}
static __inline void
ahc_done_lockinit(struct ahc_softc *ahc)
{
+ /*
+ * In 2.5.X, our own lock is held during completions.
+ * In previous versions, the io_request_lock is used.
+ * In either case, we can't initialize this lock again.
+ */
}
static __inline void
ahc_done_lock(struct ahc_softc *ahc, unsigned long *flags)
{
- /*
- * The done lock is always held while
- * the ahc lock is held so blocking
- * interrupts again would have no effect.
- */
+#if AHC_SCSI_HAS_HOST_LOCK == 0
+ spin_lock_irqsave(&io_request_lock, *flags);
+#endif
}
static __inline void
ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
{
+#if AHC_SCSI_HAS_HOST_LOCK == 0
+ spin_unlock_irqrestore(&io_request_lock, *flags);
+#endif
}
static __inline void
-ahc_list_lockinit()
+ahc_list_lockinit(void)
{
+ spin_lock_init(&ahc_list_spinlock);
}
static __inline void
ahc_list_lock(unsigned long *flags)
{
- *flags = 0;
- save_flags(*flags);
- cli();
+ spin_lock_irqsave(&ahc_list_spinlock, *flags);
}
static __inline void
ahc_list_unlock(unsigned long *flags)
{
- restore_flags(*flags);
+ spin_unlock_irqrestore(&ahc_list_spinlock, *flags);
}
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) */
/******************************* PCI Definitions ******************************/
/*
@@ -889,6 +814,7 @@
#define PCIM_CMD_BUSMASTEREN 0x0004
#define PCIM_CMD_MWRICEN 0x0010
#define PCIM_CMD_PERRESPEN 0x0040
+#define PCIM_CMD_SERRESPEN 0x0100
#define PCIR_STATUS 0x06
#define PCIR_REVID 0x08
#define PCIR_PROGIF 0x09
@@ -918,26 +844,28 @@
AHC_POWER_STATE_D3
} ahc_power_state;
-void ahc_power_state_change(struct ahc_softc *ahc,
- ahc_power_state new_state);
/**************************** VL/EISA Routines ********************************/
-int aic7770_linux_probe(Scsi_Host_Template *);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) \
+ && (defined(__i386__) || defined(__alpha__)) \
+ && (!defined(CONFIG_EISA)))
+#define CONFIG_EISA
+#endif
+
+#ifdef CONFIG_EISA
+extern uint32_t aic7xxx_probe_eisa_vl;
+void ahc_linux_eisa_init(void);
+void ahc_linux_eisa_exit(void);
int aic7770_map_registers(struct ahc_softc *ahc,
u_int port);
int aic7770_map_int(struct ahc_softc *ahc, u_int irq);
-
-/******************************* PCI Routines *********************************/
-/*
- * We need to use the bios32.h routines if we are kernel version 2.1.92 or less.
- */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,1,92)
-#if defined(__sparc_v9__) || defined(__powerpc__)
-#error "PPC and Sparc platforms are only support under 2.1.92 and above"
-#endif
-#include <linux/bios32.h>
#endif
-int ahc_linux_pci_probe(Scsi_Host_Template *);
+/******************************* PCI Routines *********************************/
+#ifdef CONFIG_PCI
+void ahc_power_state_change(struct ahc_softc *ahc,
+ ahc_power_state new_state);
+int ahc_linux_pci_init(void);
+void ahc_linux_pci_exit(void);
int ahc_pci_map_registers(struct ahc_softc *ahc);
int ahc_pci_map_int(struct ahc_softc *ahc);
@@ -1017,6 +945,7 @@
{
return (pci->bus->number);
}
+#endif
static __inline void ahc_flush_device_writes(struct ahc_softc *);
static __inline void
@@ -1036,38 +965,104 @@
#define pci_unmap_single(pdev, buffer, buflen, direction)
#endif
-/*********************** Transaction Access Wrappers **************************/
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,3)
+#define ahc_pci_set_dma_mask pci_set_dma_mask
+#else
+/*
+ * Always "return" 0 for success.
+ */
+#define ahc_pci_set_dma_mask(dev_softc, mask) \
+ (((dev_softc)->dma_mask = mask) && 0)
+#endif
+/**************************** Proc FS Support *********************************/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+int ahc_linux_proc_info(char *, char **, off_t, int, int, int);
+#else
+int ahc_linux_proc_info(struct Scsi_Host *, char *, char **,
+ off_t, int, int);
+#endif
+
+/*************************** Domain Validation ********************************/
+#define AHC_DV_CMD(cmd) ((cmd)->scsi_done == ahc_linux_dv_complete)
+#define AHC_DV_SIMQ_FROZEN(ahc) \
+ ((((ahc)->platform_data->flags & AHC_DV_ACTIVE) != 0) \
+ && (ahc)->platform_data->qfrozen == 1)
+
+/*********************** Transaction Access Wrappers *************************/
+static __inline void ahc_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
static __inline void ahc_set_transaction_status(struct scb *, uint32_t);
+static __inline void ahc_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
+static __inline void ahc_set_scsi_status(struct scb *, uint32_t);
+static __inline uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahc_get_transaction_status(struct scb *);
+static __inline uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahc_get_scsi_status(struct scb *);
+static __inline void ahc_set_transaction_tag(struct scb *, int, u_int);
+static __inline u_long ahc_get_transfer_length(struct scb *);
+static __inline int ahc_get_transfer_dir(struct scb *);
+static __inline void ahc_set_residual(struct scb *, u_long);
+static __inline void ahc_set_sense_residual(struct scb *scb, u_long resid);
+static __inline u_long ahc_get_residual(struct scb *);
+static __inline u_long ahc_get_sense_residual(struct scb *);
+static __inline int ahc_perform_autosense(struct scb *);
+static __inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *,
+ struct scb *);
+static __inline void ahc_notify_xfer_settings_change(struct ahc_softc *,
+ struct ahc_devinfo *);
+static __inline void ahc_platform_scb_free(struct ahc_softc *ahc,
+ struct scb *scb);
+static __inline void ahc_freeze_scb(struct scb *scb);
+
+static __inline
+void ahc_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
+{
+ cmd->result &= ~(CAM_STATUS_MASK << 16);
+ cmd->result |= status << 16;
+}
+
static __inline
void ahc_set_transaction_status(struct scb *scb, uint32_t status)
{
- scb->io_ctx->result &= ~(CAM_STATUS_MASK << 16);
- scb->io_ctx->result |= status << 16;
+ ahc_cmd_set_transaction_status(scb->io_ctx,status);
+}
+
+static __inline
+void ahc_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
+{
+ cmd->result &= ~0xFFFF;
+ cmd->result |= status;
}
-static __inline void ahc_set_scsi_status(struct scb *, uint32_t);
static __inline
void ahc_set_scsi_status(struct scb *scb, uint32_t status)
{
- scb->io_ctx->result &= ~0xFFFF;
- scb->io_ctx->result |= status;
+ ahc_cmd_set_scsi_status(scb->io_ctx, status);
+}
+
+static __inline
+uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd)
+{
+ return ((cmd->result >> 16) & CAM_STATUS_MASK);
}
-static __inline uint32_t ahc_get_transaction_status(struct scb *);
static __inline
uint32_t ahc_get_transaction_status(struct scb *scb)
{
- return ((scb->io_ctx->result >> 16) & CAM_STATUS_MASK);
+ return (ahc_cmd_get_transaction_status(scb->io_ctx));
+}
+
+static __inline
+uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd)
+{
+ return (cmd->result & 0xFFFF);
}
-static __inline uint32_t ahc_get_scsi_status(struct scb *);
static __inline
uint32_t ahc_get_scsi_status(struct scb *scb)
{
- return (scb->io_ctx->result & 0xFFFF);
+ return (ahc_cmd_get_scsi_status(scb->io_ctx));
}
-static __inline void ahc_set_transaction_tag(struct scb *, int, u_int);
static __inline
void ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type)
{
@@ -1077,14 +1072,12 @@
*/
}
-static __inline u_long ahc_get_transfer_length(struct scb *);
static __inline
u_long ahc_get_transfer_length(struct scb *scb)
{
return (scb->platform_data->xfer_len);
}
-static __inline int ahc_get_transfer_dir(struct scb *);
static __inline
int ahc_get_transfer_dir(struct scb *scb)
{
@@ -1109,7 +1102,6 @@
#endif
}
-static __inline void ahc_set_residual(struct scb *, u_long);
static __inline
void ahc_set_residual(struct scb *scb, u_long resid)
{
@@ -1120,14 +1112,12 @@
#endif
}
-static __inline void ahc_set_sense_residual(struct scb *, u_long);
static __inline
void ahc_set_sense_residual(struct scb *scb, u_long resid)
{
- /* This can't be reported in Linux */
+ scb->platform_data->sense_resid = resid;
}
-static __inline u_long ahc_get_residual(struct scb *);
static __inline
u_long ahc_get_residual(struct scb *scb)
{
@@ -1138,7 +1128,12 @@
#endif
}
-static __inline int ahc_perform_autosense(struct scb *);
+static __inline
+u_long ahc_get_sense_residual(struct scb *scb)
+{
+ return (scb->platform_data->sense_resid);
+}
+
static __inline
int ahc_perform_autosense(struct scb *scb)
{
@@ -1156,8 +1151,6 @@
return (sizeof(struct scsi_sense_data));
}
-static __inline void ahc_notify_xfer_settings_change(struct ahc_softc *,
- struct ahc_devinfo *);
static __inline void
ahc_notify_xfer_settings_change(struct ahc_softc *ahc,
struct ahc_devinfo *devinfo)
@@ -1165,8 +1158,6 @@
/* Nothing to do here for linux */
}
-static __inline void ahc_platform_scb_free(struct ahc_softc *ahc,
- struct scb *scb);
static __inline void
ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb)
{
@@ -1176,11 +1167,14 @@
int ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg);
void ahc_platform_free(struct ahc_softc *ahc);
void ahc_platform_freeze_devq(struct ahc_softc *ahc, struct scb *scb);
-static __inline void ahc_freeze_scb(struct scb *scb);
+
static __inline void
ahc_freeze_scb(struct scb *scb)
{
- /* Noting to do here for linux */
+ if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) {
+ scb->io_ctx->result |= CAM_DEV_QFRZN << 16;
+ scb->platform_data->dev->qfrozen++;
+ }
}
void ahc_platform_set_tags(struct ahc_softc *ahc,
@@ -1188,7 +1182,8 @@
int ahc_platform_abort_scbs(struct ahc_softc *ahc, int target,
char channel, int lun, u_int tag,
role_t role, uint32_t status);
-void ahc_linux_isr(int irq, void *dev_id, struct pt_regs * regs);
+irqreturn_t
+ ahc_linux_isr(int irq, void *dev_id, struct pt_regs * regs);
void ahc_platform_flushwork(struct ahc_softc *ahc);
int ahc_softc_comp(struct ahc_softc *, struct ahc_softc *);
void ahc_done(struct ahc_softc*, struct scb*);
@@ -1203,5 +1198,5 @@
#define AHC_PCI_CONFIG 0
#endif
#define bootverbose aic7xxx_verbose
-extern int aic7xxx_verbose;
+extern u_int aic7xxx_verbose;
#endif /* _AIC7XXX_LINUX_H_ */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)