]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/scsi/aic7xxx/aic79xx_osm.c
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[linux-2.6-omap-h63xx.git] / drivers / scsi / aic7xxx / aic79xx_osm.c
index 4eb7bba24a68ea142c78318424d925de5142e629..66e4a47bb9ee3fe85d72f6c2e0679d759dbd1fd6 100644 (file)
@@ -373,7 +373,7 @@ static void ahd_linux_handle_scsi_status(struct ahd_softc *,
                                         struct scb *);
 static void ahd_linux_queue_cmd_complete(struct ahd_softc *ahd,
                                         struct scsi_cmnd *cmd);
-static int  ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
+static int ahd_linux_queue_abort_cmd(struct scsi_cmnd *cmd);
 static void ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd);
 static u_int ahd_linux_user_tagdepth(struct ahd_softc *ahd,
                                     struct ahd_devinfo *devinfo);
@@ -481,6 +481,7 @@ ahd_linux_target_alloc(struct scsi_target *starget)
 {
        struct  ahd_softc *ahd =
                *((struct ahd_softc **)dev_to_shost(&starget->dev)->hostdata);
+       struct seeprom_config *sc = ahd->seep_config;
        unsigned long flags;
        struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);
        struct ahd_linux_target *targ = scsi_transport_target_data(starget);
@@ -496,18 +497,38 @@ ahd_linux_target_alloc(struct scsi_target *starget)
        *ahd_targp = starget;
        memset(targ, 0, sizeof(*targ));
 
+       if (sc) {
+               int flags = sc->device_flags[starget->id];
+
+               tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
+                                           starget->id, &tstate);
+
+               if ((flags  & CFPACKETIZED) == 0) {
+                       /* Do not negotiate packetized transfers */
+                       spi_rd_strm(starget) = 0;
+                       spi_pcomp_en(starget) = 0;
+                       spi_rti(starget) = 0;
+                       spi_wr_flow(starget) = 0;
+                       spi_hold_mcs(starget) = 0;
+               } else {
+                       if ((ahd->features & AHD_RTI) == 0)
+                               spi_rti(starget) = 0;
+               }
+
+               if ((flags & CFQAS) == 0)
+                       spi_qas(starget) = 0;
+
+               /* Transinfo values have been set to BIOS settings */
+               spi_max_width(starget) = (flags & CFWIDEB) ? 1 : 0;
+               spi_min_period(starget) = tinfo->user.period;
+               spi_max_offset(starget) = tinfo->user.offset;
+       }
+
        tinfo = ahd_fetch_transinfo(ahd, channel, ahd->our_id,
                                    starget->id, &tstate);
        ahd_compile_devinfo(&devinfo, ahd->our_id, starget->id,
                            CAM_LUN_WILDCARD, channel,
                            ROLE_INITIATOR);
-       spi_min_period(starget) = AHD_SYNCRATE_MAX; /* We can do U320 */
-       if ((ahd->bugs & AHD_PACED_NEGTABLE_BUG) != 0)
-               spi_max_offset(starget) = MAX_OFFSET_PACED_BUG;
-       else
-               spi_max_offset(starget) = MAX_OFFSET_PACED;
-       spi_max_width(starget) = ahd->features & AHD_WIDE;
-
        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
                         AHD_TRANS_GOAL, /*paused*/FALSE);
        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
@@ -648,10 +669,9 @@ static int
 ahd_linux_abort(struct scsi_cmnd *cmd)
 {
        int error;
+       
+       error = ahd_linux_queue_abort_cmd(cmd);
 
-       error = ahd_linux_queue_recovery_cmd(cmd, SCB_ABORT);
-       if (error != 0)
-               printf("aic79xx_abort returns 0x%x\n", error);
        return error;
 }
 
