mfd: tps6586x: Handle interrupts on suspend

Message ID 1539955373-13735-1-git-send-email-jonathanh@nvidia.com
State New
Headers show
Series
  • mfd: tps6586x: Handle interrupts on suspend
Related show

Commit Message

Jon Hunter Oct. 19, 2018, 1:22 p.m.
From: Jonathan Hunter <jonathanh@nvidia.com>

The tps6586x driver creates an irqchip that is used by its various child
devices for managing interrupts. The tps6586x-rtc device is one of its
children that uses the tps6586x irqchip. When using the tps6586x-rtc as
a wake-up device from suspend, the following is seen:

 PM: Syncing filesystems ... done.
 Freezing user space processes ... (elapsed 0.001 seconds) done.
 OOM killer disabled.
 Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
 Disabling non-boot CPUs ...
 Entering suspend state LP1
 Enabling non-boot CPUs ...
 CPU1 is up
 tps6586x 3-0034: failed to read interrupt status
 tps6586x 3-0034: failed to read interrupt status

The reason why the tps6586x interrupt status cannot be read is because
the tps6586x interrupt is not masked during suspend and when the
tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
seen before the i2c controller has been resumed in order to read the
tps6586x interrupt status.

The tps6586x-rtc driver sets it's interrupt as a wake-up source during
suspend, which gets propagated to the parent tps6586x interrupt.
However, the tps6586x-rtc driver cannot disable it's interrupt during
suspend otherwise we would never be woken up and so the tps6586x must
disable it's interrupt instead.

Prevent the tps6586x interrupt handler from executing on exiting suspend
before the i2c controller has been resumed by disabling the tps6586x
interrupt on entering suspend and re-enabling it on resuming from
suspend.

Cc: stable@vger.kernel.org

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Comments

Dmitry Osipenko Oct. 20, 2018, 9:18 p.m. | #1
On 10/19/18 4:22 PM, Jon Hunter wrote:
> From: Jonathan Hunter <jonathanh@nvidia.com>
> 
> The tps6586x driver creates an irqchip that is used by its various child
> devices for managing interrupts. The tps6586x-rtc device is one of its
> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
> a wake-up device from suspend, the following is seen:
> 
>  PM: Syncing filesystems ... done.
>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>  OOM killer disabled.
>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>  Disabling non-boot CPUs ...
>  Entering suspend state LP1
>  Enabling non-boot CPUs ...
>  CPU1 is up
>  tps6586x 3-0034: failed to read interrupt status
>  tps6586x 3-0034: failed to read interrupt status
> 
> The reason why the tps6586x interrupt status cannot be read is because
> the tps6586x interrupt is not masked during suspend and when the
> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
> seen before the i2c controller has been resumed in order to read the
> tps6586x interrupt status.
> 
> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
> suspend, which gets propagated to the parent tps6586x interrupt.
> However, the tps6586x-rtc driver cannot disable it's interrupt during
> suspend otherwise we would never be woken up and so the tps6586x must
> disable it's interrupt instead.
> 
> Prevent the tps6586x interrupt handler from executing on exiting suspend
> before the i2c controller has been resumed by disabling the tps6586x
> interrupt on entering suspend and re-enabling it on resuming from
> suspend.
> 
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---

Tested patch on linux-next and v4.14, works fine. Thank you!

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Thierry Reding Oct. 22, 2018, 9:52 a.m. | #2
On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
> From: Jonathan Hunter <jonathanh@nvidia.com>
> 
> The tps6586x driver creates an irqchip that is used by its various child
> devices for managing interrupts. The tps6586x-rtc device is one of its
> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
> a wake-up device from suspend, the following is seen:
> 
>  PM: Syncing filesystems ... done.
>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>  OOM killer disabled.
>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>  Disabling non-boot CPUs ...
>  Entering suspend state LP1
>  Enabling non-boot CPUs ...
>  CPU1 is up
>  tps6586x 3-0034: failed to read interrupt status
>  tps6586x 3-0034: failed to read interrupt status
> 
> The reason why the tps6586x interrupt status cannot be read is because
> the tps6586x interrupt is not masked during suspend and when the
> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
> seen before the i2c controller has been resumed in order to read the
> tps6586x interrupt status.
> 
> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
> suspend, which gets propagated to the parent tps6586x interrupt.
> However, the tps6586x-rtc driver cannot disable it's interrupt during
> suspend otherwise we would never be woken up and so the tps6586x must
> disable it's interrupt instead.
> 
> Prevent the tps6586x interrupt handler from executing on exiting suspend
> before the i2c controller has been resumed by disabling the tps6586x
> interrupt on entering suspend and re-enabling it on resuming from
> suspend.
> 
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)

So does this mean that the SPI interrupt for the PMIC can still be a
wakeup source even if it is masked? This is slightly odd because now
you're saying that this does work while it doesn't work for the RTC
interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
which doesn't extend to the TPS6586x? Or am I missing something?

Thierry
Dmitry Osipenko Oct. 22, 2018, 11:19 a.m. | #3
On 10/22/18 12:52 PM, Thierry Reding wrote:
> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>
>> The tps6586x driver creates an irqchip that is used by its various child
>> devices for managing interrupts. The tps6586x-rtc device is one of its
>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>> a wake-up device from suspend, the following is seen:
>>
>>  PM: Syncing filesystems ... done.
>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>  OOM killer disabled.
>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>  Disabling non-boot CPUs ...
>>  Entering suspend state LP1
>>  Enabling non-boot CPUs ...
>>  CPU1 is up
>>  tps6586x 3-0034: failed to read interrupt status
>>  tps6586x 3-0034: failed to read interrupt status
>>
>> The reason why the tps6586x interrupt status cannot be read is because
>> the tps6586x interrupt is not masked during suspend and when the
>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>> seen before the i2c controller has been resumed in order to read the
>> tps6586x interrupt status.
>>
>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>> suspend, which gets propagated to the parent tps6586x interrupt.
>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>> suspend otherwise we would never be woken up and so the tps6586x must
>> disable it's interrupt instead.
>>
>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>> before the i2c controller has been resumed by disabling the tps6586x
>> interrupt on entering suspend and re-enabling it on resuming from
>> suspend.
>>
>> Cc: stable@vger.kernel.org
>>
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>> ---
>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>  1 file changed, 24 insertions(+)
> 
> So does this mean that the SPI interrupt for the PMIC can still be a
> wakeup source even if it is masked? This is slightly odd because now
> you're saying that this does work while it doesn't work for the RTC
> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
> which doesn't extend to the TPS6586x? Or am I missing something?

What is the expected behaviour of IRQ disabling? Should it disable wakeup ability or only mask IRQ handling?

Couple months ago disabling of IRQ was disabling the wakeup, now something has been changed in kernel and wakeup isn't getting disabled. So either there was a bug before that was fixed or there is a bug now.
Jon Hunter Oct. 24, 2018, 10:41 a.m. | #4
On 22/10/2018 10:52, Thierry Reding wrote:
> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>
>> The tps6586x driver creates an irqchip that is used by its various child
>> devices for managing interrupts. The tps6586x-rtc device is one of its
>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>> a wake-up device from suspend, the following is seen:
>>
>>  PM: Syncing filesystems ... done.
>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>  OOM killer disabled.
>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>  Disabling non-boot CPUs ...
>>  Entering suspend state LP1
>>  Enabling non-boot CPUs ...
>>  CPU1 is up
>>  tps6586x 3-0034: failed to read interrupt status
>>  tps6586x 3-0034: failed to read interrupt status
>>
>> The reason why the tps6586x interrupt status cannot be read is because
>> the tps6586x interrupt is not masked during suspend and when the
>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>> seen before the i2c controller has been resumed in order to read the
>> tps6586x interrupt status.
>>
>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>> suspend, which gets propagated to the parent tps6586x interrupt.
>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>> suspend otherwise we would never be woken up and so the tps6586x must
>> disable it's interrupt instead.
>>
>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>> before the i2c controller has been resumed by disabling the tps6586x
>> interrupt on entering suspend and re-enabling it on resuming from
>> suspend.
>>
>> Cc: stable@vger.kernel.org
>>
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>> ---
>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>  1 file changed, 24 insertions(+)
> 
> So does this mean that the SPI interrupt for the PMIC can still be a
> wakeup source even if it is masked? This is slightly odd because now
> you're saying that this does work while it doesn't work for the RTC
> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
> which doesn't extend to the TPS6586x? Or am I missing something?

