Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D09FDC433F5 for ; Tue, 11 Jan 2022 13:40:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4723C830D0; Tue, 11 Jan 2022 14:40:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Gw/40GsK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4B3D83050; Tue, 11 Jan 2022 14:40:10 +0100 (CET) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0D34F830AB for ; Tue, 11 Jan 2022 14:40:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ed1-x535.google.com with SMTP id i5so13707286edf.9 for ; Tue, 11 Jan 2022 05:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/NQCZyDK6MeT2GqFVnM5KcZueLq733aisH5u/vTD5v8=; b=Gw/40GsKe5ymMffJmssxhRjRXVVaZbcblhfBCXalvmC645FtCb+Oa35j4hi820TcgD yqmO78m9SjeBvSPVXBKZIaFqfEySrqL/N38fPMclg51jefghUx3GNRIa+1QDUStOiYZO cOMGYhHuMETvx0sRtuz9lof5WknEk1FNS+k5vX2Fl4RYClQd7uMVr+LkOU+XLEJM5NIZ XCFTCja3YYYcofoXNnFHz980xaOKbNVejyg58YWYPb2nWiQUbnDZ6YtkFmLOqbQ5GcnZ Vz4LcvU7yeBApoHkO7C6aD6qiFILCPRx6gOIHDhIvwvdKa0czKnMGRuoeXXVYpKTlkbk ir+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/NQCZyDK6MeT2GqFVnM5KcZueLq733aisH5u/vTD5v8=; b=zOVsRMgRba9AXb+A0ATvnHECiMzKNb6g523fvFFz3VGgqDRW8lv6YPTVcE7p/Yg+Hq JUILVxOJpbBV9pYjzkeBgTWKToqk9PU/2PICiqvyLmm1lB4QTzzYRm5BQotVzeBBN51x dbFHGUgGWjEHjre+Sl4VS/+XZpUGLj91063S04yEidfdL1rZs/M6nbMcS9tnLtiRBA2D C/nGfxeCs6i1BY3qtoRSj3JnGkbQwPOCmirp/4RY9hILn7wfmZou5kL41kul3peXy6v3 s1ZY9A2IivLRKz69oCgIeSmjhyXL6tIHdS0MntZQSn3EWFJ2gNgh44/RNV8zvpGqs8rt lAWA== X-Gm-Message-State: AOAM531cBJqkbQxa904LmpjMCkLfUJbf1ligtbQX5C8+7dCEME2lrHVD DKjqEa862jnE7sZuhZT/WHfSg8EtN7WmOw== X-Google-Smtp-Source: ABdhPJx5ftS/QRMp/yRALHRV//dTA2pIWmLzc/g1qdLf2fozc0k2v43Y9tGA5Cas2aWG2zOlnhIxXg== X-Received: by 2002:a17:906:ae56:: with SMTP id lf22mr986531ejb.298.1641908402152; Tue, 11 Jan 2022 05:40:02 -0800 (PST) Received: from localhost.localdomain ([178.233.26.119]) by smtp.gmail.com with ESMTPSA id ck3sm1180324edb.36.2022.01.11.05.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 05:40:01 -0800 (PST) From: Alper Nebi Yasak To: u-boot@lists.denx.de Cc: Yifeng Zhao , Peng Fan , Ashok Reddy Soma , Samuel Dionne-Riel , Aswath Govindraju , Philipp Tomsich , Jagan Teki , Stephen Carlson , Akash Gajjar , Michal Simek , Kever Yang , Faiz Abbas , Simon Glass , Peter Robinson , Jaehoon Chung , Jack Mitchell , Alper Nebi Yasak Subject: [PATCH v2 3/4] rockchip: sdhci: Add HS400 Enhanced Strobe support for RK3399 Date: Tue, 11 Jan 2022 16:39:30 +0300 Message-Id: <20220111133931.7866-4-alpernebiyasak@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220111133931.7866-1-alpernebiyasak@gmail.com> References: <20220111133931.7866-1-alpernebiyasak@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On RK3399, a register bit must be set to enable Enhanced Strobe. Let the Rockchip SDHCI driver set it when Enhanced Strobe configuration is requested. However, having it set makes the lower-speed modes stop working and makes reinitialization fail, so let it be unset as needed in set_control_reg(). This is mostly ported from Linux's Arasan SDHCI driver which happens to be the underlying IP. (drivers/mmc/host/sdhci-of-arasan.c in Linux tree). Signed-off-by: Alper Nebi Yasak --- Didn't add Reviewed-by tag due to changes. Changes in v2: - Unset ES bit in rk3399 set_control_reg() to fix a reinit issue - Don't use unnecessary & for function pointer in ops struct - Rename rk3399_set_enhanced_strobe -> rk3399_sdhci_set_enhanced_strobe - Let set_enhanced_strobe() unset the ES bit if mode is not HS400_ES drivers/mmc/rockchip_sdhci.c | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index f0d7ba4774d6..f920c5141142 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -42,6 +42,9 @@ ((((x) >> PHYCTRL_DLLRDY_SHIFT) & PHYCTRL_DLLRDY_MASK) ==\ PHYCTRL_DLLRDY_DONE) +#define ARASAN_VENDOR_REGISTER 0x78 +#define ARASAN_VENDOR_ENHANCED_STROBE BIT(0) + /* Rockchip specific Registers */ #define DWCMSHC_EMMC_DLL_CTRL 0x800 #define DWCMSHC_EMMC_DLL_CTRL_RESET BIT(1) @@ -94,6 +97,7 @@ struct sdhci_data { int (*get_phy)(struct udevice *dev); void (*set_control_reg)(struct sdhci_host *host); int (*set_ios_post)(struct sdhci_host *host); + int (*set_enhanced_strobe)(struct sdhci_host *host); }; static int rk3399_emmc_phy_init(struct udevice *dev) @@ -183,6 +187,21 @@ static int rk3399_emmc_get_phy(struct udevice *dev) return 0; } +static int rk3399_sdhci_set_enhanced_strobe(struct sdhci_host *host) +{ + struct mmc *mmc = host->mmc; + u32 vendor; + + vendor = sdhci_readl(host, ARASAN_VENDOR_REGISTER); + if (mmc->selected_mode == MMC_HS_400_ES) + vendor |= ARASAN_VENDOR_ENHANCED_STROBE; + else + vendor &= ~ARASAN_VENDOR_ENHANCED_STROBE; + sdhci_writel(host, vendor, ARASAN_VENDOR_REGISTER); + + return 0; +} + static void rk3399_sdhci_set_control_reg(struct sdhci_host *host) { struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); @@ -194,6 +213,15 @@ static void rk3399_sdhci_set_control_reg(struct sdhci_host *host) rk3399_emmc_phy_power_off(priv->phy); sdhci_set_control_reg(host); + + /* + * Reinitializing the device tries to set it to lower-speed modes + * first, which fails if the Enhanced Strobe bit is set, making + * the device impossible to use. Set the correct value here to + * let reinitialization attempts succeed. + */ + if (CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)) + rk3399_sdhci_set_enhanced_strobe(host); }; static int rk3399_sdhci_set_ios_post(struct sdhci_host *host) @@ -386,10 +414,22 @@ static int rockchip_sdhci_execute_tuning(struct mmc *mmc, u8 opcode) return ret; } +static int rockchip_sdhci_set_enhanced_strobe(struct sdhci_host *host) +{ + struct rockchip_sdhc *priv = container_of(host, struct rockchip_sdhc, host); + struct sdhci_data *data = (struct sdhci_data *)dev_get_driver_data(priv->dev); + + if (data->set_enhanced_strobe) + return data->set_enhanced_strobe(host); + + return -ENOTSUPP; +} + static struct sdhci_ops rockchip_sdhci_ops = { .set_ios_post = rockchip_sdhci_set_ios_post, .platform_execute_tuning = &rockchip_sdhci_execute_tuning, .set_control_reg = rockchip_sdhci_set_control_reg, + .set_enhanced_strobe = rockchip_sdhci_set_enhanced_strobe, }; static int rockchip_sdhci_probe(struct udevice *dev) @@ -472,6 +512,7 @@ static const struct sdhci_data rk3399_data = { .emmc_phy_init = rk3399_emmc_phy_init, .set_control_reg = rk3399_sdhci_set_control_reg, .set_ios_post = rk3399_sdhci_set_ios_post, + .set_enhanced_strobe = rk3399_sdhci_set_enhanced_strobe, }; static const struct sdhci_data rk3568_data = { -- 2.34.1