diff mbox

[2/3] spi: s3c64xx: extend driver to make full use of runtime PM autosuspend

Message ID 55D4DF0C.8080104@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Heiner Kallweit Aug. 19, 2015, 7:54 p.m. UTC
Extend the driver to make full use of runtime PM autosuspend.
Before only the SPI core was instructed to use autosuspend
by setting master->auto_runtime_pm. Nevertheless due to the missing
pm_runtime_use_autosuspend call autosuspend wasn't active.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/spi/spi-s3c64xx.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Krzysztof Kozlowski Aug. 19, 2015, 11:46 p.m. UTC | #1
On 20.08.2015 04:54, Heiner Kallweit wrote:
> Extend the driver to make full use of runtime PM autosuspend.
> Before only the SPI core was instructed to use autosuspend
> by setting master->auto_runtime_pm. Nevertheless due to the missing
> pm_runtime_use_autosuspend call autosuspend wasn't active.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  drivers/spi/spi-s3c64xx.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)


I am a little bit confused... it's the same patch? It's not marked as
resend, not marked as v2 and there is no changelog...

Best regards,
Krzysztof

> 
> diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
> index 8a6ab88..8365c88 100644
> --- a/drivers/spi/spi-s3c64xx.c
> +++ b/drivers/spi/spi-s3c64xx.c
> @@ -32,6 +32,7 @@
>  #define MAX_SPI_PORTS		6
>  #define S3C64XX_SPI_QUIRK_POLL		(1 << 0)
>  #define S3C64XX_SPI_QUIRK_CS_AUTO	(1 << 1)
> +#define AUTOSUSPEND_TIMEOUT	2000
>  
>  /* Registers and bit-fields */
>  
> @@ -859,13 +860,15 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
>  		}
>  	}
>  
> -	pm_runtime_put(&sdd->pdev->dev);
> +	pm_runtime_mark_last_busy(&sdd->pdev->dev);
> +	pm_runtime_put_autosuspend(&sdd->pdev->dev);
>  	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
>  		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
>  	return 0;
>  
>  setup_exit:
> -	pm_runtime_put(&sdd->pdev->dev);
> +	pm_runtime_mark_last_busy(&sdd->pdev->dev);
> +	pm_runtime_put_autosuspend(&sdd->pdev->dev);
>  	/* setup() returns with device de-selected */
>  	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
>  		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
> @@ -1180,6 +1183,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
>  	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
>  	       sdd->regs + S3C64XX_SPI_INT_EN);
>  
> +	pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
> +	pm_runtime_use_autosuspend(&pdev->dev);
>  	pm_runtime_set_active(&pdev->dev);
>  	pm_runtime_enable(&pdev->dev);
>  
> @@ -1195,6 +1200,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
>  					mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1,
>  					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
>  
> +	pm_runtime_mark_last_busy(&pdev->dev);
> +	pm_runtime_autosuspend(&pdev->dev);
> +
>  	return 0;
>  
>  err4:
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Heiner Kallweit Aug. 20, 2015, 5:39 a.m. UTC | #2
Am 20.08.2015 um 01:46 schrieb Krzysztof Kozlowski:
> On 20.08.2015 04:54, Heiner Kallweit wrote:
>> Extend the driver to make full use of runtime PM autosuspend.
>> Before only the SPI core was instructed to use autosuspend
>> by setting master->auto_runtime_pm. Nevertheless due to the missing
>> pm_runtime_use_autosuspend call autosuspend wasn't active.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  drivers/spi/spi-s3c64xx.c | 12 ++++++++++--
>>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> 
> I am a little bit confused... it's the same patch? It's not marked as
> resend, not marked as v2 and there is no changelog...
> 
> Best regards,
> Krzysztof
The structure of the patchset significantly changed, therefore I didn't
mark it as v2. But you're right, should have done it.
Will send a v2 incl. the changes based on your remarks + changelog.

Regards, Heiner

>>
>> diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
>> index 8a6ab88..8365c88 100644
>> --- a/drivers/spi/spi-s3c64xx.c
>> +++ b/drivers/spi/spi-s3c64xx.c
>> @@ -32,6 +32,7 @@
>>  #define MAX_SPI_PORTS		6
>>  #define S3C64XX_SPI_QUIRK_POLL		(1 << 0)
>>  #define S3C64XX_SPI_QUIRK_CS_AUTO	(1 << 1)
>> +#define AUTOSUSPEND_TIMEOUT	2000
>>  
>>  /* Registers and bit-fields */
>>  
>> @@ -859,13 +860,15 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
>>  		}
>>  	}
>>  
>> -	pm_runtime_put(&sdd->pdev->dev);
>> +	pm_runtime_mark_last_busy(&sdd->pdev->dev);
>> +	pm_runtime_put_autosuspend(&sdd->pdev->dev);
>>  	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
>>  		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
>>  	return 0;
>>  
>>  setup_exit:
>> -	pm_runtime_put(&sdd->pdev->dev);
>> +	pm_runtime_mark_last_busy(&sdd->pdev->dev);
>> +	pm_runtime_put_autosuspend(&sdd->pdev->dev);
>>  	/* setup() returns with device de-selected */
>>  	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
>>  		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
>> @@ -1180,6 +1183,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
>>  	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
>>  	       sdd->regs + S3C64XX_SPI_INT_EN);
>>  
>> +	pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
>> +	pm_runtime_use_autosuspend(&pdev->dev);
>>  	pm_runtime_set_active(&pdev->dev);
>>  	pm_runtime_enable(&pdev->dev);
>>  
>> @@ -1195,6 +1200,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
>>  					mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1,
>>  					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
>>  
>> +	pm_runtime_mark_last_busy(&pdev->dev);
>> +	pm_runtime_autosuspend(&pdev->dev);
>> +
>>  	return 0;
>>  
>>  err4:
>>
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 8a6ab88..8365c88 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -32,6 +32,7 @@ 
 #define MAX_SPI_PORTS		6
 #define S3C64XX_SPI_QUIRK_POLL		(1 << 0)
 #define S3C64XX_SPI_QUIRK_CS_AUTO	(1 << 1)
+#define AUTOSUSPEND_TIMEOUT	2000
 
 /* Registers and bit-fields */
 
@@ -859,13 +860,15 @@  static int s3c64xx_spi_setup(struct spi_device *spi)
 		}
 	}
 
-	pm_runtime_put(&sdd->pdev->dev);
+	pm_runtime_mark_last_busy(&sdd->pdev->dev);
+	pm_runtime_put_autosuspend(&sdd->pdev->dev);
 	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
 		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
 	return 0;
 
 setup_exit:
-	pm_runtime_put(&sdd->pdev->dev);
+	pm_runtime_mark_last_busy(&sdd->pdev->dev);
+	pm_runtime_put_autosuspend(&sdd->pdev->dev);
 	/* setup() returns with device de-selected */
 	if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
 		writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
@@ -1180,6 +1183,8 @@  static int s3c64xx_spi_probe(struct platform_device *pdev)
 	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
 	       sdd->regs + S3C64XX_SPI_INT_EN);
 
+	pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
+	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_set_active(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 
@@ -1195,6 +1200,9 @@  static int s3c64xx_spi_probe(struct platform_device *pdev)
 					mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1,
 					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
 
+	pm_runtime_mark_last_busy(&pdev->dev);
+	pm_runtime_autosuspend(&pdev->dev);
+
 	return 0;
 
 err4: