2019-11-26 19:32:18

by Max Filippov

Subject: [PATCH] drivers/gpio/gpio-xtensa: fix driver build

Commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") removed
{RSR,WSR}_CPENABLE from xtensa code, but did not fix up all users,
breaking gpio-xtensa driver build.
Update gpio-xtensa to use new xtensa_{get,set}_sr API.

Cc: [email protected] # v5.0+
Fixes: cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr")
Signed-off-by: Max Filippov <[email protected]>
---
drivers/gpio/gpio-xtensa.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-xtensa.c b/drivers/gpio/gpio-xtensa.c
index 43d3fa5f511a..0fb2211f9573 100644
--- a/drivers/gpio/gpio-xtensa.c
+++ b/drivers/gpio/gpio-xtensa.c
@@ -44,15 +44,14 @@ static inline unsigned long enable_cp(unsigned long *cpenable)
unsigned long flags;

local_irq_save(flags);
- RSR_CPENABLE(*cpenable);
- WSR_CPENABLE(*cpenable | BIT(XCHAL_CP_ID_XTIOP));
-
+ *cpenable = xtensa_get_sr(cpenable);
+ xtensa_set_sr(*cpenable | BIT(XCHAL_CP_ID_XTIOP), cpenable);
return flags;
}

static inline void disable_cp(unsigned long flags, unsigned long cpenable)
{
- WSR_CPENABLE(cpenable);
+ xtensa_set_sr(cpenable, cpenable);
local_irq_restore(flags);
}

--
2.20.1

2019-11-27 07:32:09

by Bartosz Golaszewski

Subject: Re: [PATCH] drivers/gpio/gpio-xtensa: fix driver build

wt., 26 lis 2019 o 20:30 Max Filippov <[email protected]> napisał(a):
>
> Commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") removed
> {RSR,WSR}_CPENABLE from xtensa code, but did not fix up all users,
> breaking gpio-xtensa driver build.
> Update gpio-xtensa to use new xtensa_{get,set}_sr API.
>
> Cc: [email protected] # v5.0+
> Fixes: cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr")
> Signed-off-by: Max Filippov <[email protected]>
> ---
> drivers/gpio/gpio-xtensa.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-xtensa.c b/drivers/gpio/gpio-xtensa.c
> index 43d3fa5f511a..0fb2211f9573 100644
> --- a/drivers/gpio/gpio-xtensa.c
> +++ b/drivers/gpio/gpio-xtensa.c
> @@ -44,15 +44,14 @@ static inline unsigned long enable_cp(unsigned long *cpenable)
> unsigned long flags;
>
> local_irq_save(flags);
> - RSR_CPENABLE(*cpenable);
> - WSR_CPENABLE(*cpenable | BIT(XCHAL_CP_ID_XTIOP));
> -
> + *cpenable = xtensa_get_sr(cpenable);
> + xtensa_set_sr(*cpenable | BIT(XCHAL_CP_ID_XTIOP), cpenable);
> return flags;
> }
>
> static inline void disable_cp(unsigned long flags, unsigned long cpenable)
> {
> - WSR_CPENABLE(cpenable);
> + xtensa_set_sr(cpenable, cpenable);
> local_irq_restore(flags);
> }
>
> --
> 2.20.1
>

Patch applied, thanks!

Bart