From: Marek Vasut <marex@denx.de> To: linux-mmc@vger.kernel.org Cc: Marek Vasut <marex@denx.de>, Michal Simek <michal.simek@xilinx.com>, Adrian Hunter <adrian.hunter@intel.com>, Ulf Hansson <ulf.hansson@linaro.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH] mmc: sdhci-of-arasan: Override SDHCI_RETUNING_TIMER_COUNT_MASK on ZynqMP Date: Tue, 25 Oct 2022 21:15:00 +0200 [thread overview] Message-ID: <20221025191500.149167-1-marex@denx.de> (raw) On Xilinx ZynqMP, the reg_capabilities (SDIO) Register https://www.xilinx.com/htmldocs/registers/ug1087/sdio___reg_capabilities.html# Absolute Address 0x00FF160040 (SD0) Reset Value 0x280737EC6481 really reads 0x200737EC6481 . The interesting part is the top 32 bits, which are SDHCI_CAPABILITIES_1 = 0x2007. The missing 0x800 is SDHCI_RETUNING_TIMER_COUNT_MASK=0, which makes the SDHCI core disable retuning timer. Fix this up here by explicitly setting tuning_count to 8 as it should be, otherwise an eMMC might fail in various thermal conditions Note that the diff is best shown with -w option, this makes it visible what happened with !sdhci_arasan->has_cqe conditional, which is placed between sdhci_setup_host() and __sdhci_add_host() calls. Since sdhci_add_host() is also a sequence of these two calls and host->tuning_count must be overriden before calling __sdhci_add_host(), call the two calls separately and do all the adjustments between them in either case. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Michal Simek <michal.simek@xilinx.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: linux-arm-kernel@lists.infradead.org To: linux-mmc@vger.kernel.org --- drivers/mmc/host/sdhci-of-arasan.c | 57 ++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 3997cad1f793d..465498f2a7c0f 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -1521,37 +1521,56 @@ static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan, return 0; } -static int sdhci_arasan_add_host(struct sdhci_arasan_data *sdhci_arasan) +static int sdhci_arasan_add_host(struct sdhci_arasan_data *sdhci_arasan, + struct device *dev) { struct sdhci_host *host = sdhci_arasan->host; struct cqhci_host *cq_host; bool dma64; int ret; - if (!sdhci_arasan->has_cqe) - return sdhci_add_host(host); - ret = sdhci_setup_host(host); if (ret) return ret; - cq_host = devm_kzalloc(host->mmc->parent, - sizeof(*cq_host), GFP_KERNEL); - if (!cq_host) { - ret = -ENOMEM; - goto cleanup; - } + /* + * On Xilinx ZynqMP, the reg_capabilities (SDIO) Register + * + * https://www.xilinx.com/htmldocs/registers/ug1087/sdio___reg_capabilities.html# + * Absolute Address 0x00FF160040 (SD0) + * Reset Value 0x280737EC6481 + * + * really reads 0x200737EC6481 . The interesting part is the + * top 32 bits, which are SDHCI_CAPABILITIES_1 = 0x2007. The + * missing 0x800 is SDHCI_RETUNING_TIMER_COUNT_MASK=0, which + * makes the SDHCI core disable retuning timer. + * + * Fix this up here by explicitly setting tuning_count to 8 + * as it should be, otherwise an eMMC might fail in various + * thermal conditions. + */ + if (of_device_is_compatible(dev->of_node, "xlnx,zynqmp-8.9a")) + host->tuning_count = 1 << (8 - 1); + + if (sdhci_arasan->has_cqe) { + cq_host = devm_kzalloc(host->mmc->parent, + sizeof(*cq_host), GFP_KERNEL); + if (!cq_host) { + ret = -ENOMEM; + goto cleanup; + } - cq_host->mmio = host->ioaddr + SDHCI_ARASAN_CQE_BASE_ADDR; - cq_host->ops = &sdhci_arasan_cqhci_ops; + cq_host->mmio = host->ioaddr + SDHCI_ARASAN_CQE_BASE_ADDR; + cq_host->ops = &sdhci_arasan_cqhci_ops; - dma64 = host->flags & SDHCI_USE_64_BIT_DMA; - if (dma64) - cq_host->caps |= CQHCI_TASK_DESC_SZ_128; + dma64 = host->flags & SDHCI_USE_64_BIT_DMA; + if (dma64) + cq_host->caps |= CQHCI_TASK_DESC_SZ_128; - ret = cqhci_init(cq_host, host->mmc, dma64); - if (ret) - goto cleanup; + ret = cqhci_init(cq_host, host->mmc, dma64); + if (ret) + goto cleanup; + } ret = __sdhci_add_host(host); if (ret) @@ -1711,7 +1730,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev) host->mmc->caps2 |= MMC_CAP2_CQE_DCMD; } - ret = sdhci_arasan_add_host(sdhci_arasan); + ret = sdhci_arasan_add_host(sdhci_arasan, &pdev->dev); if (ret) goto err_add_host; -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Marek Vasut <marex@denx.de> To: linux-mmc@vger.kernel.org Cc: Marek Vasut <marex@denx.de>, Michal Simek <michal.simek@xilinx.com>, Adrian Hunter <adrian.hunter@intel.com>, Ulf Hansson <ulf.hansson@linaro.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH] mmc: sdhci-of-arasan: Override SDHCI_RETUNING_TIMER_COUNT_MASK on ZynqMP Date: Tue, 25 Oct 2022 21:15:00 +0200 [thread overview] Message-ID: <20221025191500.149167-1-marex@denx.de> (raw) On Xilinx ZynqMP, the reg_capabilities (SDIO) Register https://www.xilinx.com/htmldocs/registers/ug1087/sdio___reg_capabilities.html# Absolute Address 0x00FF160040 (SD0) Reset Value 0x280737EC6481 really reads 0x200737EC6481 . The interesting part is the top 32 bits, which are SDHCI_CAPABILITIES_1 = 0x2007. The missing 0x800 is SDHCI_RETUNING_TIMER_COUNT_MASK=0, which makes the SDHCI core disable retuning timer. Fix this up here by explicitly setting tuning_count to 8 as it should be, otherwise an eMMC might fail in various thermal conditions Note that the diff is best shown with -w option, this makes it visible what happened with !sdhci_arasan->has_cqe conditional, which is placed between sdhci_setup_host() and __sdhci_add_host() calls. Since sdhci_add_host() is also a sequence of these two calls and host->tuning_count must be overriden before calling __sdhci_add_host(), call the two calls separately and do all the adjustments between them in either case. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Michal Simek <michal.simek@xilinx.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: linux-arm-kernel@lists.infradead.org To: linux-mmc@vger.kernel.org --- drivers/mmc/host/sdhci-of-arasan.c | 57 ++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 3997cad1f793d..465498f2a7c0f 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -1521,37 +1521,56 @@ static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan, return 0; } -static int sdhci_arasan_add_host(struct sdhci_arasan_data *sdhci_arasan) +static int sdhci_arasan_add_host(struct sdhci_arasan_data *sdhci_arasan, + struct device *dev) { struct sdhci_host *host = sdhci_arasan->host; struct cqhci_host *cq_host; bool dma64; int ret; - if (!sdhci_arasan->has_cqe) - return sdhci_add_host(host); - ret = sdhci_setup_host(host); if (ret) return ret; - cq_host = devm_kzalloc(host->mmc->parent, - sizeof(*cq_host), GFP_KERNEL); - if (!cq_host) { - ret = -ENOMEM; - goto cleanup; - } + /* + * On Xilinx ZynqMP, the reg_capabilities (SDIO) Register + * + * https://www.xilinx.com/htmldocs/registers/ug1087/sdio___reg_capabilities.html# + * Absolute Address 0x00FF160040 (SD0) + * Reset Value 0x280737EC6481 + * + * really reads 0x200737EC6481 . The interesting part is the + * top 32 bits, which are SDHCI_CAPABILITIES_1 = 0x2007. The + * missing 0x800 is SDHCI_RETUNING_TIMER_COUNT_MASK=0, which + * makes the SDHCI core disable retuning timer. + * + * Fix this up here by explicitly setting tuning_count to 8 + * as it should be, otherwise an eMMC might fail in various + * thermal conditions. + */ + if (of_device_is_compatible(dev->of_node, "xlnx,zynqmp-8.9a")) + host->tuning_count = 1 << (8 - 1); + + if (sdhci_arasan->has_cqe) { + cq_host = devm_kzalloc(host->mmc->parent, + sizeof(*cq_host), GFP_KERNEL); + if (!cq_host) { + ret = -ENOMEM; + goto cleanup; + } - cq_host->mmio = host->ioaddr + SDHCI_ARASAN_CQE_BASE_ADDR; - cq_host->ops = &sdhci_arasan_cqhci_ops; + cq_host->mmio = host->ioaddr + SDHCI_ARASAN_CQE_BASE_ADDR; + cq_host->ops = &sdhci_arasan_cqhci_ops; - dma64 = host->flags & SDHCI_USE_64_BIT_DMA; - if (dma64) - cq_host->caps |= CQHCI_TASK_DESC_SZ_128; + dma64 = host->flags & SDHCI_USE_64_BIT_DMA; + if (dma64) + cq_host->caps |= CQHCI_TASK_DESC_SZ_128; - ret = cqhci_init(cq_host, host->mmc, dma64); - if (ret) - goto cleanup; + ret = cqhci_init(cq_host, host->mmc, dma64); + if (ret) + goto cleanup; + } ret = __sdhci_add_host(host); if (ret) @@ -1711,7 +1730,7 @@ static int sdhci_arasan_probe(struct platform_device *pdev) host->mmc->caps2 |= MMC_CAP2_CQE_DCMD; } - ret = sdhci_arasan_add_host(sdhci_arasan); + ret = sdhci_arasan_add_host(sdhci_arasan, &pdev->dev); if (ret) goto err_add_host; -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-10-25 19:15 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-25 19:15 Marek Vasut [this message] 2022-10-25 19:15 ` [PATCH] mmc: sdhci-of-arasan: Override SDHCI_RETUNING_TIMER_COUNT_MASK on ZynqMP Marek Vasut 2022-10-26 6:07 ` Adrian Hunter 2022-10-26 6:07 ` Adrian Hunter 2022-10-26 9:20 ` Marek Vasut 2022-10-26 9:20 ` Marek Vasut 2022-12-21 5:09 ` Potthuri, Sai Krishna 2022-12-21 5:09 ` Potthuri, Sai Krishna 2022-12-21 9:39 ` Marek Vasut 2022-12-21 9:39 ` Marek Vasut 2022-12-22 9:20 ` Potthuri, Sai Krishna 2022-12-22 9:20 ` Potthuri, Sai Krishna 2023-01-03 20:47 ` Marek Vasut 2023-01-03 20:47 ` Marek Vasut 2023-02-06 8:49 ` Potthuri, Sai Krishna 2023-02-06 8:49 ` Potthuri, Sai Krishna 2022-12-29 12:51 ` Adrian Hunter 2022-12-29 12:51 ` Adrian Hunter 2022-12-30 6:42 ` Marek Vasut 2022-12-30 6:42 ` Marek Vasut 2022-12-30 12:57 ` Adrian Hunter 2022-12-30 12:57 ` Adrian Hunter 2023-01-02 8:24 ` Michal Simek 2023-01-02 8:24 ` Michal Simek 2023-01-03 20:35 ` Marek Vasut 2023-01-03 20:35 ` Marek Vasut 2023-01-04 7:18 ` Michal Simek 2023-01-04 7:18 ` Michal Simek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221025191500.149167-1-marex@denx.de \ --to=marex@denx.de \ --cc=adrian.hunter@intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mmc@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.