From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C73CAC4321A for ; Tue, 11 Jun 2019 09:33:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA581208E3 for ; Tue, 11 Jun 2019 09:33:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404525AbfFKJdi (ORCPT ); Tue, 11 Jun 2019 05:33:38 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:35740 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404137AbfFKJdh (ORCPT ); Tue, 11 Jun 2019 05:33:37 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by kvm5.telegraphics.com.au (Postfix) with ESMTP id 8B17722915; Tue, 11 Jun 2019 05:33:33 -0400 (EDT) Date: Tue, 11 Jun 2019 19:33:38 +1000 (AEST) From: Finn Thain To: Michael Schmitz cc: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2 2/7] scsi: NCR5380: Always re-enable reselection interrupt In-Reply-To: <58081aba-4e77-3c8e-847e-0698cf80e426@gmail.com> Message-ID: References: <61f0c0f6aaf8fa96bf3dade5475615b2cfbc8846.1560043151.git.fthain@telegraphics.com.au> <58081aba-4e77-3c8e-847e-0698cf80e426@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 11 Jun 2019, Michael Schmitz wrote: > Hi Finn, > > IIRC I'd tested that change as well - didn't change broken target > behaviour but no regressions in other respects. Add my tested-by if > needed. > Unfortunately I can't confirm that this is the same patch as the one you tested as I no longer have that commit. But Stan did test a wide variety of targets and I'm confident that the reselection code path was covered. -- > Cheers, > > Michael > > > Am 09.06.2019 um 13:19 schrieb Finn Thain: > > The reselection interrupt gets disabled during selection and must be > > re-enabled when hostdata->connected becomes NULL. If it isn't re-enabled > > a disconnected command may time-out or the target may wedge the bus while > > trying to reselect the host. This can happen after a command is aborted. > > > > Fix this by enabling the reselection interrupt in NCR5380_main() after > > calls to NCR5380_select() and NCR5380_information_transfer() return. > > > > Cc: Michael Schmitz > > Cc: stable@vger.kernel.org # v4.9+ > > Fixes: 8b00c3d5d40d ("ncr5380: Implement new eh_abort_handler") > > Tested-by: Stan Johnson > > Signed-off-by: Finn Thain > > --- > > drivers/scsi/NCR5380.c | 12 ++---------- > > 1 file changed, 2 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c > > index fe0535affc14..08e3ea8159b3 100644 > > --- a/drivers/scsi/NCR5380.c > > +++ b/drivers/scsi/NCR5380.c > > @@ -709,6 +709,8 @@ static void NCR5380_main(struct work_struct *work) > > NCR5380_information_transfer(instance); > > done = 0; > > } > > + if (!hostdata->connected) > > + NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); > > spin_unlock_irq(&hostdata->lock); > > if (!done) > > cond_resched(); > > @@ -1110,8 +1112,6 @@ static bool NCR5380_select(struct Scsi_Host *instance, > > struct scsi_cmnd *cmd) > > spin_lock_irq(&hostdata->lock); > > NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); > > NCR5380_reselect(instance); > > - if (!hostdata->connected) > > - NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); > > shost_printk(KERN_ERR, instance, "reselection after won > > arbitration?\n"); > > goto out; > > } > > @@ -1119,7 +1119,6 @@ static bool NCR5380_select(struct Scsi_Host *instance, > > struct scsi_cmnd *cmd) > > if (err < 0) { > > spin_lock_irq(&hostdata->lock); > > NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); > > - NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); > > > > /* Can't touch cmd if it has been reclaimed by the scsi ML */ > > if (!hostdata->selecting) > > @@ -1157,7 +1156,6 @@ static bool NCR5380_select(struct Scsi_Host *instance, > > struct scsi_cmnd *cmd) > > if (err < 0) { > > shost_printk(KERN_ERR, instance, "select: REQ timeout\n"); > > NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); > > - NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); > > goto out; > > } > > if (!hostdata->selecting) { > > @@ -1826,9 +1824,6 @@ static void NCR5380_information_transfer(struct > > Scsi_Host *instance) > > */ > > NCR5380_write(TARGET_COMMAND_REG, 0); > > > > - /* Enable reselect interrupts */ > > - NCR5380_write(SELECT_ENABLE_REG, > > hostdata->id_mask); > > - > > maybe_release_dma_irq(instance); > > return; > > case MESSAGE_REJECT: > > @@ -1860,8 +1855,6 @@ static void NCR5380_information_transfer(struct > > Scsi_Host *instance) > > */ > > NCR5380_write(TARGET_COMMAND_REG, 0); > > > > - /* Enable reselect interrupts */ > > - NCR5380_write(SELECT_ENABLE_REG, > > hostdata->id_mask); > > #ifdef SUN3_SCSI_VME > > dregs->csr |= CSR_DMA_ENABLE; > > #endif > > @@ -1964,7 +1957,6 @@ static void NCR5380_information_transfer(struct > > Scsi_Host *instance) > > cmd->result = DID_ERROR << 16; > > complete_cmd(instance, cmd); > > maybe_release_dma_irq(instance); > > - NCR5380_write(SELECT_ENABLE_REG, > > hostdata->id_mask); > > return; > > } > > msgout = NOP; > > >