Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp214553pxj; Wed, 9 Jun 2021 21:47:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+jpDmI7E7tNOLCu+pUzZQw/yrgezMxzKraw+7bmh0/ivlEXloRPob0vb0K0Q46ghB4DRm X-Received: by 2002:a17:906:b2d1:: with SMTP id cf17mr2771721ejb.225.1623300425580; Wed, 09 Jun 2021 21:47:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623300425; cv=none; d=google.com; s=arc-20160816; b=bpE4F1dNk4N/HXU2VySO4Tx00pOm0wRWMz3KVxGJmLu944lW/NklsO8GF+FBl1yZ6K 9sQByltV0gR1hsq014b6P9YWu0p0ndduouTfymHLRxgaTN1ywthdr/5tKMu5bTI6ZGh6 RcT//9IOe96PKt/hmUSJc2vfzWx2/bCyyJROAEGIg/HIb7DUJaJe2bluKBrUqldMXvM3 H3DdOLCuDpokocNcQ53hl8VjADm//wLyHnc2yrqrA+cgNgeUSwqFaBhmvFpBkz29pM2l gxY2GK627uRw5w80t3O5LlAoeBG0HjiboXvw3TNvgkMYmh04DpY1bDX1JOf/DoOdHq1x dbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr; bh=k/zPpRUgAcpbnE5Ks+wYFO4u9Hx812FBd/jp1RX0Gj8=; b=eu1c54mrssMEo38IdRjIbDiiYbBT9T13mTIv1VrIOIuFtG3Z/O/xMV5NfsihkivQiU zS/QeriId22dywD2WM/nr230yX/Yr78sf3OT5Uf+Z0udS5gmUsjOuwCqYXW+RWhLciKD AI6qdmQaMDEXSeehFJ1iUmgVMgTNpk/kQPmfYjqrgf2+1IKxo7uOj/f0ddbDRFmUEnGX PTOHuclGMdHAUow1MjkZ+oj2lOuJAqMpgc884DZuZ6qqTq5uydIKEpz4efQ4cM+Z+fIX reax8nkfScpQZCZQ45tBZupUgkmDtKfmczvSpf9GWuFyXuOCvADJQx6X5O3mC1NeviTK rkzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i2si1696371ejp.181.2021.06.09.21.46.29; Wed, 09 Jun 2021 21:47:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229935AbhFJEqC (ORCPT + 99 others); Thu, 10 Jun 2021 00:46:02 -0400 Received: from labrats.qualcomm.com ([199.106.110.90]:10993 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbhFJEqC (ORCPT ); Thu, 10 Jun 2021 00:46:02 -0400 IronPort-SDR: 3sXAk0k9MJzrximd/juvH4shb43TTKhtGhw6v/732Q9Wvpt15eokixBnhu3t7i2BADKeir8uxf Apy7U51A5JVFyXFjT1Raois/9Ppk3V/SNi8foLXM27zPFSAAjcBOYSRJdGhSH2IvIsEdMUO0ef UwWtfanQmJSexEq6GXIBsrRcLNk75XbUvzzJ8zx0yq4bIv9luYxI3pZHxyeUmi3IgmC5zC+8DZ ucyOJcyzyyg6Q3QAa7jmNSGGSYyMC5hBp7/GoN1GfTDwn5nxQkZDR7E7JaBZxYLgOgDe3jBtLe fSg= X-IronPort-AV: E=Sophos;i="5.83,262,1616482800"; d="scan'208";a="29778427" Received: from unknown (HELO ironmsg04-sd.qualcomm.com) ([10.53.140.144]) by labrats.qualcomm.com with ESMTP; 09 Jun 2021 21:44:07 -0700 X-QCInternal: smtphost Received: from stor-presley.qualcomm.com ([192.168.140.85]) by ironmsg04-sd.qualcomm.com with ESMTP; 09 Jun 2021 21:44:05 -0700 Received: by stor-presley.qualcomm.com (Postfix, from userid 359480) id BE4E221AF7; Wed, 9 Jun 2021 21:44:05 -0700 (PDT) From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, ziqichen@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Stanley Chu , Bean Huo , Jaegeuk Kim , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 3/9] scsi: ufs: Enable IRQ after enabling clocks in error handling preparation Date: Wed, 9 Jun 2021 21:43:31 -0700 Message-Id: <1623300218-9454-4-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1623300218-9454-1-git-send-email-cang@codeaurora.org> References: <1623300218-9454-1-git-send-email-cang@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In error handling preparation, enable IRQ after enabling clocks in case unclocked register access happens. Fixes: c72e79c0ad2bd ("scsi: ufs: Recover HBA runtime PM error in error handler") Signed-off-by: Can Guo --- drivers/scsi/ufs/ufshcd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index fed893e..0c9d2ee 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -5927,13 +5927,14 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) * can be OFF or in LPM. */ ufshcd_setup_hba_vreg(hba, true); - ufshcd_enable_irq(hba); ufshcd_setup_vreg(hba, true); ufshcd_config_vreg_hpm(hba, hba->vreg_info.vccq); ufshcd_config_vreg_hpm(hba, hba->vreg_info.vccq2); ufshcd_hold(hba, false); - if (!ufshcd_is_clkgating_allowed(hba)) + if (!ufshcd_is_clkgating_allowed(hba)) { ufshcd_setup_clocks(hba, true); + ufshcd_enable_irq(hba); + } ufshcd_release(hba); pm_op = hba->is_wl_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM; ufshcd_vops_resume(hba, pm_op); -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.