Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp2172423pxm; Fri, 4 Mar 2022 10:41:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQo8hy1elA9oZt4WUkMgGKGN8gFbieHY1yALumavgn8DjhHt1qTE5NFEpSqf2bF4v8Gd92 X-Received: by 2002:a37:6557:0:b0:608:bb18:a840 with SMTP id z84-20020a376557000000b00608bb18a840mr3398392qkb.225.1646419301366; Fri, 04 Mar 2022 10:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646419301; cv=none; d=google.com; s=arc-20160816; b=sWiMwuA8ICI+LfxaHKZfrgpTm6DwSSgqOnpZyn7KYoAEdHFUDJ6omCEtyi+hRnk9qm mSrXlWLdIBAsM7XXhh1BBSJJgus7qJIq8mVhRCeLWRouzL/ejBqi1BzLyKEcoeuO25YV lf+RLWaHlZyyU7ii3P9s0NhW8vLVxudjdn+pT5y9ySENY9hl5w6BSRpAM6V8lFp2xCdf RjcmSNV48w1eNwalwAaT+1TUdRcNGqqUbJal20nloOBT8phkaTOcRDr2NYQNS5k4+MFw mqQdRN/BmlmC/CVKIamvTTiJLRsZITiMUsBRPnF1xFn71m9eNGZJtxMhr/dkOx/cQoii baGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=j0hVswqmu/Vu5Jl65S/K5JPCKbtzbb7gdrklOrZ6qb8=; b=uMgNj4I3hKJVZFnvYnC3lmR5ZJEe2qm+qRZQAg7graaFul5Y3OXyoSXZIGcdouvXNz QNqXwocWo6DYBoHTxilAcWuGKkOUl05n9eKYPVkrkLHClJ2FgLOBSKrMGagqwdghLlST I/ni+StwradsGO/LqWLqp3k89rM5u1okNwka/AqblPokSEixo49accLANMu17hbY0VOA kWqL550teSbeN9tASnMAmOHfJEKTLQw5dD9GEaqHJ08uWIynZybyH5uNyFEAcACRPnRl nEZh3QbsGXexis9HQbgyrw7S6t3f0GRoNZCQKOWH62NntkWbN/1UHaRiWDVlCAabSjPZ T+LQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o196-20020a37a5cd000000b006495b9a1237si1298082qke.576.2022.03.04.10.41.24; Fri, 04 Mar 2022 10:41:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235383AbiCDNir (ORCPT + 99 others); Fri, 4 Mar 2022 08:38:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbiCDNip (ORCPT ); Fri, 4 Mar 2022 08:38:45 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 55CD663BEF; Fri, 4 Mar 2022 05:37:56 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ADEDD1396; Fri, 4 Mar 2022 05:37:55 -0800 (PST) Received: from [10.57.39.47] (unknown [10.57.39.47]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CA9903F70D; Fri, 4 Mar 2022 05:37:52 -0800 (PST) Message-ID: Date: Fri, 4 Mar 2022 13:37:47 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] mmc: host: dw-mmc-rockchip: fix handling invalid clock rates Content-Language: en-GB To: Peter Geis , Jaehoon Chung , Ulf Hansson , Heiko Stuebner , Addy Ke , Doug Anderson Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org References: <20220303015151.1711860-1-pgwipeout@gmail.com> From: Robin Murphy In-Reply-To: <20220303015151.1711860-1-pgwipeout@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022-03-03 01:51, Peter Geis wrote: > The Rockchip ciu clock cannot be set as low as the dw-mmc hardware > supports. This leads to a situation during card initialization where the > ciu clock is set lower than the clock driver can support. The > dw-mmc-rockchip driver spews errors when this happens. > For normal operation this only happens a few times during boot, but when > cd-broken is enabled (in cases such as the SoQuartz module) this fires > multiple times each poll cycle. > > Fix this by testing the minimum frequency the clock driver can support > that is within the mmc specification, then divide that by the internal > clock divider. Set the f_min frequency to this value, or if it fails, > set f_min to the downstream driver's default. > > Fixes: f629ba2c04c9 ("mmc: dw_mmc: add support for RK3288") > > Signed-off-by: Peter Geis > --- > drivers/mmc/host/dw_mmc-rockchip.c | 31 ++++++++++++++++++++++++++---- > 1 file changed, 27 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c > index 95d0ec0f5f3a..c198590cd74a 100644 > --- a/drivers/mmc/host/dw_mmc-rockchip.c > +++ b/drivers/mmc/host/dw_mmc-rockchip.c > @@ -15,7 +15,9 @@ > #include "dw_mmc.h" > #include "dw_mmc-pltfm.h" > > -#define RK3288_CLKGEN_DIV 2 > +#define RK3288_CLKGEN_DIV 2 > +#define RK3288_MIN_INIT_FREQ 375000 > +#define MMC_MAX_INIT_FREQ 400000 > > struct dw_mci_rockchip_priv_data { > struct clk *drv_clk; > @@ -27,6 +29,7 @@ struct dw_mci_rockchip_priv_data { > static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) > { > struct dw_mci_rockchip_priv_data *priv = host->priv; > + struct mmc_host *mmc = mmc_from_priv(host); > int ret; > unsigned int cclkin; > u32 bus_hz; > @@ -34,6 +37,10 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) > if (ios->clock == 0) > return; > > + /* the clock will fail if below the f_min rate */ > + if (ios->clock < mmc->f_min) > + ios->clock = mmc->f_min; > + > /* > * cclkin: source clock of mmc controller > * bus_hz: card interface clock generated by CLKGEN > @@ -51,7 +58,7 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) > > ret = clk_set_rate(host->ciu_clk, cclkin); > if (ret) > - dev_warn(host->dev, "failed to set rate %uHz\n", ios->clock); > + dev_warn(host->dev, "failed to set rate %uHz err: %d\n", cclkin, ret); > > bus_hz = clk_get_rate(host->ciu_clk) / RK3288_CLKGEN_DIV; > if (bus_hz != host->bus_hz) { > @@ -290,13 +297,29 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host) > > static int dw_mci_rockchip_init(struct dw_mci *host) > { > + struct mmc_host *mmc = mmc_from_priv(host); Hang on, "host" here is a struct dw_mci allocated directly by dw_mci_pltfm_register(), not as private data via mmc_alloc_host(), so surely this is bogus? If I've followed things through correctly, I think it's host->slot->mmc that we need to propagate a non-default f_min to, except that that hasn't been allocated yet at this point. Having multiple different types of "host", "slot" and "mmc" variables certainly does no favours to making sense of this stuff :( Robin. > + int ret; > + > /* It is slot 8 on Rockchip SoCs */ > host->sdio_id0 = 8; > > - if (of_device_is_compatible(host->dev->of_node, > - "rockchip,rk3288-dw-mshc")) > + if (of_device_is_compatible(host->dev->of_node, "rockchip,rk3288-dw-mshc")) { > host->bus_hz /= RK3288_CLKGEN_DIV; > > + /* clock driver will fail if the clock is less than the lowest source clock > + * divided by the internal clock divider. Test for the lowest available > + * clock and set the f_min freq to clock / clock divider. If we fail, set > + * it to the downstream hardcoded value. > + */ > + ret = clk_round_rate(host->ciu_clk, MMC_MAX_INIT_FREQ * RK3288_CLKGEN_DIV); > + if (ret < 0) { > + dev_warn(host->dev, "mmc safe rate failed: %d\n", ret); > + mmc->f_min = RK3288_MIN_INIT_FREQ; > + } else { > + mmc->f_min = ret / RK3288_CLKGEN_DIV; > + } > + } > + > return 0; > } >