@@ -661,12 +681,97 @@ ahd_linux_abort(struct scsi_cmnd *cmd)
 static int
 ahd_linux_dev_reset(struct scsi_cmnd *cmd)
 {
-       int error;
+       struct ahd_softc *ahd;
+       struct ahd_linux_device *dev;
+       struct scb *reset_scb;
+       u_int  cdb_byte;
+       int    retval = SUCCESS;
+       int    paused;
+       int    wait;
+       struct  ahd_initiator_tinfo *tinfo;
+       struct  ahd_tmode_tstate *tstate;
+       unsigned long flags;
+       DECLARE_COMPLETION(done);
 
-       error = ahd_linux_queue_recovery_cmd(cmd, SCB_DEVICE_RESET);
-       if (error != 0)
-               printf("aic79xx_dev_reset returns 0x%x\n", error);
-       return error;
+       reset_scb = NULL;
+       paused = FALSE;
+       wait = FALSE;
+       ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+
+       scmd_printk(KERN_INFO, cmd,
+                   "Attempting to queue a TARGET RESET message:");
+
+       printf("CDB:");
+       for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
+               printf(" 0x%x", cmd->cmnd[cdb_byte]);
+       printf("\n");
+
+       /*
+        * Determine if we currently own this command.
+        */
+       dev = scsi_transport_device_data(cmd->device);
+
+       if (dev == NULL) {
+               /*
+                * No target device for this command exists,
+                * so we must not still own the command.
+                */
+               scmd_printk(KERN_INFO, cmd, "Is not an active device\n");
+               return SUCCESS;
+       }
+
+       /*
+        * Generate us a new SCB
+        */
+       reset_scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX);
+       if (!reset_scb) {
+               scmd_printk(KERN_INFO, cmd, "No SCB available\n");
+               return FAILED;
+       }
+
+       tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
+                                   cmd->device->id, &tstate);
+       reset_scb->io_ctx = cmd;
+       reset_scb->platform_data->dev = dev;
+       reset_scb->sg_count = 0;
+       ahd_set_residual(reset_scb, 0);
+       ahd_set_sense_residual(reset_scb, 0);
+       reset_scb->platform_data->xfer_len = 0;
+       reset_scb->hscb->control = 0;
+       reset_scb->hscb->scsiid = BUILD_SCSIID(ahd,cmd);
+       reset_scb->hscb->lun = cmd->device->lun;
+       reset_scb->hscb->cdb_len = 0;
+       reset_scb->hscb->task_management = SIU_TASKMGMT_LUN_RESET;
+       reset_scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
+       if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
+               reset_scb->flags |= SCB_PACKETIZED;
+       } else {
+               reset_scb->hscb->control |= MK_MESSAGE;
+       }
+       dev->openings--;
+       dev->active++;
+       dev->commands_issued++;
+
+       ahd_lock(ahd, &flags);
+
+       LIST_INSERT_HEAD(&ahd->pending_scbs, reset_scb, pending_links);
+       ahd_queue_scb(ahd, reset_scb);
+
+       ahd->platform_data->eh_done = &done;
+       ahd_unlock(ahd, &flags);
+
+       printf("%s: Device reset code sleeping\n", ahd_name(ahd));
+       if (!wait_for_completion_timeout(&done, 5 * HZ)) {
+               ahd_lock(ahd, &flags);
+               ahd->platform_data->eh_done = NULL;
+               ahd_unlock(ahd, &flags);
+               printf("%s: Device reset timer expired (active %d)\n",
+                      ahd_name(ahd), dev->active);
+               retval = FAILED;
+       }
+       printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval);
+
+       return (retval);
 }
 
 /*
@@ -677,6 +782,7 @@ ahd_linux_bus_reset(struct scsi_cmnd *cmd)
 {
        struct ahd_softc *ahd;
        int    found;
+       unsigned long flags;
 
        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 #ifdef AHD_DEBUG
@@ -684,8 +790,11 @@ ahd_linux_bus_reset(struct scsi_cmnd *cmd)
                printf("%s: Bus reset called for cmd %p\n",
                       ahd_name(ahd), cmd);
 #endif
+       ahd_lock(ahd, &flags);
+
        found = ahd_reset_channel(ahd, scmd_channel(cmd) + 'A',
                                  /*initiate reset*/TRUE);
+       ahd_unlock(ahd, &flags);
 
        if (bootverbose)
                printf("%s: SCSI bus reset delivered. "
@@ -802,59 +911,6 @@ ahd_dmamap_unload(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
 }
 
 /********************* Platform Dependent Functions ***************************/
-/*
- * Compare "left hand" softc with "right hand" softc, returning:
- * < 0 - lahd has a lower priority than rahd
- *   0 - Softcs are equal
- * > 0 - lahd has a higher priority than rahd
- */
-int
-ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd)
-{
-       int     value;
-
-       /*
-        * Under Linux, cards are ordered as follows:
-        *      1) PCI devices that are marked as the boot controller.
-        *      2) PCI devices with BIOS enabled sorted by bus/slot/func.
-        *      3) All remaining PCI devices sorted by bus/slot/func.
-        */
-#if 0
-       value = (lahd->flags & AHD_BOOT_CHANNEL)
-             - (rahd->flags & AHD_BOOT_CHANNEL);
-       if (value != 0)
-               /* Controllers set for boot have a *higher* priority */
-               return (value);
-#endif
-
-       value = (lahd->flags & AHD_BIOS_ENABLED)
-             - (rahd->flags & AHD_BIOS_ENABLED);
-       if (value != 0)
-               /* Controllers with BIOS enabled have a *higher* priority */
-               return (value);
-
-       /* Still equal.  Sort by bus/slot/func. */
-       if (aic79xx_reverse_scan != 0)
-               value = ahd_get_pci_bus(lahd->dev_softc)
-                     - ahd_get_pci_bus(rahd->dev_softc);
-       else
-               value = ahd_get_pci_bus(rahd->dev_softc)
-                     - ahd_get_pci_bus(lahd->dev_softc);
-       if (value != 0)
-               return (value);
-       if (aic79xx_reverse_scan != 0)
-               value = ahd_get_pci_slot(lahd->dev_softc)
-                     - ahd_get_pci_slot(rahd->dev_softc);
-       else
-               value = ahd_get_pci_slot(rahd->dev_softc)
-                     - ahd_get_pci_slot(lahd->dev_softc);
-       if (value != 0)
-               return (value);
-
-       value = rahd->channel - lahd->channel;
-       return (value);
-}
-
 static void
 ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)
 {
@@ -1474,30 +1530,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) {
@@ -1595,12 +1627,6 @@ ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs)
        return IRQ_RETVAL(ours);
 }
 
-void
-ahd_platform_flushwork(struct ahd_softc *ahd)
-{
-
-}
-
 void
 ahd_send_async(struct ahd_softc *ahd, char channel,
               u_int target, u_int lun, ac_code code, void *arg)
