From patchwork Thu Aug 8 16:47:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Detlev Casanova X-Patchwork-Id: 818361 Received: from sender4-op-o14.zoho.com (sender4-op-o14.zoho.com [136.143.188.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56949191494; Thu, 8 Aug 2024 16:48:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723135689; cv=pass; b=m8IJYMTeXzuVx1oNjnwKMHm3V5UyRyvL2zhEcOzDKt3sEysiRl9Il0983gdsL2ogRz+qnTMtGxDv6lRoBCRmT7NGDP33IyZ95hEOVElsaYWws26h9mFUYWh11gL6m4tfkKxcyqp2unsqLt7sKE1xZE33dZz/RPFFjdRjX2NyuaU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723135689; c=relaxed/simple; bh=YADMq1E6Ns2QSgl1lGFsrhN9032svaej5UPecV9n32g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ejnOQ0R7q5gnB1jLBWZeV4TqoiYtufn9s8RcwbgxYIi09jdgPOYXdbd2KltRLHa1d7OfLj1Go4WolAwOWN+HJ4PO82gHvmAoG/ZiFyOKfq8GEbTmQY8vJzz8qfdrfkTBt/fIotBeaZ5ifSnUQIkIb1qnIX54JJvLcK6j/CRAPnk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=detlev.casanova@collabora.com header.b=jdmbuLKg; arc=pass smtp.client-ip=136.143.188.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=detlev.casanova@collabora.com header.b="jdmbuLKg" ARC-Seal: i=1; a=rsa-sha256; t=1723135668; cv=none; d=zohomail.com; s=zohoarc; b=AwebEZ7sVGgKbhv17XDqKKhh11HzhakcP5aG5QEq9zEANTdTprcp4uQaQM7pAn1nEMfCjdBs4iN7YTCdTEqvLLLFVWlup0UIN7SsZW1OSiefS6hr19PKGeaRsgta2TwbrQQJANoyWw3HTRRPTlLj795HrceosEYzkOwYTiZYj0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723135668; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=KmSMPlwOYP2oZ/KiPrhvVajir7L1CmOMV+OUlQTo+R8=; b=HKIa1etRgF2uadf0Vp7AiLZNzay9PPZ038VCcs+jEH+TltSfQFrJR9mVuvjIQzYP7YFNi72aQuWEIcb2GymEDNjNHwK8dilRyjkDt+CS0QG8ZQxhIl6GO3r3MGla+HD1+S6Mq4HR7HHHddN5ew4IqzZBMTk2bKkM2UXD6InYcL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=detlev.casanova@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1723135668; s=zohomail; d=collabora.com; i=detlev.casanova@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=KmSMPlwOYP2oZ/KiPrhvVajir7L1CmOMV+OUlQTo+R8=; b=jdmbuLKgk76vwILmDtVRGilsSTSwRZaZaC/gzglpWiwwRrn5xSSWEXw/wvjSMS1b fl26TP+A8HvqEBBJxt6HKxNPQodmOy7SQUu+h5/NMChiq/ZkLSJoB307bZ/RbGd3fFP 18sjopdcLYfVV39LxuUdqQb28TYsVPl0qKco/EIs= Received: by mx.zohomail.com with SMTPS id 1723135667573571.5895238677637; Thu, 8 Aug 2024 09:47:47 -0700 (PDT) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Jaehoon Chung , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, kernel@collabora.com, Shawn Lin , Detlev Casanova Subject: [PATCH v2 2/3] mmc: dw_mmc-rockchip: Add v2 tuning support Date: Thu, 8 Aug 2024 12:47:16 -0400 Message-ID: <20240808164900.81871-3-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240808164900.81871-1-detlev.casanova@collabora.com> References: <20240808164900.81871-1-detlev.casanova@collabora.com> Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External From: Shawn Lin v2 tuning will inherit pre-stage loader's phase settings for the first time, and do re-tune if necessary. Re-tune will still try the rough degrees, for instance, 90, 180, 270, 360 but continue to do the fine tuning if sample window isn't good enough. Signed-off-by: Shawn Lin Signed-off-by: Detlev Casanova --- drivers/mmc/host/dw_mmc-rockchip.c | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index b07190ba4b7ac..b1b437ea878ae 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -24,6 +24,8 @@ struct dw_mci_rockchip_priv_data { struct clk *sample_clk; int default_sample_phase; int num_phases; + bool use_v2_tuning; + int last_degree; }; static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) @@ -134,6 +136,42 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios) #define TUNING_ITERATION_TO_PHASE(i, num_phases) \ (DIV_ROUND_UP((i) * 360, num_phases)) +static int dw_mci_v2_execute_tuning(struct dw_mci_slot *slot, u32 opcode) +{ + struct dw_mci *host = slot->host; + struct dw_mci_rockchip_priv_data *priv = host->priv; + struct mmc_host *mmc = slot->mmc; + u32 degrees[4] = {90, 180, 270, 360}; + int i; + static bool inherit = true; + + if (inherit) { + inherit = false; + i = clk_get_phase(priv->sample_clk) / 90 - 1; + goto done; + } + + /* v2 only support 4 degrees in theory */ + for (i = 0; i < ARRAY_SIZE(degrees); i++) { + if (degrees[i] == priv->last_degree) + continue; + + clk_set_phase(priv->sample_clk, degrees[i]); + if (!mmc_send_tuning(mmc, opcode, NULL)) + break; + } + + if (i == ARRAY_SIZE(degrees)) { + dev_warn(host->dev, "All phases bad!"); + return -EIO; + } + +done: + dev_info(host->dev, "Successfully tuned phase to %d\n", degrees[i]); + priv->last_degree = degrees[i]; + return 0; +} + static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode) { struct dw_mci *host = slot->host; @@ -157,6 +195,13 @@ static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode) return -EIO; } + if (priv->use_v2_tuning) { + ret = dw_mci_v2_execute_tuning(slot, opcode); + if (!ret) + return 0; + /* Otherwise we continue using fine tuning */ + } + ranges = kmalloc_array(priv->num_phases / 2 + 1, sizeof(*ranges), GFP_KERNEL); if (!ranges) @@ -277,6 +322,8 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host) &priv->default_sample_phase)) priv->default_sample_phase = 0; + priv->use_v2_tuning = of_property_read_bool(np, "rockchip,v2-tuning"); + priv->drv_clk = devm_clk_get(host->dev, "ciu-drive"); if (IS_ERR(priv->drv_clk)) dev_dbg(host->dev, "ciu-drive not available\n");