From patchwork Thu Jun 13 01:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Wang X-Patchwork-Id: 13695841 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 646D3EEC8; Thu, 13 Jun 2024 01:42:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718242957; cv=none; b=n1+pGY09VXoFklg60pJ0vSS+qlD6LjDWAB8440s+1vOFAkshqtreeIaqP2dN4EFikJ8JoQt+FQHmP7yXMRTrwlsL7lsD2OItZ+UM7b2vYG9u/s7A57/atM4/CRaUDIJKTd+R5j1m7M/COkqU2aRdWd/gr4jmb1dLjWjANmUzfkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718242957; c=relaxed/simple; bh=dwSiyZbjAYi8O0aXBmltdVy7jFDRI0ZIY1O/BdFRe2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B7MNgIDBjXqofitpPvDgsg5IATswbUrGbavQqlXEeUyqUPhWdGIOyGQcXOLtElV14ZcNhYkTbIj21U+BrOHirH39+79Q6uJhdXpAFtrnP5i7RX7Bhi84mFoVqVmtlAd/Xv44ahJOkdVfYvMb5R146D7MnKJfBFA5fCD/nc808lg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CtOSPglU; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CtOSPglU" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3d2299e6650so231311b6e.2; Wed, 12 Jun 2024 18:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718242954; x=1718847754; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qlV+jmlvyicWU6t9hgzw9ghUfe9KqjZKCqvHTzsCeeQ=; b=CtOSPglUEPGvoX2gKnpnSce/PWTTZE7G/egnTu6VNtKViEtdxg2J1qWp/MdsMIpvmJ dS6tTuno4ApDft7XCwm7idMT3NfBonhOm/cO3pQoEsLQf+uNOrPp1VJ4YJWX8r6VItR3 QDhedcAZT3s4M5nbsoDXVtYF3OsreWIQ7B84qVSNlcVa0+aJEh2C9l5SRPTwQpStbYz0 L2c5jpZf6IWsn8yqz7qWzWfsOzRwAH+jyWIpWt3l5DDxydJdbwcJzO84b8ukP3J5LtJ7 wZSxaoX39oUqNSL8MCqVjJUnDRvbmosrkia2smYiuVxi5FjGle8xgs5dCIUDTKzmfUjk wEmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718242954; x=1718847754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qlV+jmlvyicWU6t9hgzw9ghUfe9KqjZKCqvHTzsCeeQ=; b=l5QYhPNzlap4XtVyyEM6oAXGKPWgkMJ0CaereG0XUQ3zUYeTTYZAR2J5rQ/UcWk3jx fUse5rg044zXGaTIZxy+QUYXXNmWvjcb1xOpa5A8JeuDlDe9RmujI2I0NTbp7Hr23YAb Hqv7kMJwaeWZ/8fUF1TqQgdVIH6F9HgxSByDY6I19X16BCeWk4poxvQOmobgMPlCavk/ kV1s+K2AqRG4TJcu92KyJg3hZ6jIcXcv1oFanBfWB6FjWrnn1EM6AJI49rLB6T4yO/yh tWA8XN6SccjB2uuh8yO/2kaMVN/SxMYDhCx26U6XL0AmOejRqBLyDATc5jOdmTFanRrh ZJEA== X-Forwarded-Encrypted: i=1; AJvYcCUFRVB4vcdNZFDpVtj0yKyJL7uQ/o0TTW7YtkTW9fk/bnLj9c5FEWz8TrBTHiikZLuNXkgz51goiHkkqoq2lgzHx+WYiTNSRB3fZ5tJsbOX5GihU19Xrlt+8ZhS/UYbV6CxqkhBmGDUN84u4Jd+i/Psz48W5ysi+KdKwJj7UXZQMZpwfw== X-Gm-Message-State: AOJu0YxXTbJK0+QfaI0RO9gmSA2vWzH+AX7s7gax8nqVoyM+cfd4Fg5O Zmw2mw9v/2Yq4xwaL6UKWxkIqD2YNCHG6gKpA6oIZ3C2g5Yij365aiJuRyno X-Google-Smtp-Source: AGHT+IFSzepBg6/pUgNYtDyc6E3JgstuaT5hHnEQHOPNsry8OPTFbsNNvb+6S4DGGB6zA+Xi4sIVmw== X-Received: by 2002:a05:6808:1994:b0:3d2:1c4d:f0b9 with SMTP id 5614622812f47-3d23e11d1camr3409819b6e.53.1718242954055; Wed, 12 Jun 2024 18:42:34 -0700 (PDT) Received: from localhost.localdomain ([122.8.183.87]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3d2476bb5aesm48112b6e.38.2024.06.12.18.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 18:42:33 -0700 (PDT) From: Chen Wang To: adrian.hunter@intel.com, aou@eecs.berkeley.edu, conor+dt@kernel.org, guoren@kernel.org, inochiama@outlook.com, jszhang@kernel.org, krzysztof.kozlowski+dt@linaro.org, palmer@dabbelt.com, paul.walmsley@sifive.com, robh@kernel.org, ulf.hansson@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-riscv@lists.infradead.org, chao.wei@sophgo.com, haijiao.liu@sophgo.com, xiaoguang.xing@sophgo.com, tingzhu.wang@sophgo.com Cc: Chen Wang Subject: [PATCH v3 1/4] mmc: sdhci-of-dwcmshc: adjust positions of helper routines Date: Thu, 13 Jun 2024 09:42:25 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen Wang This patch does not change the logic of the code, but only adjusts the positions of some helper functions in the file according to categories to facilitate future function search and maintenance. Category: helper functions (except for driver callback functions such as probe/remove/suspend/resume) are divided into two categories: - dwcmshc level helpers - soc level helpers After the adjustment, these functions will be put together according to category. Signed-off-by: Chen Wang --- drivers/mmc/host/sdhci-of-dwcmshc.c | 392 +++++++++++++++------------- 1 file changed, 204 insertions(+), 188 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index e79aa4b3b6c3..a68818f53786 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -216,6 +216,12 @@ struct dwcmshc_priv { u16 flags; }; +/******************************************************************************* + * + * dwcmshc level helper routines begin + * + ******************************************************************************/ + /* * If DMA addr spans 128MB boundary, we split the DMA transfer into two * so that each DMA transfer doesn't exceed the boundary. @@ -249,13 +255,6 @@ static unsigned int dwcmshc_get_max_clock(struct sdhci_host *host) return pltfm_host->clock; } -static unsigned int rk35xx_get_max_clock(struct sdhci_host *host) -{ - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - - return clk_round_rate(pltfm_host->clk, ULONG_MAX); -} - static void dwcmshc_check_auto_cmd23(struct mmc_host *mmc, struct mmc_request *mrq) { @@ -377,29 +376,6 @@ static void dwcmshc_phy_3_3v_init(struct sdhci_host *host) sdhci_writeb(host, PHY_DLL_CTRL_ENABLE, PHY_DLL_CTRL_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); - u32 emmc_caps = MMC_CAP2_NO_SD | MMC_CAP2_NO_SDIO; - u16 emmc_ctrl; - - /* Before power on, set PHY configs */ - if (priv->flags & FLAG_IO_FIXED_1V8) - dwcmshc_phy_1_8v_init(host); - else - dwcmshc_phy_3_3v_init(host); - - if ((host->mmc->caps2 & emmc_caps) == emmc_caps) { - emmc_ctrl = sdhci_readw(host, priv->vendor_specific_area1 + DWCMSHC_EMMC_CONTROL); - emmc_ctrl |= DWCMSHC_CARD_IS_EMMC; - sdhci_writew(host, emmc_ctrl, priv->vendor_specific_area1 + DWCMSHC_EMMC_CONTROL); - } - - sdhci_writeb(host, FIELD_PREP(PHY_DLL_CNFG1_SLVDLY_MASK, PHY_DLL_CNFG1_SLVDLY) | - PHY_DLL_CNFG1_WAITCYCLE, PHY_DLL_CNFG1_R); -} - static void dwcmshc_set_uhs_signaling(struct sdhci_host *host, unsigned int timing) { @@ -437,20 +413,6 @@ static void dwcmshc_set_uhs_signaling(struct sdhci_host *host, sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); } -static void th1520_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); - - dwcmshc_set_uhs_signaling(host, timing); - if (timing == MMC_TIMING_MMC_HS400) - priv->delay_line = PHY_SDCLKDL_DC_HS400; - else - sdhci_writeb(host, 0, PHY_DLLDL_CNFG_R); - th1520_sdhci_set_phy(host); -} - static void dwcmshc_hs400_enhanced_strobe(struct mmc_host *mmc, struct mmc_ios *ios) { @@ -553,6 +515,112 @@ static void dwcmshc_cqhci_dumpregs(struct mmc_host *mmc) sdhci_dumpregs(mmc_priv(mmc)); } +static const struct cqhci_host_ops dwcmshc_cqhci_ops = { + .enable = dwcmshc_sdhci_cqe_enable, + .disable = sdhci_cqe_disable, + .dumpregs = dwcmshc_cqhci_dumpregs, + .set_tran_desc = dwcmshc_set_tran_desc, +}; + +static void dwcmshc_cqhci_init(struct sdhci_host *host, struct platform_device *pdev) +{ + struct cqhci_host *cq_host; + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); + bool dma64 = false; + u16 clk; + int err; + + host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD; + cq_host = devm_kzalloc(&pdev->dev, sizeof(*cq_host), GFP_KERNEL); + if (!cq_host) { + dev_err(mmc_dev(host->mmc), "Unable to setup CQE: not enough memory\n"); + goto dsbl_cqe_caps; + } + + /* + * For dwcmshc host controller we have to enable internal clock + * before access to some registers from Vendor Specific Area 2. + */ + clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + clk |= SDHCI_CLOCK_INT_EN; + sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); + clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if (!(clk & SDHCI_CLOCK_INT_EN)) { + dev_err(mmc_dev(host->mmc), "Unable to setup CQE: internal clock enable error\n"); + goto free_cq_host; + } + + cq_host->mmio = host->ioaddr + priv->vendor_specific_area2; + cq_host->ops = &dwcmshc_cqhci_ops; + + /* Enable using of 128-bit task descriptors */ + dma64 = host->flags & SDHCI_USE_64_BIT_DMA; + if (dma64) { + dev_dbg(mmc_dev(host->mmc), "128-bit task descriptors\n"); + cq_host->caps |= CQHCI_TASK_DESC_SZ_128; + } + err = cqhci_init(cq_host, host->mmc, dma64); + if (err) { + dev_err(mmc_dev(host->mmc), "Unable to setup CQE: error %d\n", err); + goto int_clock_disable; + } + + dev_dbg(mmc_dev(host->mmc), "CQE init done\n"); + + return; + +int_clock_disable: + clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + clk &= ~SDHCI_CLOCK_INT_EN; + sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); + +free_cq_host: + devm_kfree(&pdev->dev, cq_host); + +dsbl_cqe_caps: + host->mmc->caps2 &= ~(MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD); +} + +static void dwcmshc_disable_card_clk(struct sdhci_host *host) +{ + u16 ctrl; + + ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if (ctrl & SDHCI_CLOCK_CARD_EN) { + ctrl &= ~SDHCI_CLOCK_CARD_EN; + sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); + } +} + +#ifdef CONFIG_PM + +static void dwcmshc_enable_card_clk(struct sdhci_host *host) +{ + u16 ctrl; + + ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if ((ctrl & SDHCI_CLOCK_INT_EN) && !(ctrl & SDHCI_CLOCK_CARD_EN)) { + ctrl |= SDHCI_CLOCK_CARD_EN; + sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); + } +} + +#endif + +/******************************************************************************* + * + * SoC level helper routines begin + * + ******************************************************************************/ + +static unsigned int rk35xx_get_max_clock(struct sdhci_host *host) +{ + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + + return clk_round_rate(pltfm_host->clk, ULONG_MAX); +} + static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -681,6 +749,98 @@ static void rk35xx_sdhci_reset(struct sdhci_host *host, u8 mask) sdhci_reset(host, mask); } +static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) +{ + int err; + struct rk35xx_priv *priv = dwc_priv->priv; + + priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); + if (IS_ERR(priv->reset)) { + err = PTR_ERR(priv->reset); + dev_err(mmc_dev(host->mmc), "failed to get reset control %d\n", err); + return err; + } + + priv->rockchip_clks[0].id = "axi"; + priv->rockchip_clks[1].id = "block"; + priv->rockchip_clks[2].id = "timer"; + err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK35xx_MAX_CLKS, + priv->rockchip_clks); + if (err) { + dev_err(mmc_dev(host->mmc), "failed to get clocks %d\n", err); + return err; + } + + err = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, priv->rockchip_clks); + if (err) { + dev_err(mmc_dev(host->mmc), "failed to enable clocks %d\n", err); + return err; + } + + if (of_property_read_u8(mmc_dev(host->mmc)->of_node, "rockchip,txclk-tapnum", + &priv->txclk_tapnum)) + priv->txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; + + /* Disable cmd conflict check */ + sdhci_writel(host, 0x0, dwc_priv->vendor_specific_area1 + DWCMSHC_HOST_CTRL3); + /* Reset previous settings */ + sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_TXCLK); + sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_STRBIN); + + return 0; +} + +static void dwcmshc_rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) +{ + /* + * Don't support highspeed bus mode with low clk speed as we + * cannot use DLL for this condition. + */ + if (host->mmc->f_max <= 52000000) { + dev_info(mmc_dev(host->mmc), "Disabling HS200/HS400, frequency too low (%d)\n", + host->mmc->f_max); + host->mmc->caps2 &= ~(MMC_CAP2_HS200 | MMC_CAP2_HS400); + host->mmc->caps &= ~(MMC_CAP_3_3V_DDR | MMC_CAP_1_8V_DDR); + } +} + +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); + u32 emmc_caps = MMC_CAP2_NO_SD | MMC_CAP2_NO_SDIO; + u16 emmc_ctrl; + + /* Before power on, set PHY configs */ + if (priv->flags & FLAG_IO_FIXED_1V8) + dwcmshc_phy_1_8v_init(host); + else + dwcmshc_phy_3_3v_init(host); + + if ((host->mmc->caps2 & emmc_caps) == emmc_caps) { + emmc_ctrl = sdhci_readw(host, priv->vendor_specific_area1 + DWCMSHC_EMMC_CONTROL); + emmc_ctrl |= DWCMSHC_CARD_IS_EMMC; + sdhci_writew(host, emmc_ctrl, priv->vendor_specific_area1 + DWCMSHC_EMMC_CONTROL); + } + + sdhci_writeb(host, FIELD_PREP(PHY_DLL_CNFG1_SLVDLY_MASK, PHY_DLL_CNFG1_SLVDLY) | + PHY_DLL_CNFG1_WAITCYCLE, PHY_DLL_CNFG1_R); +} + +static void th1520_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); + + dwcmshc_set_uhs_signaling(host, timing); + if (timing == MMC_TIMING_MMC_HS400) + priv->delay_line = PHY_SDCLKDL_DC_HS400; + else + sdhci_writeb(host, 0, PHY_DLLDL_CNFG_R); + th1520_sdhci_set_phy(host); +} + static int th1520_execute_tuning(struct sdhci_host *host, u32 opcode) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -967,128 +1127,6 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_cv18xx_pdata = { .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, }; -static const struct cqhci_host_ops dwcmshc_cqhci_ops = { - .enable = dwcmshc_sdhci_cqe_enable, - .disable = sdhci_cqe_disable, - .dumpregs = dwcmshc_cqhci_dumpregs, - .set_tran_desc = dwcmshc_set_tran_desc, -}; - -static void dwcmshc_cqhci_init(struct sdhci_host *host, struct platform_device *pdev) -{ - struct cqhci_host *cq_host; - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); - bool dma64 = false; - u16 clk; - int err; - - host->mmc->caps2 |= MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD; - cq_host = devm_kzalloc(&pdev->dev, sizeof(*cq_host), GFP_KERNEL); - if (!cq_host) { - dev_err(mmc_dev(host->mmc), "Unable to setup CQE: not enough memory\n"); - goto dsbl_cqe_caps; - } - - /* - * For dwcmshc host controller we have to enable internal clock - * before access to some registers from Vendor Specific Area 2. - */ - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - clk |= SDHCI_CLOCK_INT_EN; - sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - if (!(clk & SDHCI_CLOCK_INT_EN)) { - dev_err(mmc_dev(host->mmc), "Unable to setup CQE: internal clock enable error\n"); - goto free_cq_host; - } - - cq_host->mmio = host->ioaddr + priv->vendor_specific_area2; - cq_host->ops = &dwcmshc_cqhci_ops; - - /* Enable using of 128-bit task descriptors */ - dma64 = host->flags & SDHCI_USE_64_BIT_DMA; - if (dma64) { - dev_dbg(mmc_dev(host->mmc), "128-bit task descriptors\n"); - cq_host->caps |= CQHCI_TASK_DESC_SZ_128; - } - err = cqhci_init(cq_host, host->mmc, dma64); - if (err) { - dev_err(mmc_dev(host->mmc), "Unable to setup CQE: error %d\n", err); - goto int_clock_disable; - } - - dev_dbg(mmc_dev(host->mmc), "CQE init done\n"); - - return; - -int_clock_disable: - clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - clk &= ~SDHCI_CLOCK_INT_EN; - sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); - -free_cq_host: - devm_kfree(&pdev->dev, cq_host); - -dsbl_cqe_caps: - host->mmc->caps2 &= ~(MMC_CAP2_CQE | MMC_CAP2_CQE_DCMD); -} - -static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) -{ - int err; - struct rk35xx_priv *priv = dwc_priv->priv; - - priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); - if (IS_ERR(priv->reset)) { - err = PTR_ERR(priv->reset); - dev_err(mmc_dev(host->mmc), "failed to get reset control %d\n", err); - return err; - } - - priv->rockchip_clks[0].id = "axi"; - priv->rockchip_clks[1].id = "block"; - priv->rockchip_clks[2].id = "timer"; - err = devm_clk_bulk_get_optional(mmc_dev(host->mmc), RK35xx_MAX_CLKS, - priv->rockchip_clks); - if (err) { - dev_err(mmc_dev(host->mmc), "failed to get clocks %d\n", err); - return err; - } - - err = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, priv->rockchip_clks); - if (err) { - dev_err(mmc_dev(host->mmc), "failed to enable clocks %d\n", err); - return err; - } - - if (of_property_read_u8(mmc_dev(host->mmc)->of_node, "rockchip,txclk-tapnum", - &priv->txclk_tapnum)) - priv->txclk_tapnum = DLL_TXCLK_TAPNUM_DEFAULT; - - /* Disable cmd conflict check */ - sdhci_writel(host, 0x0, dwc_priv->vendor_specific_area1 + DWCMSHC_HOST_CTRL3); - /* Reset previous settings */ - sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_TXCLK); - sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_STRBIN); - - return 0; -} - -static void dwcmshc_rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) -{ - /* - * Don't support highspeed bus mode with low clk speed as we - * cannot use DLL for this condition. - */ - if (host->mmc->f_max <= 52000000) { - dev_info(mmc_dev(host->mmc), "Disabling HS200/HS400, frequency too low (%d)\n", - host->mmc->f_max); - host->mmc->caps2 &= ~(MMC_CAP2_HS200 | MMC_CAP2_HS400); - host->mmc->caps &= ~(MMC_CAP_3_3V_DDR | MMC_CAP_1_8V_DDR); - } -} - static const struct of_device_id sdhci_dwcmshc_dt_ids[] = { { .compatible = "rockchip,rk3588-dwcmshc", @@ -1288,17 +1326,6 @@ static int dwcmshc_probe(struct platform_device *pdev) return err; } -static void dwcmshc_disable_card_clk(struct sdhci_host *host) -{ - u16 ctrl; - - ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - if (ctrl & SDHCI_CLOCK_CARD_EN) { - ctrl &= ~SDHCI_CLOCK_CARD_EN; - sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); - } -} - static void dwcmshc_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); @@ -1406,17 +1433,6 @@ static int dwcmshc_resume(struct device *dev) #ifdef CONFIG_PM -static void dwcmshc_enable_card_clk(struct sdhci_host *host) -{ - u16 ctrl; - - ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - if ((ctrl & SDHCI_CLOCK_INT_EN) && !(ctrl & SDHCI_CLOCK_CARD_EN)) { - ctrl |= SDHCI_CLOCK_CARD_EN; - sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); - } -} - static int dwcmshc_runtime_suspend(struct device *dev) { struct sdhci_host *host = dev_get_drvdata(dev); From patchwork Thu Jun 13 01:42:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Wang X-Patchwork-Id: 13695842 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AAF0129A99; Thu, 13 Jun 2024 01:43:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718242982; cv=none; b=WND5akb/bjrj9odLpvIFbNG0vx9yKaqDL3DDAsfnpcIyTiGc2z1ZOOr4Ae3Zq1Ui9FaC6yiZ2Xps08X+3tZdazmI2Oa5yjvtPs8g8BBRJmn5S9+gqFZOnYtnzsraus384Df6SwCnkam5ol4Ii2DUg/0hb2ILEd5A2R1mFD5ImEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718242982; c=relaxed/simple; bh=7abbWRIx27AytNTH4OXZO2H/ozQ/vLZ5aUHwu9tKvFk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kB50X5i8HHwnAwA5DM5v6fPtM/bAb8m54pk5KFZc3kJRU6CZDWRvY7f4NlDqegTP++Bz63ApiVnk476O/PlH0JIZpWyTch/JXP28CeJC/2lRKFb0nG/zQmZs8s1mXmVuHBQuQoR0jesfvHKmA0/D2OgnR1lfJzK59g74H3Dghc8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WI//pNXf; arc=none smtp.client-ip=209.85.210.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WI//pNXf" Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6f9fbec4fd9so283220a34.2; Wed, 12 Jun 2024 18:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718242980; x=1718847780; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/mEnEjULKQXk4yYyl4mjE8uROEMCabgqsBL99/Efhs4=; b=WI//pNXfCPt8Bl+53e4Q68otktL6KMEjIJY43Yfu/oP9gm8YoAJDLMeDAgb0CyhFkD j8KMuCBCiy4LAn4OUQGKL3GvrIF0t/Z8MyQ1xe2rBCL8JvX+0BfHQEiww/eckyq/yHHu 1WMA6bO/BoTS6P87gxU2dw77YKQA2zobvriYXI7sYCnsUrxLxyQye2SIbLmHN/Kog7yY gwDh1cKn+4cqmz64mu/8yu45HNZjCLv3nmWoTUmFnq5G96NbRpNousNLFcOMX1oAfwU2 EZALKtMhTpDolozqBC9LmWG3bRA+KRxGCSfdllWeF+f+IYKYoX+Z/qWVRuLLTwYjQxXj e6kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718242980; x=1718847780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/mEnEjULKQXk4yYyl4mjE8uROEMCabgqsBL99/Efhs4=; b=HLzHT22dhSOAsSlwrMwRehtZmmzcTT1ruC6XGzaAXRrrBm43Y5vUARAsivmc/E8w4m 4RjUT7hN1xpKi0Sa02zSYcoo92nBzYy4K1+vXxs/SmYGh4wtJf0rKvUaaLA3o/yh4g8f vK2tVRptbyPg71P64hG8rhrIyhAiEp3xHBWPBmZccOE66/A/ge61JX9PNa9YffYn+Sa+ 4m5FVBEdtqCX3YVBruKmVqpiNugkRItOiLbZD7UqCYH5qqfshJn2AZbP95WK66Ly2YUe udiw4L/ABp2g63G3gmfy5hRWGSqMoYQ2CByCgjEhjNJyri/MlcCuKkM8bHereiVHHu7z uC7A== X-Forwarded-Encrypted: i=1; AJvYcCW+hXlV+74H+G6k+V7XD2HoiXovBDlzIeWqnLZN+umh/eClLxcHGM6MFqmAdpqmPct8TTsFA6jzMOk5K8JI2ZpBRd8quEXVpLlP0Y5WepKvHW9OZyylGpCp8g5rOFzweEe1ISneGZxQC6IqUZkHEsnmDS4Kww5OvsrwrSGc5xXIRii2GQ== X-Gm-Message-State: AOJu0YwMW9/FqXb2qYQTN/hnlO0XwDI73huzWwwbU0qGZH9A4lBAcpZ/ SQLzIHfAF17RB21Nw4S9jB5GhOHnAoqk97UnbKAFzRV/YmiUQHtK X-Google-Smtp-Source: AGHT+IH4rU9kj/OV/RIpQ8nZ2pKMrO1e3JSgSCb/lr/90ul/n7aHhOdX2QpKamzVPNeXcaH0mEH5EA== X-Received: by 2002:a05:6830:205a:b0:6f9:72ca:fdc8 with SMTP id 46e09a7af769-6fa1c43ba6amr3001227a34.37.1718242979977; Wed, 12 Jun 2024 18:42:59 -0700 (PDT) Received: from localhost.localdomain ([122.8.183.87]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5bd6292da28sm46575eaf.47.2024.06.12.18.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 18:42:59 -0700 (PDT) From: Chen Wang To: adrian.hunter@intel.com, aou@eecs.berkeley.edu, conor+dt@kernel.org, guoren@kernel.org, inochiama@outlook.com, jszhang@kernel.org, krzysztof.kozlowski+dt@linaro.org, palmer@dabbelt.com, paul.walmsley@sifive.com, robh@kernel.org, ulf.hansson@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-riscv@lists.infradead.org, chao.wei@sophgo.com, haijiao.liu@sophgo.com, xiaoguang.xing@sophgo.com, tingzhu.wang@sophgo.com Cc: Chen Wang Subject: [PATCH v3 2/4] mmc: sdhci-of-dwcmshc: unify the naming of soc helper functions Date: Thu, 13 Jun 2024 09:42:52 +0800 Message-Id: <91adce8d020faa22a97719e8774dda01a58333e7.1718241495.git.unicorn_wang@outlook.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen Wang Continue another patch: "mmc: sdhci-of-dwcmshc: adjust positions of helper routines". The helper functions at the dwcmshc level are all prefixed with "dwcmshc_", which is easier to identify, while the functions at the soc level are more confusing. Now they are uniformly prefixed with the soc type string, such as "rk35xx_", "th1520_", etc. Signed-off-by: Chen Wang --- drivers/mmc/host/sdhci-of-dwcmshc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index a68818f53786..346d2d323a05 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -193,7 +193,7 @@ SDHCI_TRNS_BLK_CNT_EN | \ SDHCI_TRNS_DMA) -enum dwcmshc_rk_type { +enum rk35xx_type { DWCMSHC_RK3568, DWCMSHC_RK3588, }; @@ -202,7 +202,7 @@ struct rk35xx_priv { /* Rockchip specified optional clocks */ struct clk_bulk_data rockchip_clks[RK35xx_MAX_CLKS]; struct reset_control *reset; - enum dwcmshc_rk_type devtype; + enum rk35xx_type devtype; u8 txclk_tapnum; }; @@ -621,7 +621,7 @@ static unsigned int rk35xx_get_max_clock(struct sdhci_host *host) return clk_round_rate(pltfm_host->clk, ULONG_MAX); } -static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock) +static void rk3568_set_clock(struct sdhci_host *host, unsigned int clock) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host); @@ -749,7 +749,7 @@ static void rk35xx_sdhci_reset(struct sdhci_host *host, u8 mask) sdhci_reset(host, mask); } -static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) +static int rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) { int err; struct rk35xx_priv *priv = dwc_priv->priv; @@ -790,7 +790,7 @@ static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc return 0; } -static void dwcmshc_rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) +static void rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) { /* * Don't support highspeed bus mode with low clk speed as we @@ -1062,7 +1062,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { }; static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { - .set_clock = dwcmshc_rk3568_set_clock, + .set_clock = rk3568_set_clock, .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = dwcmshc_set_uhs_signaling, .get_max_clock = rk35xx_get_max_clock, @@ -1243,7 +1243,7 @@ static int dwcmshc_probe(struct platform_device *pdev) priv->priv = rk_priv; - err = dwcmshc_rk35xx_init(host, priv); + err = rk35xx_init(host, priv); if (err) goto err_clk; } @@ -1300,7 +1300,7 @@ static int dwcmshc_probe(struct platform_device *pdev) } if (rk_priv) - dwcmshc_rk35xx_postinit(host, priv); + rk35xx_postinit(host, priv); err = __sdhci_add_host(host); if (err) From patchwork Thu Jun 13 01:43:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Wang X-Patchwork-Id: 13695843 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E64158C09; Thu, 13 Jun 2024 01:43:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718243001; cv=none; b=oc2L1CI6pY6IG91u5JDcjDJ87h5iV23vDGlu+/koXPbZ9D/aAZtonu2ui7cyXCpDs4ikzdxyTk8IyHtSEKgLvLAHlz6b6iOV+9nI8oDIUR8T7QgjFRV7bMwjZ7RfM1mQrUeVdzHqV5en1k41I8TxQZUbaIiXh6yVXDZ6i4nR3cM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718243001; c=relaxed/simple; bh=18h/ZmPomL46p/IdVTL3lUMVHnK21Ly+03PCZGlxfsM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cuVScfACL0F6pIophYUNAgdHhfbunGuLD+QHQh0lmZDZIpkF2Uat6BWsA+uuZpQ+zcHb6Wl33yY/xBb85v11fxVBC64RQFpSn9GHy5AxNysLg5eRcEVV+btbZFkWPC1FlWFRV7xTGKgF0iF6NjkD5Dm4xY2bJXMgTbTnoFlXa58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OvdG+Sux; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OvdG+Sux" Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3d24724514eso101555b6e.0; Wed, 12 Jun 2024 18:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718242999; x=1718847799; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZbD6SremdmxVZ0GUzq/7rE++FPn/ciMc7/PALB4g6fM=; b=OvdG+SuxNT0UV62/bTFiTOpaQc6G6YT6yumn6cQ84mzr2iNGWfVd0M7s3nBwWomMaW LO18vLrVoO18Rn0SYfxz39cyFwNSo0WzUkEk2CywSgPlGDR8IOfJ24e9aeY/pY5rPLP4 VRSprzBzltWHY5GU94JJxuoBw8yoIVr0QRi7N05mKHWEez9KOlDXo9mP8mM7yCQoJ3oo 6wDLI5UoDA6aYVnIYtm6eYvBF3QKHQj/IsTY0veXVzfrJ2tNSvEYVlS0fpFj7IwKtspS FPIZpnc4WP/x6Nh0kydQGVTtPnYxnrQKm2S74p2MbrvCOizYZYp48ZYOEjg7D+gpI1U5 5+ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718242999; x=1718847799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZbD6SremdmxVZ0GUzq/7rE++FPn/ciMc7/PALB4g6fM=; b=PLivZhWEBlrpLFVzRWJZgeumQr5qIYQWk68CRYQEyHOfauMOAcR/PuEOGnk5E7Kjx5 er3n04JC/pnXH88oNy33vrRV6ugWsa9TK/r7OeKNkMGXXM57I4Wf8ti3eaFIuTujR/zC YznaUEb8N72+xWYHKaeTPoRFI1o8ueTwYcyGuzIRqvf5yGp/yHLhzXOeHQlr/OeurWqw Uk4uY6zhIPu0DXhSDYb427sbMX2kC7cL33LQOi/DqEt8SsHJSG2gBobuxuk7E3AD+OFh PJvBKTnlYrTUAUs3QlAhVnu6MqnJFF/WPZgrzfF4ybtS1hGgknCc6N4X246fIlHhw3Dk vTnQ== X-Forwarded-Encrypted: i=1; AJvYcCXNr4I77cfwKy9IOssgHFdLLX/RwsqBzbOEa+2IokaS90gPMSWueultJWQMk8rlpBoP8FQG2b5vxEgsg0BlnZaHZBLq7BDLkjZIx+vW74N7Jw05dIxMCQUCz5JRVOxhBqAJk6KGGg2raxcrnImZyTMF3ORV2sWrgRk5lR1zm4G55ma9kg== X-Gm-Message-State: AOJu0Yyjd4gmN6g7cqT81RchXtn6QV+jjXGwWX8MchwSGTL9lmfxkLzc FyaamG5i3ZQc7SEB4IjwN8NZyw1e1k7WqHkoR+mrdHtnmJ0tpUzC X-Google-Smtp-Source: AGHT+IFmIDk/X/zy9LRcduSnBl9YyJYHeNIg54XFnzU/VeRzTcaAbcqqt1huRWTU4iTw8UjZVGCjUg== X-Received: by 2002:a05:6808:2191:b0:3d2:308b:9bb4 with SMTP id 5614622812f47-3d23e0cfbb9mr3918608b6e.43.1718242998751; Wed, 12 Jun 2024 18:43:18 -0700 (PDT) Received: from localhost.localdomain ([122.8.183.87]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3d24762ee1esm49355b6e.29.2024.06.12.18.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 18:43:18 -0700 (PDT) From: Chen Wang To: adrian.hunter@intel.com, aou@eecs.berkeley.edu, conor+dt@kernel.org, guoren@kernel.org, inochiama@outlook.com, jszhang@kernel.org, krzysztof.kozlowski+dt@linaro.org, palmer@dabbelt.com, paul.walmsley@sifive.com, robh@kernel.org, ulf.hansson@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-riscv@lists.infradead.org, chao.wei@sophgo.com, haijiao.liu@sophgo.com, xiaoguang.xing@sophgo.com, tingzhu.wang@sophgo.com Cc: Chen Wang Subject: [PATCH v3 3/4] mmc: sdhci-of-dwcmshc: extract init function for rk35xx/th1520 Date: Thu, 13 Jun 2024 09:43:11 +0800 Message-Id: <459e341a32128ffbae5acdc77a1c835cbee582e6.1718241495.git.unicorn_wang@outlook.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen Wang Extract init function for rk35xx/th1520, which is an intermediate process before further optimization. Signed-off-by: Chen Wang --- drivers/mmc/host/sdhci-of-dwcmshc.c | 83 ++++++++++++++++------------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 346d2d323a05..38ab755aa044 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -749,10 +749,19 @@ static void rk35xx_sdhci_reset(struct sdhci_host *host, u8 mask) sdhci_reset(host, mask); } -static int rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) +static int rk35xx_init(struct device *dev, struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) { int err; - struct rk35xx_priv *priv = dwc_priv->priv; + struct rk35xx_priv *priv; + + priv = devm_kzalloc(dev, sizeof(struct rk35xx_priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + if (of_device_is_compatible(dev->of_node, "rockchip,rk3588-dwcmshc")) + priv->devtype = DWCMSHC_RK3588; + else + priv->devtype = DWCMSHC_RK3568; priv->reset = devm_reset_control_array_get_optional_exclusive(mmc_dev(host->mmc)); if (IS_ERR(priv->reset)) { @@ -787,6 +796,8 @@ static int rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_TXCLK); sdhci_writel(host, 0, DWCMSHC_EMMC_DLL_STRBIN); + dwc_priv->priv = priv; + return 0; } @@ -915,6 +926,35 @@ static void th1520_sdhci_reset(struct sdhci_host *host, u8 mask) } } +static int th1520_init(struct device *dev, + struct sdhci_host *host, + struct dwcmshc_priv *dwc_priv) +{ + dwc_priv->delay_line = PHY_SDCLKDL_DC_DEFAULT; + + if (device_property_read_bool(dev, "mmc-ddr-1_8v") || + device_property_read_bool(dev, "mmc-hs200-1_8v") || + device_property_read_bool(dev, "mmc-hs400-1_8v")) + dwc_priv->flags |= FLAG_IO_FIXED_1V8; + else + dwc_priv->flags &= ~FLAG_IO_FIXED_1V8; + + /* + * start_signal_voltage_switch() will try 3.3V first + * then 1.8V. Use SDHCI_SIGNALING_180 rather than + * SDHCI_SIGNALING_330 to avoid setting voltage to 3.3V + * in sdhci_start_signal_voltage_switch(). + */ + if (dwc_priv->flags & FLAG_IO_FIXED_1V8) { + host->flags &= ~SDHCI_SIGNALING_330; + host->flags |= SDHCI_SIGNALING_180; + } + + sdhci_enable_v4_mode(host); + + return 0; +} + static void cv18xx_sdhci_reset(struct sdhci_host *host, u8 mask) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -1230,46 +1270,15 @@ static int dwcmshc_probe(struct platform_device *pdev) host->mmc_host_ops.execute_tuning = dwcmshc_execute_tuning; if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { - rk_priv = devm_kzalloc(&pdev->dev, sizeof(struct rk35xx_priv), GFP_KERNEL); - if (!rk_priv) { - err = -ENOMEM; - goto err_clk; - } - - if (of_device_is_compatible(pdev->dev.of_node, "rockchip,rk3588-dwcmshc")) - rk_priv->devtype = DWCMSHC_RK3588; - else - rk_priv->devtype = DWCMSHC_RK3568; - - priv->priv = rk_priv; - - err = rk35xx_init(host, priv); + err = rk35xx_init(&pdev->dev, host, priv); if (err) goto err_clk; } if (pltfm_data == &sdhci_dwcmshc_th1520_pdata) { - priv->delay_line = PHY_SDCLKDL_DC_DEFAULT; - - if (device_property_read_bool(dev, "mmc-ddr-1_8v") || - device_property_read_bool(dev, "mmc-hs200-1_8v") || - device_property_read_bool(dev, "mmc-hs400-1_8v")) - priv->flags |= FLAG_IO_FIXED_1V8; - else - priv->flags &= ~FLAG_IO_FIXED_1V8; - - /* - * start_signal_voltage_switch() will try 3.3V first - * then 1.8V. Use SDHCI_SIGNALING_180 rather than - * SDHCI_SIGNALING_330 to avoid setting voltage to 3.3V - * in sdhci_start_signal_voltage_switch(). - */ - if (priv->flags & FLAG_IO_FIXED_1V8) { - host->flags &= ~SDHCI_SIGNALING_330; - host->flags |= SDHCI_SIGNALING_180; - } - - sdhci_enable_v4_mode(host); + err = th1520_init(&pdev->dev, host, priv); + if (err) + goto err_clk; } #ifdef CONFIG_ACPI From patchwork Thu Jun 13 01:43:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Wang X-Patchwork-Id: 13695844 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5086217741; Thu, 13 Jun 2024 01:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718243025; cv=none; b=ffRI8p5aoZq+mUXqL0IeEqSHNm9WhyDrLS8WXeWAXScwS72DtWSIm/LyQeqigzW9cbCP8RvNc43rRHQie3UHDNcoXkGTjwblTXWIGdVhTe0f6q2v5Ae4pucSx9sCmWoJQ3mVqwVcTQkeINCkAM97q45R0S6Tl5c42mep956fapA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718243025; c=relaxed/simple; bh=RvJV1kfgS5VsvQe2v3nI15O55PRjbk5jKsiC3YqjJ20=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YkypvcUJ2SFlY8ZHhLbPkR/o4fiFEhGvS2xaDrGS1Plom3PJFQTcHQj3uwJr3gTcAegP1jz3Za7U8apRDL9jFzz3aiJoJds4pH6zmrj+MmCGZD3mVinJy+K/o1WIKgbcy5bG6ZBtfBNPVwnbLZJmRmsaYzfgePl7OYJu8RBWcsA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PCXnYEPh; arc=none smtp.client-ip=209.85.161.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PCXnYEPh" Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-5ba70a0ed75so298920eaf.1; Wed, 12 Jun 2024 18:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718243022; x=1718847822; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pa5paPyLFaIvlDKRYO3r2AiKWf66KpIRKCv3yER7jFo=; b=PCXnYEPhRyc9u3LuLG+dpmXop+TAV4sn0UshY83Ze/6jFMlOntb2yddvAjTq+aYa3g bBXHU/NdjtyEggtM1N0SztFkNn3GDoaI6U0Su1bx3eq3pX3G9DLGwYWTg48Q/YTx333L EkgLgV1JB4keoVukSbcAEcTw+KAyeafNJBHwjAwjW7EfCPEFyywFGzZlWC1yijRPzvpR UpGVw7OY1upFy1cDYbLNvYjI8QmnUYrNbsqXnO6SIOYnO3XQPE/G9i8cERnT84BHfiz6 W8XzWZgGq0huNzXq/4eShm/LsVsh1qwodNzSaALxexKpzqTVM9C8HhyOE2SQgeFgWX73 XvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718243022; x=1718847822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pa5paPyLFaIvlDKRYO3r2AiKWf66KpIRKCv3yER7jFo=; b=tBU5KknQzC6CC9rlyCFQlLBeC1+bkKY/pAYMA85E5UrFG/z2Ek4sksQBxzG53Im1Xg EsP0ppd9z3dvikUGTI+1Q6kWQRhIubk1U4zSo0XM/vnvP1iOzb4cOiD3A3zozi5uNm/H ivwQglaKaxrHYar5yvI8ZL1XsgbgLLZBqhLOx133Itwh4ca7jgINo7CJWhaja2IHtLwA laLPV/+WDY+6V5jEpemYwAgjmXMo2T+XUgv6TZ+kWiBhr1/rRcTZq8I9LxbstaAafkap 0usDQ9kaiZf+5pcmRyrYkCLjHTpIHOeryLeNyLQvGst+0uC2g93HAtZRfCr9m8Kyu3CO +7Wg== X-Forwarded-Encrypted: i=1; AJvYcCWYzWqlfJ6XzZ3siWdWmcjQPM0/o5z70cZ8ZQL6CFFsXTHuWUaOs3qu1Pc6TMcmLsPDMyHqlkYhsjU2E3G8CyQ6hC/cxCYow4eV/K6BnjTAS3QhAklBo8mlDAKIzwEbnET6qibrked+0ozMzt2zGq1bZkU/8nOO8GfcBO9WrmnqmsCB+g== X-Gm-Message-State: AOJu0YzEZuRhYzuH0+anfJOoo5VadZ/XHUZ0k5X0HB3jA/qGdd2+HV/i QB0EcVOJPev7Z0ioW6AV5CpSpw98qbwxcgdixQKEl2elxARvtxak X-Google-Smtp-Source: AGHT+IFHY32p6WRy8aXgAhgI2jg/QRmSqj0czMoSEtq5wJ8S15vpDIei+2sdjk80QfaRRPhpbCPk4w== X-Received: by 2002:a4a:cb13:0:b0:5bd:15fc:8fe5 with SMTP id 006d021491bc7-5bd15fc96fbmr799925eaf.7.1718243021947; Wed, 12 Jun 2024 18:43:41 -0700 (PDT) Received: from localhost.localdomain ([122.8.183.87]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5bd62926ef8sm46561eaf.39.2024.06.12.18.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 18:43:41 -0700 (PDT) From: Chen Wang To: adrian.hunter@intel.com, aou@eecs.berkeley.edu, conor+dt@kernel.org, guoren@kernel.org, inochiama@outlook.com, jszhang@kernel.org, krzysztof.kozlowski+dt@linaro.org, palmer@dabbelt.com, paul.walmsley@sifive.com, robh@kernel.org, ulf.hansson@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-riscv@lists.infradead.org, chao.wei@sophgo.com, haijiao.liu@sophgo.com, xiaoguang.xing@sophgo.com, tingzhu.wang@sophgo.com Cc: Chen Wang Subject: [PATCH v3 4/4] mmc: sdhci-of-dwcmshc: add callback functions for dwcmshc Date: Thu, 13 Jun 2024 09:43:34 +0800 Message-Id: <2182f65bad83e394a7ffb9259b2c1aa130912961.1718241495.git.unicorn_wang@outlook.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen Wang The current framework is not easily extended to support new SOCs. For example, in the current code we see that the SOC-level structure `rk35xx_priv` and related logic are distributed in functions such as dwcmshc_probe/dwcmshc_remove/dwcmshc_suspend/......, which is inappropriate. The solution is to abstract some possible common operations of soc as dwcmshc platform data. Each soc implements the corresponding callback function according to its own needs. dwcmshc framework is responsible for calling these callback functions in those dwcmshc_xxx functions at proper positions. Signed-off-by: Chen Wang --- drivers/mmc/host/sdhci-of-dwcmshc.c | 143 +++++++++++++++++++--------- 1 file changed, 99 insertions(+), 44 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 38ab755aa044..ebae461019f9 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -206,6 +206,7 @@ struct rk35xx_priv { u8 txclk_tapnum; }; +struct dwcmshc_ops; struct dwcmshc_priv { struct clk *bus_clk; int vendor_specific_area1; /* P_VENDOR_SPECIFIC_AREA1 reg */ @@ -214,6 +215,20 @@ struct dwcmshc_priv { void *priv; /* pointer to SoC private stuff */ u16 delay_line; u16 flags; + + const struct dwcmshc_ops *ops; +}; + +struct dwcmshc_ops { + int (*init)(struct device *dev, struct sdhci_host *host, struct dwcmshc_priv *dwc_priv); + void (*postinit)(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv); + int (*clks_enable)(struct dwcmshc_priv *dwc_priv); + void (*clks_disable)(struct dwcmshc_priv *dwc_priv); +}; + +struct dwcmshc_data { + const struct sdhci_pltfm_data *pdata; + const struct dwcmshc_ops *ops; }; /******************************************************************************* @@ -815,6 +830,25 @@ static void rk35xx_postinit(struct sdhci_host *host, struct dwcmshc_priv *dwc_pr } } +static int rk35xx_clks_enable(struct dwcmshc_priv *dwc_priv) +{ + struct rk35xx_priv *priv = dwc_priv->priv; + int ret = 0; + + if (priv) + ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, priv->rockchip_clks); + return ret; +} + +static void rk35xx_clks_disable(struct dwcmshc_priv *dwc_priv) +{ + struct rk35xx_priv *priv = dwc_priv->priv; + + if (priv) + clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, + priv->rockchip_clks); +} + static void th1520_sdhci_set_phy(struct sdhci_host *host) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); @@ -1167,30 +1201,65 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_cv18xx_pdata = { .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, }; +static const struct dwcmshc_ops dwcmshc_rk35xx_ops = { + .init = rk35xx_init, + .postinit = rk35xx_postinit, + .clks_enable = rk35xx_clks_enable, + .clks_disable = rk35xx_clks_disable, +}; + +static const struct dwcmshc_ops dwcmshc_th1520_ops = { + .init = th1520_init, +}; + +static const struct dwcmshc_data dwcmshc_cv18xx_data = { + .pdata = &sdhci_dwcmshc_cv18xx_pdata, +}; + +static const struct dwcmshc_data dwcmshc_generic_data = { + .pdata = &sdhci_dwcmshc_pdata, +}; + +static const struct dwcmshc_data dwcmshc_rk35xx_data = { + .pdata = &sdhci_dwcmshc_rk35xx_pdata, + .ops = &dwcmshc_rk35xx_ops, +}; + +static const struct dwcmshc_data dwcmshc_th1520_data = { + .pdata = &sdhci_dwcmshc_th1520_pdata, + .ops = &dwcmshc_th1520_ops, +}; + +#ifdef CONFIG_ACPI +static const struct dwcmshc_data dwcmshc_bf3_data = { + .pdata = &sdhci_dwcmshc_bf3_pdata, +}; +#endif + static const struct of_device_id sdhci_dwcmshc_dt_ids[] = { { .compatible = "rockchip,rk3588-dwcmshc", - .data = &sdhci_dwcmshc_rk35xx_pdata, + .data = &dwcmshc_rk35xx_data, }, { .compatible = "rockchip,rk3568-dwcmshc", - .data = &sdhci_dwcmshc_rk35xx_pdata, + .data = &dwcmshc_rk35xx_data, }, { .compatible = "snps,dwcmshc-sdhci", - .data = &sdhci_dwcmshc_pdata, + .data = &dwcmshc_generic_data, }, { .compatible = "sophgo,cv1800b-dwcmshc", - .data = &sdhci_dwcmshc_cv18xx_pdata, + .data = &dwcmshc_cv18xx_data, }, { .compatible = "sophgo,sg2002-dwcmshc", - .data = &sdhci_dwcmshc_cv18xx_pdata, + .data = &dwcmshc_cv18xx_data, }, { .compatible = "thead,th1520-dwcmshc", - .data = &sdhci_dwcmshc_th1520_pdata, + .data = &dwcmshc_th1520_data, }, {}, }; @@ -1200,7 +1269,7 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids); static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = { { .id = "MLNXBF30", - .driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata, + .driver_data = (kernel_ulong_t)&dwcmshc_bf3_data, }, {} }; @@ -1213,18 +1282,17 @@ static int dwcmshc_probe(struct platform_device *pdev) struct sdhci_pltfm_host *pltfm_host; struct sdhci_host *host; struct dwcmshc_priv *priv; - struct rk35xx_priv *rk_priv = NULL; - const struct sdhci_pltfm_data *pltfm_data; + const struct dwcmshc_data *data; int err; u32 extra, caps; - pltfm_data = device_get_match_data(&pdev->dev); - if (!pltfm_data) { + data = device_get_match_data(&pdev->dev); + if (!data) { dev_err(&pdev->dev, "Error: No device match data found\n"); return -ENODEV; } - host = sdhci_pltfm_init(pdev, pltfm_data, + host = sdhci_pltfm_init(pdev, data->pdata, sizeof(struct dwcmshc_priv)); if (IS_ERR(host)) return PTR_ERR(host); @@ -1239,6 +1307,7 @@ static int dwcmshc_probe(struct platform_device *pdev) pltfm_host = sdhci_priv(host); priv = sdhci_pltfm_priv(pltfm_host); + priv->ops = data->ops; if (dev->of_node) { pltfm_host->clk = devm_clk_get(dev, "core"); @@ -1269,20 +1338,14 @@ static int dwcmshc_probe(struct platform_device *pdev) host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; host->mmc_host_ops.execute_tuning = dwcmshc_execute_tuning; - if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { - err = rk35xx_init(&pdev->dev, host, priv); - if (err) - goto err_clk; - } - - if (pltfm_data == &sdhci_dwcmshc_th1520_pdata) { - err = th1520_init(&pdev->dev, host, priv); + if (data->ops && data->ops->init) { + err = data->ops->init(&pdev->dev, host, priv); if (err) goto err_clk; } #ifdef CONFIG_ACPI - if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) + if (data == &dwcmshc_bf3_data) sdhci_enable_v4_mode(host); #endif @@ -1308,8 +1371,8 @@ static int dwcmshc_probe(struct platform_device *pdev) dwcmshc_cqhci_init(host, pdev); } - if (rk_priv) - rk35xx_postinit(host, priv); + if (data->ops && data->ops->postinit) + data->ops->postinit(host, priv); err = __sdhci_add_host(host); if (err) @@ -1327,9 +1390,8 @@ static int dwcmshc_probe(struct platform_device *pdev) err_clk: clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(priv->bus_clk); - if (rk_priv) - clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, - rk_priv->rockchip_clks); + if (data->ops && data->ops->clks_disable) + data->ops->clks_disable(priv); free_pltfm: sdhci_pltfm_free(pdev); return err; @@ -1340,7 +1402,6 @@ static void dwcmshc_remove(struct platform_device *pdev) struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); - struct rk35xx_priv *rk_priv = priv->priv; pm_runtime_get_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); @@ -1352,9 +1413,8 @@ static void dwcmshc_remove(struct platform_device *pdev) clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(priv->bus_clk); - if (rk_priv) - clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, - rk_priv->rockchip_clks); + if (priv->ops && priv->ops->clks_disable) + priv->ops->clks_disable(priv); sdhci_pltfm_free(pdev); } @@ -1364,7 +1424,6 @@ static int dwcmshc_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); - struct rk35xx_priv *rk_priv = priv->priv; int ret; pm_runtime_resume(dev); @@ -1383,9 +1442,8 @@ static int dwcmshc_suspend(struct device *dev) if (!IS_ERR(priv->bus_clk)) clk_disable_unprepare(priv->bus_clk); - if (rk_priv) - clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, - rk_priv->rockchip_clks); + if (priv->ops && priv->ops->clks_disable) + priv->ops->clks_disable(priv); return ret; } @@ -1395,7 +1453,6 @@ static int dwcmshc_resume(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host); - struct rk35xx_priv *rk_priv = priv->priv; int ret; ret = clk_prepare_enable(pltfm_host->clk); @@ -1408,29 +1465,27 @@ static int dwcmshc_resume(struct device *dev) goto disable_clk; } - if (rk_priv) { - ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, - rk_priv->rockchip_clks); + if (priv->ops && priv->ops->clks_enable) { + ret = priv->ops->clks_enable(priv); if (ret) goto disable_bus_clk; } ret = sdhci_resume_host(host); if (ret) - goto disable_rockchip_clks; + goto disable_soc_clks; if (host->mmc->caps2 & MMC_CAP2_CQE) { ret = cqhci_resume(host->mmc); if (ret) - goto disable_rockchip_clks; + goto disable_soc_clks; } return 0; -disable_rockchip_clks: - if (rk_priv) - clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, - rk_priv->rockchip_clks); +disable_soc_clks: + if (priv->ops && priv->ops->clks_disable) + priv->ops->clks_disable(priv); disable_bus_clk: if (!IS_ERR(priv->bus_clk)) clk_disable_unprepare(priv->bus_clk);