No it is not a quirk for the Tegra LIC/GIC, it is purely an issue with
the PMIC driver and this issue could occur on other platforms not just
Tegra.

During suspend, we want the PMIC's host interrupt to be masked in the
LIC/GIC level, but the wake-up for this interrupt to be enabled in the
LIC. Currently, the wake-up is enabled in the LIC, but the interrupt is
not being masked in the LIC/GIC which is the problem.

If the RTC interrupt within the PMIC is disabled, then the PMIC
generates no interrupt to the host (ie. Tegra) on an alarm. The PMIC
interrupt controller only has an interrupt mask for the various
interrupt sources within the PMIC. Therefore, if the RTC is
enabled/in-use we should never mask its interrupt within the PMIC.

Once the PMIC has been suspended, then it makes sense to disable its
interrupt, because it cannot be service until it has been resumed,
implying that I2C controller (ie. its parent) has also been resumed.

Cheers
Jon
Jon Hunter Oct. 24, 2018, 10:49 a.m. | #5
On 22/10/2018 12:19, Dmitry Osipenko wrote:
> On 10/22/18 12:52 PM, Thierry Reding wrote:
>> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>>
>>> The tps6586x driver creates an irqchip that is used by its various child
>>> devices for managing interrupts. The tps6586x-rtc device is one of its
>>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>>> a wake-up device from suspend, the following is seen:
>>>
>>>  PM: Syncing filesystems ... done.
>>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>>  OOM killer disabled.
>>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>>  Disabling non-boot CPUs ...
>>>  Entering suspend state LP1
>>>  Enabling non-boot CPUs ...
>>>  CPU1 is up
>>>  tps6586x 3-0034: failed to read interrupt status
>>>  tps6586x 3-0034: failed to read interrupt status
>>>
>>> The reason why the tps6586x interrupt status cannot be read is because
>>> the tps6586x interrupt is not masked during suspend and when the
>>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>>> seen before the i2c controller has been resumed in order to read the
>>> tps6586x interrupt status.
>>>
>>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>>> suspend, which gets propagated to the parent tps6586x interrupt.
>>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>>> suspend otherwise we would never be woken up and so the tps6586x must
>>> disable it's interrupt instead.
>>>
>>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>>> before the i2c controller has been resumed by disabling the tps6586x
>>> interrupt on entering suspend and re-enabling it on resuming from
>>> suspend.
>>>
>>> Cc: stable@vger.kernel.org
>>>
>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>> ---
>>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>>  1 file changed, 24 insertions(+)
>>
>> So does this mean that the SPI interrupt for the PMIC can still be a
>> wakeup source even if it is masked? This is slightly odd because now
>> you're saying that this does work while it doesn't work for the RTC
>> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
>> which doesn't extend to the TPS6586x? Or am I missing something?
> 
> What is the expected behaviour of IRQ disabling? Should it disable wakeup ability or only mask IRQ handling?

I believe only mask the interrupt. However, the caveat here could be if
the parent interrupt controller actually supports wake-up. For Tegra it
is the LIC that handles the wake-up.

> Couple months ago disabling of IRQ was disabling the wakeup, now something has been changed in kernel and wakeup isn't getting disabled. So either there was a bug before that was fixed or there is a bug now.

Are you sure you were disabling the PMIC host interrupt? If you disable
the RTC interrupt in the PMIC's RTC driver, then this will prevent the
wake-up from occurring because you are masking the interrupt within the
PMIC and so it will never generate an interrupt to the host.

