Commit fd30b79d authored by Justin T. Gibbs's avatar Justin T. Gibbs

Update Aic79xx Driver

 o Fix async negotiation bug when the initial bus reset is
   disabled if the target device rejects our WDTR of 0.
 o Fix driver initialization hang if the PCI cacheline size is 0.
 o Fix typos.
 o Fix printf arguments to work in both C99 and C89 environments. 
parent 8ab9f40f
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#79 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#81 $
* *
* $FreeBSD$ * $FreeBSD$
*/ */
...@@ -737,7 +737,7 @@ struct ahd_tmode_lstate; ...@@ -737,7 +737,7 @@ struct ahd_tmode_lstate;
#define AHD_WIDTH_UNKNOWN 0xFF #define AHD_WIDTH_UNKNOWN 0xFF
#define AHD_PERIOD_UNKNOWN 0xFF #define AHD_PERIOD_UNKNOWN 0xFF
#define AHD_OFFSET_UNKNOWN 0x0 #define AHD_OFFSET_UNKNOWN 0xFF
#define AHD_PPR_OPTS_UNKNOWN 0xFF #define AHD_PPR_OPTS_UNKNOWN 0xFF
/* /*
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
* *
* $FreeBSD$ * $FreeBSD$
*/ */
VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#60 $" VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#61 $"
/* /*
* This file is processed by the aic7xxx_asm utility for use in assembling * This file is processed by the aic7xxx_asm utility for use in assembling
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#161 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#163 $
* *
* $FreeBSD$ * $FreeBSD$
*/ */
...@@ -5168,7 +5168,7 @@ ahd_init_scbdata(struct ahd_softc *ahd) ...@@ -5168,7 +5168,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
scb_data->init_level++; scb_data->init_level++;
/* DMA tag for our S/G structures. */ /* DMA tag for our S/G structures. */
if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1, if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/8,
/*boundary*/BUS_SPACE_MAXADDR_32BIT + 1, /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
/*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
/*highaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR,
...@@ -6351,7 +6351,7 @@ ahd_default_config(struct ahd_softc *ahd) ...@@ -6351,7 +6351,7 @@ ahd_default_config(struct ahd_softc *ahd)
#else #else
tinfo->user.period = AHD_SYNCRATE_160; tinfo->user.period = AHD_SYNCRATE_160;
#endif #endif
tinfo->user.offset= ~0; tinfo->user.offset = MAX_OFFSET;
tinfo->user.ppr_options = MSG_EXT_PPR_RD_STRM tinfo->user.ppr_options = MSG_EXT_PPR_RD_STRM
| MSG_EXT_PPR_WR_FLOW | MSG_EXT_PPR_WR_FLOW
| MSG_EXT_PPR_HOLD_MCS | MSG_EXT_PPR_HOLD_MCS
...@@ -8161,7 +8161,7 @@ ahd_loadseq(struct ahd_softc *ahd) ...@@ -8161,7 +8161,7 @@ ahd_loadseq(struct ahd_softc *ahd)
/* Start by aligning to the nearest cacheline. */ /* Start by aligning to the nearest cacheline. */
sg_prefetch_align = ahd->pci_cachesize; sg_prefetch_align = ahd->pci_cachesize;
if (sg_prefetch_align == 0) if (sg_prefetch_align == 0)
sg_prefetch_cnt = 8; sg_prefetch_align = 8;
/* Round down to the nearest power of 2. */ /* Round down to the nearest power of 2. */
while (powerof2(sg_prefetch_align) == 0) while (powerof2(sg_prefetch_align) == 0)
sg_prefetch_align--; sg_prefetch_align--;
......
/* /*
* Adaptec AIC79xx device driver for Linux. * Adaptec AIC79xx device driver for Linux.
* *
* $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#123 $ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#124 $
* *
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Copyright (c) 1994-2000 Justin T. Gibbs. * Copyright (c) 1994-2000 Justin T. Gibbs.
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#112 $ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#113 $
* *
*/ */
#ifndef _AIC79XX_LINUX_H_ #ifndef _AIC79XX_LINUX_H_
...@@ -947,7 +947,7 @@ void ahd_power_state_change(struct ahd_softc *ahd, ...@@ -947,7 +947,7 @@ void ahd_power_state_change(struct ahd_softc *ahd,
*/ */
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,1,92) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,1,92)
#if defined(__sparc_v9__) || defined(__powerpc__) #if defined(__sparc_v9__) || defined(__powerpc__)
#error "PPC and Sparc platforms are only support under 2.1.92 and above" #error "PPC and Sparc platforms are only supported under 2.1.92 and above"
#endif #endif
#include <linux/bios32.h> #include <linux/bios32.h>
#endif #endif
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES. * POSSIBILITY OF SUCH DAMAGES.
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#65 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#66 $
* *
* $FreeBSD$ * $FreeBSD$
*/ */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* from the following source files: * from the following source files:
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#60 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#61 $
*/ */
typedef int (ahd_reg_print_t)(u_int, u_int *, u_int); typedef int (ahd_reg_print_t)(u_int, u_int *, u_int);
typedef struct ahd_reg_parse_entry { typedef struct ahd_reg_parse_entry {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* from the following source files: * from the following source files:
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#60 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#61 $
*/ */
#include "aic79xx_osm.h" #include "aic79xx_osm.h"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* from the following source files: * from the following source files:
* *
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#86 $
* $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#60 $ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#61 $
*/ */
static uint8_t seqprog[] = { static uint8_t seqprog[] = {
0xff, 0x02, 0x06, 0x78, 0xff, 0x02, 0x06, 0x78,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment