# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1589 -> 1.1590
# drivers/scsi/scsiiom.c 1.4 -> 1.5
# drivers/scsi/tmscsim.h 1.4 -> 1.5
# drivers/scsi/tmscsim.c 1.26 -> 1.27
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/02/22 hch@bird.bsdonline.org 1.1590
# kill dc390 internal queue
# --------------------------------------------
#
diff -Nru a/drivers/scsi/scsiiom.c b/drivers/scsi/scsiiom.c
--- a/drivers/scsi/scsiiom.c Sun Feb 22 19:08:31 2004
+++ b/drivers/scsi/scsiiom.c Sun Feb 22 19:08:31 2004
@@ -1150,7 +1150,6 @@
pSRB = psrb;
}
pDCB->pGoingSRB = 0;
- dc390_Query_to_Waiting (pACB);
dc390_Waiting_process (pACB);
}
else
@@ -1632,7 +1631,6 @@
pcmd->scsi_done (pcmd);
DC390_LOCK_ACB_NI;
- dc390_Query_to_Waiting (pACB);
dc390_Waiting_process (pACB);
return;
}
@@ -1679,7 +1677,6 @@
pdcb->TagMask = 0;
pdcb = pdcb->pNextDCB;
} while( pdcb != pDCB );
- dc390_Query_to_Waiting (pACB);
}
diff -Nru a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
--- a/drivers/scsi/tmscsim.c Sun Feb 22 19:08:31 2004
+++ b/drivers/scsi/tmscsim.c Sun Feb 22 19:08:31 2004
@@ -753,37 +753,6 @@
return q;
}
#endif
-
-
-/* Append to Query List */
-static void dc390_Query_append( PSCSICMD cmd, PACB pACB )
-{
- dc390_cmd_scp_t *cmdq = (dc390_cmd_scp_t *)&cmd->SCp;
-
- DEBUG0(printk ("DC390: Append cmd %li to Query\n", cmd->pid));
-
- list_add_tail(&cmdq->list, &pACB->cmdq);
- pACB->QueryCnt++;
- pACB->CmdOutOfSRB++;
-}
-
-
-/* Return next cmd from Query list */
-static PSCSICMD dc390_Query_get ( PACB pACB )
-{
- PSCSICMD pcmd;
- dc390_cmd_scp_t *cmdq;
- if (list_empty(&pACB->cmdq))
- return NULL;
-
- pcmd = (PSCSICMD) list_entry(pACB->cmdq.next, struct scsi_cmnd_list, scp.list);
- DEBUG0(printk ("DC390: Get cmd %li from Query\n", pcmd->pid));
- cmdq = (dc390_cmd_scp_t *)&pcmd->SCp;
- list_del(&cmdq->list);
- pACB->QueryCnt--;
- return pcmd;
-}
-
/* Return next free SRB */
static __inline__ PSRB dc390_Free_get ( PACB pACB )
@@ -1115,38 +1084,6 @@
/* KG: deferred PCI mapping to dc390_StartSCSI */
}
-/* Put cmnd from Query to Waiting list and send next Waiting cmnd */
-static void dc390_Query_to_Waiting (PACB pACB)
-{
- Scsi_Cmnd *pcmd;
- PSRB pSRB;
- PDCB pDCB;
-
- if( pACB->ACBFlag & (RESET_DETECT+RESET_DONE+RESET_DEV) )
- return;
-
- while (pACB->QueryCnt)
- {
- pSRB = dc390_Free_get ( pACB );
- if (!pSRB) return;
- pcmd = dc390_Query_get ( pACB );
- if (!pcmd) { dc390_Free_insert (pACB, pSRB); return; } /* should not happen */
- pDCB = dc390_findDCB (pACB, pcmd->device->id, pcmd->device->lun);
- if (!pDCB)
- {
- dc390_Free_insert (pACB, pSRB);
- printk (KERN_ERR "DC390: Command in queue to non-existing device!\n");
- pcmd->result = MK_RES(DRIVER_ERROR,DID_ERROR,0,0);
- DC390_UNLOCK_ACB_NI;
- pcmd->done (pcmd);
- DC390_LOCK_ACB_NI;
- return;
- }
- dc390_BuildSRB (pcmd, pDCB, pSRB);
- dc390_Waiting_append ( pDCB, pSRB );
- }
-}
-
/***********************************************************************
* Function : static int DC390_queue_command (Scsi_Cmnd *cmd,
* void (*done)(Scsi_Cmnd *))
@@ -1255,20 +1192,12 @@
pACB->Cmds++;
cmd->scsi_done = done;
cmd->result = 0;
-
- dc390_Query_to_Waiting (pACB);
-
- if( pACB->QueryCnt ) /* Unsent commands ? */
- {
- DEBUG0(printk ("DC390: QueryCnt != 0\n"));
- dc390_Query_append ( cmd, pACB );
- dc390_Waiting_process (pACB);
- }
- else if (pDCB->pWaitingSRB)
+ if (pDCB->pWaitingSRB)
{
pSRB = dc390_Free_get ( pACB );
DEBUG0(if (!pSRB) printk ("DC390: No free SRB but Waiting\n"); else printk ("DC390: Free SRB w/ Waiting\n"));
- if (!pSRB) dc390_Query_append (cmd, pACB);
+ if (!pSRB)
+ return 1;
else
{
dc390_BuildSRB (cmd, pDCB, pSRB);
@@ -1282,8 +1211,8 @@
DEBUG0(if (!pSRB) printk ("DC390: No free SRB w/o Waiting\n"); else printk ("DC390: Free SRB w/o Waiting\n"));
if (!pSRB)
{
- dc390_Query_append (cmd, pACB);
dc390_Waiting_process (pACB);
+ return 1;
}
else
{
@@ -1501,21 +1430,6 @@
printk ("DC390: Abort command (pid %li, Device %02i-%02i)\n",
cmd->pid, cmd->device->id, cmd->device->lun);
- /* First scan Query list */
- if( pACB->QueryCnt )
- {
- struct scsi_cmnd_list *t, *pcmd_l;
- list_for_each_entry_safe(pcmd_l, t, &pACB->cmdq, scp.list)
- if( (struct scsi_cmnd*)pcmd_l == cmd )
- {
- /* Found: Dequeue */
- list_del(&pcmd_l->scp.list);
- pACB->QueryCnt--;
- status = SCSI_ABORT_SUCCESS;
- goto ABO_X;
- }
- }
-
pDCB = dc390_findDCB (pACB, cmd->device->id, cmd->device->lun);
if( !pDCB ) goto NOT_RUN;
@@ -1973,8 +1887,6 @@
pACB->pActiveDCB = NULL;
pACB->pFreeSRB = pACB->SRB_array;
pACB->SRBCount = MAX_SRB_CNT;
- pACB->QueryCnt = 0;
- INIT_LIST_HEAD(&pACB->cmdq);
pACB->AdapterIndex = index;
pACB->status = 0;
psh->this_id = dc390_eepromBuf[index][EE_ADAPT_SCSI_ID];
@@ -2776,7 +2688,6 @@
{
int dev, spd, spd1;
char *pos = buffer;
- struct scsi_cmnd_list *cl;
PACB pACB;
PDCB pDCB;
DC390_AFLAGS;
@@ -2847,9 +2758,6 @@
SPRINTF (" %02i\n", pDCB->MaxCommand);
pDCB = pDCB->pNextDCB;
}
- SPRINTF ("Commands in Queues: Query: %li:", pACB->QueryCnt);
- list_for_each_entry(cl, &pACB->cmdq, scp.list)
- SPRINTF (" %li", ((struct scsi_cmnd*)cl)->pid);
if (timer_pending(&pACB->Waiting_Timer)) SPRINTF ("Waiting queue timer running\n");
else SPRINTF ("\n");
pDCB = pACB->pLinkDCB;
diff -Nru a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h
--- a/drivers/scsi/tmscsim.h Sun Feb 22 19:08:31 2004
+++ b/drivers/scsi/tmscsim.h Sun Feb 22 19:08:31 2004
@@ -214,16 +214,12 @@
PSRB pTmpSRB;
/* 0x2c: */
-ULONG QueryCnt;
-struct list_head cmdq;
-
-/* 0x38: */
UCHAR msgin123[4];
UCHAR DCBmap[MAX_SCSI_ID];
UCHAR Connected;
UCHAR pad;
-/* 0x3c: */
+/* 0x30: */
#if defined(USE_SPINLOCKS) && USE_SPINLOCKS > 1 && (defined(CONFIG_SMP) || DEBUG_SPINLOCKS > 0)
spinlock_t lock;
#endif
@@ -234,20 +230,20 @@
UCHAR Ignore_IRQ; /* Not used */
PDEVDECL1; /* Pointer to PCI cfg. space */
-/* 0x4c/0x48: */
+/* 0x40/0x3c: */
ULONG Cmds;
UINT SelLost;
UINT SelConn;
UINT CmdInQ;
UINT CmdOutOfSRB;
-/* 0x60/0x5c: */
+/* 0x54/0x50: */
struct timer_list Waiting_Timer;
-/* 0x74/0x70: */
+/* 0x68/0x64: */
DC390_SRB TmpSRB;
-/* 0xd8/0xd4: */
+/* 0xcc/0xc8: */
DC390_SRB SRB_array[MAX_SRB_CNT]; /* 50 SRBs */
-/* 0xfb0/0xfac: */
+/* 0xfa4/0xfa0: */
};
typedef struct _ACB DC390_ACB, *PACB;
@@ -406,15 +402,8 @@
* SISC query queue
*/
typedef struct {
- struct list_head list;
dma_addr_t saved_dma_handle;
} dc390_cmd_scp_t;
-
-struct scsi_cmnd_list
-{
- char dummy[offsetof(struct scsi_cmnd, SCp)];
- dc390_cmd_scp_t scp;
-};
/*
** Inquiry Data format