All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
	Al Cooper <alcooperx@gmail.com>,
	Jaedon Shin <jaedon.shin@gmail.com>,
	Haibo Chen <haibo.chen@nxp.com>,
	Dong Aisheng <aisheng.dong@nxp.com>,
	Shawn Lin <shawn.lin@rock-chips.com>,
	Douglas Anderson <dianders@chromium.org>,
	Zach Brown <zach.brown@ni.com>,
	Ludovic Desroches <ludovic.desroches@atmel.com>,
	Jisheng Zhang <jszhang@marvell.com>,
	Yangbo Lu <yangbo.lu@nxp.com>,
	Jaehoon Chung <jh80.chung@samsung.com>,
	Weijun Yang <Weijun.Yang@csr.com>,
	Barry Song <Baohua.Song@csr.com>,
	Peter Griffin <peter.griffin@linaro.org>,
	Lee Jones <lee.jones@linaro.org>,
	Jon Hunter <jonathanh@nvidia.com>,
	Harjani Ritesh <riteshh@codeaurora.org>
Subject: [PATCH 06/25] mmc: sdhci-pci: Don't re-tune with runtime pm for some Intel devices
Date: Mon, 20 Mar 2017 19:50:34 +0200	[thread overview]
Message-ID: <1490032253-6030-7-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1490032253-6030-1-git-send-email-adrian.hunter@intel.com>

Make use  of an Intel ACPI _DSM that indicates if re-tuning is needed after
D3.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci-pci-core.c | 90 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 84b73cb22940..3564327c9c7b 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -259,6 +259,77 @@ static int mfd_sdio_probe_slot(struct sdhci_pci_slot *slot)
 	.probe_slot	= pch_hc_probe_slot,
 };
 
+enum {
+	INTEL_DSM_FNS		=  0,
+	INTEL_DSM_D3_RETUNE	= 10,
+};
+
+struct intel_host {
+	u32	dsm_fns;
+	bool	d3_retune;
+};
+
+const u8 intel_dsm_uuid[] = {
+	0xA5, 0x3E, 0xC1, 0xF6, 0xCD, 0x65, 0x1F, 0x46,
+	0xAB, 0x7A, 0x29, 0xF7, 0xE8, 0xD5, 0xBD, 0x61,
+};
+
+static int __intel_dsm(struct intel_host *intel_host, struct device *dev,
+		       unsigned int fn, u32 *result)
+{
+	union acpi_object *obj;
+	int err = 0;
+
+	obj = acpi_evaluate_dsm(ACPI_HANDLE(dev), intel_dsm_uuid, 0, fn, NULL);
+	if (!obj)
+		return -EOPNOTSUPP;
+
+	if (obj->type != ACPI_TYPE_BUFFER || obj->buffer.length < 1) {
+		err = -EINVAL;
+		goto out;
+	}
+
+	if (obj->buffer.length >= 4)
+		*result = *(u32 *)obj->buffer.pointer;
+	else if (obj->buffer.length >= 2)
+		*result = *(u16 *)obj->buffer.pointer;
+	else
+		*result = *(u8 *)obj->buffer.pointer;
+out:
+	ACPI_FREE(obj);
+
+	return err;
+}
+
+static int intel_dsm(struct intel_host *intel_host, struct device *dev,
+		     unsigned int fn, u32 *result)
+{
+	if (fn > 31 || !(intel_host->dsm_fns & (1 << fn)))
+		return -EOPNOTSUPP;
+
+	return __intel_dsm(intel_host, dev, fn, result);
+}
+
+static void intel_dsm_init(struct intel_host *intel_host, struct device *dev,
+			   struct mmc_host *mmc)
+{
+	int err;
+	u32 val;
+
+	err = __intel_dsm(intel_host, dev, INTEL_DSM_FNS, &intel_host->dsm_fns);
+	if (err) {
+		pr_debug("%s: DSM not supported, error %d\n",
+			 mmc_hostname(mmc), err);
+		return;
+	}
+
+	pr_debug("%s: DSM function mask %#x\n",
+		 mmc_hostname(mmc), intel_host->dsm_fns);
+
+	err = intel_dsm(intel_host, dev, INTEL_DSM_D3_RETUNE, &val);
+	intel_host->d3_retune = err ? true : !!val;
+}
+
 static void sdhci_pci_int_hw_reset(struct sdhci_host *host)
 {
 	u8 reg;
@@ -359,8 +430,19 @@ static int bxt_get_cd(struct mmc_host *mmc)
 	return ret;
 }
 
+static void byt_read_dsm(struct sdhci_pci_slot *slot)
+{
+	struct intel_host *intel_host = sdhci_pci_priv(slot);
+	struct device *dev = &slot->chip->pdev->dev;
+	struct mmc_host *mmc = slot->host->mmc;
+
+	intel_dsm_init(intel_host, dev, mmc);
+	slot->chip->rpm_retune = intel_host->d3_retune;
+}
+
 static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
 {
+	byt_read_dsm(slot);
 	slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
 				 MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |
 				 MMC_CAP_CMD_DURING_TFR |
@@ -405,6 +487,8 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 {
 	int err;
 
+	byt_read_dsm(slot);
+
 	err = ni_set_max_freq(slot);
 	if (err)
 		return err;
@@ -416,6 +500,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 
 static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 {
+	byt_read_dsm(slot);
 	slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |
 				 MMC_CAP_WAIT_WHILE_BUSY;
 	return 0;
@@ -423,6 +508,7 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 
 static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
 {
+	byt_read_dsm(slot);
 	slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
 	slot->cd_idx = 0;
 	slot->cd_override_level = true;
@@ -488,6 +574,7 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode,
 			  SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400 |
 			  SDHCI_QUIRK2_STOP_WITH_TC,
 	.ops		= &sdhci_intel_byt_ops,
+	.priv_size	= sizeof(struct intel_host),
 };
 
 static const struct sdhci_pci_fixes sdhci_ni_byt_sdio = {
@@ -497,6 +584,7 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode,
 	.allow_runtime_pm = true,
 	.probe_slot	= ni_byt_sdio_probe_slot,
 	.ops		= &sdhci_intel_byt_ops,
+	.priv_size	= sizeof(struct intel_host),
 };
 
 static const struct sdhci_pci_fixes sdhci_intel_byt_sdio = {
@@ -506,6 +594,7 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode,
 	.allow_runtime_pm = true,
 	.probe_slot	= byt_sdio_probe_slot,
 	.ops		= &sdhci_intel_byt_ops,
+	.priv_size	= sizeof(struct intel_host),
 };
 
 static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
@@ -517,6 +606,7 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode,
 	.own_cd_for_runtime_pm = true,
 	.probe_slot	= byt_sd_probe_slot,
 	.ops		= &sdhci_intel_byt_ops,
+	.priv_size	= sizeof(struct intel_host),
 };
 
 /* Define Host controllers for Intel Merrifield platform */
-- 
1.9.1


  parent reply	other threads:[~2017-03-20 17:58 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-20 17:50 [PATCH 00/25] sdhci patches Adrian Hunter
2017-03-20 17:50 ` [PATCH 01/25] mmc: sdhci: Do not disable interrupts while waiting for clock Adrian Hunter
2017-03-20 17:50 ` [PATCH 02/25] mmc: sdhci-pci: Do not disable interrupts in sdhci_intel_set_power Adrian Hunter
2017-03-20 17:50 ` [PATCH 03/25] mmc: sdhci: Optimize delay loops Adrian Hunter
2017-03-20 17:50 ` [PATCH 04/25] mmc: sdhci: Let drivers decide whether to use mmc_retune_needed() with pm Adrian Hunter
2017-03-20 17:50 ` [PATCH 05/25] mmc: sdhci-pci: Let devices define their own private data Adrian Hunter
2017-03-20 17:50 ` Adrian Hunter [this message]
2017-03-20 17:50 ` [PATCH 07/25] mmc: sdhci-pci: Use ACPI DSM to get driver strength for some Intel devices Adrian Hunter
2017-04-04  8:48   ` Wolfram Sang
2017-04-19  8:50     ` Adrian Hunter
2017-04-19 12:24       ` Wolfram Sang
2017-04-19 12:58         ` Adrian Hunter
2017-03-20 17:50 ` [PATCH 08/25] mmc: sdhci: Remove ->select_drive_strength() callback Adrian Hunter
2017-03-20 17:50 ` [PATCH 09/25] mmc: sdhci: Do not use spin lock in set_ios paths Adrian Hunter
2017-03-20 17:50 ` [PATCH 10/25] mmc: sdhci: Reduce spin lock usage in sdhci_execute_tuning Adrian Hunter
2017-03-20 17:50 ` [PATCH 11/25] mmc: sdhci: Improve debug print format Adrian Hunter
2017-03-20 17:50 ` [PATCH 12/25] mmc: sdhci: Add response register to register dump Adrian Hunter
2017-03-20 17:50 ` [PATCH 13/25] mmc: sdhci: Use sdhci_readl() not readl() in sdhci_dumpregs() Adrian Hunter
2017-03-20 17:50 ` [PATCH 14/25] mmc: sdhci: Improve register dump print format Adrian Hunter
2017-03-20 17:50 ` [PATCH 15/25] mmc: sdhci: Export sdhci_dumpregs Adrian Hunter
2017-03-20 17:50 ` [PATCH 16/25] mmc: sdhci: Get rid of 'extern' in header file Adrian Hunter
2017-03-20 17:50 ` [PATCH 17/25] mmc: sdhci: Add sdhci_cleanup_host Adrian Hunter
2017-03-20 17:50 ` [PATCH 18/25] mmc: sdhci: Factor out sdhci_set_default_irqs Adrian Hunter
2017-03-20 17:50 ` [PATCH 19/25] mmc: sdhci: Add CQE support Adrian Hunter
2017-03-20 17:50 ` [PATCH 20/25] mmc: sdhci-pci: Let devices define how to add the host Adrian Hunter
2017-03-20 17:50 ` [PATCH 21/25] mmc: sdhci-pci: Do not use suspend/resume callbacks with runtime pm Adrian Hunter
2017-03-20 17:50 ` [PATCH 22/25] mmc: sdhci-pci: Conditionally compile pm sleep functions Adrian Hunter
2017-03-20 17:50 ` [PATCH 23/25] mmc: sdhci-pci: Let suspend/resume callbacks replace default callbacks Adrian Hunter
2017-03-20 17:50 ` [PATCH 24/25] mmc: sdhci-pci: Add runtime suspend/resume callbacks Adrian Hunter
2017-03-20 17:50 ` [PATCH 25/25] mmc: sdhci-pci: Move a function to avoid later forward declaration Adrian Hunter
2017-03-21 10:01 ` [PATCH 00/25] sdhci patches Ulf Hansson
2017-03-21 11:00 ` Lee Jones
2017-03-21 11:54   ` Adrian Hunter
2017-03-21 15:14     ` Lee Jones
2017-03-21 15:17       ` Lee Jones
2017-03-22  8:47 ` Ludovic Desroches

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=1490032253-6030-7-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=Baohua.Song@csr.com \
    --cc=Weijun.Yang@csr.com \
    --cc=aisheng.dong@nxp.com \
    --cc=alcooperx@gmail.com \
    --cc=dianders@chromium.org \
    --cc=haibo.chen@nxp.com \
    --cc=jaedon.shin@gmail.com \
    --cc=jh80.chung@samsung.com \
    --cc=jonathanh@nvidia.com \
    --cc=jszhang@marvell.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ludovic.desroches@atmel.com \
    --cc=peter.griffin@linaro.org \
    --cc=riteshh@codeaurora.org \
    --cc=shawn.lin@rock-chips.com \
    --cc=ulf.hansson@linaro.org \
    --cc=yangbo.lu@nxp.com \
    --cc=zach.brown@ni.com \
    /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: link
Be 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.