Cheers
Jon
Dmitry Osipenko Oct. 24, 2018, 12:44 p.m. | #6
On 10/24/18 1:49 PM, Jon Hunter wrote:
> 
> On 22/10/2018 12:19, Dmitry Osipenko wrote:
>> On 10/22/18 12:52 PM, Thierry Reding wrote:
>>> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>>>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>>>
>>>> The tps6586x driver creates an irqchip that is used by its various child
>>>> devices for managing interrupts. The tps6586x-rtc device is one of its
>>>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>>>> a wake-up device from suspend, the following is seen:
>>>>
>>>>  PM: Syncing filesystems ... done.
>>>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>>>  OOM killer disabled.
>>>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>>>  Disabling non-boot CPUs ...
>>>>  Entering suspend state LP1
>>>>  Enabling non-boot CPUs ...
>>>>  CPU1 is up
>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>
>>>> The reason why the tps6586x interrupt status cannot be read is because
>>>> the tps6586x interrupt is not masked during suspend and when the
>>>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>>>> seen before the i2c controller has been resumed in order to read the
>>>> tps6586x interrupt status.
>>>>
>>>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>>>> suspend, which gets propagated to the parent tps6586x interrupt.
>>>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>>>> suspend otherwise we would never be woken up and so the tps6586x must
>>>> disable it's interrupt instead.
>>>>
>>>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>>>> before the i2c controller has been resumed by disabling the tps6586x
>>>> interrupt on entering suspend and re-enabling it on resuming from
>>>> suspend.
>>>>
>>>> Cc: stable@vger.kernel.org
>>>>
>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>> ---
>>>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>>>  1 file changed, 24 insertions(+)
>>>
>>> So does this mean that the SPI interrupt for the PMIC can still be a
>>> wakeup source even if it is masked? This is slightly odd because now
>>> you're saying that this does work while it doesn't work for the RTC
>>> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
>>> which doesn't extend to the TPS6586x? Or am I missing something?
>>
>> What is the expected behaviour of IRQ disabling? Should it disable wakeup ability or only mask IRQ handling?
> 
> I believe only mask the interrupt. However, the caveat here could be if
> the parent interrupt controller actually supports wake-up. For Tegra it
> is the LIC that handles the wake-up.
> 
>> Couple months ago disabling of IRQ was disabling the wakeup, now something has been changed in kernel and wakeup isn't getting disabled. So either there was a bug before that was fixed or there is a bug now.
> 
> Are you sure you were disabling the PMIC host interrupt? If you disable
> the RTC interrupt in the PMIC's RTC driver, then this will prevent the
> wake-up from occurring because you are masking the interrupt within the
> PMIC and so it will never generate an interrupt to the host.

I'm pretty sure (but not 100%) that was trying the same change as in your patch and it didn't work sometime before. If disable_irq() shouldn't disable wakeup, then everything is perfect now.
Jon Hunter Oct. 24, 2018, 2:19 p.m. | #7
On 24/10/2018 13:44, Dmitry Osipenko wrote:
> On 10/24/18 1:49 PM, Jon Hunter wrote:
>>
>> On 22/10/2018 12:19, Dmitry Osipenko wrote:
>>> On 10/22/18 12:52 PM, Thierry Reding wrote:
>>>> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>>>>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>>>>
>>>>> The tps6586x driver creates an irqchip that is used by its various child
>>>>> devices for managing interrupts. The tps6586x-rtc device is one of its
>>>>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>>>>> a wake-up device from suspend, the following is seen:
>>>>>
>>>>>  PM: Syncing filesystems ... done.
>>>>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>>>>  OOM killer disabled.
>>>>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>>>>  Disabling non-boot CPUs ...
>>>>>  Entering suspend state LP1
>>>>>  Enabling non-boot CPUs ...
>>>>>  CPU1 is up
>>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>>
>>>>> The reason why the tps6586x interrupt status cannot be read is because
>>>>> the tps6586x interrupt is not masked during suspend and when the
>>>>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>>>>> seen before the i2c controller has been resumed in order to read the
>>>>> tps6586x interrupt status.
>>>>>
>>>>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>>>>> suspend, which gets propagated to the parent tps6586x interrupt.
>>>>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>>>>> suspend otherwise we would never be woken up and so the tps6586x must
>>>>> disable it's interrupt instead.
>>>>>
>>>>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>>>>> before the i2c controller has been resumed by disabling the tps6586x
>>>>> interrupt on entering suspend and re-enabling it on resuming from
>>>>> suspend.
>>>>>
>>>>> Cc: stable@vger.kernel.org
>>>>>
>>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>>> ---
>>>>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>>>>  1 file changed, 24 insertions(+)
>>>>
>>>> So does this mean that the SPI interrupt for the PMIC can still be a
>>>> wakeup source even if it is masked? This is slightly odd because now
>>>> you're saying that this does work while it doesn't work for the RTC
>>>> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
>>>> which doesn't extend to the TPS6586x? Or am I missing something?
>>>
>>> What is the expected behaviour of IRQ disabling? Should it disable wakeup ability or only mask IRQ handling?
>>
>> I believe only mask the interrupt. However, the caveat here could be if
>> the parent interrupt controller actually supports wake-up. For Tegra it
>> is the LIC that handles the wake-up.
>>
>>> Couple months ago disabling of IRQ was disabling the wakeup, now something has been changed in kernel and wakeup isn't getting disabled. So either there was a bug before that was fixed or there is a bug now.
>>
>> Are you sure you were disabling the PMIC host interrupt? If you disable
>> the RTC interrupt in the PMIC's RTC driver, then this will prevent the
>> wake-up from occurring because you are masking the interrupt within the
>> PMIC and so it will never generate an interrupt to the host.
> 
> I'm pretty sure (but not 100%) that was trying the same change as in your patch and it didn't work sometime before. If disable_irq() shouldn't disable wakeup, then everything is perfect now.

