From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932909AbcKWHkj (ORCPT ); Wed, 23 Nov 2016 02:40:39 -0500 Received: from mga06.intel.com ([134.134.136.31]:40762 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754327AbcKWHki (ORCPT ); Wed, 23 Nov 2016 02:40:38 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,537,1473145200"; d="scan'208";a="1089320067" Subject: Re: [PATCH v2 2/2] mmc: sdhci-pci: Use ACPI to get max frequency for Intel byt sdio controller sub-vended by NI To: Zach Brown , ulf.hansson@linaro.org References: <1479851602-19788-1-git-send-email-zach.brown@ni.com> <1479851602-19788-3-git-send-email-zach.brown@ni.com> Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <0020c9d8-fcfb-e092-0ec8-5767f4ae7fed@intel.com> Date: Wed, 23 Nov 2016 09:35:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1479851602-19788-3-git-send-email-zach.brown@ni.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/11/16 23:53, Zach Brown wrote: > On NI 9037 boards the max SDIO frequency is limited by trace lengths > and other layout choices. The max SDIO frequency is stored in an ACPI > table. > > The driver reads the ACPI entry MXFQ during sdio_probe_slot and sets the > f_max field of the host. > > Signed-off-by: Nathan Sullivan > Reviewed-by: Jaeden Amero > Reviewed-by: Josh Cartwright > Signed-off-by: Zach Brown > --- > drivers/mmc/host/sdhci-pci-core.c | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index 9741505..34284b8 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > #include "sdhci.h" > #include "sdhci-pci.h" > @@ -375,6 +376,30 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) > return 0; > } > > +#ifdef CONFIG_ACPI > + > +static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) > +{ > + acpi_status status; > + unsigned long long max_freq; > + > + status = acpi_evaluate_integer(ACPI_HANDLE(&slot->chip->pdev->dev), > + "MXFQ", NULL, &max_freq); > + if (ACPI_FAILURE(status)) { > + dev_err(&slot->chip->pdev->dev, > + "MXFQ not found in acpi table\n"); > + return -EINVAL; > + } > + > + slot->host->mmc->f_max = max_freq * 1000000; > + > + slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE | > + MMC_CAP_WAIT_WHILE_BUSY; > + return 0; > +} > + > +#else No, it is the ACPI access that needs to be a separate function. We don't want 2 ni_byt_sdio_probe_slot(). Perhaps, something like: #ifdef CONFIG_ACPI static int ni_set_max_freq(struct sdhci_pci_slot *slot) { acpi_status status; unsigned long long max_freq; status = acpi_evaluate_integer(ACPI_HANDLE(&slot->chip->pdev->dev), "MXFQ", NULL, &max_freq); if (ACPI_FAILURE(status)) dev_err(&slot->chip->pdev->dev, "MXFQ not found in acpi table\n"); return -EINVAL; } slot->host->mmc->f_max = max_freq * 1000000; return 0; } #else static inline int ni_set_max_freq(struct sdhci_pci_slot *slot) { return 0; } #endif