From patchwork Fri Jun 5 14:14:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BB32C433E1 for ; Fri, 5 Jun 2020 14:23:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE08320663 for ; Fri, 5 Jun 2020 14:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591367038; bh=ilA4Z8elbiOlh3xjoP7C2eEXxHXicILD+BN/Nzn4i78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=coBVEu6RCFxyPc4TsCd+IneUoUHDjg1oOU6CDrRUcniipruKBy8zQx/+3Qw9BJw2Z TeSFTzQLkFRlpZoLOVfX0OmOyHMAQVaEpGuCrfiuhkyB2aWIGLIGXsMNjnxE0X2URj BSaM23aJmXE8O+NUhnUuQgAz1B8tmj6U4EVzMRf4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728398AbgFEOX4 (ORCPT ); Fri, 5 Jun 2020 10:23:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728584AbgFEOSF (ORCPT ); Fri, 5 Jun 2020 10:18:05 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A0A782086A; Fri, 5 Jun 2020 14:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591366685; bh=ilA4Z8elbiOlh3xjoP7C2eEXxHXicILD+BN/Nzn4i78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nM7fBTyeEYH9cBltsnOYmicnhgvzyJs2pKrFhRplyryc3lBDgWauKHLym1zJFxkx8 zEtICfzZz/Ieie77SNaS7/bdUtAvmJKNpBYzJqhf1HQMN4hR3HNRFytRBq5nlKDCtC bJe+ZwmDKoCeqEO9ocj47/wc2CYXFLjR+pIh6Kuk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bean Huo , Can Guo , "Martin K. Petersen" , Eric Biggers Subject: [PATCH 5.4 12/38] scsi: ufs: Release clock if DMA map fails Date: Fri, 5 Jun 2020 16:14:55 +0200 Message-Id: <20200605140253.311154217@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200605140252.542768750@linuxfoundation.org> References: <20200605140252.542768750@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Can Guo commit 17c7d35f141ef6158076adf3338f115f64fcf760 upstream. In queuecommand path, if DMA map fails, it bails out with clock held. In this case, release the clock to keep its usage paired. [mkp: applied by hand] Link: https://lore.kernel.org/r/0101016ed3d66395-1b7e7fce-b74d-42ca-a88a-4db78b795d3b-000000@us-west-2.amazonses.com Reviewed-by: Bean Huo Signed-off-by: Can Guo Signed-off-by: Martin K. Petersen [EB: resolved cherry-pick conflict caused by newer kernels not having the clear_bit_unlock() line] Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/ufs/ufshcd.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2480,6 +2480,7 @@ static int ufshcd_queuecommand(struct Sc err = ufshcd_map_sg(hba, lrbp); if (err) { + ufshcd_release(hba); lrbp->cmd = NULL; clear_bit_unlock(tag, &hba->lrb_in_use); goto out;