Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3570902ybl; Mon, 3 Feb 2020 02:46:43 -0800 (PST) X-Google-Smtp-Source: APXvYqwa5k3ndotTL/4ff4U4v7dmJgRfyT9DKx0icL0z9Xw6AokbbAapejZZH8/eXHdGFRapFQ1H X-Received: by 2002:a9d:4e99:: with SMTP id v25mr17762514otk.363.1580726803379; Mon, 03 Feb 2020 02:46:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580726803; cv=none; d=google.com; s=arc-20160816; b=mcUMVRucVASY5Rr3kstMdE3N3Y/4c/Z3gdaJSGqJo7v15aB2/b5jkgrjNUUKbfIw8W WmT9/Z+0iKhMtTnLpouQ9O6zm1Yf33RmGABApfSBFXpnwPtpCq36jO6OMGrzEpvNpv52 kX3hKSN3fiJxiKswQDVVrsr/InfOWIF4CswrYG7WcHEfy36IHr/m9qRCxE+t+QnFLi3G YkAVVSDMCQKugFyC8bERV6nFHjFOPw8Ur/PzWVM/IKOAtsjsfk2FTYAaWUDEF0JX82Vd IX6K+NigDfBePxqnMpod1Bi+5x3paFhlD1Eos/WDW3yQ8NhF7C54ua2dVMtVXeO4rxTl r4KQ== 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; bh=/mowUMRBwi8+f1Y4Wpo+Yhwj4BjgTxc+Oi6vytVPViQ=; b=jEB6P23ZcBzbUJ+52O/0nFwuK8qQ6WK2ECDDZv6L7TlmLZoXqTVR1KPkSq5ntSrviW 3xQCuwWv4jCOaWaZDwXDpdLGEfYVoqaDomu7LFKsGugpwkN4ChRcI2Cft1ddzhrKzWKj vYSCvKuFOOhpwXNi3xnpd83eI09gwT7aKl7nF/TP30ziM02GZhqX0pbcgoCWR/BGmusd v/sEyTf4k1hCayYEe+Kwdp4OxwBb8zlFYbq18PILig27HoLDswmUQWMu5ZyCJVLo/zMy gdzb8ufsysvunymNBy8vNRXtqkCquC7p01suvlWVC7I/lGbTGIQht/ejoL+wRlEpz+yN sRLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=Mgr88Bva; 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 h9si8385040otb.49.2020.02.03.02.46.28; Mon, 03 Feb 2020 02:46:43 -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=fail header.i=@mg.codeaurora.org header.s=smtp header.b=Mgr88Bva; 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 S1727945AbgBCJSN (ORCPT + 99 others); Mon, 3 Feb 2020 04:18:13 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:26135 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727600AbgBCJSN (ORCPT ); Mon, 3 Feb 2020 04:18:13 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580721492; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=/mowUMRBwi8+f1Y4Wpo+Yhwj4BjgTxc+Oi6vytVPViQ=; b=Mgr88Bva/rimNVfCDWmz8HjpArFzqBO9S1dUx3AOazrPEf+uMe77uywGocglLdlaHflvJWkz xxaksWn/9NvMFLVZbo1V/mEQWGIDB+oDwqUGzwBkITKI7cgkxva+jGmzF4TtDlVnEYXOLPjG wUQaYXK8a9Tu7gRGm/3CFNUaJyY= X-Mailgun-Sending-Ip: 104.130.122.25 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e37e551.7f0a50d5e8f0-smtp-out-n02; Mon, 03 Feb 2020 09:18:09 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 2F2E6C447A6; Mon, 3 Feb 2020 09:18:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE, URIBL_BLOCKED autolearn=unavailable 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) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6F559C43383; Mon, 3 Feb 2020 09:18:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6F559C43383 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=cang@codeaurora.org From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Sayali Lokhande , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Stanley Chu , Bean Huo , Bart Van Assche , Venkat Gopalakrishnan , Tomas Winkler , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 1/8] scsi: ufs: Flush exception event before suspend Date: Mon, 3 Feb 2020 01:17:43 -0800 Message-Id: <1580721472-10784-2-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1580721472-10784-1-git-send-email-cang@codeaurora.org> References: <1580721472-10784-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 From: Sayali Lokhande Exception event can be raised by the device when system suspend is in progress. This will result in unclocked register access in exception event handler as clocks will be turned off during suspend. This change makes sure to flush exception event handler work in suspend before disabling clocks to avoid unclocked register access issue. Signed-off-by: Sayali Lokhande Signed-off-by: Asutosh Das Signed-off-by: Can Guo --- drivers/scsi/ufs/ufshcd.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index abd0e6b..10dbc0c 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4730,8 +4730,15 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev) * UFS device needs urgent BKOPs. */ if (!hba->pm_op_in_progress && - ufshcd_is_exception_event(lrbp->ucd_rsp_ptr)) - schedule_work(&hba->eeh_work); + ufshcd_is_exception_event(lrbp->ucd_rsp_ptr) && + schedule_work(&hba->eeh_work)) { + /* + * Prevent suspend once eeh_work is scheduled + * to avoid deadlock between ufshcd_suspend + * and exception event handler. + */ + pm_runtime_get_noresume(hba->dev); + } break; case UPIU_TRANSACTION_REJECT_UPIU: /* TODO: handle Reject UPIU Response */ @@ -5184,7 +5191,14 @@ static void ufshcd_exception_event_handler(struct work_struct *work) out: ufshcd_scsi_unblock_requests(hba); - pm_runtime_put_sync(hba->dev); + /* + * pm_runtime_get_noresume is called while scheduling + * eeh_work to avoid suspend racing with exception work. + * Hence decrement usage counter using pm_runtime_put_noidle + * to allow suspend on completion of exception event handler. + */ + pm_runtime_put_noidle(hba->dev); + pm_runtime_put(hba->dev); return; } @@ -7924,6 +7938,7 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto enable_gating; } + flush_work(&hba->eeh_work); ret = ufshcd_link_state_transition(hba, req_link_state, 1); if (ret) goto set_dev_active; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project