Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5427009pxj; Wed, 23 Jun 2021 00:39:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfCPpXqBSF2ruGVVp2htZpNxRrG8gqnvc+EE5M/SPKwd4UoqszfQ9Xj6/fHr/5T5xGxacd X-Received: by 2002:a17:907:2941:: with SMTP id et1mr8360600ejc.394.1624433956725; Wed, 23 Jun 2021 00:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624433956; cv=none; d=google.com; s=arc-20160816; b=Y9ve24VQhB74VLX/nuc2/UwulnyEjG0L6mR0Xly9V5kgh2A7S7mhMc+3O1pgy/avMn 7wh+oGNH+Z9AfzvENIsGjcQ1ayt+89kvxF3YiLwXCfwTiZpUWe+g+LERrKRc6IY1rLzA wJ1a1xYTyoS7QiKltz2kFqQQHI61Q8V5XeGtarUmYILBNxYrmbZQLj3Fa6GElo8GE1xs qlSitT4tmxrycAEPL5tkKyguXw/ynPScMypcrmH3IZCYcC7ZizMsJ7fNwN/cUyioRkLl NyTLnKi5zur5Wcuu193BSKMdblRX16bSGADzzRXovjgGgsZ/fgRDxNh9KA854QNdvVjg MJUA== 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=sgYO9dBTxfV9CvKFRdYudEB6OH7Tg0XCXcbtIWJ6arc=; b=g5mZBAn7+axRGnArz6xsjQwsCi8ZrdZ5RynksDULkG1SpaoS5ChlEMpcKigUMD6Og5 rVZslo6Zu0mDVEshddSkQv4TKjoWeVUv0C57bavkVRNn4C4uaV/FK0wANQmoIhP4xSTp ENCaEx7mMDP4137MKJnrBAy/iU7Qu+efLjjZMPMAFH20N5s2fQpCCUcBGQ9N4uzq72bm ElYL3ngDnBHNyycudHIhJ433pM80tY1shQWQmAVt1L6bQSn+rpyzL1Jg3Z7tN1TYdAof vAAxabQ/p00KujuSTVhu1Ugz1vXQQMFbnTHOUTVTLM1ANox4zhRqwX5cNdZHIEciQYAn L6Iw== 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 f16si22697955edx.460.2021.06.23.00.38.53; Wed, 23 Jun 2021 00:39:16 -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 S230490AbhFWHjj (ORCPT + 99 others); Wed, 23 Jun 2021 03:39:39 -0400 Received: from labrats.qualcomm.com ([199.106.110.90]:1666 "EHLO labrats.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230363AbhFWHjT (ORCPT ); Wed, 23 Jun 2021 03:39:19 -0400 IronPort-SDR: M6TRVFwkS6FOV6qff0MiXiwDGxCYMI6QeciZCr6r/nzZ2LyTUwFjjCx3z1aAc6lUN5EWFiOAkr UvDV+CraFZoTQtSQGA0V/Y1lNfw5xGqKJmZZlvoyaRBRvyP0GEJbG7qJBxN8mcc5k/cbaKrlWW UKmvewxRIrOe5VBdFzKwaPH9XcI+SYro7bzENHa5m7H5c4f6445KoggB6WUTLU5vdnnJlbqslb NpKk/0r3FEwCPcCePzBHHj5if3THNiYv26deN8EN6OVzF6d7Sr4Z1JHCYQA2Ggyf/qjHDCV+Ru p3g= X-IronPort-AV: E=Sophos;i="5.83,293,1616482800"; d="scan'208";a="29780820" Received: from unknown (HELO ironmsg03-sd.qualcomm.com) ([10.53.140.143]) by labrats.qualcomm.com with ESMTP; 23 Jun 2021 00:37:00 -0700 X-QCInternal: smtphost Received: from stor-presley.qualcomm.com ([192.168.140.85]) by ironmsg03-sd.qualcomm.com with ESMTP; 23 Jun 2021 00:36:59 -0700 Received: by stor-presley.qualcomm.com (Postfix, from userid 359480) id BC2E921BC1; Wed, 23 Jun 2021 00:36:59 -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 v4 04/10] scsi: ufs: Enable IRQ after enabling clocks in error handling preparation Date: Wed, 23 Jun 2021 00:35:03 -0700 Message-Id: <1624433711-9339-5-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1624433711-9339-1-git-send-email-cang@codeaurora.org> References: <1624433711-9339-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 ee70522..5f837c4 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_wlu_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.