Sync up drivers/scsi/aic7xxx
PATCH 26/28 Sync up drivers/scsi/aic7xxx
Sync up drivers/scsi/aic7xxx/. (4030-4071)
==== //depot/aic7xxx/aic7xxx/aic79xx.reg#76 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx.reg ====
home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx.reg renamed from tmp/tmp.28265.0 +25 -4
@@ -1,7 +1,7 @@ /* * Aic79xx register and scratch ram definitions. * - * Copyright (c) 1994-2001 Justin T. Gibbs. + * Copyright (c) 1994-2001, 2004 Justin T. Gibbs. * Copyright (c) 2000-2002 Adaptec Inc. * All rights reserved. *
@@ -39,7 +39,7 @@ * * $FreeBSD$ */ -VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $" +VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $" /* * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -3715,8 +3715,9 @@ SEQ_FLAGS2 { size 1 - field TARGET_MSG_PENDING 0x02 - field SELECTOUT_QFROZEN 0x04 + field PENDING_MK_MESSAGE 0x01 + field TARGET_MSG_PENDING 0x02 + field SELECTOUT_QFROZEN 0x04 } ALLOCFIFO_SCBPTR {
@@ -3777,6 +3778,26 @@ CMDSIZE_TABLE { size 8 } + /* + * When an SCB with the MK_MESSAGE flag is + * queued to the controller, it cannot enter + * the waiting for selection list until the + * selections for any previously queued + * commands to that target complete. During + * the wait, the MK_MESSAGE SCB is queued + * here. + */ + MK_MESSAGE_SCB { + size 2 + } + /* + * Saved SCSIID of MK_MESSAGE_SCB to avoid + * an extra SCBPTR operation when deciding + * if the MK_MESSAGE_SCB can be run. + */ + MK_MESSAGE_SCSIID { + size 1 + } } /************************* Hardware SCB Definition ****************************/
==== //depot/aic7xxx/aic7xxx/aic79xx.seq#119 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx.seq ====
home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx.seq renamed from tmp/tmp.28265.1 +120 -23
235 lines not on this page · raw message
==== //depot/aic7xxx/aic7xxx/aic79xx.c#247 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_core.c ====
home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_core.c renamed from tmp/tmp.28265.2 +196 -79
529 lines not on this page · raw message
==== //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_inline.h ====
home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_inline.h renamed from tmp/tmp.28265.3 +4 -3
@@ -37,7 +37,7 @@* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -* $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 $ +* $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#59 $ * * $FreeBSD$ */
@@ -804,9 +804,10 @@uint64_t host_dataptr; host_dataptr =aic_le64toh (scb->hscb->dataptr); -printf ("%s: Queueing SCB 0x%x bus addr 0x%x - 0x%x%x/0x%x\n" , +printf ("%s: Queueing SCB %d:0x%x bus addr 0x%x - 0x%x%x/0x%x\n" ,ahd_name (ahd), -SCB_GET_TAG (scb),aic_le32toh (scb->hscb->hscb_busaddr), +SCB_GET_TAG (scb), scb->hscb->scsiid, +aic_le32toh (scb->hscb->hscb_busaddr), (u_int)((host_dataptr >>32 ) &0xFFFFFFFF ), (u_int)(host_dataptr &0xFFFFFFFF ),aic_le32toh (scb->hscb->datacnt));
==== //depot/aic7xxx/aic7xxx/aic79xx_pci.c#89 - /home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_pci.c ====
home/luben/projects/linux/2.6/linux-2.5/drivers/scsi/aic7xxx/aic79xx_pci.c renamed from tmp/tmp.28265.4 +3 -2
@@ -38,7 +38,7 @@* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -* $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#89 $ +* $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#90 $ */ #ifdef __linux__
@@ -996,7 +996,8 @@u_int devconfig1; ahd->features |=AHD_RTI |AHD_NEW_IOCELL_OPTS - |AHD_NEW_DFCNTRL_OPTS |AHD_FAST_CDB_DELIVERY ; + |AHD_NEW_DFCNTRL_OPTS |AHD_FAST_CDB_DELIVERY + |AHD_BUSFREEREV_BUG ; ahd->bugs |=AHD_LQOOVERRUN_BUG |AHD_EARLY_REQ_BUG ;/*