From patchwork Mon Jun 4 10:45:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivasharan S X-Patchwork-Id: 10446317 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 C4DDF60284 for ; Mon, 4 Jun 2018 10:45:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B58052876C for ; Mon, 4 Jun 2018 10:45:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA26128BEF; Mon, 4 Jun 2018 10:45:43 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, 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 4AAF52876C for ; Mon, 4 Jun 2018 10:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752252AbeFDKpm (ORCPT ); Mon, 4 Jun 2018 06:45:42 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:44456 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751941AbeFDKp3 (ORCPT ); Mon, 4 Jun 2018 06:45:29 -0400 Received: by mail-qt0-f194.google.com with SMTP id l33-v6so3026995qta.11 for ; Mon, 04 Jun 2018 03:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KqHX/oCgUPeiRkc1Ivr91TILzyjEeb993+YdqbgtxOQ=; b=YhiAO5CMJLHHPzZBJhGg/SNaGzM0LnOMui6Rv3jjzaOLPjpiAJmULSuv6gY4YYoCub QnUXf3dKIcSm01jgaDSpSIQG1zl5p0yz+cyzIb7Yb/1oZUjoB7UXKuG8NQMSYkTs7ncD 6FWK6ZiBGy1oExORszkcUXszXjgFLm2xsRMAE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KqHX/oCgUPeiRkc1Ivr91TILzyjEeb993+YdqbgtxOQ=; b=n3LPpLa7HaXkJG9Hjwz5jni6C+6fJZdJUPxn5jw9M62r3GyWslqb1GeUFFD3NR0nuP CEiemcDErjZ0OY6464AZMAKw1DhxY25cd0bdcWz5vzYlF3yyO2BhlaGIZjkg34QAhN0k IiDgQCVuUT2NYqmsx8UX7f1FxOlAdEq7RbZarWEXI0TL2I+jKBX9D3T6Y3fiH1ysii4v 2EP+IUIIU077j+yCrX+pUwftyXsPcFc0eWZZI3ybyNEItnpVyVU78f3qNbZGjSymsOn+ KRypj51w1exBM0bx2nBgZkqwV0rM3ToFEEyPyjNUyAveDMWqh8zwoJArbGso56gH+Oed rD1Q== X-Gm-Message-State: APt69E3A6vF3NT2/sqTyV0b+333z0dNH2LX2+sUtKmH5983fwW0uKghS 4LTBkUy2fmzN9XPAW5fDlIGSTc0l X-Google-Smtp-Source: ADUXVKLyPzZJsr7UM1Xg58ZUzJzOzApnKRnM86foIwxmt4KbeUpfJ0ZhiBfn5RI6MZCZLrY7aodKOw== X-Received: by 2002:ac8:163a:: with SMTP id p55-v6mr14779427qtj.157.1528109127973; Mon, 04 Jun 2018 03:45:27 -0700 (PDT) Received: from dhcp-135-24-192-142.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id n21-v6sm7660500qtc.38.2018.06.04.03.45.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jun 2018 03:45:27 -0700 (PDT) From: Shivasharan S To: linux-scsi@vger.kernel.org Cc: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, Shivasharan S Subject: [PATCH 1/5] megaraid_sas: Do not do Kill adapter if GET_CTRL_INFO times out Date: Mon, 4 Jun 2018 03:45:09 -0700 Message-Id: <1528109113-1512-2-git-send-email-shivasharan.srikanteshwara@broadcom.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1528109113-1512-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> References: <1528109113-1512-1-git-send-email-shivasharan.srikanteshwara@broadcom.com> 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 If MR_DCMD_CTRL_GET_INFO DCMD timed out, return failure rather than doing kill adapter. Signed-off-by: Shivasharan S --- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 55c38bcf3c73..6b2b615846e7 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -4755,14 +4755,15 @@ megasas_get_ctrl_info(struct megasas_instance *instance) __func__, __LINE__); break; } + break; case DCMD_FAILED: megaraid_sas_kill_hba(instance); break; } - megasas_return_cmd(instance, cmd); - + if (ret != DCMD_TIMEOUT) + megasas_return_cmd(instance, cmd); return ret; }