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: 12397969 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 07F50C4338F for ; Sun, 25 Jul 2021 04:27:43 +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 BC04060E77 for ; Sun, 25 Jul 2021 04:27:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BC04060E77 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=Osh9rcxHK0dJvlML00ZxHgodR4orTyvb/xpBVz8rMeU=; b=3DJEO/XWPSfDQr2APMGzJvEgtH cOzbzIa4DhugxpXfJqqYF7xd7p0P1I+BUFL8YYFMssjQAOmGy2ySeqyj74u1Tu8kWeHwaEruuFKHq WZCq+bT5gUKPBPj/DeotLsVmSmZGQDkVvwelINFya60cJGUcz5GegdjPQi+rnFE4fU9E9Z6ijWe5E I9kZGrZLZoSISuZTKCj1rSG/AHzHBxY+FI/nP4PO/BBQDqHbatshAua4ieHnmcXA2x30QheLhgFZi PcawVfOCS4Xa60JGmjnmieWA3y5F2arR3GoPEN6KFm4HJRlc6JdwVrI/IKjcRXjTngGZQmAcAHQXa X/7W203A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7Vhb-0088wy-6H; Sun, 25 Jul 2021 04:25:23 +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-0088vX-7X for linux-arm-kernel@lists.infradead.org; Sun, 25 Jul 2021 04:25:20 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 4GXVMw5tY7zWx; 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=heq1Nrofd2BQKP+4WIO5NxEzHqe39kUnYWVEiXv6rW0=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=Y2HEpcdbQreqce7yHTVI3ebiKNVIzLSd9s+J5JhHu3tcvjwdZLY4EvvA0WwK+/+sB qfTG6E+50eN+Ob1RTN3FMADZaRm9/S9ubrKsG9orZXDIZzgaW1jgmn4/XsQSDqMEyz cGAFONr1HY85Ws+inBjEPlmF1ilI4NSBBTZXlS7nZwx1qQLkvmnf1WU0BZeO/TDzHM ENEN+ij5NQZgGvS6Puv8+zYXD4T/I57MHbqZ6tVBTuCOxsufRgHqEbZqM8DggRJDKZ cllyTO325ExBTeNI74PvO95xi/N7gEy3Js2fF3dZvDmuog7VLNr9TW7OJh9OeYBM0W i6QKrRsxdnuKA== 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: In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH v3 2/5] mmc: sdhci: always obey programmable clock config in preset value MIME-Version: 1.0 To: Kevin Liu , Suneel Garapati , Ulf Hansson Cc: Adrian Hunter , Chris Ball , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Michal Simek X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210724_212519_557334_AA03F57A X-CRM114-Status: GOOD ( 10.65 ) 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 When host controller uses programmable clock presets but doesn't advertise programmable clock support, we can only guess what frequency it generates. Let's at least return correct SDHCI_PROG_CLOCK_MODE bit value in this case. Fixes: 52983382c74f ("mmc: sdhci: enhance preset value function") Signed-off-by: Michał Mirosław --- v3: added a comment for this case v2: no changes --- drivers/mmc/host/sdhci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c7438dd13e3e..3ab60e7f936b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1859,11 +1859,14 @@ u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock, pre_val = sdhci_get_preset_value(host); div = FIELD_GET(SDHCI_PRESET_SDCLK_FREQ_MASK, pre_val); - if (host->clk_mul && - (pre_val & SDHCI_PRESET_CLKGEN_SEL)) { + if (pre_val & SDHCI_PRESET_CLKGEN_SEL) { clk = SDHCI_PROG_CLOCK_MODE; real_div = div + 1; clk_mul = host->clk_mul; + if (!clk_mul) { + /* The clock frequency is unknown. Assume undivided base. */ + clk_mul = 1; + } } else { real_div = max_t(int, 1, div << 1); }