Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1257780ybv; Thu, 6 Feb 2020 00:35:29 -0800 (PST) X-Google-Smtp-Source: APXvYqzMZwpdsahzOZJOzt2ipGS2TG7IzsVrPx2/rwwB9rRpBlFrZ3Bo3FB95Ldk5o6VgevR6kDG X-Received: by 2002:a05:6808:8d5:: with SMTP id k21mr6224263oij.121.1580978129056; Thu, 06 Feb 2020 00:35:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580978129; cv=none; d=google.com; s=arc-20160816; b=NRfIBGP11vg+Oy50+Enoyb5Pj0GkVYg3I4qPLYETv4IRIYk8KGlwMyY4cPclDzN+kp Ztmx/N23pYVvy4fc+ZFxbyZSloO6yue4z8cqIJWvMdZRYteRdeg+glXjiX89BILB5HYT 8W01XNGxqfrUTg9fttFPHj5YHBJThH94kmxoFb8NOumXLnfDCqeI8sL5+0zwU9+R44Rs sSTAv1xiNOkSaIph3+QYpRi7KL8EE+6fVm7Mo8MY5/8pJkIWWGVILF7CaZG91XcadQ2M zKTczKOwsd4NP2QtjIW8FzU7vpkwLD8qyAbIH8b/XmCiUFcfqw5bkUULegCvpaUvQy2H z09Q== 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=M5EiAM340YTfaI+JUM+VIwr5LUgYqYXxc1QkKU1WUtI=; b=mHJ+n8As5OedypbxiXeUtf8q/6V0T0fWXTQUAEHGAMtj+iNT9l9VpNXiDe2as4R5M/ gUKRuSVzbPK+AQMvdOK2Fe4L5SUWDUmKhvHIlEL1B5v9ODvcmTM61Qd25tnjJMhPFLS+ uLs0Wtjxvl6nLv9XZdoSwbVXTE93wATro1qT06RzqogoEaSj3p/tZEelQBZUET/AAQPP 40Z9/RR47DTwkyzzcUDhlne84U3HlH4784W1HO+Cp6yIx4jH5KX3gfpcO0NKoZjEDKS8 BIaMaLOithtV+d5nnx5F0VKOZhpDfFbIgiBPVIfVEImHm2H2J2iynGkyaxS0I1mnZLgL mTGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=iQ4Sa3M5; 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 f9si1662634oti.44.2020.02.06.00.35.17; Thu, 06 Feb 2020 00:35: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=fail header.i=@mg.codeaurora.org header.s=smtp header.b=iQ4Sa3M5; 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 S1728060AbgBFIeG (ORCPT + 99 others); Thu, 6 Feb 2020 03:34:06 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:44892 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727942AbgBFIeF (ORCPT ); Thu, 6 Feb 2020 03:34:05 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580978045; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=M5EiAM340YTfaI+JUM+VIwr5LUgYqYXxc1QkKU1WUtI=; b=iQ4Sa3M5MgY7goYusm1XcH5yBTSDPQWfDHWDk/dQtkm+WB9+Anhaewu2bJg63HtzqzqhnfbQ G4+Q1sXzYuoQTunbqW/+R8MChXMjN5JMoypHc0ned3htd1yCtMdgSR1bQtROY1uSMKfqqTjt Sl1BLFnZA6388LDSZgpgAdKAdhg= X-Mailgun-Sending-Ip: 104.130.122.26 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 5e3bcf7b.7fa253358c70-smtp-out-n01; Thu, 06 Feb 2020 08:34:03 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 58D52C447BD; Thu, 6 Feb 2020 08:34:00 +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 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 C0C83C447A2; Thu, 6 Feb 2020 08:33:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C0C83C447A2 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: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Matthias Brugger , Bean Huo , Stanley Chu , Bart Van Assche , Venkat Gopalakrishnan , Tomas Winkler , linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH v7 5/8] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic Date: Thu, 6 Feb 2020 00:33:24 -0800 Message-Id: <1580978008-9327-6-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1580978008-9327-1-git-send-email-cang@codeaurora.org> References: <1580978008-9327-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 The async version of ufshcd_hold(async == true), which is only called in queuecommand path as for now, is expected to work in atomic context, thus it should not sleep or schedule out. When it runs into the condition that clocks are ON but link is still in hibern8 state, it should bail out without flushing the clock ungate work. Signed-off-by: Can Guo Reviewed-by: Hongwu Su Reviewed-by: Asutosh Das Reviewed-by: Bean Huo Reviewed-by: Stanley Chu --- drivers/scsi/ufs/ufshcd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index bbc2607..e8f7f9d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1518,6 +1518,11 @@ int ufshcd_hold(struct ufs_hba *hba, bool async) */ if (ufshcd_can_hibern8_during_gating(hba) && ufshcd_is_link_hibern8(hba)) { + if (async) { + rc = -EAGAIN; + hba->clk_gating.active_reqs--; + break; + } spin_unlock_irqrestore(hba->host->host_lock, flags); flush_work(&hba->clk_gating.ungate_work); 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