Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp1830223rwb; Sun, 6 Aug 2023 04:07:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjZO5JuKzaCphHsRTDhISORlAL56IRqBKly7a3Ux3e9reG1+rRm1yy139V2bOlLGB09cFM X-Received: by 2002:a17:903:428c:b0:1b8:7bd2:f77d with SMTP id ju12-20020a170903428c00b001b87bd2f77dmr4667720plb.64.1691320060204; Sun, 06 Aug 2023 04:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691320060; cv=none; d=google.com; s=arc-20160816; b=q8VSffvq15kjw6t7T2b2mUyoV2iUk/EQFUYuQB7KcHOzfuebKfg2lVXmsbjw+DiZTI RQj7fnkSOCfL1/d7f9xfVeXcPpGS0FNZHVyMVFbvrJhHEZrj+OTk+Ifn50DYoe2C7SdN CfVNO3qdNEQI2NJbfpPSlRCEcEOI9Bu99SLDslH7jiCjEyHpvOL00JLV9wOXWuAqYAq9 rzDvnHqYHTkuiIytw90BfXgZnHYng5iO3Nh0fYpX6AQD3AUjAVwlO2FD9TT2P5xv7XEG j1qkY+jd9VxAqV0xRMa+16D4/eou99vHTYllgzApsg+r8V4WgnA4YVs8d+V/qF3goS0G SPIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=qy3A/QnMZlHDI/j077kfXUfoviSiVqrtpWKcFMB9JsM=; fh=Gb5lzgZ516e0+Hx7ZhI9qkI2nXvt7xANwKFkCpayWP0=; b=cnscQkussEzV5uRtqOAVCGjoI74rWb/xO6FCVR5JO/1Ac50blr5Ws/Ggyrw8XzEd+C xXw8Hp4vl867x0a6YWitGoJjfQe381jWaIG4hCiDFgA1deaxMuY4EP7PgFsnpgls0RT2 kn4tbpUOESE92GRfqHvIaBdX1D/kVEkq6VdeX5hZgGA4G0HkAiywXSpa1ENor9t5EnMw V+r/am6P7iCRdMS4b9OwfCBtTXGVA5JAff5W0gByIxfQi9TXgKxW2FTfdB7YCREnx2Fw p/muESBLJcjzq9vl9k4FDMZXLGIY8OhA7SejOv8piD2HNb+17DBxAHfY1epRsLKD88SO StyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=stGsaIQO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t4-20020a170902bc4400b001ab089f7329si4332755plz.73.2023.08.06.04.07.28; Sun, 06 Aug 2023 04:07:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=stGsaIQO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230290AbjHFKV0 (ORCPT + 99 others); Sun, 6 Aug 2023 06:21:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjHFKVX (ORCPT ); Sun, 6 Aug 2023 06:21:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABBEE19A6; Sun, 6 Aug 2023 03:21:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 30EC561015; Sun, 6 Aug 2023 10:21:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37A48C433C7; Sun, 6 Aug 2023 10:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691317280; bh=J4NNRln2gLqiCWjoDB4d/tIeb4cKmu5RRzQPYOywb7g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=stGsaIQO6ClE2mZ56Qh3oKZvbHI5Xtu5NGcbRHbYdCM2/qhBtln+fBj8spibF50SZ yfeYyTkLoB/NqC59oEu7g7n944hRQhGAK3L4f7ssvy6EfzB16gEz666p894Yr1jwyl YYVDbvo5io/CI+LR6gLwdPfL8OLxaN+mXRFJQEh1eQkscJPvjD+nbSor6lfmnJsa6b mwQoE3ZL/AKV6B2cgTP0CPSaitj1/EuK+GimaEjbSsSrNof5Hv7UehyRQYdbIuwzHC 3GNVaMrteCfeD5T3i5z4lIilS7f0BE8eLaf8xeNA5At0TDBm5fkizK8uzsynIzyM9h sele47nuPvobQ== Date: Sun, 6 Aug 2023 18:09:39 +0800 From: Jisheng Zhang To: Drew Fustini Cc: Guo Ren , Fu Wei , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Adrian Hunter , Ulf Hansson , linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Robert Nelson , Jason Kridner Subject: Re: [PATCH RFC v2 4/4] mmc: sdhci-of-dwcmshc: Add support for T-Head TH1520 Message-ID: References: <20230724-th1520-emmc-v2-0-132ed2e2171e@baylibre.com> <20230724-th1520-emmc-v2-4-132ed2e2171e@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230724-th1520-emmc-v2-4-132ed2e2171e@baylibre.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 04, 2023 at 08:14:48PM -0700, Drew Fustini wrote: > Add basic support for the T-Head TH1520 SoC mmc controller with the new > compatible "thead,th1520-dwcmshc". > > However, quirks are currently set to disable DMA and use PIO. The proper > settings for DMA support still need to be determined. Hi Drew, Thank you for this patch. I think we need to make DMA work even in the first version. Several comments below. > > Another issue is th1520-specific code for MMC_TIMING_MMC_HS400 in > dwcmshc_set_uhs_signaling() will run on all platforms which is not > correct. One solution could be to add a th1520 flag to dwcmshc_priv but > that is hacky. Another solution could be to set the set_uhs_signaling op > in sdhci_dwcmshc_th1520_ops to a th1520-specific function. However, that > new function would have to duplicate all the code in the current > dwcmshc_set_uhs_signaling(). > > Signed-off-by: Drew Fustini > --- > drivers/mmc/host/sdhci-of-dwcmshc.c | 336 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 336 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c > index e68cd87998c8..d35e204cdb16 100644 > --- a/drivers/mmc/host/sdhci-of-dwcmshc.c > +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c > @@ -71,6 +71,63 @@ > (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) > #define RK35xx_MAX_CLKS 3 > > +/* T-Head specific registers */ I guess this may not be T-HEAD specific but dwc phy, could you please check? > +#define DWC_MSHC_PTR_PHY_R 0x300 > +#define PHY_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x00) > +#define PHY_RSTN 0x0 > +#define PAD_SP 0x10 > +#define PAD_SN 0x14 > + > +#define PHY_CMDPAD_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x04) > +#define PHY_DATAPAD_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x06) > +#define PHY_CLKPAD_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x08) > +#define PHY_STBPAD_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x0a) > +#define PHY_RSTNPAD_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x0c) > +#define RXSEL 0x0 > +#define WEAKPULL_EN 0x3 > +#define TXSLEW_CTRL_P 0x5 > +#define TXSLEW_CTRL_N 0x9 > + > +#define PHY_PADTEST_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x0e) > +#define PHY_PADTEST_OUT_R (DWC_MSHC_PTR_PHY_R + 0x10) > +#define PHY_PADTEST_IN_R (DWC_MSHC_PTR_PHY_R + 0x12) > +#define PHY_PRBS_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x18) > +#define PHY_PHYLBK_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x1a) > +#define PHY_COMMDL_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x1c) > + > +#define PHY_SDCLKDL_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x1d) > +#define UPDATE_DC 0x4 > + > +#define PHY_SDCLKDL_DC_R (DWC_MSHC_PTR_PHY_R + 0x1e) > +#define PHY_SMPLDL_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x20) > +#define PHY_ATDL_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x21) > +#define INPSEL_CNFG 2 > + > +#define PHY_DLL_CTRL_R (DWC_MSHC_PTR_PHY_R + 0x24) > +#define DLL_EN 0x0 > + > +#define PHY_DLL_CNFG1_R (DWC_MSHC_PTR_PHY_R + 0x25) > +#define PHY_DLL_CNFG2_R (DWC_MSHC_PTR_PHY_R + 0x26) > +#define PHY_DLLDL_CNFG_R (DWC_MSHC_PTR_PHY_R + 0x28) > +#define SLV_INPSEL 0x5 > + > +#define P_VENDOR_SPECIFIC_AREA 0x500 > +#define EMMC_CTRL_R (P_VENDOR_SPECIFIC_AREA + 0x2c) > +#define AT_CTRL_R (P_VENDOR_SPECIFIC_AREA + 0x40) > +#define AT_EN 0x0 > +#define CI_SEL 0x1 > +#define SWIN_TH_EN 0x2 > +#define RPT_TUNE_ERR 0x3 > +#define SW_TUNE_EN 0x4 > +#define WIN_EDGE_SEL 0x8 > +#define TUNE_CLK_STOP_EN 0x10 > +#define PRE_CHANGE_DLY 0x11 > +#define POST_CHANGE_DLY 0x13 > +#define SWIN_TH_VAL 0x18 > + > +#define DELAY_LINE_HS400 24 > +#define DELAY_LINE_DEFAULT 50 > + > #define BOUNDARY_OK(addr, len) \ > ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) > > @@ -91,6 +148,10 @@ struct dwcmshc_priv { > struct clk *bus_clk; > int vendor_specific_area1; /* P_VENDOR_SPECIFIC_AREA reg */ > void *priv; /* pointer to SoC private stuff */ > + uint32_t delay_line; > + bool non_removable; can be replaced with mmc_host.caps & MMC_CAP_NONREMOVABLE > + bool pull_up_en; > + bool io_fixed_1v8; replace them with flag? > }; > > /* > @@ -156,11 +217,171 @@ static void dwcmshc_request(struct mmc_host *mmc, struct mmc_request *mrq) > sdhci_request(mmc, mrq); > } > > +static void sdhci_phy_1_8v_init_no_pull(struct sdhci_host *host) > +{ > + uint32_t val; > + sdhci_writel(host, 1, DWC_MSHC_PTR_PHY_R); > + sdhci_writeb(host, 1 << 4, PHY_SDCLKDL_CNFG_R); > + sdhci_writeb(host, 0x40, PHY_SDCLKDL_DC_R); These magic numbers need a proper macro definitions. > + > + val = sdhci_readb(host, PHY_SDCLKDL_CNFG_R); > + val &= ~(1 << 4); ditto > + sdhci_writeb(host, val, PHY_SDCLKDL_CNFG_R); > + > + > + val = sdhci_readw(host, PHY_CMDPAD_CNFG_R); > + sdhci_writew(host, val | 1, PHY_CMDPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_DATAPAD_CNFG_R); > + sdhci_writew(host, val | 1, PHY_DATAPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_RSTNPAD_CNFG_R); > + sdhci_writew(host, val | 1, PHY_RSTNPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_STBPAD_CNFG_R); > + sdhci_writew(host, val | 1, PHY_STBPAD_CNFG_R); > + > + val = sdhci_readb(host, PHY_DLL_CTRL_R); > + sdhci_writeb(host, val | 1, PHY_DLL_CTRL_R); > +} > + > +static void sdhci_phy_3_3v_init_no_pull(struct sdhci_host *host) > +{ > + uint32_t val; > + > + sdhci_writel(host, 1, DWC_MSHC_PTR_PHY_R); > + sdhci_writeb(host, 1 << 4, PHY_SDCLKDL_CNFG_R); > + sdhci_writeb(host, 0x40, PHY_SDCLKDL_DC_R); > + > + val = sdhci_readb(host, PHY_SDCLKDL_CNFG_R); > + val &= ~(1 << 4); > + sdhci_writeb(host, val, PHY_SDCLKDL_CNFG_R); > + > + val = sdhci_readw(host, PHY_CMDPAD_CNFG_R); > + sdhci_writew(host, val | 2, PHY_CMDPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_DATAPAD_CNFG_R); > + sdhci_writew(host, val | 2, PHY_DATAPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_RSTNPAD_CNFG_R); > + sdhci_writew(host, val | 2, PHY_RSTNPAD_CNFG_R); > + > + val = sdhci_readw(host, PHY_STBPAD_CNFG_R); > + sdhci_writew(host, val | 2, PHY_STBPAD_CNFG_R); > + > + val = sdhci_readb(host, PHY_DLL_CTRL_R); > + sdhci_writeb(host, val | 1, PHY_DLL_CTRL_R); > +} > + > +static void th1520_phy_1_8v_init(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > + u32 val; > + > + if (!priv) > + return; > + > + if (priv->pull_up_en == 0) { > + sdhci_phy_1_8v_init_no_pull(host); > + return; > + } > + > + /* set driving force */ > + sdhci_writel(host, (1 << PHY_RSTN) | (0xc << PAD_SP) | (0xc << PAD_SN), PHY_CNFG_R); > + > + /* disable delay lane */ > + sdhci_writeb(host, 1 << UPDATE_DC, PHY_SDCLKDL_CNFG_R); > + > + /* set delay lane */ > + sdhci_writeb(host, priv->delay_line, PHY_SDCLKDL_DC_R); > + sdhci_writeb(host, 0xa, PHY_DLL_CNFG2_R); > + > + /* enable delay lane */ > + val = sdhci_readb(host, PHY_SDCLKDL_CNFG_R); > + val &= ~(1 << UPDATE_DC); > + sdhci_writeb(host, val, PHY_SDCLKDL_CNFG_R); > + > + val = (1 << RXSEL) | (1 << WEAKPULL_EN) | (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_CMDPAD_CNFG_R); > + sdhci_writew(host, val, PHY_DATAPAD_CNFG_R); > + sdhci_writew(host, val, PHY_RSTNPAD_CNFG_R); > + > + val = (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_CLKPAD_CNFG_R); > + > + val = (1 << RXSEL) | (2 << WEAKPULL_EN) | (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_STBPAD_CNFG_R); > + > + /* enable data strobe mode */ > + sdhci_writeb(host, 3 << SLV_INPSEL, PHY_DLLDL_CNFG_R); > + sdhci_writeb(host, (1 << DLL_EN), PHY_DLL_CTRL_R); > +} > + > +static void th1520_phy_3_3v_init(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > + u32 val; > + > + if (priv->pull_up_en == 0) { > + sdhci_phy_3_3v_init_no_pull(host); > + return; > + } > + > + /* set driving force */ > + sdhci_writel(host, (1 << PHY_RSTN) | (0xc << PAD_SP) | (0xc << PAD_SN), PHY_CNFG_R); > + > + /* disable delay lane */ > + sdhci_writeb(host, 1 << UPDATE_DC, PHY_SDCLKDL_CNFG_R); > + > + /* set delay lane */ > + sdhci_writeb(host, priv->delay_line, PHY_SDCLKDL_DC_R); > + sdhci_writeb(host, 0xa, PHY_DLL_CNFG2_R); > + > + /* enable delay lane */ > + val = sdhci_readb(host, PHY_SDCLKDL_CNFG_R); > + val &= ~(1 << UPDATE_DC); > + sdhci_writeb(host, val, PHY_SDCLKDL_CNFG_R); > + > + val = (2 << RXSEL) | (1 << WEAKPULL_EN) | (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_CMDPAD_CNFG_R); > + sdhci_writew(host, val, PHY_DATAPAD_CNFG_R); > + sdhci_writew(host, val, PHY_RSTNPAD_CNFG_R); > + > + val = (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_CLKPAD_CNFG_R); > + > + val = (2 << RXSEL) | (2 << WEAKPULL_EN) | (3 << TXSLEW_CTRL_P) | (3 << TXSLEW_CTRL_N); > + sdhci_writew(host, val, PHY_STBPAD_CNFG_R); > +} > + > + > +static void th1520_sdhci_set_phy(struct sdhci_host *host) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > + u8 emmc_ctl; > + > + /* Before power on, set PHY configs */ > + emmc_ctl = sdhci_readw(host, EMMC_CTRL_R); > + if (priv->non_removable) { > + th1520_phy_1_8v_init(host); > + emmc_ctl |= (1 << DWCMSHC_CARD_IS_EMMC); > + } else { > + th1520_phy_3_3v_init(host); > + emmc_ctl &=~(1 << DWCMSHC_CARD_IS_EMMC); > + } > + sdhci_writeb(host, emmc_ctl, EMMC_CTRL_R); > + sdhci_writeb(host, 0x25, PHY_DLL_CNFG1_R); magic 0x25 needs a meaningful MACRO definition. > +} > + > static void dwcmshc_set_uhs_signaling(struct sdhci_host *host, > unsigned int timing) > { > struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > + we don't need this extra blank line > u16 ctrl, ctrl_2; > > ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); > @@ -188,7 +409,22 @@ static void dwcmshc_set_uhs_signaling(struct sdhci_host *host, > ctrl_2 |= DWCMSHC_CTRL_HS400; > } > > + if (priv->io_fixed_1v8) > + ctrl_2 |= SDHCI_CTRL_VDD_180; > + > sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > + > + /* TODO: add check so that this only runs on th1520 */ this TODO needs to be solved since it affects other platforms such as NV and RK > + if (timing == MMC_TIMING_MMC_HS400) { > + /* disable auto tuning */ > + u32 reg = sdhci_readl(host, AT_CTRL_R); > + reg &= ~1; > + sdhci_writel(host, reg, AT_CTRL_R); > + priv->delay_line = DELAY_LINE_HS400; > + th1520_sdhci_set_phy(host); > + } else { > + sdhci_writeb(host, 0, PHY_DLLDL_CNFG_R); > + } > } > > static void dwcmshc_hs400_enhanced_strobe(struct mmc_host *mmc, > @@ -337,6 +573,49 @@ static void rk35xx_sdhci_reset(struct sdhci_host *host, u8 mask) > sdhci_reset(host, mask); > } > > +static int th1520_execute_tuning(struct sdhci_host *host, u32 opcode) > +{ > + u32 val = 0; > + > + sdhci_writeb(host, 3 << INPSEL_CNFG, PHY_ATDL_CNFG_R); > + > + val = sdhci_readl(host, AT_CTRL_R); > + val &= ~((1 << CI_SEL) | (1 << RPT_TUNE_ERR) \ > + | (1 << SW_TUNE_EN) |(0xf << WIN_EDGE_SEL)); > + val |= (1 << AT_EN) | (1 << SWIN_TH_EN) | (1 << TUNE_CLK_STOP_EN)\ > + | (1 << PRE_CHANGE_DLY) | (3 << POST_CHANGE_DLY) | (9 << SWIN_TH_VAL); > + > + sdhci_writel(host, val, AT_CTRL_R); > + > + val = sdhci_readl(host, AT_CTRL_R); > + if(!(val & (1 << AT_EN))) { > + pr_warn("%s(): auto tuning is not enabled", __func__); AFAIK, the controller supports both auto tuning and sw tuning. > + return -1; can we replace -1 with meaningful error number? > + } > + > + val &= ~(1 << AT_EN); > + sdhci_writel(host, val, AT_CTRL_R); > + > + return 0; > +} > + > +static void th1520_sdhci_reset(struct sdhci_host *host, u8 mask) > +{ > + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); > + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); > + u16 ctrl_2; > + > + sdhci_reset(host, mask); > + > + if(priv->io_fixed_1v8){ > + ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); > + if(! (ctrl_2 & SDHCI_CTRL_VDD_180)){ > + ctrl_2 |= SDHCI_CTRL_VDD_180; > + sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); > + } > + } > +} > + > static const struct sdhci_ops sdhci_dwcmshc_ops = { > .set_clock = sdhci_set_clock, > .set_bus_width = sdhci_set_bus_width, > @@ -355,6 +634,17 @@ static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { > .adma_write_desc = dwcmshc_adma_write_desc, > }; > > +static const struct sdhci_ops sdhci_dwcmshc_th1520_ops = { > + .set_clock = sdhci_set_clock, > + .set_bus_width = sdhci_set_bus_width, > + .set_uhs_signaling = dwcmshc_set_uhs_signaling, > + .get_max_clock = dwcmshc_get_max_clock, > + .reset = th1520_sdhci_reset, > + .adma_write_desc = dwcmshc_adma_write_desc, > + .voltage_switch = th1520_phy_1_8v_init, > + .platform_execute_tuning = &th1520_execute_tuning, > +}; > + > static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { > .ops = &sdhci_dwcmshc_ops, > .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, > @@ -378,6 +668,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { > SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, > }; > > +static const struct sdhci_pltfm_data sdhci_dwcmshc_th1520_pdata = { > + .ops = &sdhci_dwcmshc_th1520_ops, > + > + .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | > + SDHCI_QUIRK_BROKEN_DMA | > + SDHCI_QUIRK_BROKEN_ADMA, > + .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, > +}; > + > static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) > { > int err; > @@ -434,6 +733,10 @@ static void dwcmshc_rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv > } > > static const struct of_device_id sdhci_dwcmshc_dt_ids[] = { > + { > + .compatible = "thead,th1520-dwcmshc", > + .data = &sdhci_dwcmshc_th1520_pdata, > + }, > { > .compatible = "rockchip,rk3588-dwcmshc", > .data = &sdhci_dwcmshc_rk35xx_pdata, > @@ -541,6 +844,39 @@ static int dwcmshc_probe(struct platform_device *pdev) > goto err_clk; > } > > + if (pltfm_data == &sdhci_dwcmshc_th1520_pdata) { > + > + priv->delay_line = DELAY_LINE_DEFAULT; > + > + if (device_property_present(&pdev->dev, "non-removable")) > + priv->non_removable = 1; > + else > + priv->non_removable = 0; > + > + if (device_property_present(&pdev->dev, "thead,pull-up")) > + priv->pull_up_en = 1; > + else > + priv->pull_up_en = 0; > + > + if (device_property_present(&pdev->dev, "thead,io-fixed-1v8")) > + priv->io_fixed_1v8 = true; > + else > + priv->io_fixed_1v8 = false; > + > + /* > + * start_signal_voltage_switch() will try 3.3V first > + * then 1.8V. Use SDHCI_SIGNALING_180 ranther than > + * SDHCI_SIGNALING_330 to avoid setting voltage to 3.3V > + * in sdhci_start_signal_voltage_switch(). > + */ > + if(priv->io_fixed_1v8){ > + host->flags &=~SDHCI_SIGNALING_330; > + host->flags |= SDHCI_SIGNALING_180; > + } > + > + sdhci_enable_v4_mode(host); > + } > + > #ifdef CONFIG_ACPI > if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) > sdhci_enable_v4_mode(host); > > -- > 2.34.1 >