Please note that this is very similar to the following fix where I
experienced the same problem with another PMIC a couple years back ...

35deff7eb212 ("mfd: as3722: Handle interrupts on suspend")

I did not bother setting the enable/disable_irq_wake() for the tps6586x
host irq during resume/suspend because the irqchip for the tps6586x has
an irq_set_wake function that propagates the wake enable/disable.

Cheers
Jon
Dmitry Osipenko Oct. 25, 2018, 1:01 p.m. | #8
On 10/24/18 5:19 PM, Jon Hunter wrote:
> 
> On 24/10/2018 13:44, Dmitry Osipenko wrote:
>> On 10/24/18 1:49 PM, Jon Hunter wrote:
>>>
>>> On 22/10/2018 12:19, Dmitry Osipenko wrote:
>>>> On 10/22/18 12:52 PM, Thierry Reding wrote:
>>>>> On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
>>>>>> From: Jonathan Hunter <jonathanh@nvidia.com>
>>>>>>
>>>>>> The tps6586x driver creates an irqchip that is used by its various child
>>>>>> devices for managing interrupts. The tps6586x-rtc device is one of its
>>>>>> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
>>>>>> a wake-up device from suspend, the following is seen:
>>>>>>
>>>>>>  PM: Syncing filesystems ... done.
>>>>>>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>>>>>>  OOM killer disabled.
>>>>>>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>>>>>>  Disabling non-boot CPUs ...
>>>>>>  Entering suspend state LP1
>>>>>>  Enabling non-boot CPUs ...
>>>>>>  CPU1 is up
>>>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>>>  tps6586x 3-0034: failed to read interrupt status
>>>>>>
>>>>>> The reason why the tps6586x interrupt status cannot be read is because
>>>>>> the tps6586x interrupt is not masked during suspend and when the
>>>>>> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
>>>>>> seen before the i2c controller has been resumed in order to read the
>>>>>> tps6586x interrupt status.
>>>>>>
>>>>>> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
>>>>>> suspend, which gets propagated to the parent tps6586x interrupt.
>>>>>> However, the tps6586x-rtc driver cannot disable it's interrupt during
>>>>>> suspend otherwise we would never be woken up and so the tps6586x must
>>>>>> disable it's interrupt instead.
>>>>>>
>>>>>> Prevent the tps6586x interrupt handler from executing on exiting suspend
>>>>>> before the i2c controller has been resumed by disabling the tps6586x
>>>>>> interrupt on entering suspend and re-enabling it on resuming from
>>>>>> suspend.
>>>>>>
>>>>>> Cc: stable@vger.kernel.org
>>>>>>
>>>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>>>> ---
>>>>>>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>>>>>>  1 file changed, 24 insertions(+)
>>>>>
>>>>> So does this mean that the SPI interrupt for the PMIC can still be a
>>>>> wakeup source even if it is masked? This is slightly odd because now
>>>>> you're saying that this does work while it doesn't work for the RTC
>>>>> interrupt. So is this an implementation quirk of the LIC/GIC on Tegra
>>>>> which doesn't extend to the TPS6586x? Or am I missing something?
>>>>
>>>> What is the expected behaviour of IRQ disabling? Should it disable wakeup ability or only mask IRQ handling?
>>>
>>> I believe only mask the interrupt. However, the caveat here could be if
>>> the parent interrupt controller actually supports wake-up. For Tegra it
>>> is the LIC that handles the wake-up.
>>>
>>>> Couple months ago disabling of IRQ was disabling the wakeup, now something has been changed in kernel and wakeup isn't getting disabled. So either there was a bug before that was fixed or there is a bug now.
>>>
>>> Are you sure you were disabling the PMIC host interrupt? If you disable
>>> the RTC interrupt in the PMIC's RTC driver, then this will prevent the
>>> wake-up from occurring because you are masking the interrupt within the
>>> PMIC and so it will never generate an interrupt to the host.
>>
>> I'm pretty sure (but not 100%) that was trying the same change as in your patch and it didn't work sometime before. If disable_irq() shouldn't disable wakeup, then everything is perfect now.
> 
> Please note that this is very similar to the following fix where I
> experienced the same problem with another PMIC a couple years back ...
> 
> 35deff7eb212 ("mfd: as3722: Handle interrupts on suspend")
> 
> I did not bother setting the enable/disable_irq_wake() for the tps6586x
> host irq during resume/suspend because the irqchip for the tps6586x has
> an irq_set_wake function that propagates the wake enable/disable.

