From patchwork Sun Jul 25 04:25:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 12397973 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=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 80D75C4338F for ; Sun, 25 Jul 2021 04:28:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5138660E77 for ; Sun, 25 Jul 2021 04:28:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5138660E77 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=rere.qmqm.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:MIME-Version:Subject:From: References:In-Reply-To:Message-Id:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=X6HTLkxwgFUGTfGhHXQaelkMeD82RUhmS5nbrViKNu8=; b=i2fAH4DeVhaMJBya73MfDAK0Aq /5UlqX6nakE6BvHtZA555QEwWM06KPXqFwKFz/OL+I4KBJNRiTKPeioRc5aUWaQQGRf2SqhvQu5CM WjZQcRgZhU9HwNUMXbCNr5x0JRGJL46XCRiXxipK4svwmQrZBeVp2CtCpyAtgvjuVR4SjIYbOzvJi m8Yk4AnD4qjQGqyKl12BTxf3iJgWSCVR05lcuAptl3w8wrbcuE04aIus+e1ZnUFVG68eNNLVuysHk kDUooh6utRDA5oMRyJSqbYK/WHesHv9Ea6kpjCU8slqGdJIuUm+LVwqrlJPIaFlyGMo1aitMtuoQo FecovJ5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7Vi6-0088zf-5x; Sun, 25 Jul 2021 04:25:54 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7VhX-0088vW-7a for linux-arm-kernel@lists.infradead.org; Sun, 25 Jul 2021 04:25:22 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4GXVMw2gk7zQ4; Sun, 25 Jul 2021 06:25:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1627187116; bh=n4tm9awV3n8UWCA4HHMvEDV8yXB7gzSUySmWHxD0+vs=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=DX3eQvrVT8ICox9QlqW7PUFy/rzo0ebRf53PlNHU6soL7KwQresQvwAGU27L/gHsj 0G+nBF1seKdAXZJpcE1uKgjals/C3tK6IRWp6SZyjcvxTu2FXjLfUmjfJBsj3J6v2K KYRVf2h+rssZI4wGr3VSP03OUzOaQ5CPM/EOLNRr+xcy5Hpi/zUp6q4KMVqCN+B8V7 xWly68niUwUnd4sybkhgONKpCaocVuxDpE9lqFoe/I6Q9V1f3nfOSlyGtvTex2beto wbOtg2gn8HfdgxpxbYoT7hEqICih/sTV6qy+F4C8hgVTdF5Y2lc+6oLZBfRa3HuyGi EsHK+QR9bHzTw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.2 at mail Date: Sun, 25 Jul 2021 06:25:16 +0200 Message-Id: <2fea541c7e679dcda64b5a128bf8ff301fdf1af7.1627186831.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH v3 1/5] mmc: sdhci: fix base clock usage in preset value MIME-Version: 1.0 To: Ulf Hansson , Kevin Liu , Suneel Garapati Cc: Adrian Hunter , Chris Ball , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michal Simek X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210724_212519_557340_C38F37DA X-CRM114-Status: GOOD ( 10.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fixed commit added an unnecessary read of CLOCK_CONTROL. The value read is overwritten for programmable clock preset, but is carried over for divided clock preset. This can confuse sdhci_enable_clk() if the register has enable bits set for some reason at time time of clock calculation. Remove the read. Quoting Al Cooper: sdhci_brcmstb_set_clock() assumed that sdhci_calc_clk() would always return the divider value without the enable set, so this fixes a case for DDR52 where the enable was not being cleared when the divider value was changed. Cc: stable@kernel.vger.org Fixes: 52983382c74f ("mmc: sdhci: enhance preset value function") Signed-off-by: Michał Mirosław Acked-by: Al Cooper --- v3: updated commit message v2: removed truncated sentence from commitmsg Signed-off-by: Michał Mirosław --- drivers/mmc/host/sdhci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index aba6e10b8605..c7438dd13e3e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1857,7 +1857,6 @@ u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock, if (host->preset_enabled) { u16 pre_val; - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); pre_val = sdhci_get_preset_value(host); div = FIELD_GET(SDHCI_PRESET_SDCLK_FREQ_MASK, pre_val); if (host->clk_mul &&