| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAPDyKFpvuKU50T1UXfo-H5=gesOwqH4rW4sok4sYOZBgFijt2g@mail.gmail.com>
Date: Fri, 19 Mar 2021 15:12:28 +0100
From: Ulf Hansson <ulf.hansson@...aro.org>
To: Liming Sun <limings@...dia.com>
Cc: Adrian Hunter <adrian.hunter@...el.com>,
Khalil Blaiech <kblaiech@...dia.com>,
linux-mmc <linux-mmc@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2] mmc: sdhci-of-dwcmshc: add ACPI support for
BlueField-3 SoC
On Wed, 17 Mar 2021 at 00:20, Liming Sun <limings@...dia.com> wrote:
>
> This commit adds ACPI support in the sdhci-of-dwcmshc driver for
> BlueField-3 SoC. It has changes to only use the clock hierarchy
> for Deviec Tree since the clk is not supported by ACPI. Instead,
> ACPI can define 'clock-frequency' which is parsed by existing
> sdhci_get_property(). This clock value will be returned in function
> dwcmshc_get_max_clock().
>
> Signed-off-by: Liming Sun <limings@...dia.com>
> Reviewed-by: Khalil Blaiech <kblaiech@...dia.com>
Liming, can you please rebase and repost a new version. It seems like
Shawn Lin's patch that added rockchip platform support causes the
conflict.
Kind regards
Uffe
> ---
> v1->v2:
> Changes for comments from Adrian Hunter <adrian.hunter@...el.com>:
> - Make changes in sdhci-of-dwcmshc instead.
> v1: Initial version which was done in sdhci-acpi.c
> ---
> drivers/mmc/host/sdhci-of-dwcmshc.c | 50 ++++++++++++++++++++++++++-----------
> 1 file changed, 36 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
> index 59d8d96..bf5037a 100644
> --- a/drivers/mmc/host/sdhci-of-dwcmshc.c
> +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
> @@ -7,6 +7,7 @@
> * Author: Jisheng Zhang <jszhang@...nel.org>
> */
>
> +#include <linux/acpi.h>
> #include <linux/clk.h>
> #include <linux/dma-mapping.h>
> #include <linux/kernel.h>
> @@ -51,6 +52,16 @@ static void dwcmshc_adma_write_desc(struct sdhci_host *host, void **desc,
> sdhci_adma_write_desc(host, desc, addr, len, cmd);
> }
>
> +static unsigned int dwcmshc_get_max_clock(struct sdhci_host *host)
> +{
> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> +
> + if (pltfm_host->clk)
> + return sdhci_pltfm_clk_get_max_clock(host);
> + else
> + return pltfm_host->clock;
> +}
> +
> static void dwcmshc_check_auto_cmd23(struct mmc_host *mmc,
> struct mmc_request *mrq)
> {
> @@ -104,7 +115,7 @@ static void dwcmshc_set_uhs_signaling(struct sdhci_host *host,
> .set_clock = sdhci_set_clock,
> .set_bus_width = sdhci_set_bus_width,
> .set_uhs_signaling = dwcmshc_set_uhs_signaling,
> - .get_max_clock = sdhci_pltfm_clk_get_max_clock,
> + .get_max_clock = dwcmshc_get_max_clock,
> .reset = sdhci_reset,
> .adma_write_desc = dwcmshc_adma_write_desc,
> };
> @@ -117,6 +128,7 @@ static void dwcmshc_set_uhs_signaling(struct sdhci_host *host,
>
> static int dwcmshc_probe(struct platform_device *pdev)
> {
> + struct device *dev = &pdev->dev;
> struct sdhci_pltfm_host *pltfm_host;
> struct sdhci_host *host;
> struct dwcmshc_priv *priv;
> @@ -131,7 +143,7 @@ static int dwcmshc_probe(struct platform_device *pdev)
> /*
> * extra adma table cnt for cross 128M boundary handling.
> */
> - extra = DIV_ROUND_UP_ULL(dma_get_required_mask(&pdev->dev), SZ_128M);
> + extra = DIV_ROUND_UP_ULL(dma_get_required_mask(dev), SZ_128M);
> if (extra > SDHCI_MAX_SEGS)
> extra = SDHCI_MAX_SEGS;
> host->adma_table_cnt += extra;
> @@ -139,19 +151,21 @@ static int dwcmshc_probe(struct platform_device *pdev)
> pltfm_host = sdhci_priv(host);
> priv = sdhci_pltfm_priv(pltfm_host);
>
> - pltfm_host->clk = devm_clk_get(&pdev->dev, "core");
> - if (IS_ERR(pltfm_host->clk)) {
> - err = PTR_ERR(pltfm_host->clk);
> - dev_err(&pdev->dev, "failed to get core clk: %d\n", err);
> - goto free_pltfm;
> + if (dev->of_node) {
> + pltfm_host->clk = devm_clk_get(dev, "core");
> + if (IS_ERR(pltfm_host->clk)) {
> + err = PTR_ERR(pltfm_host->clk);
> + dev_err(dev, "failed to get core clk: %d\n", err);
> + goto free_pltfm;
> + }
> + err = clk_prepare_enable(pltfm_host->clk);
> + if (err)
> + goto free_pltfm;
> +
> + priv->bus_clk = devm_clk_get(dev, "bus");
> + if (!IS_ERR(priv->bus_clk))
> + clk_prepare_enable(priv->bus_clk);
> }
> - err = clk_prepare_enable(pltfm_host->clk);
> - if (err)
> - goto free_pltfm;
> -
> - priv->bus_clk = devm_clk_get(&pdev->dev, "bus");
> - if (!IS_ERR(priv->bus_clk))
> - clk_prepare_enable(priv->bus_clk);
>
> err = mmc_of_parse(host->mmc);
> if (err)
> @@ -239,11 +253,19 @@ static int dwcmshc_resume(struct device *dev)
> };
> MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids);
>
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = {
> + { .id = "MLNXBF30" },
> + {}
> +};
> +#endif
> +
> static struct platform_driver sdhci_dwcmshc_driver = {
> .driver = {
> .name = "sdhci-dwcmshc",
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> .of_match_table = sdhci_dwcmshc_dt_ids,
> + .acpi_match_table = ACPI_PTR(sdhci_dwcmshc_acpi_ids),
> .pm = &dwcmshc_pmops,
> },
> .probe = dwcmshc_probe,
> --
> 1.8.3.1
>
Powered by blists - more mailing lists