From patchwork Fri Jun 30 17:18:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9820175 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A47D602B1 for ; Fri, 30 Jun 2017 17:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FF37286B0 for ; Fri, 30 Jun 2017 17:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64648286CA; Fri, 30 Jun 2017 17:19:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3E5C286B0 for ; Fri, 30 Jun 2017 17:19:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751813AbdF3RTn (ORCPT ); Fri, 30 Jun 2017 13:19:43 -0400 Received: from mx2.suse.de ([195.135.220.15]:59906 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751728AbdF3RTi (ORCPT ); Fri, 30 Jun 2017 13:19:38 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id AEDCCAC6D; Fri, 30 Jun 2017 17:18:38 +0000 (UTC) From: Hannes Reinecke To: "Martin K. Petersen" Cc: Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org, Raghava Aditya Renukunta , Hannes Reinecke , Hannes Reinecke Subject: [PATCH 3/7] aacraid: split off device, target, and bus reset Date: Fri, 30 Jun 2017 19:18:08 +0200 Message-Id: <1498843092-76285-4-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1498843092-76285-1-git-send-email-hare@suse.de> References: <1498843092-76285-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Split off device, target, and bus reset functionality into individual functions. Signed-off-by: Hannes Reinecke Reviewed-by: Raghava Aditya Renukunta --- drivers/scsi/aacraid/linit.c | 141 +++++++++++++++++++++++++++++++------------ 1 file changed, 102 insertions(+), 39 deletions(-) diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index bf21006..57b2077 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -861,68 +861,129 @@ static u8 aac_eh_tmf_hard_reset_fib(struct aac_dev *aac, struct fib *fib, } /* - * aac_eh_reset - Reset command handling + * aac_eh_dev_reset - Device reset command handling * @scsi_cmd: SCSI command block causing the reset * */ -static int aac_eh_reset(struct scsi_cmnd* cmd) +static int aac_eh_dev_reset(struct scsi_cmnd *cmd) { struct scsi_device * dev = cmd->device; struct Scsi_Host * host = dev->host; struct aac_dev * aac = (struct aac_dev *)host->hostdata; int count; u32 bus, cid; + struct fib *fib; int ret = FAILED; - int status = 0; - + int status; + u8 command; bus = aac_logical_to_phys(scmd_channel(cmd)); cid = scmd_id(cmd); - if (bus < AAC_MAX_BUSES && cid < AAC_MAX_TARGETS && - aac->hba_map[bus][cid].devtype == AAC_DEVTYPE_NATIVE_RAW) { - struct fib *fib; - int status; - u8 command; + if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS || + aac->hba_map[bus][cid].devtype != AAC_DEVTYPE_NATIVE_RAW) + return FAILED; - pr_err("%s: Host adapter reset request. SCSI hang ?\n", - AAC_DRIVERNAME); + pr_err("%s: Host adapter reset request. SCSI hang ?\n", + AAC_DRIVERNAME); - fib = aac_fib_alloc(aac); - if (!fib) - return ret; + fib = aac_fib_alloc(aac); + if (!fib) + return ret; - if (aac->hba_map[bus][cid].reset_state == 0) { - /* start a HBA_TMF_LUN_RESET TMF request */ - command = aac_eh_tmf_lun_reset_fib(aac, fib, - bus, cid, - cmd->device->lun); - aac->hba_map[bus][cid].reset_state++; - } else if (aac->hba_map[bus][cid].reset_state >= 1) { - /* already tried, start a hard reset now */ - command = aac_eh_tmf_hard_reset_fib(aac, fib, bus, cid); - aac->hba_map[bus][cid].reset_state = 0; + /* start a HBA_TMF_LUN_RESET TMF request */ + command = aac_eh_tmf_lun_reset_fib(aac, fib, bus, cid, + cmd->device->lun); + + cmd->SCp.sent_command = 0; + + status = aac_hba_send(command, fib, + (fib_callback) aac_hba_callback, + (void *) cmd); + + /* Wait up to 15 seconds for completion */ + for (count = 0; count < 15; ++count) { + if (cmd->SCp.sent_command) { + ret = SUCCESS; + break; } - cmd->SCp.sent_command = 0; + msleep(1000); + } - status = aac_hba_send(command, fib, - (fib_callback) aac_hba_callback, - (void *) cmd); + return ret; +} - /* Wait up to 15 seconds for completion */ - for (count = 0; count < 15; ++count) { - if (cmd->SCp.sent_command) { - ret = SUCCESS; - break; - } - msleep(1000); +/* + * aac_eh_target_reset - Target reset command handling + * @scsi_cmd: SCSI command block causing the reset + * + */ +static int aac_eh_target_reset(struct scsi_cmnd *cmd) +{ + struct scsi_device * dev = cmd->device; + struct Scsi_Host * host = dev->host; + struct aac_dev * aac = (struct aac_dev *)host->hostdata; + int count; + u32 bus, cid; + int ret = FAILED; + struct fib *fib; + int status; + u8 command; + + bus = aac_logical_to_phys(scmd_channel(cmd)); + cid = scmd_id(cmd); + if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS || + aac->hba_map[bus][cid].devtype != AAC_DEVTYPE_NATIVE_RAW) + return FAILED; + + pr_err("%s: Host adapter reset request. SCSI hang ?\n", + AAC_DRIVERNAME); + + fib = aac_fib_alloc(aac); + if (!fib) + return ret; + + + /* already tried, start a hard reset now */ + command = aac_eh_tmf_hard_reset_fib(aac, fib, bus, cid); + + cmd->SCp.sent_command = 0; + + status = aac_hba_send(command, fib, + (fib_callback) aac_hba_callback, + (void *) cmd); + + /* Wait up to 15 seconds for completion */ + for (count = 0; count < 15; ++count) { + if (cmd->SCp.sent_command) { + ret = SUCCESS; + break; } + msleep(1000); + } - if (ret == SUCCESS) - return ret; + return ret; +} + +/* + * aac_eh_bus_reset - Bus reset command handling + * @scsi_cmd: SCSI command block causing the reset + * + */ +static int aac_eh_bus_reset(struct scsi_cmnd* cmd) +{ + struct scsi_device * dev = cmd->device; + struct Scsi_Host * host = dev->host; + struct aac_dev * aac = (struct aac_dev *)host->hostdata; + int count; + u32 bus, cid; + int status = 0; - } else { + bus = aac_logical_to_phys(scmd_channel(cmd)); + cid = scmd_id(cmd); + if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS || + aac->hba_map[bus][cid].devtype != AAC_DEVTYPE_NATIVE_RAW) { /* Mark the assoc. FIB to not complete, eh handler does this */ for (count = 0; count < (host->can_queue + AAC_NUM_MGT_FIB); @@ -1409,7 +1470,9 @@ ssize_t aac_get_serial_number(struct device *device, char *buf) .change_queue_depth = aac_change_queue_depth, .sdev_attrs = aac_dev_attrs, .eh_abort_handler = aac_eh_abort, - .eh_bus_reset_handler = aac_eh_reset, + .eh_device_reset_handler = aac_eh_dev_reset, + .eh_target_reset_handler = aac_eh_target_reset, + .eh_bus_reset_handler = aac_eh_bus_reset, .eh_host_reset_handler = aac_eh_host_reset, .can_queue = AAC_NUM_IO_FIB, .this_id = MAXIMUM_NUM_CONTAINERS,