linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
@ 2017-03-28 18:08 Azhar Shaikh
  2017-03-28 18:08 ` [PATCH 2/2] mmc: sdhci-pci: " Azhar Shaikh
  2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
  0 siblings, 2 replies; 8+ messages in thread
From: Azhar Shaikh @ 2017-03-28 18:08 UTC (permalink / raw)
  To: ulf.hansson, linux-mmc, adrian.hunter; +Cc: linux-kernel, azhar.shaikh

Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
controllers.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
 drivers/mmc/host/sdhci-acpi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 9dcb704..a15d237 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -263,10 +263,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
 
 	/* Platform specific code during sd probe slot goes here */
 
-	if (hid && !strcmp(hid, "80865ACA")) {
+	if (hid && !strcmp(hid, "80865ACA"))
 		host->mmc_host_ops.get_cd = bxt_get_cd;
-		host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
-	}
 
 	return 0;
 }
@@ -302,7 +300,7 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
 	.quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
 	.quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
 		   SDHCI_QUIRK2_STOP_WITH_TC,
-	.caps    = MMC_CAP_WAIT_WHILE_BUSY,
+	.caps    = MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_AGGRESSIVE_PM,
 	.probe_slot	= sdhci_acpi_sd_probe_slot,
 };
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] mmc: sdhci-pci: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-28 18:08 [PATCH 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers Azhar Shaikh
@ 2017-03-28 18:08 ` Azhar Shaikh
  2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
  1 sibling, 0 replies; 8+ messages in thread
From: Azhar Shaikh @ 2017-03-28 18:08 UTC (permalink / raw)
  To: ulf.hansson, linux-mmc, adrian.hunter; +Cc: linux-kernel, azhar.shaikh

Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
controllers.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
 drivers/mmc/host/sdhci-pci-core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 86560d5..4a58a80 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -423,16 +423,15 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
 
 static int byt_sd_probe_slot(struct sdhci_pci_slot *slot)
 {
-	slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
+	slot->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY |
+				 MMC_CAP_AGGRESSIVE_PM;
 	slot->cd_idx = 0;
 	slot->cd_override_level = true;
 	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
 	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
 	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||
-	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {
+	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD)
 		slot->host->mmc_host_ops.get_cd = bxt_get_cd;
-		slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
-	}
 
 	return 0;
 }
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v2 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-28 18:08 [PATCH 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers Azhar Shaikh
  2017-03-28 18:08 ` [PATCH 2/2] mmc: sdhci-pci: " Azhar Shaikh
@ 2017-03-29 18:16 ` Azhar Shaikh
  2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
                     ` (2 more replies)
  1 sibling, 3 replies; 8+ messages in thread
From: Azhar Shaikh @ 2017-03-29 18:16 UTC (permalink / raw)
  To: ulf.hansson, linux-mmc, adrian.hunter; +Cc: linux-kernel, azhar.shaikh

Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
controllers.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
Changes in v2:
  - Rebased the patch on top of 'next' branch.
  - No code change.

 drivers/mmc/host/sdhci-acpi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 665c5f3..c6a9a1b 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -263,10 +263,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
 
 	/* Platform specific code during sd probe slot goes here */
 
-	if (hid && !strcmp(hid, "80865ACA")) {
+	if (hid && !strcmp(hid, "80865ACA"))
 		host->mmc_host_ops.get_cd = bxt_get_cd;
-		host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
-	}
 
 	return 0;
 }
@@ -302,7 +300,7 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
 	.quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
 	.quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
 		   SDHCI_QUIRK2_STOP_WITH_TC,
-	.caps    = MMC_CAP_WAIT_WHILE_BUSY,
+	.caps    = MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_AGGRESSIVE_PM,
 	.probe_slot	= sdhci_acpi_sd_probe_slot,
 };
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH v2 2/2] mmc: sdhci-pci: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
@ 2017-03-29 18:16   ` Azhar Shaikh
  2017-03-30  7:41     ` Adrian Hunter
  2017-03-30 19:31     ` Ulf Hansson
  2017-03-30  7:41   ` [PATCH v2 1/2] mmc: sdhci-acpi: " Adrian Hunter
  2017-03-30 19:31   ` Ulf Hansson
  2 siblings, 2 replies; 8+ messages in thread
From: Azhar Shaikh @ 2017-03-29 18:16 UTC (permalink / raw)
  To: ulf.hansson, linux-mmc, adrian.hunter; +Cc: linux-kernel, azhar.shaikh

Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
controllers.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
Changes in v2:
  - Rebased the patch on top of 'next' branch.
  - No code change.

 drivers/mmc/host/sdhci-pci-core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 6c0440e..833072b 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -630,16 +630,15 @@ 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->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY |
+				 MMC_CAP_AGGRESSIVE_PM;
 	slot->cd_idx = 0;
 	slot->cd_override_level = true;
 	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
 	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
 	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||
-	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {
+	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD)
 		slot->host->mmc_host_ops.get_cd = bxt_get_cd;
-		slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
-	}
 
 	return 0;
 }
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
  2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
@ 2017-03-30  7:41   ` Adrian Hunter
  2017-03-30 19:31   ` Ulf Hansson
  2 siblings, 0 replies; 8+ messages in thread
From: Adrian Hunter @ 2017-03-30  7:41 UTC (permalink / raw)
  To: Azhar Shaikh, ulf.hansson, linux-mmc; +Cc: linux-kernel

On 29/03/17 21:16, Azhar Shaikh wrote:
> Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
> controllers.
> 
> Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
> Changes in v2:
>   - Rebased the patch on top of 'next' branch.
>   - No code change.
> 
>  drivers/mmc/host/sdhci-acpi.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
> index 665c5f3..c6a9a1b 100644
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -263,10 +263,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
>  
>  	/* Platform specific code during sd probe slot goes here */
>  
> -	if (hid && !strcmp(hid, "80865ACA")) {
> +	if (hid && !strcmp(hid, "80865ACA"))
>  		host->mmc_host_ops.get_cd = bxt_get_cd;
> -		host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
> -	}
>  
>  	return 0;
>  }
> @@ -302,7 +300,7 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
>  	.quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
>  	.quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
>  		   SDHCI_QUIRK2_STOP_WITH_TC,
> -	.caps    = MMC_CAP_WAIT_WHILE_BUSY,
> +	.caps    = MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_AGGRESSIVE_PM,
>  	.probe_slot	= sdhci_acpi_sd_probe_slot,
>  };
>  
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 2/2] mmc: sdhci-pci: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
@ 2017-03-30  7:41     ` Adrian Hunter
  2017-03-30 19:31     ` Ulf Hansson
  1 sibling, 0 replies; 8+ messages in thread
From: Adrian Hunter @ 2017-03-30  7:41 UTC (permalink / raw)
  To: Azhar Shaikh, ulf.hansson, linux-mmc; +Cc: linux-kernel

On 29/03/17 21:16, Azhar Shaikh wrote:
> Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
> controllers.
> 
> Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
> Changes in v2:
>   - Rebased the patch on top of 'next' branch.
>   - No code change.
> 
>  drivers/mmc/host/sdhci-pci-core.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index 6c0440e..833072b 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -630,16 +630,15 @@ 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->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY |
> +				 MMC_CAP_AGGRESSIVE_PM;
>  	slot->cd_idx = 0;
>  	slot->cd_override_level = true;
>  	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
>  	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
>  	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||
> -	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {
> +	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD)
>  		slot->host->mmc_host_ops.get_cd = bxt_get_cd;
> -		slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
> -	}
>  
>  	return 0;
>  }
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 2/2] mmc: sdhci-pci: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
  2017-03-30  7:41     ` Adrian Hunter
@ 2017-03-30 19:31     ` Ulf Hansson
  1 sibling, 0 replies; 8+ messages in thread
From: Ulf Hansson @ 2017-03-30 19:31 UTC (permalink / raw)
  To: Azhar Shaikh; +Cc: linux-mmc, Adrian Hunter, linux-kernel

On 29 March 2017 at 20:16, Azhar Shaikh <azhar.shaikh@intel.com> wrote:
> Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
> controllers.
>
> Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>


Thanks, applied for next!

Kind regards
Uffe


> ---
> Changes in v2:
>   - Rebased the patch on top of 'next' branch.
>   - No code change.
>
>  drivers/mmc/host/sdhci-pci-core.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index 6c0440e..833072b 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -630,16 +630,15 @@ 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->host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY |
> +                                MMC_CAP_AGGRESSIVE_PM;
>         slot->cd_idx = 0;
>         slot->cd_override_level = true;
>         if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||
>             slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||
>             slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||
> -           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {
> +           slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD)
>                 slot->host->mmc_host_ops.get_cd = bxt_get_cd;
> -               slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
> -       }
>
>         return 0;
>  }
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers
  2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
  2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
  2017-03-30  7:41   ` [PATCH v2 1/2] mmc: sdhci-acpi: " Adrian Hunter
@ 2017-03-30 19:31   ` Ulf Hansson
  2 siblings, 0 replies; 8+ messages in thread
From: Ulf Hansson @ 2017-03-30 19:31 UTC (permalink / raw)
  To: Azhar Shaikh; +Cc: linux-mmc, Adrian Hunter, linux-kernel

On 29 March 2017 at 20:16, Azhar Shaikh <azhar.shaikh@intel.com> wrote:
> Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card
> controllers.
>
> Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>


Thanks, applied for next!

Kind regards
Uffe


> ---
> Changes in v2:
>   - Rebased the patch on top of 'next' branch.
>   - No code change.
>
>  drivers/mmc/host/sdhci-acpi.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
> index 665c5f3..c6a9a1b 100644
> --- a/drivers/mmc/host/sdhci-acpi.c
> +++ b/drivers/mmc/host/sdhci-acpi.c
> @@ -263,10 +263,8 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
>
>         /* Platform specific code during sd probe slot goes here */
>
> -       if (hid && !strcmp(hid, "80865ACA")) {
> +       if (hid && !strcmp(hid, "80865ACA"))
>                 host->mmc_host_ops.get_cd = bxt_get_cd;
> -               host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;
> -       }
>
>         return 0;
>  }
> @@ -302,7 +300,7 @@ static int sdhci_acpi_sd_probe_slot(struct platform_device *pdev,
>         .quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
>         .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON |
>                    SDHCI_QUIRK2_STOP_WITH_TC,
> -       .caps    = MMC_CAP_WAIT_WHILE_BUSY,
> +       .caps    = MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_AGGRESSIVE_PM,
>         .probe_slot     = sdhci_acpi_sd_probe_slot,
>  };
>
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-03-30 19:31 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-28 18:08 [PATCH 1/2] mmc: sdhci-acpi: Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel controllers Azhar Shaikh
2017-03-28 18:08 ` [PATCH 2/2] mmc: sdhci-pci: " Azhar Shaikh
2017-03-29 18:16 ` [PATCH v2 1/2] mmc: sdhci-acpi: " Azhar Shaikh
2017-03-29 18:16   ` [PATCH v2 2/2] mmc: sdhci-pci: " Azhar Shaikh
2017-03-30  7:41     ` Adrian Hunter
2017-03-30 19:31     ` Ulf Hansson
2017-03-30  7:41   ` [PATCH v2 1/2] mmc: sdhci-acpi: " Adrian Hunter
2017-03-30 19:31   ` Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).