Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp1490148ybc; Tue, 12 Nov 2019 22:47:29 -0800 (PST) X-Google-Smtp-Source: APXvYqwYwtinajY6cmDSbC8RH1bAlpQGEH/Y1PfrSWNaxySAqqL5Cwv1vsqN0dcP4odL0fm+d3sY X-Received: by 2002:aa7:df8e:: with SMTP id b14mr1845981edy.59.1573627649562; Tue, 12 Nov 2019 22:47:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573627649; cv=none; d=google.com; s=arc-20160816; b=aL6eWZGbLvmKMnP4f+I8lXxg4e6O/sUSfml9yXieJbyc002JymR9u0PWzv3UePFtnA lu3dSB1jLcHf/gHxZp84rqdathfaP2TCuqSJvh1Txq8VKw1du9DBfJsY3vnnQI43xeWO uUda4TOhvWi0NNAPsLzyFqNpYuC0ZxiXDSyAazy81O9thYu8PSMO+3rfEkqabKIwoSCH gdsMEosddTbsMYwyHB6n+KNVDtYQ9u6iR1N7eNofM90/jQaAqERhhLmuqNbJ2vNCeuFI t37+3ankDL1Vfzudm66xGDIXJ6ComQX5jiGhTqYeUje6vRt54aO9HvSdMjPdc/Lo2g+V 1WrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature; bh=NGsr9UGIeBnOyjXXwly2fa7ZwyX/wMfEsSXhs88/CFw=; b=jcR3ZMV3jzwkfjDNjBNIfWwA5ZacP5NG7EmmV8D999GKAFuVX/Dhho1EnoMUg8BmPV 4idGe3T4rsxmcfJVmyY3RDIuCtTs2vEYIwRnvW5x8due0jLlcuwCEfdaKbH0YWp0Ud82 CDJxpsqHZz/tym1mPIrVnS7lLBHtoasDJRpXHBxXHkzzHsVzzEkLph1ja79aAoCZ8H4b NIvICB1ph4ew25/e4kq10v2HuqSE8g5kITJXiGNyybpbX/32+UvbHoNYdisTZIz6dYLA CJR6nLZ46+djIhEt2k3gJ9VWZ1uyIm+H207gxCVLUzHK67nEajxss9kQEldfhMB38yvB YRVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ErVtDEnl; dkim=pass header.i=@codeaurora.org header.s=default header.b=nucpMfuk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qu7si567704ejb.79.2019.11.12.22.47.04; Tue, 12 Nov 2019 22:47:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=ErVtDEnl; dkim=pass header.i=@codeaurora.org header.s=default header.b=nucpMfuk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbfKMGq2 (ORCPT + 99 others); Wed, 13 Nov 2019 01:46:28 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:44012 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbfKMGq2 (ORCPT ); Wed, 13 Nov 2019 01:46:28 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9DE7F607C6; Wed, 13 Nov 2019 06:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1573627587; bh=jx/SmZAawFg/FnEm6roPssceTWagqsaNGcQB2jC2CHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ErVtDEnlwkWs/Zb75oVW25mqYMk3x5q9r2Pvc4APPG1Jr+ap6L28HPlw4VQBGO1tR 3TIOigsZRd4wTzal5u/BxKQ6ukCDspyrFJsNCQpXzebVmx6Gk8qjO8ZMcEdAYA+0uA 1tSniIBNU769dri6Z/+BVYN/mNx47wCsme0p/q5c= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from pacamara-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cang@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id E54876025A; Wed, 13 Nov 2019 06:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1573627586; bh=jx/SmZAawFg/FnEm6roPssceTWagqsaNGcQB2jC2CHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nucpMfukQCSI79i7LZevhREmB1OhyyC3Q82z5D657N6xVPAp4U6piXWiztX0wSONe Txqj//gV5cmj3TrHNAaF+83efwnUak8pJd7FgrPuA3+2xNO4rJ6f3Pc0DobrQIvYN+ v7/hGvOnVJcDYR3fS2nq/rkLT05RWi7BND+7OECM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org E54876025A Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=cang@codeaurora.org From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , Pedro Sousa , "James E.J. Bottomley" , "Martin K. Petersen" , Stanley Chu , Bean Huo , Tomas Winkler , Venkat Gopalakrishnan , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 1/7] scsi: ufs: Add device reset in link recovery path Date: Tue, 12 Nov 2019 22:45:45 -0800 Message-Id: <1573627552-12615-2-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1573627552-12615-1-git-send-email-cang@codeaurora.org> References: <1573627552-12615-1-git-send-email-cang@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to recover from hibern8 exit failure, perform a reset in link recovery path before issuing link start-up. Signed-off-by: Can Guo Reviewed-by: Bean Huo --- drivers/scsi/ufs/ufshcd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c28c144..525f8e6 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -3859,6 +3859,9 @@ static int ufshcd_link_recovery(struct ufs_hba *hba) ufshcd_set_eh_in_progress(hba); spin_unlock_irqrestore(hba->host->host_lock, flags); + /* Reset the attached device */ + ufshcd_vops_device_reset(hba); + ret = ufshcd_host_reset_and_restore(hba); spin_lock_irqsave(hba->host->host_lock, flags); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project