Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1211266ybv; Fri, 7 Feb 2020 16:52:24 -0800 (PST) X-Google-Smtp-Source: APXvYqwR5or6CTEXF3dG8hu8SQ5AplTjo6QR7lUhEvscx8osinzK5EpmCqObLH7lzIgUK+JCOb+K X-Received: by 2002:aca:4996:: with SMTP id w144mr3725248oia.111.1581123144688; Fri, 07 Feb 2020 16:52:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581123144; cv=none; d=google.com; s=arc-20160816; b=0AeAmo6YrUgM9TqpSRJfPFGSKAXrQQCB+FxPtcc6r62PvdiFgybgRdDcDxPqy66Yjm vOcwfATdZVYkS6TDDFU5yQmQju7WVDIE7MlV86ChNctVxcjXXRA57uu+K9ZmdeK8IsKW oLZJvjCpnsg9eima7Zf3wLF7AxJBS4ObFMxGLLQyaHISNfITmUCdrwurIcdYO2XkuPfk FYQS/i+ZaUHxlLkbJqoZUByVo21wrLq5iOukmx6XC5Mg7pNG3JwOKrFOMsM+oGm4bBuH dhhQya59P3NJ86pQUzJgoIzw/9JsXyTrZPFtS2/dp3Fpg259/PO9307lC0t6BwtNQty3 Ca6A== 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=Acsfsqg2b6NUDHJeY/gDJ1vlOSDS93J/sV1EZBqKdko=; b=VzGjdYTAGEliYohW2RlnU+tfFfapKE6oanl2BfFq1vszhwtzl6f3i53LYeIEOfbWWX GfBHYSIqtIq2XtccqfMKwj7xrVz0+zr+5A6kPTBOPKDuF8bQB54JbWpWrkMkH8WvtvoL 8cMGOl37XrII0+mzXuet5gBA2oCBENvB4TChKW3rTNi9Nr6uPEI++pXGx6B7UFh4alhS pQ8/E+mcz4rzpLSEk7AW+WRG6LLEvVKN7++tj1BE2TH6FTQIebidapNPldsubsOvTuDV DWWgvPBS2JNyJRq2lH9M7z4gYAiYf3QZh3Cx7ZASFKxrHgTxxa6LCrjGcQMZ8XJJ4kKK eqLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=oNmJsZIl; 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 r66si4825111oie.255.2020.02.07.16.52.13; Fri, 07 Feb 2020 16:52:24 -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=oNmJsZIl; 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 S1727549AbgBHAvG (ORCPT + 99 others); Fri, 7 Feb 2020 19:51:06 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:55847 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727130AbgBHAvF (ORCPT ); Fri, 7 Feb 2020 19:51:05 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1581123064; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=Acsfsqg2b6NUDHJeY/gDJ1vlOSDS93J/sV1EZBqKdko=; b=oNmJsZIlIVLwSVrpibioQp+VUxqfWJW1DWoCfI5yTGhvO/HbI0ClItzOZ2b+r8yUC3m4RZHS qIXMNwKTCLwRuac9HKu3ZulRTIBqUQGjXnBoLbSuuJyN1IdHNkFwvQnncMpf9+p8/ulRmEsv SN/4xDLFfrwI85gjbpv+a1BeoGQ= 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 5e3e05f7.7ff4d03405a8-smtp-out-n01; Sat, 08 Feb 2020 00:51:03 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id B1230C43383; Sat, 8 Feb 2020 00:51:02 +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 C548FC447A5; Sat, 8 Feb 2020 00:50:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C548FC447A5 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 5/7] scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic Date: Fri, 7 Feb 2020 16:50:27 -0800 Message-Id: <1581123030-12023-6-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1581123030-12023-1-git-send-email-cang@codeaurora.org> References: <1581123030-12023-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 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