Okay, thanks.
Thierry Reding Oct. 29, 2018, 9:53 a.m. | #9
On Fri, Oct 19, 2018 at 02:22:53PM +0100, Jon Hunter wrote:
> From: Jonathan Hunter <jonathanh@nvidia.com>
> 
> The tps6586x driver creates an irqchip that is used by its various child
> devices for managing interrupts. The tps6586x-rtc device is one of its
> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
> a wake-up device from suspend, the following is seen:
> 
>  PM: Syncing filesystems ... done.
>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>  OOM killer disabled.
>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>  Disabling non-boot CPUs ...
>  Entering suspend state LP1
>  Enabling non-boot CPUs ...
>  CPU1 is up
>  tps6586x 3-0034: failed to read interrupt status
>  tps6586x 3-0034: failed to read interrupt status
> 
> The reason why the tps6586x interrupt status cannot be read is because
> the tps6586x interrupt is not masked during suspend and when the
> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
> seen before the i2c controller has been resumed in order to read the
> tps6586x interrupt status.
> 
> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
> suspend, which gets propagated to the parent tps6586x interrupt.
> However, the tps6586x-rtc driver cannot disable it's interrupt during
> suspend otherwise we would never be woken up and so the tps6586x must
> disable it's interrupt instead.
> 
> Prevent the tps6586x interrupt handler from executing on exiting suspend
> before the i2c controller has been resumed by disabling the tps6586x
> interrupt on entering suspend and re-enabling it on resuming from
> suspend.
> 
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)

Acked-by: Thierry Reding <treding@nvidia.com>
Jon Hunter Nov. 5, 2018, 11:24 a.m. | #10
Hi Lee,

On 19/10/2018 14:22, Jon Hunter wrote:
> From: Jonathan Hunter <jonathanh@nvidia.com>
> 
> The tps6586x driver creates an irqchip that is used by its various child
> devices for managing interrupts. The tps6586x-rtc device is one of its
> children that uses the tps6586x irqchip. When using the tps6586x-rtc as
> a wake-up device from suspend, the following is seen:
> 
>  PM: Syncing filesystems ... done.
>  Freezing user space processes ... (elapsed 0.001 seconds) done.
>  OOM killer disabled.
>  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
>  Disabling non-boot CPUs ...Hi 
>  Entering suspend state LP1
>  Enabling non-boot CPUs ...
>  CPU1 is up
>  tps6586x 3-0034: failed to read interrupt status
>  tps6586x 3-0034: failed to read interrupt status
> 
> The reason why the tps6586x interrupt status cannot be read is because
> the tps6586x interrupt is not masked during suspend and when the
> tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
> seen before the i2c controller has been resumed in order to read the
> tps6586x interrupt status.
> 
> The tps6586x-rtc driver sets it's interrupt as a wake-up source during
> suspend, which gets propagated to the parent tps6586x interrupt.
> However, the tps6586x-rtc driver cannot disable it's interrupt during
> suspend otherwise we would never be woken up and so the tps6586x must
> disable it's interrupt instead.
> 
> Prevent the tps6586x interrupt handler from executing on exiting suspend
> before the i2c controller has been resumed by disabling the tps6586x
> interrupt on entering suspend and re-enabling it on resuming from
> suspend.
> 
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---

