From patchwork Wed Jul 24 19:21:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 169647 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp10673216ilk; Wed, 24 Jul 2019 13:00:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTnw/hB056TFkV14m+OFQkmqi5ZSZELJaN+A1fpfuwdRG3Qz17xMXUSu+XzEudASYT6vNl X-Received: by 2002:a63:2b84:: with SMTP id r126mr38826334pgr.308.1563998415012; Wed, 24 Jul 2019 13:00:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563998415; cv=none; d=google.com; s=arc-20160816; b=Pg+V3J+I2j77v+IRGNDRTpSJO9N5/5wIbNoLyN5uyTpXcurp7g2E3Nv8xMInaz7T4S L3yrM41twXg9749fVYWdaVC1gjqtk3zbIJdZkylYyowi4TStS9iuqvtEcxw6md4BlkBa XnRAkusjjzxEMJoO1WNpot+FhlgRS2mvzgPK6BqPDtvz6+ndsijEn3iq4Wo/1AYj3Keo dDaeLqM31ExIwqC1CPynZ9gIHedrVeuJzoVUWWnty8/U5F5q9o7sDhthIeVkPU78jq4Y Gsya+9oFunjxSw8bxordhyKHPIWDAoDxXEy2XL0jYX42YHrGRzROgVB/M+8QC6lFF/M4 /5ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AkVstSVnl+LvYb1c0UOjGq0BUL7a9Vs2w7FlAPyr784=; b=V8Q6nGeDjrpb/xQyGb6GRRbtKJTPwXLpRdTgOCWO0fn1iBw8V5ZIyhvbJexlKZmgIM VPeeAu9zNZHYV4IH5fkJZYzl6pPipHQGLppMVDnkBXJY5qVyOBcppGSZFaElbvxtTEOI 59cuLC5pbthDVpGyWPXMtz/gODjBdV9Jb3V1M4t4OJr1Lx1DwiEgWgR51scSsMcmDxYG bwYXnhKiz6PKsxAgnmBQJbmAWG1FMDuH6A1L/jjNLG63Xdw2mfYciSb4Oa0dhDSYpoBa 6o6uRUO874HzukBhxg4a2DMMvF2jihsykFOD2YnbyFQlzxvtfKlIOnyKfS3le/jnYQt0 Dx7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0mU5Gzon; 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 b20si14254218pgk.437.2019.07.24.13.00.14; Wed, 24 Jul 2019 13:00:15 -0700 (PDT) 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=pass header.i=@kernel.org header.s=default header.b=0mU5Gzon; 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 S2405198AbfGXUAN (ORCPT + 29 others); Wed, 24 Jul 2019 16:00:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:48004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405181AbfGXUAJ (ORCPT ); Wed, 24 Jul 2019 16:00:09 -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 6B2CD205C9; Wed, 24 Jul 2019 20:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998408; bh=KA3Z+uT9YKRz0tLsoqjBeY0+gyv4LdT1Si7fJUJ72t8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0mU5GzonPSoaN7WtRTKqM6YLfzQJuw2uXlnqHV7fmeXaf+qOyTLm0fIv5UrFv1VkX LJqb363K13MYnfIr8sUr3wNh9Dz6Ilt6RvmS3t47kgz3SOl/vZQnCev2KELMYU+5TB IIhbsZaMt34z/K2LKTgqAIikxc/yDju+P3utHbFE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jorge Ramirez-Ortiz , Bjorn Andersson , Vinod Koul , Adrian Hunter , Ulf Hansson Subject: [PATCH 5.1 356/371] mmc: sdhci-msm: fix mutex while in spinlock Date: Wed, 24 Jul 2019 21:21:48 +0200 Message-Id: <20190724191750.757264008@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jorge Ramirez-Ortiz commit 5e6b6651d22de109ebf48ca00d0373bc2c0cc080 upstream. mutexes can sleep and therefore should not be taken while holding a spinlock. move clk_get_rate (can sleep) outside the spinlock protected region. Fixes: 83736352e0ca ("mmc: sdhci-msm: Update DLL reset sequence") Cc: stable@vger.kernel.org Signed-off-by: Jorge Ramirez-Ortiz Reviewed-by: Bjorn Andersson Reviewed-by: Vinod Koul Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-msm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -584,11 +584,14 @@ static int msm_init_cm_dll(struct sdhci_ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); int wait_cnt = 50; - unsigned long flags; + unsigned long flags, xo_clk = 0; u32 config; const struct sdhci_msm_offset *msm_offset = msm_host->offset; + if (msm_host->use_14lpp_dll_reset && !IS_ERR_OR_NULL(msm_host->xo_clk)) + xo_clk = clk_get_rate(msm_host->xo_clk); + spin_lock_irqsave(&host->lock, flags); /* @@ -636,10 +639,10 @@ static int msm_init_cm_dll(struct sdhci_ config &= CORE_FLL_CYCLE_CNT; if (config) mclk_freq = DIV_ROUND_CLOSEST_ULL((host->clock * 8), - clk_get_rate(msm_host->xo_clk)); + xo_clk); else mclk_freq = DIV_ROUND_CLOSEST_ULL((host->clock * 4), - clk_get_rate(msm_host->xo_clk)); + xo_clk); config = readl_relaxed(host->ioaddr + msm_offset->core_dll_config_2);