Skip to contentSkip to conversation

gpio: R-Car and EM GPIO update

PATCH In review Magnus Damm 3 participants 11 messages Nov 13, 2013 – Nov 19, 2013

Subsystems (3)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

cover gpio: R-Car and EM GPIO update

gpio: R-Car and EM GPIO update

[PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend [PATCH 02/03] gpio: em: Setup gpiochip->dev
[PATCH 03/03] gpio: em: Use lazy disable and mask on suspend

Update the R-Car GPIO driver and the GPIO driver used on EMEV2 to use lazy disable and mask on suspend. This fixes the Suspend-to-RAM behavior to make sure wakeup sources are left enabled while suspending. Also include a small fix for gpio-em that fixes the DT use case.

---

Written against renesas.git tag renesas-devel-v3.12-20131112

 drivers/gpio/gpio-em.c   |    5 ++---
 drivers/gpio/gpio-rcar.c |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)
author maintainer
#1 lore raw

PATCH 1/3 gpio: rcar: Use lazy disable and mask on suspend

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts. Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Tested on the Lager board with GPIO-keys and Suspend-to-RAM.

---

 drivers/gpio/gpio-rcar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpio/gpio-rcar.c +1 -2
@@ -368,10 +368,9 @@ static int gpio_rcar_probe(struct platfo
 	irq_chip->name = name;
 	irq_chip->irq_mask = gpio_rcar_irq_disable;
 	irq_chip->irq_unmask = gpio_rcar_irq_enable;
-	irq_chip->irq_enable = gpio_rcar_irq_enable;
-	irq_chip->irq_disable = gpio_rcar_irq_disable;
 	irq_chip->irq_set_type = gpio_rcar_irq_set_type;
 	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED;
+	irq_chip->flags	|= IRQCHIP_MASK_ON_SUSPEND;
 
 	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
 					      p->config.number_of_pins,
#2 lore raw

Re: [PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend

Hi Magnus,

Thank you for the patch.

Quoted 4 lines · On Thursday 14 November 2013 07:59:36 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts.

Is that just for optimization purpose, or is there another reason ?

Quoted 2 lines

Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Shouldn't this be split to a separate patch ?

Quoted 11 lines

Tested on the Lager board with GPIO-keys and Suspend-to-RAM.

---

 drivers/gpio/gpio-rcar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/gpio/gpio-rcar.c static int gpio_rcar_probe(struct platfo · line 373

Quoted 8 lines
drivers/gpio/gpio-rcar.c +1 -2
@@ -368,10 +368,9 @@ static int gpio_rcar_probe(struct platfo
 	irq_chip->name = name;
 	irq_chip->irq_mask = gpio_rcar_irq_disable;
 	irq_chip->irq_unmask = gpio_rcar_irq_enable;
-	irq_chip->irq_enable = gpio_rcar_irq_enable;
-	irq_chip->irq_disable = gpio_rcar_irq_disable;
 	irq_chip->irq_set_type = gpio_rcar_irq_set_type;
 	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED;
+	irq_chip->flags	|= IRQCHIP_MASK_ON_SUSPEND;

You can write it as

        irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED
                        | IRQCHIP_MASK_ON_SUSPEND;
Quoted 2 lines
drivers/gpio/gpio-rcar.c +0 -0
 	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
 					      p->config.number_of_pins,
Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#3 lore raw

Re: [PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend

Hi Laurent,

Thanks for checking the patches.

Quoted 11 lines · Laurent Pinchart

Hi Magnus,

Thank you for the patch.

Quoted 4 lines · On Thursday 14 November 2013 07:59:36 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts.

Is that just for optimization purpose, or is there another reason ?

It is needed for IRQCHIP_MASK_ON_SUSPEND operation, which in turn is needed for Suspend-to-RAM.

Quoted 4 lines
Quoted 2 lines

Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Shouldn't this be split to a separate patch ?

I could split them up, but since there is a dependency and since I mainly care about making sure Suspend-to-RAM works I preferred to keep them together.

Quoted 22 lines
Quoted 11 lines

Tested on the Lager board with GPIO-keys and Suspend-to-RAM.

---

 drivers/gpio/gpio-rcar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/gpio/gpio-rcar.c 2013-11-13 19:26:26.000000000 +0900 static int gpio_rcar_probe(struct platfo · line 373

Quoted 8 lines
drivers/gpio/gpio-rcar.c 2013-11-13 19:26:26.000000000 +0900 renamed from drivers/gpio/gpio-rcar.c +1 -2
@@ -368,10 +368,9 @@ static int gpio_rcar_probe(struct platfo
      irq_chip->name = name;
      irq_chip->irq_mask = gpio_rcar_irq_disable;
      irq_chip->irq_unmask = gpio_rcar_irq_enable;
-     irq_chip->irq_enable = gpio_rcar_irq_enable;
-     irq_chip->irq_disable = gpio_rcar_irq_disable;
      irq_chip->irq_set_type = gpio_rcar_irq_set_type;
      irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED;
+     irq_chip->flags |= IRQCHIP_MASK_ON_SUSPEND;

You can write it as

Quoted 2 lines
        irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED
                        | IRQCHIP_MASK_ON_SUSPEND;

I know. =) If that's the preferred way then..

Cheers,

/ magnus

#4 lore raw

Re: [PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend

Hi Magnus,

Quoted 16 lines · On Thursday 14 November 2013 11:03:06 Magnus Damm wrote:
Quoted 7 lines · Laurent Pinchart
Quoted 4 lines · On Thursday 14 November 2013 07:59:36 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts.

Is that just for optimization purpose, or is there another reason ?

It is needed for IRQCHIP_MASK_ON_SUSPEND operation, which in turn is needed for Suspend-to-RAM.

Quoted 4 lines
Quoted 3 lines

Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Quoted 5 lines
Quoted 1 line

Shouldn't this be split to a separate patch ?

I could split them up, but since there is a dependency and since I mainly care about making sure Suspend-to-RAM works I preferred to keep them together.

Fine with me. Could you then please update the commit message to mention that lazy disabling is required for IRQCHIP_MASK_ON_SUSPEND ? Same comment for patch 03/03.

Quoted 26 lines
Quoted 22 lines
Quoted 11 lines

Tested on the Lager board with GPIO-keys and Suspend-to-RAM.

---

 drivers/gpio/gpio-rcar.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/gpio/gpio-rcar.c 2013-11-13 19:26:26.000000000 +0900 static int gpio_rcar_probe(struct platfo · line 373

Quoted 8 lines
drivers/gpio/gpio-rcar.c 2013-11-13 19:26:26.000000000 +0900 renamed from drivers/gpio/gpio-rcar.c +1 -2
@@ -368,10 +368,9 @@ static int gpio_rcar_probe(struct platfo
      irq_chip->name = name;
      irq_chip->irq_mask = gpio_rcar_irq_disable;
      irq_chip->irq_unmask = gpio_rcar_irq_enable;
-     irq_chip->irq_enable = gpio_rcar_irq_enable;
-     irq_chip->irq_disable = gpio_rcar_irq_disable;
      irq_chip->irq_set_type = gpio_rcar_irq_set_type;
      irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED;
+     irq_chip->flags |= IRQCHIP_MASK_ON_SUSPEND;

You can write it as

Quoted 2 lines
        irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_SET_TYPE_MASKED
                        | IRQCHIP_MASK_ON_SUSPEND;

I know. =) If that's the preferred way then..

Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#5 lore raw

Re: [PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend

Hi Laurent,

Quoted 21 lines · Laurent Pinchart

Hi Magnus,

Quoted 18 lines · On Thursday 14 November 2013 11:03:06 Magnus Damm wrote:
Quoted 7 lines · Laurent Pinchart
Quoted 4 lines · On Thursday 14 November 2013 07:59:36 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts.

Is that just for optimization purpose, or is there another reason ?

It is needed for IRQCHIP_MASK_ON_SUSPEND operation, which in turn is needed for Suspend-to-RAM.

Quoted 5 lines
Quoted 3 lines

Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Shouldn't this be split to a separate patch ?

Quoted 7 lines
Quoted 3 lines

I could split them up, but since there is a dependency and since I mainly care about making sure Suspend-to-RAM works I preferred to keep them together.

Fine with me. Could you then please update the commit message to mention that lazy disabling is required for IRQCHIP_MASK_ON_SUSPEND ? Same comment for patch 03/03.

Since when is it common practise to describe the dependencies for the various components included in a single commit? My opinion is that the person reading the code if requiring more information will have to grep for IRQCHIP_MASK_ON_SUSPEND in the friendly source code and learn how the subsystem is held together.

In the case you have some special detailed commit message that you would like me to use then please feel free to propose that. If not then I will then split up the patches.

/ magnus

#6 lore raw

Re: [PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend

Hi Magnus,

Quoted 24 lines · On Thursday 14 November 2013 17:50:09 Magnus Damm wrote:
Quoted 23 lines · Laurent Pinchart
Quoted 21 lines · On Thursday 14 November 2013 11:03:06 Magnus Damm wrote:
Quoted 7 lines · Laurent Pinchart
Quoted 4 lines · On Thursday 14 November 2013 07:59:36 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts.

Is that just for optimization purpose, or is there another reason ?

It is needed for IRQCHIP_MASK_ON_SUSPEND operation, which in turn is needed for Suspend-to-RAM.

Quoted 5 lines
Quoted 3 lines

Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Shouldn't this be split to a separate patch ?

I could split them up, but since there is a dependency and since I mainly care about making sure Suspend-to-RAM works I preferred to keep them together.

Quoted 6 lines
Quoted 3 lines

Fine with me. Could you then please update the commit message to mention that lazy disabling is required for IRQCHIP_MASK_ON_SUSPEND ? Same comment for patch 03/03.

Since when is it common practise to describe the dependencies for the various components included in a single commit?

It's common practice to describe the reason for a commit in the commit message. In this case the two changes seemed unrelated at first sight, I believe explained why they're both needed would be good.

Quoted 7 lines

My opinion is that the person reading the code if requiring more information will have to grep for IRQCHIP_MASK_ON_SUSPEND in the friendly source code and learn how the subsystem is held together.

In the case you have some special detailed commit message that you would like me to use then please feel free to propose that. If not then I will then split up the patches.

I would have use something like

"gpio: rcar: Use mask on suspend

Set IRQCHIP_MASK_ON_SUSPEND to tell the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM. This requires lazy interrupt disabling, so set the ->irq_enable() and ->irq_disable() methods to NULL."

Alternatively you can split the patches, I have no preference.

Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#7 lore raw

PATCH 2/3 gpio: em: Setup gpiochip->dev

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Make sure gpio_chip->dev is setup so of_gpiochip_add() will work as expected.

---

 drivers/gpio/gpio-em.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpio/gpio-em.c +1 -0
@@ -327,6 +327,7 @@ static int em_gio_probe(struct platform_
 	gpio_chip->request = em_gio_request;
 	gpio_chip->free = em_gio_free;
 	gpio_chip->label = name;
+	gpio_chip->dev = &pdev->dev;
 	gpio_chip->owner = THIS_MODULE;
 	gpio_chip->base = pdata->gpio_base;
 	gpio_chip->ngpio = pdata->number_of_pins;
Acked-by on v1 2/3
#8 lore raw

Re: [PATCH 02/03] gpio: em: Setup gpiochip->dev

Hi Magnus,

Thank you for the patch.

Quoted 6 lines · On Thursday 14 November 2013 07:59:46 Magnus Damm wrote:

From: Magnus Damm <[email protected]>

Make sure gpio_chip->dev is setup so of_gpiochip_add() will work as expected.

Quoted 15 lines

---

 drivers/gpio/gpio-em.c |    1 +
 1 file changed, 1 insertion(+)
drivers/gpio/gpio-em.c +1 -0
@@ -327,6 +327,7 @@ static int em_gio_probe(struct platform_
 	gpio_chip->request = em_gio_request;
 	gpio_chip->free = em_gio_free;
 	gpio_chip->label = name;
+	gpio_chip->dev = &pdev->dev;
 	gpio_chip->owner = THIS_MODULE;
 	gpio_chip->base = pdata->gpio_base;
 	gpio_chip->ngpio = pdata->number_of_pins;
Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#9 lore raw

PATCH 3/3 gpio: em: Use lazy disable and mask on suspend

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Set the ->irq_enable() and ->irq_disable() methods to NULL to enable lazy disable of interrupts. Also extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM.

Tested on the KZM9D board with GPIO-keys.

---

 drivers/gpio/gpio-em.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpio/gpio-em.c +1 -3
@@ -336,10 +336,8 @@ static int em_gio_probe(struct platform_
 	irq_chip->name = name;
 	irq_chip->irq_mask = em_gio_irq_disable;
 	irq_chip->irq_unmask = em_gio_irq_enable;
-	irq_chip->irq_enable = em_gio_irq_enable;
-	irq_chip->irq_disable = em_gio_irq_disable;
 	irq_chip->irq_set_type = em_gio_irq_set_type;
-	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE;
+	irq_chip->flags	= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
 
 	p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
 					      pdata->number_of_pins,
#10 lore raw
In reply to Magnus Damm
Quoted 6 lines · Magnus Damm

gpio: R-Car and EM GPIO update

[PATCH 01/03] gpio: rcar: Use lazy disable and mask on suspend [PATCH 02/03] gpio: em: Setup gpiochip->dev
[PATCH 03/03] gpio: em: Use lazy disable and mask on suspend

Quoted 6 lines

Update the R-Car GPIO driver and the GPIO driver used on EMEV2 to use lazy disable and mask on suspend. This fixes the Suspend-to-RAM behavior to make sure wakeup sources are left enabled while suspending. Also include a small fix for gpio-em that fixes the DT use case.

These look OK but I see you and Laurent are discussing patch 1, so whenever you feel ready with the series, please resend so I can apply it.

Yours,
Linus Walleij