From patchwork Tue Jul 29 16:38:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4641421 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ADBC39F2B8 for ; Tue, 29 Jul 2014 16:38:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E20F20145 for ; Tue, 29 Jul 2014 16:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7940520158 for ; Tue, 29 Jul 2014 16:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbaG2QiQ (ORCPT ); Tue, 29 Jul 2014 12:38:16 -0400 Received: from mail-vc0-f175.google.com ([209.85.220.175]:49269 "EHLO mail-vc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774AbaG2QiO (ORCPT ); Tue, 29 Jul 2014 12:38:14 -0400 Received: by mail-vc0-f175.google.com with SMTP id ik5so5077779vcb.20 for ; Tue, 29 Jul 2014 09:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=XbKPP3YE+R+QX5rYBOAmAdeU5/EUC5RZEKC3sKXKDck=; b=Lzd7iyo0b24HqkhJ5ckdKnnBNgPQNQ/D3As7kwq5AAtZddW0in5bvfsqNkjxn1Hpga QNROXffoAWCPOZtLqYxyusoZWMBjGP/pCuyyWVy9HA2qsSp3yurGT9/TPYh/+OlXyPmb lI3esVV9vGaDj2f2zj6rla5mYi2LW94aEwUtb/rcdz7UmrPJUm4bBwpNQCpsvEo6McHi onOSLzQjqju/gTQzUdkMo5ovzpReUZIFECGkZKuXn9ZkwZowo6bB+5EwxH0fBZ3JUwkA qZTHbb3+2zdAEbBFqezB/tF6BuJ21/DN1vwYUJr4TvPpPBhyokD5OAkqxlsP35AhkBXy W4hA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=XbKPP3YE+R+QX5rYBOAmAdeU5/EUC5RZEKC3sKXKDck=; b=Otd/ITzRqNURjSqRCDgqE/xSsE1Rb89SbITYm4fbneBlAm5QaII2a3MJgp29Is6YGE 5+lcw2je9mkhg2LKLieCr20loWl4wL1tJl9hHIDtxCKyEIXVbug7Cb/XC0AfjSfT6OJJ LCRpz0R+sfMfMHMzYinE75wrbX0rXllYdt/jg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=XbKPP3YE+R+QX5rYBOAmAdeU5/EUC5RZEKC3sKXKDck=; b=g9uLr0N3seCQsfSLLeWrfBb/dLtGE9OLiJ+0dMDOL1RKS9UBTg6RkW/2dC5bAkpvlI UiPbHB3NbubPO5SqC8eMnFmdXZau61ILx6HtimQDKo1XGdBR2H/HhYiA1Z5PfQ0CaeVS sft3SZRt7tL+Xuo2pG6lU29MBg5tYgdfyWANDkU8lEf+bP6Wd+Q3h+GgGnLtSPWL9cmr slVIt7hnWyLInxOy9W8o2MJwRGJaWp7jDddP2cMJECjsnauEo12sLzZJJ5+GmjoqyDHg bswqvDH5m8THrVlDuHS+qa138DRwcltdBT3gt0N7/t7XSqOntFgLWqCFVqhS9zh2BZA8 O6KA== X-Gm-Message-State: ALoCoQlQfx+D4HWzD/QhGo/+QZiQhD3YS9lj0ImuZx32GjnMlT8+FYDtE5tGKIzghBvf5OirxZQr MIME-Version: 1.0 X-Received: by 10.52.248.232 with SMTP id yp8mr1829305vdc.83.1406651893216; Tue, 29 Jul 2014 09:38:13 -0700 (PDT) Received: by 10.52.100.132 with HTTP; Tue, 29 Jul 2014 09:38:13 -0700 (PDT) In-Reply-To: References: <1404565174-2923-1-git-send-email-addy.ke@rock-chips.com> <1404963109-3906-1-git-send-email-addy.ke@rock-chips.com> Date: Tue, 29 Jul 2014 09:38:13 -0700 X-Google-Sender-Auth: m-iYEroDkn1w9zxLUjyuHlHdCzs Message-ID: Subject: Re: [PATCH v2] mmc: dw_mmc: add support for RK3288 From: Doug Anderson To: Addy Ke Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap , Seungwon Jeon , Jaehoon Chung , Chris Ball , Ulf Hansson , Dinh Nguyen , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Olof Johansson , "devicetree@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-mmc@vger.kernel.org" , zyf , Sonny Rao Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY, URIBL_BLACK autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Addy, On Mon, Jul 28, 2014 at 9:52 PM, Doug Anderson wrote: > Addy, > > On Wed, Jul 9, 2014 at 8:31 PM, Addy Ke wrote: >> This patch focuses on clock setting for RK3288 mmc controller. >> >> In RK3288 mmc controller, CLKDIV register can only be set 0 or 1, >> and if DDR 8bit mode, CLKDIV register must be set 1. >> >> Signed-off-by: Addy Ke >> --- >> changes since v1: >> - dw_mci_rk3288_setup_clock: do not call clk_get_rate(), just use the >> host->bus_hz which is already called by dw_mmc.c, suggested by Jaehoon Chung >> >> .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 4 +- >> drivers/mmc/host/dw_mmc-pltfm.c | 50 +++++++++++++++++++++- >> 2 files changed, 51 insertions(+), 3 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt >> index c559f3f..e3f95cd 100644 >> --- a/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt >> +++ b/Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt >> @@ -10,7 +10,9 @@ extensions to the Synopsys Designware Mobile Storage Host Controller. >> Required Properties: >> >> * compatible: should be >> - - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following >> + - "rockchip,rk2928-dw-mshc": for Rockchip RK2928 and following, >> + before RK3288 >> + - "rockchip,rk3288-dw-mshc": for Rockchip RK3288 >> >> Example: >> >> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c >> index d4a47a9..809c28b 100644 >> --- a/drivers/mmc/host/dw_mmc-pltfm.c >> +++ b/drivers/mmc/host/dw_mmc-pltfm.c >> @@ -21,17 +21,61 @@ >> #include >> #include >> #include >> +#include >> >> #include "dw_mmc.h" >> #include "dw_mmc-pltfm.h" >> >> +#define RK3288_CLKGEN_DIV 2 > > Yup, this matches what I see in the TRM. It will always divide by 2 > to allow for 4 phases (picking the phases not supported yet). Default > phase looks to be 180 degrees which is why we've (currently) got > USE_HOLD_REG hardcoded. :) > >> + >> static void dw_mci_pltfm_prepare_command(struct dw_mci *host, u32 *cmdr) >> { >> *cmdr |= SDMMC_CMD_USE_HOLD_REG; >> } >> >> -static const struct dw_mci_drv_data rockchip_drv_data = { >> +static int dw_mci_rk3288_setup_clock(struct dw_mci *host) >> +{ >> + host->bus_hz /= RK3288_CLKGEN_DIV; >> + >> + return 0; >> +} >> + >> +static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) >> +{ >> + int ret; >> + unsigned int cclkin; >> + >> + /* >> + * cclkin: source clock of mmc controller. >> + * bus_hz: card interface clock generated by CLKGEN. >> + * bus_hz = cclkin / RK3288_CLKGEN_DIV; >> + * ios->clock = (div == 0) ? bus_hz : (bus_hz / (2 * div)) >> + * >> + * Note: div can only be 0 or 1 >> + * if DDR50 8bit mode, div must be set 1 > > Makes sense. So this function is essentially reversing the logic in > dw_mmc and making sure that we'll get the right DIV (0 or 1) in > dw_mci_setup_bus(). > > >> + */ >> + if ((ios->bus_width == MMC_BUS_WIDTH_8) && >> + (ios->timing == MMC_TIMING_UHS_DDR50 || > > Probably don't need UHS_DDR50 since (I think) you can't have an 8-bit > SD card--only MMC, right? ...but it doesn't hurt. > > >> + ios->timing == MMC_TIMING_MMC_DDR52)) >> + cclkin = 2 * ios->clock * RK3288_CLKGEN_DIV; >> + else >> + cclkin = ios->clock * RK3288_CLKGEN_DIV; >> + >> + ret = clk_set_rate(host->ciu_clk, cclkin); >> + if (ret) >> + dev_warn(host->dev, "failed to set rate %uHz\n", ios->clock); >> + >> + host->bus_hz = clk_get_rate(host->ciu_clk) / RK3288_CLKGEN_DIV; >> +} >> + >> +static const struct dw_mci_drv_data rk2928_drv_data = { >> + .prepare_command = dw_mci_pltfm_prepare_command, >> +}; >> + >> +static const struct dw_mci_drv_data rk3288_drv_data = { >> .prepare_command = dw_mci_pltfm_prepare_command, >> + .set_ios = dw_mci_rk3288_set_ios, >> + .setup_clock = dw_mci_rk3288_setup_clock, >> }; >> >> static const struct dw_mci_drv_data socfpga_drv_data = { >> @@ -95,7 +139,9 @@ EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops); >> static const struct of_device_id dw_mci_pltfm_match[] = { >> { .compatible = "snps,dw-mshc", }, >> { .compatible = "rockchip,rk2928-dw-mshc", >> - .data = &rockchip_drv_data }, >> + .data = &rk2928_drv_data }, >> + { .compatible = "rockchip,rk3288-dw-mshc", >> + .data = &rk3288_drv_data }, >> { .compatible = "altr,socfpga-dw-mshc", >> .data = &socfpga_drv_data }, >> {}, > > Reviewed-by: Doug Anderson > Tested-by: Doug Anderson It turns out that I spoke too soon. I realized that in my testing I didn't have "DDR" mode enabled for my eMMC card. When I did that then your patch didn't work. The problem is that dw_mci_setup_bus() doesn't realize that you've changed "bus_hz" so it needs to re-run. You can fix it like this: * cclkin: source clock of mmc controller. @@ -65,7 +66,11 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) if (ret) dev_warn(host->dev, "failed to set rate %uHz\n", ios->clock); - host->bus_hz = clk_get_rate(host->ciu_clk) / RK3288_CLKGEN_DIV; + bus_hz = clk_get_rate(host->ciu_clk) / RK3288_CLKGEN_DIV; + if (bus_hz != host->bus_hz) { + host->bus_hz = bus_hz; + host->current_speed = 0; /* force dw_mci_setup_bus() */ + } } static const struct dw_mci_drv_data rk2928_drv_data = { Do you want to spin the patch for this? -Doug --- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index 809c28b..bcc96d0 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -44,6 +44,7 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) { int ret; unsigned int cclkin; + u32 bus_hz; /*