From 76744f429a178ad2df06b722e5e7bbbf1b5245ee Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 8 Mar 2006 13:00:07 +0100 Subject: [SCSI] aic79xx: Avoid renegotiation on inquiry Because of some quirk in the SCSI spec the aic79xx driver chose to force a renegotiation when sending an inquiry. This should better be handled by the upper layers if required at all. Signed-off-by: Hannes Reinecke Signed-off-by: James Bottomley --- drivers/scsi/aic7xxx/aic79xx_osm.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'drivers/scsi/aic7xxx') diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 0fbd1ec58340..bcced0a417e6 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -1526,30 +1526,6 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev, if ((tstate->auto_negotiate & mask) != 0) { scb->flags |= SCB_AUTO_NEGOTIATE; scb->hscb->control |= MK_MESSAGE; - } else if (cmd->cmnd[0] == INQUIRY - && (tinfo->curr.offset != 0 - || tinfo->curr.width != MSG_EXT_WDTR_BUS_8_BIT - || tinfo->curr.ppr_options != 0) - && (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ)==0) { - /* - * The SCSI spec requires inquiry - * commands to complete without - * reporting unit attention conditions. - * Because of this, an inquiry command - * that occurs just after a device is - * reset will result in a data phase - * with mismatched negotiated rates. - * The core already forces a renegotiation - * for reset events that are visible to - * our controller or that we initiate, - * but a third party device reset or a - * hot-plug insertion can still cause this - * issue. Therefore, we force a re-negotiation - * for every inquiry command unless we - * are async. - */ - scb->flags |= SCB_NEGOTIATE; - scb->hscb->control |= MK_MESSAGE; } if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) { -- cgit v1.2.3