From patchwork Tue Jun 9 17:44:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 224630 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=unavailable 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 83A8BC433E0 for ; Tue, 9 Jun 2020 18:14:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56E0C2068D for ; Tue, 9 Jun 2020 18:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591726463; bh=1D1atwDSzipyEayBvq/aWajeGTfkEWw1Y6rBLxAEMoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rzyHuYTw3QhK6ppHySW+/R1hJ+P2ihCfuFUXLt552WXkLbgEh8rodRveKYdsq+dSr uc24snMtoe9vROzzYvDB62bf37fB2LBDbKAd+4LyiRImrxJZnhnOGH5aToAOqsY95x zff7LskSxma5WKB3EMwldjsVPStlux79kO09tEkQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731078AbgFISOC (ORCPT ); Tue, 9 Jun 2020 14:14:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:38682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731193AbgFIRup (ORCPT ); Tue, 9 Jun 2020 13:50:45 -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 B4DD120734; Tue, 9 Jun 2020 17:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725045; bh=1D1atwDSzipyEayBvq/aWajeGTfkEWw1Y6rBLxAEMoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xYIox7UM36XVvY3r+UhuG3ivncnClQ8/OeTfw3BMrrTtUZMxJuR/njrtOsef2NrSP q0lUIVZwafvNJUjvRucyvkzG9eX+SmEdCpi2ITppV6Ew7WIuhMd2N4xKNTJHCEX/Wy xHRyYegrSVqRrC/OAvuhKrUlzlFcTwQqFLV9jfh0= 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 4.14 21/46] scsi: ufs: Release clock if DMA map fails Date: Tue, 9 Jun 2020 19:44:37 +0200 Message-Id: <20200609174026.103882129@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174022.938987501@linuxfoundation.org> References: <20200609174022.938987501@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 @@ -2365,6 +2365,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;