@@ -1950,72 +1976,108 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
 static void
 ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
 {
+       int status;
+       int new_status = DID_OK;
+       int do_fallback = 0;
+       int scsi_status;
+
        /*
         * Map CAM error codes into Linux Error codes.  We
         * avoid the conversion so that the DV code has the
         * full error information available when making
         * state change decisions.
         */
-       {
-               uint32_t status;
-               u_int new_status;
-
-               status = ahd_cmd_get_transaction_status(cmd);
-               switch (status) {
-               case CAM_REQ_INPROG:
-               case CAM_REQ_CMP:
-               case CAM_SCSI_STATUS_ERROR:
-                       new_status = DID_OK;
-                       break;
-               case CAM_REQ_ABORTED:
-                       new_status = DID_ABORT;
-                       break;
-               case CAM_BUSY:
-                       new_status = DID_BUS_BUSY;
-                       break;
-               case CAM_REQ_INVALID:
-               case CAM_PATH_INVALID:
-                       new_status = DID_BAD_TARGET;
-                       break;
-               case CAM_SEL_TIMEOUT:
-                       new_status = DID_NO_CONNECT;
-                       break;
-               case CAM_SCSI_BUS_RESET:
-               case CAM_BDR_SENT:
-                       new_status = DID_RESET;
-                       break;
-               case CAM_UNCOR_PARITY:
-                       new_status = DID_PARITY;
-                       break;
-               case CAM_CMD_TIMEOUT:
-                       new_status = DID_TIME_OUT;
-                       break;
-               case CAM_UA_ABORT:
-               case CAM_REQ_CMP_ERR:
-               case CAM_AUTOSENSE_FAIL:
-               case CAM_NO_HBA:
-               case CAM_DATA_RUN_ERR:
-               case CAM_UNEXP_BUSFREE:
-               case CAM_SEQUENCE_FAIL:
-               case CAM_CCB_LEN_ERR:
-               case CAM_PROVIDE_FAIL:
-               case CAM_REQ_TERMIO:
-               case CAM_UNREC_HBA_ERROR:
-               case CAM_REQ_TOO_BIG:
-                       new_status = DID_ERROR;
-                       break;
-               case CAM_REQUEUE_REQ:
-                       new_status = DID_REQUEUE;
+
+       status = ahd_cmd_get_transaction_status(cmd);
+       switch (status) {
+       case CAM_REQ_INPROG:
+       case CAM_REQ_CMP:
+               new_status = DID_OK;
+               break;
+       case CAM_AUTOSENSE_FAIL:
+               new_status = DID_ERROR;
+               /* Fallthrough */
+       case CAM_SCSI_STATUS_ERROR:
+               scsi_status = ahd_cmd_get_scsi_status(cmd);
+
+               switch(scsi_status) {
+               case SCSI_STATUS_CMD_TERMINATED:
+               case SCSI_STATUS_CHECK_COND:
+                       if ((cmd->result >> 24) != DRIVER_SENSE) {
+                               do_fallback = 1;
+                       } else {
+                               struct scsi_sense_data *sense;
+                               
+                               sense = (struct scsi_sense_data *)
+                                       &cmd->sense_buffer;
+                               if (sense->extra_len >= 5 &&
+                                   (sense->add_sense_code == 0x47
+                                    || sense->add_sense_code == 0x48))
+                                       do_fallback = 1;
+                       }
                        break;
                default:
-                       /* We should never get here */
-                       new_status = DID_ERROR;
                        break;
                }
+               break;
+       case CAM_REQ_ABORTED:
+               new_status = DID_ABORT;
+               break;
+       case CAM_BUSY:
+               new_status = DID_BUS_BUSY;
+               break;
+       case CAM_REQ_INVALID:
+       case CAM_PATH_INVALID:
+               new_status = DID_BAD_TARGET;
+               break;
+       case CAM_SEL_TIMEOUT:
+               new_status = DID_NO_CONNECT;
+               break;
+       case CAM_SCSI_BUS_RESET:
+       case CAM_BDR_SENT:
+               new_status = DID_RESET;
+               break;
+       case CAM_UNCOR_PARITY:
+               new_status = DID_PARITY;
+               do_fallback = 1;
+               break;
+       case CAM_CMD_TIMEOUT:
+               new_status = DID_TIME_OUT;
+               do_fallback = 1;
+               break;
+       case CAM_REQ_CMP_ERR:
+       case CAM_UNEXP_BUSFREE:
+       case CAM_DATA_RUN_ERR:
+               new_status = DID_ERROR;
+               do_fallback = 1;
+               break;
+       case CAM_UA_ABORT:
+       case CAM_NO_HBA:
+       case CAM_SEQUENCE_FAIL:
+       case CAM_CCB_LEN_ERR:
+       case CAM_PROVIDE_FAIL:
+       case CAM_REQ_TERMIO:
+       case CAM_UNREC_HBA_ERROR:
+       case CAM_REQ_TOO_BIG:
+               new_status = DID_ERROR;
+               break;
+       case CAM_REQUEUE_REQ:
+               new_status = DID_REQUEUE;
+               break;
+       default:
+               /* We should never get here */
+               new_status = DID_ERROR;
+               break;
+       }
 
-               ahd_cmd_set_transaction_status(cmd, new_status);
+       if (do_fallback) {
+               printf("%s: device overrun (status %x) on %d:%d:%d\n",
+                      ahd_name(ahd), status, cmd->device->channel,
+                      cmd->device->id, cmd->device->lun);
        }
 
+       ahd_cmd_set_transaction_status(cmd, new_status);
+
        cmd->scsi_done(cmd);
 }
 
@@ -2032,7 +2094,7 @@ ahd_release_simq(struct ahd_softc *ahd)
 }
 
 static int
-ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
+ahd_linux_queue_abort_cmd(struct scsi_cmnd *cmd)
 {
        struct ahd_softc *ahd;
        struct ahd_linux_device *dev;
@@ -2047,7 +2109,6 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
        int    paused;
        int    wait;
        int    disconnected;
-       int    found;
        ahd_mode_state saved_modes;
        unsigned long flags;
 
@@ -2057,8 +2118,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 
        scmd_printk(KERN_INFO, cmd,
-              "Attempting to queue a%s message:",
-              flag == SCB_ABORT ? "n ABORT" : " TARGET RESET");
+                   "Attempting to queue an ABORT message:");
 
        printf("CDB:");
        for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
@@ -2094,19 +2154,6 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                        break;
        }
 