Thierry and Dmitry have acked/reviewed this, let me know if you have any
comments.

Cheers
Jon
Lee Jones Nov. 13, 2018, 7:52 a.m. | #11
On Mon, 05 Nov 2018, Jon Hunter wrote:

> Hi Lee,
> 
> On 19/10/2018 14:22, Jon Hunter wrote:
> > From: Jonathan Hunter <jonathanh@nvidia.com>
> > 
> > The tps6586x driver creates an irqchip that is used by its various child
> > devices for managing interrupts. The tps6586x-rtc device is one of its
> > children that uses the tps6586x irqchip. When using the tps6586x-rtc as
> > a wake-up device from suspend, the following is seen:
> > 
> >  PM: Syncing filesystems ... done.
> >  Freezing user space processes ... (elapsed 0.001 seconds) done.
> >  OOM killer disabled.
> >  Freezing remaining freezable tasks ... (elapsed 0.000 seconds) done.
> >  Disabling non-boot CPUs ...Hi 
> >  Entering suspend state LP1
> >  Enabling non-boot CPUs ...
> >  CPU1 is up
> >  tps6586x 3-0034: failed to read interrupt status
> >  tps6586x 3-0034: failed to read interrupt status
> > 
> > The reason why the tps6586x interrupt status cannot be read is because
> > the tps6586x interrupt is not masked during suspend and when the
> > tps6586x-rtc interrupt occurs, to wake-up the device, the interrupt is
> > seen before the i2c controller has been resumed in order to read the
> > tps6586x interrupt status.
> > 
> > The tps6586x-rtc driver sets it's interrupt as a wake-up source during
> > suspend, which gets propagated to the parent tps6586x interrupt.
> > However, the tps6586x-rtc driver cannot disable it's interrupt during
> > suspend otherwise we would never be woken up and so the tps6586x must
> > disable it's interrupt instead.
> > 
> > Prevent the tps6586x interrupt handler from executing on exiting suspend
> > before the i2c controller has been resumed by disabling the tps6586x
> > interrupt on entering suspend and re-enabling it on resuming from
> > suspend.
> > 
> > Cc: stable@vger.kernel.org
> > 
> > Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> > ---
> 
> Thierry and Dmitry have acked/reviewed this, let me know if you have any
> comments.

Best thing you can do to regain attention on a potentially forgotten
submission is to collect any Acks you have accrued (if any) and submit
a [RESEND].

Patch

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index b89379782741..9c7925ca13cf 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -592,6 +592,29 @@  static int tps6586x_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
+static int __maybe_unused tps6586x_i2c_suspend(struct device *dev)
+{
+	struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+	if (tps6586x->client->irq)
+		disable_irq(tps6586x->client->irq);
+
+	return 0;
+}
+
+static int __maybe_unused tps6586x_i2c_resume(struct device *dev)
+{
+	struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+	if (tps6586x->client->irq)
+		enable_irq(tps6586x->client->irq);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(tps6586x_pm_ops, tps6586x_i2c_suspend,
+			 tps6586x_i2c_resume);
+
 static const struct i2c_device_id tps6586x_id_table[] = {
 	{ "tps6586x", 0 },
 	{ },
@@ -602,6 +625,7 @@  static struct i2c_driver tps6586x_driver = {
 	.driver	= {
 		.name	= "tps6586x",
 		.of_match_table = of_match_ptr(tps6586x_of_match),
+		.pm	= &tps6586x_pm_ops,
 	},
 	.probe		= tps6586x_i2c_probe,
 	.remove		= tps6586x_i2c_remove,