* [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts
@ 2014-10-10 10:48 Krzysztof Kozlowski
2014-10-10 10:56 ` Lee Jones
2014-10-10 10:56 ` Chanwoo Choi
0 siblings, 2 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2014-10-10 10:48 UTC (permalink / raw)
To: MyungJoo Ham, Chanwoo Choi, Samuel Ortiz, Lee Jones, linux-kernel
Cc: Kyungmin Park, Marek Szyprowski, Bartlomiej Zolnierkiewicz,
Krzysztof Kozlowski, stable
All interrupts coming from MUIC were ignored because interrupt source
register was masked.
The Maxim 77693 has a "interrupt source" - a separate register and interrupts
which give information about PMIC block triggering the individual
interrupt (charger, topsys, MUIC, flash LED).
By default bootloader could initialize this register to "mask all"
value. In such case (observed on Trats2 board) MUIC interrupts won't be
generated regardless of their mask status. Regmap irq chip was unmasking
individual MUIC interrupts but the source was masked
Before introducing regmap irq chip this interrupt source was unmasked,
read and acked. Reading and acking is not necessary but unmasking is.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: <stable@vger.kernel.org>
Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
---
Changes since v1:
1. Do the unmasking in main MFD driver. Additionally unmask all
interrupts, not only MUIC. Suggested by Chanwoo Choi.
---
drivers/mfd/max77693.c | 12 ++++++++++++
include/linux/mfd/max77693-private.h | 7 +++++++
2 files changed, 19 insertions(+)
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 4b54da1ff7ab..4e4e6a1a6301 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -253,6 +253,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
goto err_irq_muic;
}
+ /* Unmask interrupts from all blocks in interrupt source register */
+ ret = regmap_update_bits(max77693->regmap,
+ MAX77693_PMIC_REG_INTSRC_MASK,
+ SRC_IRQ_ALL, ~SRC_IRQ_ALL);
+ if (ret < 0) {
+ dev_err(max77693->dev,
+ "Could not unmask interrupts in INTSRC: %d\n",
+ ret);
+ goto err_intsrc;
+ }
+
pm_runtime_set_active(max77693->dev);
ret = mfd_add_devices(max77693->dev, -1, max77693_devs,
@@ -264,6 +275,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
err_mfd:
mfd_remove_devices(max77693->dev);
+err_intsrc:
regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
err_irq_muic:
regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index e1b2b61285b9..15fed5365a20 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -438,6 +438,13 @@ enum max77693_irq_source {
MAX77693_IRQ_GROUP_NR,
};
+#define SRC_IRQ_CHARGER BIT(0)
+#define SRC_IRQ_TOP BIT(1)
+#define SRC_IRQ_FLASH BIT(2)
+#define SRC_IRQ_MUIC BIT(3)
+#define SRC_IRQ_ALL (SRC_IRQ_CHARGER | SRC_IRQ_TOP \
+ | SRC_IRQ_FLASH | SRC_IRQ_MUIC)
+
#define LED_IRQ_FLED2_OPEN BIT(0)
#define LED_IRQ_FLED2_SHORT BIT(1)
#define LED_IRQ_FLED1_OPEN BIT(2)
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts
2014-10-10 10:48 [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts Krzysztof Kozlowski
@ 2014-10-10 10:56 ` Lee Jones
2014-10-22 9:28 ` Krzysztof Kozlowski
2014-10-10 10:56 ` Chanwoo Choi
1 sibling, 1 reply; 5+ messages in thread
From: Lee Jones @ 2014-10-10 10:56 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: MyungJoo Ham, Chanwoo Choi, Samuel Ortiz, linux-kernel,
Kyungmin Park, Marek Szyprowski, Bartlomiej Zolnierkiewicz,
stable
On Fri, 10 Oct 2014, Krzysztof Kozlowski wrote:
> All interrupts coming from MUIC were ignored because interrupt source
> register was masked.
>
> The Maxim 77693 has a "interrupt source" - a separate register and interrupts
> which give information about PMIC block triggering the individual
> interrupt (charger, topsys, MUIC, flash LED).
>
> By default bootloader could initialize this register to "mask all"
> value. In such case (observed on Trats2 board) MUIC interrupts won't be
> generated regardless of their mask status. Regmap irq chip was unmasking
> individual MUIC interrupts but the source was masked
>
> Before introducing regmap irq chip this interrupt source was unmasked,
> read and acked. Reading and acking is not necessary but unmasking is.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: <stable@vger.kernel.org>
> Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
Applied to -fixes until someone complains.
> ---
>
> Changes since v1:
> 1. Do the unmasking in main MFD driver. Additionally unmask all
> interrupts, not only MUIC. Suggested by Chanwoo Choi.
> ---
> drivers/mfd/max77693.c | 12 ++++++++++++
> include/linux/mfd/max77693-private.h | 7 +++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
> index 4b54da1ff7ab..4e4e6a1a6301 100644
> --- a/drivers/mfd/max77693.c
> +++ b/drivers/mfd/max77693.c
> @@ -253,6 +253,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> goto err_irq_muic;
> }
>
> + /* Unmask interrupts from all blocks in interrupt source register */
> + ret = regmap_update_bits(max77693->regmap,
> + MAX77693_PMIC_REG_INTSRC_MASK,
> + SRC_IRQ_ALL, ~SRC_IRQ_ALL);
> + if (ret < 0) {
> + dev_err(max77693->dev,
> + "Could not unmask interrupts in INTSRC: %d\n",
> + ret);
> + goto err_intsrc;
> + }
> +
> pm_runtime_set_active(max77693->dev);
>
> ret = mfd_add_devices(max77693->dev, -1, max77693_devs,
> @@ -264,6 +275,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
>
> err_mfd:
> mfd_remove_devices(max77693->dev);
> +err_intsrc:
> regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
> err_irq_muic:
> regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
> diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
> index e1b2b61285b9..15fed5365a20 100644
> --- a/include/linux/mfd/max77693-private.h
> +++ b/include/linux/mfd/max77693-private.h
> @@ -438,6 +438,13 @@ enum max77693_irq_source {
> MAX77693_IRQ_GROUP_NR,
> };
>
> +#define SRC_IRQ_CHARGER BIT(0)
> +#define SRC_IRQ_TOP BIT(1)
> +#define SRC_IRQ_FLASH BIT(2)
> +#define SRC_IRQ_MUIC BIT(3)
> +#define SRC_IRQ_ALL (SRC_IRQ_CHARGER | SRC_IRQ_TOP \
> + | SRC_IRQ_FLASH | SRC_IRQ_MUIC)
> +
> #define LED_IRQ_FLED2_OPEN BIT(0)
> #define LED_IRQ_FLED2_SHORT BIT(1)
> #define LED_IRQ_FLED1_OPEN BIT(2)
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts
2014-10-10 10:48 [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts Krzysztof Kozlowski
2014-10-10 10:56 ` Lee Jones
@ 2014-10-10 10:56 ` Chanwoo Choi
1 sibling, 0 replies; 5+ messages in thread
From: Chanwoo Choi @ 2014-10-10 10:56 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: MyungJoo Ham, Samuel Ortiz, Lee Jones, linux-kernel,
Kyungmin Park, Marek Szyprowski, Bartlomiej Zolnierkiewicz,
stable
On 10/10/2014 07:48 PM, Krzysztof Kozlowski wrote:
> All interrupts coming from MUIC were ignored because interrupt source
> register was masked.
>
> The Maxim 77693 has a "interrupt source" - a separate register and interrupts
> which give information about PMIC block triggering the individual
> interrupt (charger, topsys, MUIC, flash LED).
>
> By default bootloader could initialize this register to "mask all"
> value. In such case (observed on Trats2 board) MUIC interrupts won't be
> generated regardless of their mask status. Regmap irq chip was unmasking
> individual MUIC interrupts but the source was masked
>
> Before introducing regmap irq chip this interrupt source was unmasked,
> read and acked. Reading and acking is not necessary but unmasking is.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Cc: <stable@vger.kernel.org>
> Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
>
> ---
>
> Changes since v1:
> 1. Do the unmasking in main MFD driver. Additionally unmask all
> interrupts, not only MUIC. Suggested by Chanwoo Choi.
> ---
> drivers/mfd/max77693.c | 12 ++++++++++++
> include/linux/mfd/max77693-private.h | 7 +++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
> index 4b54da1ff7ab..4e4e6a1a6301 100644
> --- a/drivers/mfd/max77693.c
> +++ b/drivers/mfd/max77693.c
> @@ -253,6 +253,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> goto err_irq_muic;
> }
>
> + /* Unmask interrupts from all blocks in interrupt source register */
> + ret = regmap_update_bits(max77693->regmap,
> + MAX77693_PMIC_REG_INTSRC_MASK,
> + SRC_IRQ_ALL, ~SRC_IRQ_ALL);
> + if (ret < 0) {
> + dev_err(max77693->dev,
> + "Could not unmask interrupts in INTSRC: %d\n",
> + ret);
> + goto err_intsrc;
> + }
> +
> pm_runtime_set_active(max77693->dev);
>
> ret = mfd_add_devices(max77693->dev, -1, max77693_devs,
> @@ -264,6 +275,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
>
> err_mfd:
> mfd_remove_devices(max77693->dev);
> +err_intsrc:
> regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
> err_irq_muic:
> regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
> diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
> index e1b2b61285b9..15fed5365a20 100644
> --- a/include/linux/mfd/max77693-private.h
> +++ b/include/linux/mfd/max77693-private.h
> @@ -438,6 +438,13 @@ enum max77693_irq_source {
> MAX77693_IRQ_GROUP_NR,
> };
>
> +#define SRC_IRQ_CHARGER BIT(0)
> +#define SRC_IRQ_TOP BIT(1)
> +#define SRC_IRQ_FLASH BIT(2)
> +#define SRC_IRQ_MUIC BIT(3)
> +#define SRC_IRQ_ALL (SRC_IRQ_CHARGER | SRC_IRQ_TOP \
> + | SRC_IRQ_FLASH | SRC_IRQ_MUIC)
> +
> #define LED_IRQ_FLED2_OPEN BIT(0)
> #define LED_IRQ_FLED2_SHORT BIT(1)
> #define LED_IRQ_FLED1_OPEN BIT(2)
>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Thanks,
Chanwoo Choi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts
2014-10-10 10:56 ` Lee Jones
@ 2014-10-22 9:28 ` Krzysztof Kozlowski
2014-10-22 11:37 ` Lee Jones
0 siblings, 1 reply; 5+ messages in thread
From: Krzysztof Kozlowski @ 2014-10-22 9:28 UTC (permalink / raw)
To: Lee Jones
Cc: MyungJoo Ham, Chanwoo Choi, Samuel Ortiz, linux-kernel,
Kyungmin Park, Marek Szyprowski, Bartlomiej Zolnierkiewicz,
stable
On pią, 2014-10-10 at 11:56 +0100, Lee Jones wrote:
> On Fri, 10 Oct 2014, Krzysztof Kozlowski wrote:
>
> > All interrupts coming from MUIC were ignored because interrupt source
> > register was masked.
> >
> > The Maxim 77693 has a "interrupt source" - a separate register and interrupts
> > which give information about PMIC block triggering the individual
> > interrupt (charger, topsys, MUIC, flash LED).
> >
> > By default bootloader could initialize this register to "mask all"
> > value. In such case (observed on Trats2 board) MUIC interrupts won't be
> > generated regardless of their mask status. Regmap irq chip was unmasking
> > individual MUIC interrupts but the source was masked
> >
> > Before introducing regmap irq chip this interrupt source was unmasked,
> > read and acked. Reading and acking is not necessary but unmasking is.
> >
> > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> > Cc: <stable@vger.kernel.org>
> > Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
>
> Applied to -fixes until someone complains.
Hi Lee,
I cannot find this patch on gitweb (MFD tree), have you applied it?
If not then could you squash it with:
mfd: max77693: Fix a truncate warning
https://lkml.org/lkml/2014/10/14/161
If you wish I could resend it.
Best regards,
Krzysztof
>
> > ---
> >
> > Changes since v1:
> > 1. Do the unmasking in main MFD driver. Additionally unmask all
> > interrupts, not only MUIC. Suggested by Chanwoo Choi.
> > ---
> > drivers/mfd/max77693.c | 12 ++++++++++++
> > include/linux/mfd/max77693-private.h | 7 +++++++
> > 2 files changed, 19 insertions(+)
> >
> > diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
> > index 4b54da1ff7ab..4e4e6a1a6301 100644
> > --- a/drivers/mfd/max77693.c
> > +++ b/drivers/mfd/max77693.c
> > @@ -253,6 +253,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> > goto err_irq_muic;
> > }
> >
> > + /* Unmask interrupts from all blocks in interrupt source register */
> > + ret = regmap_update_bits(max77693->regmap,
> > + MAX77693_PMIC_REG_INTSRC_MASK,
> > + SRC_IRQ_ALL, ~SRC_IRQ_ALL);
> > + if (ret < 0) {
> > + dev_err(max77693->dev,
> > + "Could not unmask interrupts in INTSRC: %d\n",
> > + ret);
> > + goto err_intsrc;
> > + }
> > +
> > pm_runtime_set_active(max77693->dev);
> >
> > ret = mfd_add_devices(max77693->dev, -1, max77693_devs,
> > @@ -264,6 +275,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> >
> > err_mfd:
> > mfd_remove_devices(max77693->dev);
> > +err_intsrc:
> > regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
> > err_irq_muic:
> > regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
> > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
> > index e1b2b61285b9..15fed5365a20 100644
> > --- a/include/linux/mfd/max77693-private.h
> > +++ b/include/linux/mfd/max77693-private.h
> > @@ -438,6 +438,13 @@ enum max77693_irq_source {
> > MAX77693_IRQ_GROUP_NR,
> > };
> >
> > +#define SRC_IRQ_CHARGER BIT(0)
> > +#define SRC_IRQ_TOP BIT(1)
> > +#define SRC_IRQ_FLASH BIT(2)
> > +#define SRC_IRQ_MUIC BIT(3)
> > +#define SRC_IRQ_ALL (SRC_IRQ_CHARGER | SRC_IRQ_TOP \
> > + | SRC_IRQ_FLASH | SRC_IRQ_MUIC)
> > +
> > #define LED_IRQ_FLED2_OPEN BIT(0)
> > #define LED_IRQ_FLED2_SHORT BIT(1)
> > #define LED_IRQ_FLED1_OPEN BIT(2)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts
2014-10-22 9:28 ` Krzysztof Kozlowski
@ 2014-10-22 11:37 ` Lee Jones
0 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2014-10-22 11:37 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: MyungJoo Ham, Chanwoo Choi, Samuel Ortiz, linux-kernel,
Kyungmin Park, Marek Szyprowski, Bartlomiej Zolnierkiewicz,
stable
On Wed, 22 Oct 2014, Krzysztof Kozlowski wrote:
> On pią, 2014-10-10 at 11:56 +0100, Lee Jones wrote:
> > On Fri, 10 Oct 2014, Krzysztof Kozlowski wrote:
> >
> > > All interrupts coming from MUIC were ignored because interrupt source
> > > register was masked.
> > >
> > > The Maxim 77693 has a "interrupt source" - a separate register and interrupts
> > > which give information about PMIC block triggering the individual
> > > interrupt (charger, topsys, MUIC, flash LED).
> > >
> > > By default bootloader could initialize this register to "mask all"
> > > value. In such case (observed on Trats2 board) MUIC interrupts won't be
> > > generated regardless of their mask status. Regmap irq chip was unmasking
> > > individual MUIC interrupts but the source was masked
> > >
> > > Before introducing regmap irq chip this interrupt source was unmasked,
> > > read and acked. Reading and acking is not necessary but unmasking is.
> > >
> > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> > > Cc: <stable@vger.kernel.org>
> > > Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
> >
> > Applied to -fixes until someone complains.
>
> Hi Lee,
>
> I cannot find this patch on gitweb (MFD tree), have you applied it?
>
> If not then could you squash it with:
> mfd: max77693: Fix a truncate warning
> https://lkml.org/lkml/2014/10/14/161
>
> If you wish I could resend it.
It as applied, just not pushed.
I can squash that commit into it yes.
> > > ---
> > >
> > > Changes since v1:
> > > 1. Do the unmasking in main MFD driver. Additionally unmask all
> > > interrupts, not only MUIC. Suggested by Chanwoo Choi.
> > > ---
> > > drivers/mfd/max77693.c | 12 ++++++++++++
> > > include/linux/mfd/max77693-private.h | 7 +++++++
> > > 2 files changed, 19 insertions(+)
> > >
> > > diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
> > > index 4b54da1ff7ab..4e4e6a1a6301 100644
> > > --- a/drivers/mfd/max77693.c
> > > +++ b/drivers/mfd/max77693.c
> > > @@ -253,6 +253,17 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> > > goto err_irq_muic;
> > > }
> > >
> > > + /* Unmask interrupts from all blocks in interrupt source register */
> > > + ret = regmap_update_bits(max77693->regmap,
> > > + MAX77693_PMIC_REG_INTSRC_MASK,
> > > + SRC_IRQ_ALL, ~SRC_IRQ_ALL);
> > > + if (ret < 0) {
> > > + dev_err(max77693->dev,
> > > + "Could not unmask interrupts in INTSRC: %d\n",
> > > + ret);
> > > + goto err_intsrc;
> > > + }
> > > +
> > > pm_runtime_set_active(max77693->dev);
> > >
> > > ret = mfd_add_devices(max77693->dev, -1, max77693_devs,
> > > @@ -264,6 +275,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
> > >
> > > err_mfd:
> > > mfd_remove_devices(max77693->dev);
> > > +err_intsrc:
> > > regmap_del_irq_chip(max77693->irq, max77693->irq_data_muic);
> > > err_irq_muic:
> > > regmap_del_irq_chip(max77693->irq, max77693->irq_data_charger);
> > > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
> > > index e1b2b61285b9..15fed5365a20 100644
> > > --- a/include/linux/mfd/max77693-private.h
> > > +++ b/include/linux/mfd/max77693-private.h
> > > @@ -438,6 +438,13 @@ enum max77693_irq_source {
> > > MAX77693_IRQ_GROUP_NR,
> > > };
> > >
> > > +#define SRC_IRQ_CHARGER BIT(0)
> > > +#define SRC_IRQ_TOP BIT(1)
> > > +#define SRC_IRQ_FLASH BIT(2)
> > > +#define SRC_IRQ_MUIC BIT(3)
> > > +#define SRC_IRQ_ALL (SRC_IRQ_CHARGER | SRC_IRQ_TOP \
> > > + | SRC_IRQ_FLASH | SRC_IRQ_MUIC)
> > > +
> > > #define LED_IRQ_FLED2_OPEN BIT(0)
> > > #define LED_IRQ_FLED2_SHORT BIT(1)
> > > #define LED_IRQ_FLED1_OPEN BIT(2)
> >
>
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-22 11:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-10 10:48 [PATCH fixes v2] mfd: max77693: Fix always masked MUIC interrupts Krzysztof Kozlowski
2014-10-10 10:56 ` Lee Jones
2014-10-22 9:28 ` Krzysztof Kozlowski
2014-10-22 11:37 ` Lee Jones
2014-10-10 10:56 ` Chanwoo Choi
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).