This patch does the following
Calls the pm_runtime_* functions directly.
Remove the MOD_REG_BIT macro usage thereby removiing un-needed branch.
At remove dont use the autosuspend runtime calls.
Shubhrajyoti D (3):
spi: omap2-mcspi: Call pm_runtime_* functions directly
spi: omap2-mcspi: Remove the macro MOD_REG_BIT
spi: omap2-mcspi: At remove dont use the runtime_autosuspend calls
drivers/spi/spi-omap2-mcspi.c | 55 ++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 31 deletions(-)
--
1.7.5.4
Remove the macro MOD_REG_BIT instead make the bit field modifications
directly. This deletes a branch operation in cases where the the set
is predecided.While at it optimise two sequential bit clear in one step.
Signed-off-by: Shubhrajyoti D <[email protected]>
---
drivers/spi/spi-omap2-mcspi.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index dd887eb..5642111 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -140,13 +140,6 @@ struct omap2_mcspi_cs {
u32 chconf0;
};
-#define MOD_REG_BIT(val, mask, set) do { \
- if (set) \
- val |= mask; \
- else \
- val &= ~mask; \
-} while (0)
-
static inline void mcspi_write_reg(struct spi_master *master,
int idx, u32 val)
{
@@ -205,7 +198,11 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
else
rw = OMAP2_MCSPI_CHCONF_DMAW;
- MOD_REG_BIT(l, rw, enable);
+ if (enable)
+ l |= rw;
+ else
+ l &= ~rw;
+
mcspi_write_chconf0(spi, l);
}
@@ -224,7 +221,11 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
u32 l;
l = mcspi_cached_chconf0(spi);
- MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
+ if (cs_active)
+ l |= OMAP2_MCSPI_CHCONF_FORCE;
+ else
+ l &= ~OMAP2_MCSPI_CHCONF_FORCE;
+
mcspi_write_chconf0(spi, l);
}
@@ -239,9 +240,8 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
* to single-channel master mode
*/
l = mcspi_read_reg(master, OMAP2_MCSPI_MODULCTRL);
- MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_STEST, 0);
- MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
- MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
+ l &= ~(OMAP2_MCSPI_MODULCTRL_STEST | OMAP2_MCSPI_MODULCTRL_MS);
+ l |= OMAP2_MCSPI_MODULCTRL_SINGLE;
mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);
ctx->modulctrl = l;
@@ -1276,9 +1276,9 @@ static int omap2_mcspi_resume(struct device *dev)
* We need to toggle CS state for OMAP take this
* change in account.
*/
- MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 1);
+ cs->chconf0 |= OMAP2_MCSPI_CHCONF_FORCE;
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
- MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 0);
+ cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
}
}
--
1.7.5.4
Call the pm_runtime functions directly making room for possible
pm optimisations. Also the runtime functions aren't just about
enabling and disabling of clocks though it does enable clocks also.
Signed-off-by: Shubhrajyoti D <[email protected]>
---
drivers/spi/spi-omap2-mcspi.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 259f601..dd887eb 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -260,16 +260,6 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
list_for_each_entry(cs, &ctx->cs, node)
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
}
-static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
-{
- pm_runtime_mark_last_busy(mcspi->dev);
- pm_runtime_put_autosuspend(mcspi->dev);
-}
-
-static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
-{
- return pm_runtime_get_sync(mcspi->dev);
-}
static int omap2_prepare_transfer(struct spi_master *master)
{
@@ -848,12 +838,13 @@ static int omap2_mcspi_setup(struct spi_device *spi)
return ret;
}
- ret = omap2_mcspi_enable_clocks(mcspi);
+ ret = pm_runtime_get_sync(mcspi->dev);
if (ret < 0)
return ret;
ret = omap2_mcspi_setup_transfer(spi, NULL);
- omap2_mcspi_disable_clocks(mcspi);
+ pm_runtime_mark_last_busy(mcspi->dev);
+ pm_runtime_put_autosuspend(mcspi->dev);
return ret;
}
@@ -1067,7 +1058,7 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
int ret = 0;
- ret = omap2_mcspi_enable_clocks(mcspi);
+ ret = pm_runtime_get_sync(mcspi->dev);
if (ret < 0)
return ret;
@@ -1076,7 +1067,8 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
omap2_mcspi_set_master_mode(master);
- omap2_mcspi_disable_clocks(mcspi);
+ pm_runtime_mark_last_busy(mcspi->dev);
+ pm_runtime_put_autosuspend(mcspi->dev);
return 0;
}
@@ -1251,7 +1243,8 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
mcspi = spi_master_get_devdata(master);
dma_channels = mcspi->dma_channels;
- omap2_mcspi_disable_clocks(mcspi);
+ pm_runtime_mark_last_busy(mcspi->dev);
+ pm_runtime_put_autosuspend(mcspi->dev);
pm_runtime_disable(&pdev->dev);
spi_unregister_master(master);
@@ -1276,7 +1269,7 @@ static int omap2_mcspi_resume(struct device *dev)
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
struct omap2_mcspi_cs *cs;
- omap2_mcspi_enable_clocks(mcspi);
+ pm_runtime_get_sync(mcspi->dev);
list_for_each_entry(cs, &ctx->cs, node) {
if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE) == 0) {
/*
@@ -1289,7 +1282,8 @@ static int omap2_mcspi_resume(struct device *dev)
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
}
}
- omap2_mcspi_disable_clocks(mcspi);
+ pm_runtime_mark_last_busy(mcspi->dev);
+ pm_runtime_put_autosuspend(mcspi->dev);
return 0;
}
#else
--
1.7.5.4
At remove we shouldnt be using the autosuspend timeout as we are
calling pm_runtime_disable immediately after.
Signed-off-by: Shubhrajyoti D <[email protected]>
---
drivers/spi/spi-omap2-mcspi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 5642111..f5bf628 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1243,8 +1243,7 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
mcspi = spi_master_get_devdata(master);
dma_channels = mcspi->dma_channels;
- pm_runtime_mark_last_busy(mcspi->dev);
- pm_runtime_put_autosuspend(mcspi->dev);
+ pm_runtime_put_sync(mcspi->dev);
pm_runtime_disable(&pdev->dev);
spi_unregister_master(master);
--
1.7.5.4
On Tue, Aug 21, 2012 at 11:47:42AM +0530, Shubhrajyoti D wrote:
> Call the pm_runtime functions directly making room for possible
> pm optimisations. Also the runtime functions aren't just about
> enabling and disabling of clocks though it does enable clocks also.
>
> Signed-off-by: Shubhrajyoti D <[email protected]>
Acked-by: Felipe Balbi <[email protected]>
> ---
> drivers/spi/spi-omap2-mcspi.c | 28 +++++++++++-----------------
> 1 files changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 259f601..dd887eb 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -260,16 +260,6 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
> list_for_each_entry(cs, &ctx->cs, node)
> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
> }
> -static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
> -{
> - pm_runtime_mark_last_busy(mcspi->dev);
> - pm_runtime_put_autosuspend(mcspi->dev);
> -}
> -
> -static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
> -{
> - return pm_runtime_get_sync(mcspi->dev);
> -}
>
> static int omap2_prepare_transfer(struct spi_master *master)
> {
> @@ -848,12 +838,13 @@ static int omap2_mcspi_setup(struct spi_device *spi)
> return ret;
> }
>
> - ret = omap2_mcspi_enable_clocks(mcspi);
> + ret = pm_runtime_get_sync(mcspi->dev);
> if (ret < 0)
> return ret;
>
> ret = omap2_mcspi_setup_transfer(spi, NULL);
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
>
> return ret;
> }
> @@ -1067,7 +1058,7 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
> struct omap2_mcspi_regs *ctx = &mcspi->ctx;
> int ret = 0;
>
> - ret = omap2_mcspi_enable_clocks(mcspi);
> + ret = pm_runtime_get_sync(mcspi->dev);
> if (ret < 0)
> return ret;
>
> @@ -1076,7 +1067,8 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
> ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
>
> omap2_mcspi_set_master_mode(master);
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> return 0;
> }
>
> @@ -1251,7 +1243,8 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
> mcspi = spi_master_get_devdata(master);
> dma_channels = mcspi->dma_channels;
>
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> pm_runtime_disable(&pdev->dev);
>
> spi_unregister_master(master);
> @@ -1276,7 +1269,7 @@ static int omap2_mcspi_resume(struct device *dev)
> struct omap2_mcspi_regs *ctx = &mcspi->ctx;
> struct omap2_mcspi_cs *cs;
>
> - omap2_mcspi_enable_clocks(mcspi);
> + pm_runtime_get_sync(mcspi->dev);
> list_for_each_entry(cs, &ctx->cs, node) {
> if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE) == 0) {
> /*
> @@ -1289,7 +1282,8 @@ static int omap2_mcspi_resume(struct device *dev)
> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
> }
> }
> - omap2_mcspi_disable_clocks(mcspi);
> + pm_runtime_mark_last_busy(mcspi->dev);
> + pm_runtime_put_autosuspend(mcspi->dev);
> return 0;
> }
> #else
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
balbi
On Tue, Aug 21, 2012 at 11:47:43AM +0530, Shubhrajyoti D wrote:
> Remove the macro MOD_REG_BIT instead make the bit field modifications
> directly. This deletes a branch operation in cases where the the set
> is predecided.While at it optimise two sequential bit clear in one step.
^^
you need a space here, besides you can add the ack below
> Signed-off-by: Shubhrajyoti D <[email protected]>
Acked-by: Felipe Balbi <[email protected]>
> ---
> drivers/spi/spi-omap2-mcspi.c | 28 ++++++++++++++--------------
> 1 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index dd887eb..5642111 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -140,13 +140,6 @@ struct omap2_mcspi_cs {
> u32 chconf0;
> };
>
> -#define MOD_REG_BIT(val, mask, set) do { \
> - if (set) \
> - val |= mask; \
> - else \
> - val &= ~mask; \
> -} while (0)
> -
> static inline void mcspi_write_reg(struct spi_master *master,
> int idx, u32 val)
> {
> @@ -205,7 +198,11 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
> else
> rw = OMAP2_MCSPI_CHCONF_DMAW;
>
> - MOD_REG_BIT(l, rw, enable);
> + if (enable)
> + l |= rw;
> + else
> + l &= ~rw;
> +
> mcspi_write_chconf0(spi, l);
> }
>
> @@ -224,7 +221,11 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
> u32 l;
>
> l = mcspi_cached_chconf0(spi);
> - MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
> + if (cs_active)
> + l |= OMAP2_MCSPI_CHCONF_FORCE;
> + else
> + l &= ~OMAP2_MCSPI_CHCONF_FORCE;
> +
> mcspi_write_chconf0(spi, l);
> }
>
> @@ -239,9 +240,8 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
> * to single-channel master mode
> */
> l = mcspi_read_reg(master, OMAP2_MCSPI_MODULCTRL);
> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_STEST, 0);
> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
> + l &= ~(OMAP2_MCSPI_MODULCTRL_STEST | OMAP2_MCSPI_MODULCTRL_MS);
> + l |= OMAP2_MCSPI_MODULCTRL_SINGLE;
> mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);
>
> ctx->modulctrl = l;
> @@ -1276,9 +1276,9 @@ static int omap2_mcspi_resume(struct device *dev)
> * We need to toggle CS state for OMAP take this
> * change in account.
> */
> - MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 1);
> + cs->chconf0 |= OMAP2_MCSPI_CHCONF_FORCE;
> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
> - MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 0);
> + cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
> }
> }
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
balbi
On Tue, Aug 21, 2012 at 11:47:44AM +0530, Shubhrajyoti D wrote:
> At remove we shouldnt be using the autosuspend timeout as we are
> calling pm_runtime_disable immediately after.
>
> Signed-off-by: Shubhrajyoti D <[email protected]>
Makes sense to me:
Acked-by: Felipe Balbi <[email protected]>
> ---
> drivers/spi/spi-omap2-mcspi.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 5642111..f5bf628 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -1243,8 +1243,7 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
> mcspi = spi_master_get_devdata(master);
> dma_channels = mcspi->dma_channels;
>
> - pm_runtime_mark_last_busy(mcspi->dev);
> - pm_runtime_put_autosuspend(mcspi->dev);
> + pm_runtime_put_sync(mcspi->dev);
> pm_runtime_disable(&pdev->dev);
>
> spi_unregister_master(master);
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
balbi
Hi Felipe,
Thanks for the review
On Tuesday 21 August 2012 02:35 PM, Felipe Balbi wrote:
> On Tue, Aug 21, 2012 at 11:47:43AM +0530, Shubhrajyoti D wrote:
>> Remove the macro MOD_REG_BIT instead make the bit field modifications
>> directly. This deletes a branch operation in cases where the the set
>> is predecided.While at it optimise two sequential bit clear in one step.
> ^^
> you need a space here, besides you can add the ack below
Will fix that and resend.
>> Signed-off-by: Shubhrajyoti D <[email protected]>
> Acked-by: Felipe Balbi <[email protected]>
>
>> ---
>> drivers/spi/spi-omap2-mcspi.c | 28 ++++++++++++++--------------
>> 1 files changed, 14 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
>> index dd887eb..5642111 100644
>> --- a/drivers/spi/spi-omap2-mcspi.c
>> +++ b/drivers/spi/spi-omap2-mcspi.c
>> @@ -140,13 +140,6 @@ struct omap2_mcspi_cs {
>> u32 chconf0;
>> };
>>
>> -#define MOD_REG_BIT(val, mask, set) do { \
>> - if (set) \
>> - val |= mask; \
>> - else \
>> - val &= ~mask; \
>> -} while (0)
>> -
>> static inline void mcspi_write_reg(struct spi_master *master,
>> int idx, u32 val)
>> {
>> @@ -205,7 +198,11 @@ static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
>> else
>> rw = OMAP2_MCSPI_CHCONF_DMAW;
>>
>> - MOD_REG_BIT(l, rw, enable);
>> + if (enable)
>> + l |= rw;
>> + else
>> + l &= ~rw;
>> +
>> mcspi_write_chconf0(spi, l);
>> }
>>
>> @@ -224,7 +221,11 @@ static void omap2_mcspi_force_cs(struct spi_device *spi, int cs_active)
>> u32 l;
>>
>> l = mcspi_cached_chconf0(spi);
>> - MOD_REG_BIT(l, OMAP2_MCSPI_CHCONF_FORCE, cs_active);
>> + if (cs_active)
>> + l |= OMAP2_MCSPI_CHCONF_FORCE;
>> + else
>> + l &= ~OMAP2_MCSPI_CHCONF_FORCE;
>> +
>> mcspi_write_chconf0(spi, l);
>> }
>>
>> @@ -239,9 +240,8 @@ static void omap2_mcspi_set_master_mode(struct spi_master *master)
>> * to single-channel master mode
>> */
>> l = mcspi_read_reg(master, OMAP2_MCSPI_MODULCTRL);
>> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_STEST, 0);
>> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_MS, 0);
>> - MOD_REG_BIT(l, OMAP2_MCSPI_MODULCTRL_SINGLE, 1);
>> + l &= ~(OMAP2_MCSPI_MODULCTRL_STEST | OMAP2_MCSPI_MODULCTRL_MS);
>> + l |= OMAP2_MCSPI_MODULCTRL_SINGLE;
>> mcspi_write_reg(master, OMAP2_MCSPI_MODULCTRL, l);
>>
>> ctx->modulctrl = l;
>> @@ -1276,9 +1276,9 @@ static int omap2_mcspi_resume(struct device *dev)
>> * We need to toggle CS state for OMAP take this
>> * change in account.
>> */
>> - MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 1);
>> + cs->chconf0 |= OMAP2_MCSPI_CHCONF_FORCE;
>> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
>> - MOD_REG_BIT(cs->chconf0, OMAP2_MCSPI_CHCONF_FORCE, 0);
>> + cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
>> __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
>> }
>> }
>> --
>> 1.7.5.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/