From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01120C25B08 for ; Sat, 20 Aug 2022 19:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235103AbiHTT7j (ORCPT ); Sat, 20 Aug 2022 15:59:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232707AbiHTT6u (ORCPT ); Sat, 20 Aug 2022 15:58:50 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB0A3326D3 for ; Sat, 20 Aug 2022 12:58:47 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id y141so7040620pfb.7 for ; Sat, 20 Aug 2022 12:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc; bh=jQxqJRMDZJaQoBVA5zc0nS90T27LyxE0WQ7RiUL+5/8=; b=lVm13wXfoqOK0P3bQudLyy/ZUTjxwI51VH7FwKO1pHhDjXGCNyQ+NO8tVV/5w+LOJE dSRm0PxdWGmRubhjOT9/BrvnAWszZTu55w1b2YHghHlN2YZMRSV3G6opjlv+L5SdWLq0 tOirAnisHMz9Y4lncQW0DIcgyIEk6KtD5KzxVLUv+aROuIrRIiwg8HlfHdFMsTEQz2BM dIPbQbB1X5YR6jgFjRctS0GlDrG0beEZAKew6+Epd+xhDW1Ci8LmzFheQYg30koO1a/4 0JBBMZproFdQzdRcuhSrHXu+m3jGtYlrznMY25qwBa2e8MLTYVrdQW1ueKhcG6s8fPP0 3I8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=jQxqJRMDZJaQoBVA5zc0nS90T27LyxE0WQ7RiUL+5/8=; b=DIe+Onj9gWNLEd5AVwOUz+jKvNciWBSi7aSlpFIpGL61O70KOBEISu/IGPqXj7ImEJ 8jcn0z2vdMI85uIEgMIq0dWQW1quQPay6FHl6RgLpnc4n/T3SLz0aweswsaxhnWc9ALK QIVnE8C6fjaBQCI+1IANzPJfNcRWrD/zG9tzAEw3afkPZwLcJDELBwLy/j2xOzeTcch3 x8h+attWqPrP3W+2x9jI/wg4my4PY2VIpel/XfnV5ZTtZSlYnJBA6TyJmrK14UEpyEaj ANNwJyHansY+cRAFBt2/+pD5+Xfe3fe9MT4h9kI2wygBqQa+SlGRyPzsPzzbXWnmYntA MQZQ== X-Gm-Message-State: ACgBeo1eYe9/F3hTC79fj6T/4A8WSp0G3boFi6NZSCg5CwhLwN4Qq9fs oQu401nDglMQuSHV2KQQsAOt/g== X-Google-Smtp-Source: AA6agR6V+W12g3z/SCutMu3xdVCV0zPyZftrloynOKYKb3GKOxs7BHoPTGP/IfXxUhhiUtX/rmdk7w== X-Received: by 2002:a63:77ce:0:b0:429:f679:2335 with SMTP id s197-20020a6377ce000000b00429f6792335mr11080510pgc.327.1661025527490; Sat, 20 Aug 2022 12:58:47 -0700 (PDT) Received: from platform-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id u66-20020a626045000000b005363bc65bb1sm2316794pfb.91.2022.08.20.12.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 12:58:47 -0700 (PDT) From: Brad Larson To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, adrian.hunter@intel.com, alcooperx@gmail.com, andy.shevchenko@gmail.com, arnd@arndb.de, brad@pensando.io, blarson@amd.com, brijeshkumar.singh@amd.com, catalin.marinas@arm.com, gsomlo@gmail.com, gerg@linux-m68k.org, krzk@kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, broonie@kernel.org, yamada.masahiro@socionext.com, p.zabel@pengutronix.de, piotrs@cadence.com, p.yadav@ti.com, rdunlap@infradead.org, robh+dt@kernel.org, samuel@sholland.org, fancer.lancer@gmail.com, suravee.suthikulpanit@amd.com, thomas.lendacky@amd.com, ulf.hansson@linaro.org, will@kernel.org, devicetree@vger.kernel.org Subject: [PATCH v6 13/17] mmc: sdhci-cadence: Enable device specific override of writel() Date: Sat, 20 Aug 2022 12:57:46 -0700 Message-Id: <20220820195750.70861-14-brad@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220820195750.70861-1-brad@pensando.io> References: <20220820195750.70861-1-brad@pensando.io> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Brad Larson SoCs with device specific Cadence implementation, such as setting byte-enables before the write, need to override writel(). Add a callback where the default is writel() for all existing chips. Signed-off-by: Brad Larson --- drivers/mmc/host/sdhci-cadence.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 6f2de54a5987..708d4297f241 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -67,6 +67,7 @@ struct sdhci_cdns_phy_param { struct sdhci_cdns_priv { void __iomem *hrs_addr; bool enhanced_strobe; + void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg); unsigned int nr_phy_params; struct sdhci_cdns_phy_param phy_params[]; }; @@ -90,6 +91,12 @@ static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = { { "cdns,phy-dll-delay-strobe", SDHCI_CDNS_PHY_DLY_STROBE, }, }; +static inline void cdns_writel(struct sdhci_cdns_priv *priv, u32 val, + void __iomem *reg) +{ + writel(val, reg); +} + static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, u8 addr, u8 data) { @@ -104,17 +111,17 @@ static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, tmp = FIELD_PREP(SDHCI_CDNS_HRS04_WDATA, data) | FIELD_PREP(SDHCI_CDNS_HRS04_ADDR, addr); - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); tmp |= SDHCI_CDNS_HRS04_WR; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 0, 10); if (ret) return ret; tmp &= ~SDHCI_CDNS_HRS04_WR; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS04_ACK), 0, 10); @@ -191,7 +198,7 @@ static void sdhci_cdns_set_emmc_mode(struct sdhci_cdns_priv *priv, u32 mode) tmp = readl(priv->hrs_addr + SDHCI_CDNS_HRS06); tmp &= ~SDHCI_CDNS_HRS06_MODE; tmp |= FIELD_PREP(SDHCI_CDNS_HRS06_MODE, mode); - writel(tmp, priv->hrs_addr + SDHCI_CDNS_HRS06); + priv->priv_writel(priv, tmp, priv->hrs_addr + SDHCI_CDNS_HRS06); } static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv) @@ -223,7 +230,7 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) */ for (i = 0; i < 2; i++) { tmp |= SDHCI_CDNS_HRS06_TUNE_UP; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS06_TUNE_UP), @@ -386,6 +393,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev) priv->nr_phy_params = nr_phy_params; priv->hrs_addr = host->ioaddr; priv->enhanced_strobe = false; + priv->priv_writel = cdns_writel; host->ioaddr += SDHCI_CDNS_SRS_BASE; host->mmc_host_ops.hs400_enhanced_strobe = sdhci_cdns_hs400_enhanced_strobe; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8CF0C25B08 for ; Sat, 20 Aug 2022 20:49:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VTAqa/DdjLRpwh6KmcEx6QGFMroVLEzrrMrIgjNWCz4=; b=zE6djL8h0Pbdhy KEc33dKM8u+sd2EMycq8UnwXdOzEmcB8+cyc5LnRAqt2xY6QUyaI1H5QDRumLron3u7Bc+pEz6eeD BIudedkHLaxwb/jHvNBzWRWAKcIj1gg0dZpe5wMSRtbgI+c549VmaIZylYMirhol6I46x1IsmMkJS A9y/Y1edL1TaCaHiAI1kfSD08qzi5y6w47XfV0A2TKYNZL/Jf+wwuyYWskFleCIzjxc3S6P6YrdRD QAd48gyFg9Sm+kIGBWLM1Wktem2Y4RM/JCOYhPdFKkYRJ7w1Em2VZHPR/bO6XXGodPDwjRDMht/zB nuPmgWxPsLYzS7nijmXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPVOH-00CD9n-Qe; Sat, 20 Aug 2022 20:48:22 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPVO1-00CCqE-2L for linux-arm-kernel@bombadil.infradead.org; Sat, 20 Aug 2022 20:48:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=References:In-Reply-To:Message-Id:Date :Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=jQxqJRMDZJaQoBVA5zc0nS90T27LyxE0WQ7RiUL+5/8=; b=JgPvWw/XTHDehloZaOVzPrO4p6 ddxGB5yFxUHDA779fw4QZ9/r8iOeQu/dGI8j1d+m8N2K1s7dCjeRKN8se4JoaY4Jm4IEezc1Yudmr d1Hj7emqOaYNsFkyKWIgfkIqn/IG05/34dorArnLI+ATx0DME1/yBUelv2kC0QFcV+19VNoMLT69g /T+iGk/YtqWJPM8qI2L9JnJ2OXbnUJ5LqvkresdxhIWKz9NL2EKdmRtQ1X3OIHdktpbsj7y+yHY6x Iw82fqXnkmue7kXXgHfN5EKHAmfIAA1vQwLagk37rVDy0TITP6nJM3ShEVg1frXc8iDlLwbREYpce 4xNtYykA==; Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oPUcN-004W7c-Ty for linux-arm-kernel@lists.infradead.org; Sat, 20 Aug 2022 19:58:55 +0000 Received: by mail-pg1-x52a.google.com with SMTP id 12so6238990pga.1 for ; Sat, 20 Aug 2022 12:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc; bh=jQxqJRMDZJaQoBVA5zc0nS90T27LyxE0WQ7RiUL+5/8=; b=lVm13wXfoqOK0P3bQudLyy/ZUTjxwI51VH7FwKO1pHhDjXGCNyQ+NO8tVV/5w+LOJE dSRm0PxdWGmRubhjOT9/BrvnAWszZTu55w1b2YHghHlN2YZMRSV3G6opjlv+L5SdWLq0 tOirAnisHMz9Y4lncQW0DIcgyIEk6KtD5KzxVLUv+aROuIrRIiwg8HlfHdFMsTEQz2BM dIPbQbB1X5YR6jgFjRctS0GlDrG0beEZAKew6+Epd+xhDW1Ci8LmzFheQYg30koO1a/4 0JBBMZproFdQzdRcuhSrHXu+m3jGtYlrznMY25qwBa2e8MLTYVrdQW1ueKhcG6s8fPP0 3I8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=jQxqJRMDZJaQoBVA5zc0nS90T27LyxE0WQ7RiUL+5/8=; b=N/6LbYb2pVgc5fBKv8OlmBEVv4FGSrdxP9cU7f1Vwk476/o3ydqlwlpHnZg0hggpCr o8czEWIkqsicMS2txtTchMY2WaOcszCp+tDb4Aq7S5JUdvuGFmqVhKRhT9+X68i/Yt16 eHBTk/jOI979fGGEvxIIGlBaiAjypAKk8nobZu/Latvw8pI5vIAICwp3pkHBLjQ7RzQ5 9qEC8CoxNKwlIuCCityXw9ZFTZXjTFhJs0gzpSMnjO26RAdM1Nzz4R3uDMVUCs0epyRP xXX8fgK6GbqYsWQ1K7qI+W9wPso2VY4M74MHMobfs2tuSGwLQKwotYHtXu3pJmk8V+4d 6sJA== X-Gm-Message-State: ACgBeo04JsUi5yyCEOLfaA5Pb5Se9m42l8jmdwlp5w6p54cQjbOFsZuP fgqPlBljOvACK1odl+yrdQNt5RCA5JsC2OGw X-Google-Smtp-Source: AA6agR6V+W12g3z/SCutMu3xdVCV0zPyZftrloynOKYKb3GKOxs7BHoPTGP/IfXxUhhiUtX/rmdk7w== X-Received: by 2002:a63:77ce:0:b0:429:f679:2335 with SMTP id s197-20020a6377ce000000b00429f6792335mr11080510pgc.327.1661025527490; Sat, 20 Aug 2022 12:58:47 -0700 (PDT) Received: from platform-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id u66-20020a626045000000b005363bc65bb1sm2316794pfb.91.2022.08.20.12.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Aug 2022 12:58:47 -0700 (PDT) From: Brad Larson To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, adrian.hunter@intel.com, alcooperx@gmail.com, andy.shevchenko@gmail.com, arnd@arndb.de, brad@pensando.io, blarson@amd.com, brijeshkumar.singh@amd.com, catalin.marinas@arm.com, gsomlo@gmail.com, gerg@linux-m68k.org, krzk@kernel.org, krzysztof.kozlowski+dt@linaro.org, lee.jones@linaro.org, broonie@kernel.org, yamada.masahiro@socionext.com, p.zabel@pengutronix.de, piotrs@cadence.com, p.yadav@ti.com, rdunlap@infradead.org, robh+dt@kernel.org, samuel@sholland.org, fancer.lancer@gmail.com, suravee.suthikulpanit@amd.com, thomas.lendacky@amd.com, ulf.hansson@linaro.org, will@kernel.org, devicetree@vger.kernel.org Subject: [PATCH v6 13/17] mmc: sdhci-cadence: Enable device specific override of writel() Date: Sat, 20 Aug 2022 12:57:46 -0700 Message-Id: <20220820195750.70861-14-brad@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220820195750.70861-1-brad@pensando.io> References: <20220820195750.70861-1-brad@pensando.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220820_205852_134449_90903601 X-CRM114-Status: GOOD ( 13.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Brad Larson SoCs with device specific Cadence implementation, such as setting byte-enables before the write, need to override writel(). Add a callback where the default is writel() for all existing chips. Signed-off-by: Brad Larson --- drivers/mmc/host/sdhci-cadence.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 6f2de54a5987..708d4297f241 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -67,6 +67,7 @@ struct sdhci_cdns_phy_param { struct sdhci_cdns_priv { void __iomem *hrs_addr; bool enhanced_strobe; + void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg); unsigned int nr_phy_params; struct sdhci_cdns_phy_param phy_params[]; }; @@ -90,6 +91,12 @@ static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = { { "cdns,phy-dll-delay-strobe", SDHCI_CDNS_PHY_DLY_STROBE, }, }; +static inline void cdns_writel(struct sdhci_cdns_priv *priv, u32 val, + void __iomem *reg) +{ + writel(val, reg); +} + static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, u8 addr, u8 data) { @@ -104,17 +111,17 @@ static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, tmp = FIELD_PREP(SDHCI_CDNS_HRS04_WDATA, data) | FIELD_PREP(SDHCI_CDNS_HRS04_ADDR, addr); - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); tmp |= SDHCI_CDNS_HRS04_WR; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 0, 10); if (ret) return ret; tmp &= ~SDHCI_CDNS_HRS04_WR; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS04_ACK), 0, 10); @@ -191,7 +198,7 @@ static void sdhci_cdns_set_emmc_mode(struct sdhci_cdns_priv *priv, u32 mode) tmp = readl(priv->hrs_addr + SDHCI_CDNS_HRS06); tmp &= ~SDHCI_CDNS_HRS06_MODE; tmp |= FIELD_PREP(SDHCI_CDNS_HRS06_MODE, mode); - writel(tmp, priv->hrs_addr + SDHCI_CDNS_HRS06); + priv->priv_writel(priv, tmp, priv->hrs_addr + SDHCI_CDNS_HRS06); } static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv) @@ -223,7 +230,7 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val) */ for (i = 0; i < 2; i++) { tmp |= SDHCI_CDNS_HRS06_TUNE_UP; - writel(tmp, reg); + priv->priv_writel(priv, tmp, reg); ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS06_TUNE_UP), @@ -386,6 +393,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev) priv->nr_phy_params = nr_phy_params; priv->hrs_addr = host->ioaddr; priv->enhanced_strobe = false; + priv->priv_writel = cdns_writel; host->ioaddr += SDHCI_CDNS_SRS_BASE; host->mmc_host_ops.hs400_enhanced_strobe = sdhci_cdns_hs400_enhanced_strobe; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel