From patchwork Mon Oct 2 12:27:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 114593 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp622278qgn; Mon, 2 Oct 2017 05:28:01 -0700 (PDT) X-Received: by 10.159.206.134 with SMTP id bg6mr9616496plb.273.1506947281390; Mon, 02 Oct 2017 05:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506947281; cv=none; d=google.com; s=arc-20160816; b=Qy8ZKhjhwX35k9JfOnGrDIN8s4pd2+qmIUuYKAcmJD55AUANtMyKrX68Zj7O0uM+ql s3p/m/xTa2DSmIyGieUw7XgTBAyfdbPv2ULm+1hFRJ8qv0X8PNt7foJnMVYjIYBp1edV /8eyZQ+anlnMIohzlliqEfhy8NWDnOBSPifbhRfximcGNKTO80IKrHXvRLE9vJSQugQv fg9jNyh+LXCTVfPnt9Ym0j1dbGgi1Hly6LWTEOYUCRpRmZWC6JZ5DvX1NdG3s4Bdo1eI Si9MzPWz4nJGR/snX4Rn6LvI02tZ/QT4g68BN8IKlYjR1jJOJzWDZC4ZbBlF3dCZT6BW 0pnQ== 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=B5aNHi8LR4Wf2/fXrjR5+cPr5lKC5mPx5dEboI9Wmvo=; b=f9RBl72yvNPKt75lHpqr1o6G1/Gekx9cn6OagkBN8Be3a0ge2JH4YbryzFzKKnWdcH 3FOwCkg2ck5JFrxPgFTiNgfxcxQt9T0EBSIGBG67s9z6Q6GTOYljs3K+Mh2KCDY4LJ1D ynwLXkyhGm/t4N05XkvgO4mENosZUmYWF6RVqF/RPXyUXvMi1hs3QrRz+arp0L/TtQSe QYfWDc5ZmOti5BrrWhJJgGIOIIin8NXWzX+/yZbnwJBMTjJC1QWJPMRHw94FAUDyAShA 3Ps9J5R/efSjs4sTqdV/TC8A5aIuuUVCuY6++XphkjeTiuWmPrVavtytL77ZOjOQyuXm v+KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=lnBi7lU3; 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 g78si4803734pfe.194.2017.10.02.05.28.01; Mon, 02 Oct 2017 05:28:01 -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=lnBi7lU3; 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 S1751371AbdJBM16 (ORCPT + 26 others); Mon, 2 Oct 2017 08:27:58 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:48258 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751305AbdJBM1x (ORCPT ); Mon, 2 Oct 2017 08:27:53 -0400 Received: by mail-wm0-f43.google.com with SMTP id i82so8082616wmd.3 for ; Mon, 02 Oct 2017 05:27:53 -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=B5aNHi8LR4Wf2/fXrjR5+cPr5lKC5mPx5dEboI9Wmvo=; b=lnBi7lU3WI+0GRXMWHYo074p53OPMfuMvoykDJba4U/EIP2fDOIaaM+Mq8s78vlwrN 90bD5mkEnF5T0pTlfPX4wot+Daui54D9hmtJZtphvSEejswFsHoa8dHILBbof974mATO o6LwrDj2UYUwBTWt7dSJs7+e0/Bhi80h0C5s7yPTh6GLch30lhe37keERTjLrNOXj6ZN BiK1PuLYklPkLUrAppMj/e5XbXSvVAHExC0UI+ObONxjlGwfPaVoICujF0DrTfA3eFR/ tktqll26HTFbcEsACzpHUaEutf2yOdGLotpAgXUo0vbGC0H/f26p3lrNakdPR1DIYdc/ uOvw== 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=B5aNHi8LR4Wf2/fXrjR5+cPr5lKC5mPx5dEboI9Wmvo=; b=udXEHWYoXO31ixTlat767BtdW8o1tIWLs5ciNc8VlZ8WOR45mgeRtHlRNLy+/8veQY 9Xn1SHn27p4Li6SbTOdl22h49KdvXuxeyuiKYhsD39DNFFvCKMhzJLuKq9ygJ5R/kyJ1 ltOH8yEx6eqSyLx0Gm6R+2wpHADc0cLGu0OSxTzQjJWREk4srSQardgINZnVw8R+PTBS N4J2cOSSEWKnSr/LovXrlgKvGx3KvgKjHLUUx3JgPi7SM619k8FHivehpkA6JA0I6uxB oEjIOdhIc+KnbPWdrKHQuBcm3cKG3Nd4ao9znpaeDDjH8HHjDGTogJN0F+Z4JcdQXkPG K2eA== X-Gm-Message-State: AHPjjUiSMiHCBJvKCc/fOdBDqO7WUzA4orjDxiRWz3YU8NoQRqs2UBXP cqrbqh6PNgwpAfkz5gLImwhkiQ== X-Google-Smtp-Source: AOwi7QCNp0fPjCLDY9b/z8ssOqetHUDVDxYTPrgF4hpJmXD2en0HxRpmZHDJb9WwMsgCavBY8nj2Rg== X-Received: by 10.28.103.195 with SMTP id b186mr11211301wmc.86.1506947272271; Mon, 02 Oct 2017 05:27:52 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id u96sm14354287wrc.68.2017.10.02.05.27.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 05:27:51 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , Heiner Kallweit , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] mmc: meson-gx: fix rx phase reset Date: Mon, 2 Oct 2017 14:27:42 +0200 Message-Id: <20171002122743.32334-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171002122743.32334-1-jbrunet@baylibre.com> References: <20171002122743.32334-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Resetting the phase when POWER_ON is set the set_ios() call means that the phase is reset almost every time the set_ios() is called, while the expected behavior was to reset the phase on a power cycle. This had gone unnoticed until now because in all mode (except hs400) the tuning is done after the last to set_ios(). In such case, the tuning result is used anyway. In HS400, there are a few calls to set_ios() after the tuning is done, overwriting the tuning result. Resetting the phase on POWER_UP instead of POWER_ON solve the problem. Fixes: d341ca88eead ("mmc: meson-gx: rework tuning function") Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.13.5 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 421c8719c202..08a55c2e96e1 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -745,6 +745,10 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) case MMC_POWER_UP: if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); + + /* Reset rx phase */ + clk_set_phase(host->rx_clk, 0); + break; case MMC_POWER_ON: @@ -758,8 +762,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->vqmmc_enabled = true; } - /* Reset rx phase */ - clk_set_phase(host->rx_clk, 0); break; } From patchwork Mon Oct 2 12:27:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 114594 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp622325qgn; Mon, 2 Oct 2017 05:28:04 -0700 (PDT) X-Received: by 10.98.80.85 with SMTP id e82mr14780877pfb.265.1506947284498; Mon, 02 Oct 2017 05:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506947284; cv=none; d=google.com; s=arc-20160816; b=nR8bG1JLvu/VZ38ZJtw0B4L7iLqK/p2wTuAsdSDD0p91A2WZqqKkQBJ+n2R8kF3PRM DOCc7AWPaJWCSiU50ULR4Al9d2aJw/sq/DnFjkhnbos8R82o8/cui9m/+n0jSqMdAASt z7eiA6ZuLahg6C4rTIGLM2wKRNF0mdh7JX8VkXl8oagyOtRpnwTvXsfWI4pFrebkO2tQ EdcVDtrNnxXpdDg3T65u9G1RnGrfnTZ4ZICa/qDf78/LQcQLTRWJQhdKtlxS+nTDyq5C BQLrSDd744ARs4ON+CrZhUs03B9m9h5lK4cpKiNdT2jB1EhOU78TwWWtV2xZcMKbt6lm 2Egw== 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=7CkBvwonkVOhON/4HrCHr7vpIOloln4LXHTZU1V9M+I=; b=BMDbi7LIOQ045A3F+UKgukkLChx7igkwJAHkRfqnRIb8LIgkFSzOAabkNRaSpXOdq9 Lyursd8P8Ww1XaHtyezcYnqOOS3yYu8+XCyB+tWdpAxzePcIH2Mu255XFrcm+rmNPTMD lzCsyUFgUWw63YMszjdcF+yYGdJzHBySESF2BbNGCFq3frkzcouLDwZWgM9Nym0tzLIk u9MYHgO1Pn1UsKojkGeJQZ1+FT/oE3eLf0Un72zl95uWh8R9CJRHtnkwQxv5hYMl3LND Ehu82kUm3qjzfNTCb7Sa9eUFjDIPkr6FqpeX8jFQHUEpGSRRP2K7Ys9xrB6LfFIddvDs IIlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=Ly/LP6Ou; 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 s10si7605150pgp.757.2017.10.02.05.28.03; Mon, 02 Oct 2017 05:28:04 -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=Ly/LP6Ou; 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 S1751420AbdJBM2B (ORCPT + 26 others); Mon, 2 Oct 2017 08:28:01 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:48007 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750984AbdJBM1y (ORCPT ); Mon, 2 Oct 2017 08:27:54 -0400 Received: by mail-wm0-f46.google.com with SMTP id t69so10238709wmt.2 for ; Mon, 02 Oct 2017 05:27:54 -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=7CkBvwonkVOhON/4HrCHr7vpIOloln4LXHTZU1V9M+I=; b=Ly/LP6OugtKsBEJqUB6thk54nVs7+uJesym12TluNXyAGxG2u3wTegAe2xWkj90f4t fLpOlBEbPM4xCHRUZEEYdvchtUYcu3d7+kTRTcf4UX0YZ8YDyrfJLmfS+VSaR9ljdHCU HBoheX7V6XQ8xC/KpTJrnPyGPexq8zvqkTMNl74Hj2d2zHeL+r+J8/BFywIeCK2XpBL/ k3Vxb/VwSrfuowhNfgSGCD3pNghawM5pHqOXKzpHv89ZFInsaHoRQQfCVOP7Hoyq4ap0 25YLn/bDPwM7sCQLMOyxOxEIvR3iC7MNIoKrCO5tK/ZMxkMCpqgzXQNqc9/tvubwiUhD NnAQ== 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=7CkBvwonkVOhON/4HrCHr7vpIOloln4LXHTZU1V9M+I=; b=kgdd8Oarjo68Oe+WdR6HBj9SELxhP5Q+kWK75AceHlCE8XYQcfNOrQcMs9uNCyXH4O YHOmsVYfpW6/D2XyoCE1yVQ+hltLV4/loc4H8bohmzGCILsUR+O6bAITp9rK34et8gjJ /rVZBQN6hF/Wy1I8GYlPWY8xwpddpUN+5zLrKUCKvzj9u3TJhrHgU52aC5IQdyJS8rlu qeX9IulqchAF537X9byA0H2kbXHsDX3kt78GdQlpf7gFDa+aF+shp7+lM+ntJ7ucgYID T6eg5ZjAOxPpJYIwidGDsTaVLwUE1kFiqJ5COY54Wh2E5R0LJQqlxvOjESEK7Kbu5oOz eC3w== X-Gm-Message-State: AMCzsaWUlGkher8l2psWz93RozYlcg0ytCjy65kMkonWy/RSCOnrCiEz CNFsfQhk+3IqOY2sfTmudMTcxw== X-Google-Smtp-Source: AOwi7QAboVDXjWTEXcHQidweGkI7m75yu2L9f9aP91cUzd8Ic8tLeZIZ/e2noMkjA5azS6VDaZtXYQ== X-Received: by 10.28.196.79 with SMTP id u76mr7369024wmf.95.1506947273636; Mon, 02 Oct 2017 05:27:53 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id u96sm14354287wrc.68.2017.10.02.05.27.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 05:27:52 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , Heiner Kallweit , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] mmc: meson-gx: include tx phase in the tuning process Date: Mon, 2 Oct 2017 14:27:43 +0200 Message-Id: <20171002122743.32334-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171002122743.32334-1-jbrunet@baylibre.com> References: <20171002122743.32334-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It has been reported that some platforms (odroid-c2) may require a different tx phase setting to operate at high speed (hs200 and hs400) To improve the situation, this patch includes tx phase in the tuning process. Fixes: d341ca88eead ("mmc: meson-gx: rework tuning function") Reported-by: Heiner Kallweit Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) -- 2.13.5 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 08a55c2e96e1..85745ef179e2 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -716,6 +716,22 @@ static int meson_mmc_clk_phase_tuning(struct mmc_host *mmc, u32 opcode, static int meson_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode) { struct meson_host *host = mmc_priv(mmc); + int ret; + + /* + * If this is the initial tuning, try to get a sane Rx starting + * phase before doing the actual tuning. + */ + if (!mmc->doing_retune) { + ret = meson_mmc_clk_phase_tuning(mmc, opcode, host->rx_clk); + + if (ret) + return ret; + } + + ret = meson_mmc_clk_phase_tuning(mmc, opcode, host->tx_clk); + if (ret) + return ret; return meson_mmc_clk_phase_tuning(mmc, opcode, host->rx_clk); } @@ -746,8 +762,9 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); - /* Reset rx phase */ + /* Reset phases */ clk_set_phase(host->rx_clk, 0); + clk_set_phase(host->tx_clk, 270); break;