From patchwork Mon Aug 28 14:29:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 111168 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4921076qge; Mon, 28 Aug 2017 07:31:20 -0700 (PDT) X-Received: by 10.98.200.154 with SMTP id i26mr760357pfk.256.1503930679913; Mon, 28 Aug 2017 07:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503930679; cv=none; d=google.com; s=arc-20160816; b=achgqouI2agWtrUD9ma+Q7UJYKGTetSA3aNZtbS3zbW0iBfFbQbVWHY5siuAIiCZus 11AnBURiQOtZx1aaYZ52EVJezPm7pxZCu9YxfBZVJq5WHN6oE9b66oWwNXMDN2CWb3kY v4BFdiZrV5WzHdvu5z95n26aB7x+nkbKIAEhvzk9c2DztELAY2vtssUJpNeGn3/GsszE CBpucwnnvHud0lxabwLUjxiR/+Mk6etW2pjfRfl50P5RUMKlCqulWfOmcgZVsrh281Oi 7CHKcfbylwhSseq3UTHtZiK3Jg+hDElxzJ5N2K9255YwrVSQV5aP7alLzJ51AK+tiV0f C/8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=m2LavEGYkE6hveXQ402i8QyHI3Jw0kp2lrkRgTHjUds=; b=OTDMb5UhP9eG3ENlHeovXqbJs9Sv8ZQwEQJWy/n9qSa4G9osczZqSEnfuBoKWGaUKC MPlCqd77Caqp2NZFthQVcp5f+j4qcJKkPErZSlutkLeZFWzGnFy5skryMZ2C3C23kwK4 RAXNaOfsLA3INxEGb6H/A4RAdWYvyw95Xj6gzoaclnY6rYbxqH7sScdom5XjHcEP2dFs rBULjCyc7lmd9VXUCu5xtkeJJGzi2TQUsBIj4JmEtaN6sjoFMJny7OH0JVR9LhESIhNS vxeSTFjc970Kq0HnRG9C7c4q45uXxYpRcwcxq73OYVD2IoqTqDLR3bj8yL4+baO4C/BA GSyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=HcSlH7pM; 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 t6si369329pgt.643.2017.08.28.07.31.19; Mon, 28 Aug 2017 07:31:19 -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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=HcSlH7pM; 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 S1751866AbdH1ObR (ORCPT + 26 others); Mon, 28 Aug 2017 10:31:17 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:35352 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdH1O30 (ORCPT ); Mon, 28 Aug 2017 10:29:26 -0400 Received: by mail-wr0-f177.google.com with SMTP id j29so1308681wre.2 for ; Mon, 28 Aug 2017 07:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m2LavEGYkE6hveXQ402i8QyHI3Jw0kp2lrkRgTHjUds=; b=HcSlH7pM5y4Gn4msX+qV1eK2qjHFWI/qpmULfVsCtKVXdgpA0prvxmrCao26Momj5m QLJfRo+1OklEjZoNvq9ycy9Ag5yXyJcUaT2fCeWsdMx79Pa0ib/iyXMBt7F4DCoLm6D2 dEdyQwB8MMl/zxvgJbeuLfZkK4mTE9Hm+JRIfLfXVLy+JT0S1conHgoEhGMR0vuGRZ9f gq+rol9tcKw4hWS904omi9+xviFabfzj3AKtaon6zYY8y9e6Dcl23qlLBn7pKP8eb0w4 QvcHmbugHSjukNIEdx3/jmJQz4OyM/v+4/jaTQ00kR2tZ5Z1aCHHAR3u1o95A+p+x9hy D30A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m2LavEGYkE6hveXQ402i8QyHI3Jw0kp2lrkRgTHjUds=; b=ZHJhmQfRVmE19Diel7r8ShmUv2BKdOG6y+VaXJ33OEOQDidK7+emD78XzdqxjEFl3l +dSwpYAOtIIi//mNczgs8xT6qLxXk0p9I/du3l9+kiD/WvaKqtVr89u50KL6nIgf6r4E BhS0V0XFyjkTyRZ7D0xQfs2e8FRm2LBtJpdIZRWRj0x76M4FZNhz//IJX9YUP34DBuhU Y7RZ1P6qjGDDyCtngXIlKATMCwCy9oeg4ITgCF7psL70DI6ZHJll/4Y3KZTdWQigE0XX x0KSBsxEa2vElr15hqyyPkI5hE5eAESej4IuWSbYsugtbcKIR7g/WDLqLWxrb7nU14Pz xutg== X-Gm-Message-State: AHYfb5hlxHCHV+4/CqvIj3fyYjLtODKL5LUPlR1gwTmAAuBm75kVkIn8 WwfGWiUyJ+Ir1obVTJA= X-Received: by 10.223.130.111 with SMTP id 102mr499604wrb.211.1503930565285; Mon, 28 Aug 2017 07:29:25 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id z39sm604792wrz.61.2017.08.28.07.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 07:29:24 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 06/13] mmc: meson-gx: fix dual data rate mode frequencies Date: Mon, 28 Aug 2017 16:29:08 +0200 Message-Id: <20170828142915.27020-7-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170828142915.27020-1-jbrunet@baylibre.com> References: <20170828142915.27020-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In DDR modes, meson mmc controller requires an input rate twice as fast as the output rate Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms") Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) -- 2.9.5 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 7800a7ace2de..341e5a1b32cc 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -262,14 +262,29 @@ static void meson_mmc_post_req(struct mmc_host *mmc, struct mmc_request *mrq, mmc_get_dma_dir(data)); } -static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) +static bool meson_mmc_timing_is_ddr(struct mmc_ios *ios) +{ + if (ios->timing == MMC_TIMING_MMC_DDR52 || + ios->timing == MMC_TIMING_UHS_DDR50 || + ios->timing == MMC_TIMING_MMC_HS400) + return true; + + return false; +} + +static int meson_mmc_clk_set(struct meson_host *host, struct mmc_ios *ios) { struct mmc_host *mmc = host->mmc; + unsigned long rate = ios->clock; int ret; u32 cfg; + /* DDR modes require higher module clock */ + if (meson_mmc_timing_is_ddr(ios)) + rate <<= 1; + /* Same request - bail-out */ - if (host->req_rate == clk_rate) + if (host->req_rate == rate) return 0; /* stop clock */ @@ -278,25 +293,29 @@ static int meson_mmc_clk_set(struct meson_host *host, unsigned long clk_rate) writel(cfg, host->regs + SD_EMMC_CFG); host->req_rate = 0; - if (!clk_rate) { + if (!rate) { mmc->actual_clock = 0; /* return with clock being stopped */ return 0; } - ret = clk_set_rate(host->mmc_clk, clk_rate); + ret = clk_set_rate(host->mmc_clk, rate); if (ret) { dev_err(host->dev, "Unable to set cfg_div_clk to %lu. ret=%d\n", - clk_rate, ret); + rate, ret); return ret; } - host->req_rate = clk_rate; + host->req_rate = rate; mmc->actual_clock = clk_get_rate(host->mmc_clk); + /* We should report the real output frequency of the controller */ + if (meson_mmc_timing_is_ddr(ios)) + mmc->actual_clock >>= 1; + dev_dbg(host->dev, "clk rate: %u Hz\n", mmc->actual_clock); - if (clk_rate != mmc->actual_clock) - dev_dbg(host->dev, "requested rate was %lu\n", clk_rate); + if (ios->clock != mmc->actual_clock) + dev_dbg(host->dev, "requested rate was %u\n", ios->clock); /* (re)start clock */ cfg = readl(host->regs + SD_EMMC_CFG); @@ -490,16 +509,14 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) val |= FIELD_PREP(CFG_BUS_WIDTH_MASK, bus_width); val &= ~CFG_DDR; - if (ios->timing == MMC_TIMING_UHS_DDR50 || - ios->timing == MMC_TIMING_MMC_DDR52 || - ios->timing == MMC_TIMING_MMC_HS400) + if (meson_mmc_timing_is_ddr(ios)) val |= CFG_DDR; val &= ~CFG_CHK_DS; if (ios->timing == MMC_TIMING_MMC_HS400) val |= CFG_CHK_DS; - err = meson_mmc_clk_set(host, ios->clock); + err = meson_mmc_clk_set(host, ios); if (err) dev_err(host->dev, "Failed to set clock: %d\n,", err);