-       if (pending_scb == NULL && flag == SCB_DEVICE_RESET) {
-
-               /* Any SCB for this device will do for a target reset */
-               LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
-                       if (ahd_match_scb(ahd, pending_scb,
-                                         scmd_id(cmd),
-                                         scmd_channel(cmd) + 'A',
-                                         CAM_LUN_WILDCARD,
-                                         SCB_LIST_NULL, ROLE_INITIATOR))
-                               break;
-               }
-       }
-
        if (pending_scb == NULL) {
                scmd_printk(KERN_INFO, cmd, "Command not found\n");
                goto no_cmd;
@@ -2140,25 +2187,17 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
        ahd_dump_card_state(ahd);
 
        disconnected = TRUE;
-       if (flag == SCB_ABORT) {
-               if (ahd_search_qinfifo(ahd, cmd->device->id, 
-                                      cmd->device->channel + 'A',
-                                      cmd->device->lun, 
-                                      pending_scb->hscb->tag,
-                                      ROLE_INITIATOR, CAM_REQ_ABORTED,
-                                      SEARCH_COMPLETE) > 0) {
-                       printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
-                              ahd_name(ahd), cmd->device->channel, 
-                              cmd->device->id, cmd->device->lun);
-                       retval = SUCCESS;
-                       goto done;
-               }
-       } else if (ahd_search_qinfifo(ahd, cmd->device->id,
-                                     cmd->device->channel + 'A',
-                                     cmd->device->lun, pending_scb->hscb->tag,
-                                     ROLE_INITIATOR, /*status*/0,
-                                     SEARCH_COUNT) > 0) {
-               disconnected = FALSE;
+       if (ahd_search_qinfifo(ahd, cmd->device->id, 
+                              cmd->device->channel + 'A',
+                              cmd->device->lun, 
+                              pending_scb->hscb->tag,
+                              ROLE_INITIATOR, CAM_REQ_ABORTED,
+                              SEARCH_COMPLETE) > 0) {
+               printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
+                      ahd_name(ahd), cmd->device->channel, 
+                      cmd->device->id, cmd->device->lun);
+               retval = SUCCESS;
+               goto done;
        }
 
        saved_modes = ahd_save_modes(ahd);
@@ -2166,17 +2205,12 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
        last_phase = ahd_inb(ahd, LASTPHASE);
        saved_scbptr = ahd_get_scbptr(ahd);
        active_scbptr = saved_scbptr;
-       if (disconnected && ((last_phase != P_BUSFREE) || 
-                            (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0)) {
+       if (disconnected && (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
                struct scb *bus_scb;
 
                bus_scb = ahd_lookup_scb(ahd, active_scbptr);
                if (bus_scb == pending_scb)
                        disconnected = FALSE;
-               else if (flag != SCB_ABORT
-                        && ahd_inb(ahd, SAVED_SCSIID) == pending_scb->hscb->scsiid
-                        && ahd_inb(ahd, SAVED_LUN) == SCB_GET_LUN(pending_scb))
-                       disconnected = FALSE;
        }
 
        /*
@@ -2185,41 +2219,26 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
         * bus or is in the disconnected state.
         */
        saved_scsiid = ahd_inb(ahd, SAVED_SCSIID);
-       if (SCB_GET_TAG(pending_scb) == active_scbptr
-            || (flag == SCB_DEVICE_RESET
-                && SCSIID_TARGET(ahd, saved_scsiid) == scmd_id(cmd))) {
+       if (last_phase != P_BUSFREE
+           && SCB_GET_TAG(pending_scb) == active_scbptr) {
 
                /*
                 * We're active on the bus, so assert ATN
                 * and hope that the target responds.
                 */
                pending_scb = ahd_lookup_scb(ahd, active_scbptr);
-               pending_scb->flags |= SCB_RECOVERY_SCB|SCB_DEVICE_RESET;
+               pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
                ahd_outb(ahd, MSG_OUT, HOST_MSG);
                ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
-               scmd_printk(KERN_INFO, cmd, "BDR message in message buffer\n");
+               scmd_printk(KERN_INFO, cmd, "Device is active, asserting ATN\n");
                wait = TRUE;
-       } else if (last_phase != P_BUSFREE
-                  && ahd_inb(ahd, SCSIPHASE) == 0) {
-               /*
-                * SCB is not identified, there
-                * is no pending REQ, and the sequencer
-                * has not seen a busfree.  Looks like
-                * a stuck connection waiting to
-                * go busfree.  Reset the bus.
-                */
-               found = ahd_reset_channel(ahd, cmd->device->channel + 'A',
-                                         /*Initiate Reset*/TRUE);
-               printf("%s: Issued Channel %c Bus Reset. "
-                      "%d SCBs aborted\n", ahd_name(ahd),
-                      cmd->device->channel + 'A', found);
        } else if (disconnected) {
 
                /*
                 * Actually re-queue this SCB in an attempt
                 * to select the device before it reconnects.
                 */
-               pending_scb->flags |= SCB_RECOVERY_SCB|flag;
+               pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
                ahd_set_scbptr(ahd, SCB_GET_TAG(pending_scb));
                pending_scb->hscb->cdb_len = 0;
                pending_scb->hscb->task_attribute = 0;