4430sdp nfsroot broken with ff5c9059

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Do we need to pass the GPIO edge/level info now?

From ed3e66bcd4c0cb3df4cb70e75c45fa4462f70565 Mon Sep 17 00:00:00 2001

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hence, I have not been testing ethernet when booting with device-tree because we need to fix [1] which has been really crippling my testing. So this needs to be resolved so ethernet can work consistently on all omap boards.

Quoted 1 line

Do we need to pass the GPIO edge/level info now?

Yes and here is a patch. I have tested on my OMAP4 SDP this morning. Reviewing all the OMAP/AM dts(i) files I believe that only the SDP and OMAP4-VAR-SOM are impacted by this. I don't see any other boards currently using the gpio as an interrupt-controller.

[1] comments.gmane.org/gmane.linux.ports.arm.omap/92192

From ed3e66bcd4c0cb3df4cb70e75c45fa4462f70565 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Wed, 10 Apr 2013 11:44:44 -0500
Subject: [PATCH] ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

Commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property) updated the number of interrupt cells required for configuring gpios as interrupts for other devices (such as ethernet controllers). This update allowed the interrupt type (edge, level, etc) to be configured via device-tree (as described in the Documentation/devicetree/bindings/gpio/gpio-omap.txt).

This broke ethernet support on the OMAP4 SDP board that defines a gpio as the ethernet IRQ because the interrupt type (level, edge, etc) was not getting configured correctly. This board use the ks8851 ethernet chip which has an active low interrupt. Fix this by defining the gpio interrupt as active-low in the device-tree binding.

Please note that the OMAP4-VAR-SOM also uses the same ethernet controller and it is expected it will have the same problem. So the same fix is also applied to this board.

Signed-off-by Jon Hunter <[email protected]>

---
 arch/arm/boot/dts/omap4-sdp.dts     |    2 +-
 arch/arm/boot/dts/omap4-var-som.dts |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/omap4-sdp.dts +1 -1

index c387bdc..25cbe43 100644
@@ -363,7 +363,7 @@
 		spi-max-frequency = <24000000>;
 		reg = <0>;
 		interrupt-parent = <&gpio2>;
-		interrupts = <2>; /* gpio line 34 */
+		interrupts = <2 8>; /* gpio line 34, low triggered */
 		vdd-supply = <&vdd_eth>;
 	};
 };

arch/arm/boot/dts/omap4-var-som.dts +1 -1

index 222a413..7e04103 100644
@@ -68,7 +68,7 @@
 		spi-max-frequency = <24000000>;
 		reg = <0>;
 		interrupt-parent = <&gpio6>;
-		interrupts = <11>; /* gpio line 171 */
+		interrupts = <11 8>; /* gpio line 171, low triggered */
 		vdd-supply = <&vdd_eth>;
 	};
 };

Signature · 1 line

1.7.10.4

Quoted 17 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Quoted 4 lines

Hence, I have not been testing ethernet when booting with device-tree because we need to fix [1] which has been really crippling my testing. So this needs to be resolved so ethernet can work consistently on all omap boards.

Cool.

Quoted 7 lines

Quoted 1 line

Do we need to pass the GPIO edge/level info now?

Yes and here is a patch. I have tested on my OMAP4 SDP this morning. Reviewing all the OMAP/AM dts(i) files I believe that only the SDP and OMAP4-VAR-SOM are impacted by this. I don't see any other boards currently using the gpio as an interrupt-controller.

Great. Just one comment: You might be able to already use the DT preprocessor now easily with linux next for the edge info.

From fe74fee9ac4d011703918557f7b9b638bfead300 Mon Sep 17 00:00:00 2001

Quoted 33 lines · Tony Lindgren

Quoted 17 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Quoted 4 lines

Hence, I have not been testing ethernet when booting with device-tree because we need to fix [1] which has been really crippling my testing. So this needs to be resolved so ethernet can work consistently on all omap boards.

Cool.

Quoted 7 lines

Quoted 1 line

Do we need to pass the GPIO edge/level info now?

Yes and here is a patch. I have tested on my OMAP4 SDP this morning. Reviewing all the OMAP/AM dts(i) files I believe that only the SDP and OMAP4-VAR-SOM are impacted by this. I don't see any other boards currently using the gpio as an interrupt-controller.

Quoted 3 lines

Great. Just one comment: You might be able to already use the DT preprocessor now easily with linux next for the edge info.

Good idea. We could do something like the below, but it would be better to include the "arm-gic.h" from the omap4.dtsi file so that the definitions can be used there too. The problem is that if I include "arm-gic.h" in the omap4.dtsi file I get a DTC compiler error because of the "#include" statement. It appears that the compiler does not like it if a file includes a file using "/include/" and the file it is including uses "#include". So really I think that we need to switch all the dts/dtsi files to use "#include" first.

Quoted 39 lines · Jon Hunter

Quoted 33 lines · Tony Lindgren

Quoted 17 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Quoted 4 lines

Hence, I have not been testing ethernet when booting with device-tree because we need to fix [1] which has been really crippling my testing. So this needs to be resolved so ethernet can work consistently on all omap boards.

Cool.

Quoted 7 lines

Quoted 1 line

Do we need to pass the GPIO edge/level info now?

Yes and here is a patch. I have tested on my OMAP4 SDP this morning. Reviewing all the OMAP/AM dts(i) files I believe that only the SDP and OMAP4-VAR-SOM are impacted by this. I don't see any other boards currently using the gpio as an interrupt-controller.

Quoted 3 lines

Great. Just one comment: You might be able to already use the DT preprocessor now easily with linux next for the edge info.

Quoted 9 lines

Good idea. We could do something like the below, but it would be better to include the "arm-gic.h" from the omap4.dtsi file so that the definitions can be used there too. The problem is that if I include "arm-gic.h" in the omap4.dtsi file I get a DTC compiler error because of the "#include" statement. It appears that the compiler does not like it if a file includes a file using "/include/" and the file it is including uses "#include". So really I think that we need to switch all the dts/dtsi files to use "#include" first.

OK maybe note that in the description too.

Also, is there need to back port these two patches to v3.9-rc? If nobody has noticed, I guess not?

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

Quoted 2 lines

Also, is there need to back port these two patches to v3.9-rc? If nobody has noticed, I guess not?

This should only be applicable to v3.10 so no need to backport. Or are you saying that you are seeing this with v3.9 also? That would be odd.

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

From arch/arm/boot/dts/omap4-sdp.dts:

Quoted 9 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Quoted 8 lines

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hi Jon,

Ethernet is working on 4430sdp since the optional "gpio" property is specified on the fixed regulator used by the eth device node.

From arch/arm/boot/dts/omap4-sdp.dts:

        vdd_eth: fixedregulator-vdd-eth {
                compatible = "regulator-fixed";
                regulator-name = "VDD_ETH";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio2 16 0>;  /* gpio line 48 */
                enable-active-high;
                regulator-boot-on;
        };
...
&mcspi1 {
        eth@0 {
                compatible = "ks8851";
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio2>;
                interrupts = <2>; /* gpio line 34 */
                vdd-supply = <&vdd_eth>;
        };
};

So is the regulator who is calling gpio_request() and enabling the GPIO bank and no the ks881 ethernet driver. That's why it was working although I think is just a DT hack and should be changed once we found a proper solution to fhis.

Quoted 47 lines · Javier Martinez Canillas

Quoted 9 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Quoted 8 lines

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hi Jon,

Ethernet is working on 4430sdp since the optional "gpio" property is specified on the fixed regulator used by the eth device node.

From arch/arm/boot/dts/omap4-sdp.dts:

        vdd_eth: fixedregulator-vdd-eth {
                compatible = "regulator-fixed";
                regulator-name = "VDD_ETH";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio2 16 0>;  /* gpio line 48 */
                enable-active-high;
                regulator-boot-on;
        };
...
&mcspi1 {
        eth@0 {
                compatible = "ks8851";
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio2>;
                interrupts = <2>; /* gpio line 34 */
                vdd-supply = <&vdd_eth>;
        };
};

Quoted 4 lines

So is the regulator who is calling gpio_request() and enabling the GPIO bank and no the ks881 ethernet driver. That's why it was working although I think is just a DT hack and should be changed once we found a proper solution to fhis.

Right, in the above I mentioned it is working because of other gpios in the bank that are enabled. So I understand why it works, but wanted to point out that this is lucky :-)

Jon

Quoted 9 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Quoted 8 lines

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hi Jon,

Ethernet is working on 4430sdp since the optional "gpio" property is specified on the fixed regulator used by the eth device node.

From arch/arm/boot/dts/omap4-sdp.dts:

        vdd_eth: fixedregulator-vdd-eth {
                compatible = "regulator-fixed";
                regulator-name = "VDD_ETH";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio2 16 0>;  /* gpio line 48 */
                enable-active-high;
                regulator-boot-on;
        };
...
&mcspi1 {
        eth@0 {
                compatible = "ks8851";
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio2>;
                interrupts = <2>; /* gpio line 34 */
                vdd-supply = <&vdd_eth>;
        };
};

So is the regulator who is calling gpio_request() and enabling the GPIO bank and no the ks881 ethernet driver. That's why it was working although I think is just a DT hack and should be changed once we found a proper solution to fhis.

Hi Javier,

Quoted 47 lines · Javier Martinez Canillas

Quoted 9 lines · Jon Hunter

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Quoted 8 lines

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hi Jon,

Ethernet is working on 4430sdp since the optional "gpio" property is specified on the fixed regulator used by the eth device node.

From arch/arm/boot/dts/omap4-sdp.dts:

        vdd_eth: fixedregulator-vdd-eth {
                compatible = "regulator-fixed";
                regulator-name = "VDD_ETH";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
                gpio = <&gpio2 16 0>;  /* gpio line 48 */
                enable-active-high;
                regulator-boot-on;
        };
...
&mcspi1 {
        eth@0 {
                compatible = "ks8851";
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio2>;
                interrupts = <2>; /* gpio line 34 */
                vdd-supply = <&vdd_eth>;
        };
};

Quoted 4 lines

So is the regulator who is calling gpio_request() and enabling the GPIO bank and no the ks881 ethernet driver. That's why it was working although I think is just a DT hack and should be changed once we found a proper solution to fhis.

It is not really a hack. There is a regulator controlled by a GPIO that can control the Ethernet chip power. Both gpio48 and gpio34 are used for Ethernet. On some SDP version there is even a third line, but I was not able to find any evidence in the schematic I was using.

Regards,
Benoit

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

No let's do that the preprocessor conversion for v3.11.

Quoted 7 lines · Tony Lindgren

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

Quoted 1 line

No let's do that the preprocessor conversion for v3.11.

Hmm looks like there are few more 3430sdp dt nfsroot exposed issues in today's linux next.

To get nfsroot to behave, I had to have your earlier fix from this thread and also revert a2797bea (gpio/omap: force restore if context loss is not detectable).

Otherwise nfsroot fails, but not necessarily every time?

I could not git bisect it down to the commit above, had to manually figure it out.. There may also be DMA related issues, but I don't know for sure any longer. I made a patch to fix SPI PIO mode and then hacked SPI to always use PIO to leave out the DMA related parts. Anyways, will post that separately, let's hope the DMA related issues I saw earlier are also related to dt + a2797bea.

Quoted 8 lines · Tony Lindgren

Quoted 7 lines · Tony Lindgren

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

Quoted 4 lines

Quoted 1 line

No let's do that the preprocessor conversion for v3.11.

Hmm looks like there are few more 3430sdp dt nfsroot exposed issues in today's linux next.

I don't even see any ethernet devices defined in the omap3430-sdp.dts file. Is this something that you have added on top?

Quoted 5 lines

To get nfsroot to behave, I had to have your earlier fix from this thread and also revert a2797bea (gpio/omap: force restore if context loss is not detectable).

Otherwise nfsroot fails, but not necessarily every time?

Well this patch is going to force a gpio restore everytime we call pm_runtime_get() when the use-count is 0. Yes this is not efficient, however, without this patch you run the risk of context being lost and you would never know. Per the changelog, long term a better solution is needed.

Quoted 7 lines

I could not git bisect it down to the commit above, had to manually figure it out.. There may also be DMA related issues, but I don't know for sure any longer. I made a patch to fix SPI PIO mode and then hacked SPI to always use PIO to leave out the DMA related parts. Anyways, will post that separately, let's hope the DMA related issues I saw earlier are also related to dt + a2797bea.

Ok, I don't follow that. I am not sure how gpio is related to DMA in this case.

Quoted 12 lines · Jon Hunter

Quoted 10 lines · Tony Lindgren

Quoted 8 lines · Tony Lindgren

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

No let's do that the preprocessor conversion for v3.11.

Quoted 5 lines

Quoted 2 lines

Hmm looks like there are few more 3430sdp dt nfsroot exposed issues in today's linux next.

I don't even see any ethernet devices defined in the omap3430-sdp.dts file. Is this something that you have added on top?

Oops sorry I meant the ks8851 on SPI on 4430sdp, not 3430.

Quoted 6 lines

Quoted 5 lines

To get nfsroot to behave, I had to have your earlier fix from this thread and also revert a2797bea (gpio/omap: force restore if context loss is not detectable).

Otherwise nfsroot fails, but not necessarily every time?

Quoted 5 lines

Well this patch is going to force a gpio restore everytime we call pm_runtime_get() when the use-count is 0. Yes this is not efficient, however, without this patch you run the risk of context being lost and you would never know. Per the changelog, long term a better solution is needed.

It seems that this patch kills the ks8851 GPIO interrupt somehow, at least most of the time.

Quoted 8 lines

Quoted 7 lines

I could not git bisect it down to the commit above, had to manually figure it out.. There may also be DMA related issues, but I don't know for sure any longer. I made a patch to fix SPI PIO mode and then hacked SPI to always use PIO to leave out the DMA related parts. Anyways, will post that separately, let's hope the DMA related issues I saw earlier are also related to dt + a2797bea.

Quoted 2 lines

Ok, I don't follow that. I am not sure how gpio is related to DMA in this case.

I think the DMA issues might be related to the GPIO interrupt not working properly.

Quoted 13 lines · Tony Lindgren

Quoted 12 lines · Jon Hunter

Quoted 10 lines · Tony Lindgren

Quoted 8 lines · Tony Lindgren

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

No let's do that the preprocessor conversion for v3.11.

Quoted 7 lines

Quoted 5 lines

Quoted 2 lines

Hmm looks like there are few more 3430sdp dt nfsroot exposed issues in today's linux next.

I don't even see any ethernet devices defined in the omap3430-sdp.dts file. Is this something that you have added on top?

Oops sorry I meant the ks8851 on SPI on 4430sdp, not 3430.

Ok makes sense.

Quoted 12 lines

Quoted 11 lines

Quoted 5 lines

To get nfsroot to behave, I had to have your earlier fix from this thread and also revert a2797bea (gpio/omap: force restore if context loss is not detectable).

Otherwise nfsroot fails, but not necessarily every time?

Well this patch is going to force a gpio restore everytime we call pm_runtime_get() when the use-count is 0. Yes this is not efficient, however, without this patch you run the risk of context being lost and you would never know. Per the changelog, long term a better solution is needed.

Quoted 2 lines

It seems that this patch kills the ks8851 GPIO interrupt somehow, at least most of the time.

Hmmm, let me go back and re-test this.

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001

Quoted 37 lines · Jon Hunter

Quoted 13 lines · Tony Lindgren

Quoted 12 lines · Jon Hunter

Quoted 10 lines · Tony Lindgren

Quoted 8 lines · Tony Lindgren

Quoted 5 lines · Jon Hunter

Are you saying that you want to use the version with that is using the pre-processor definitions? I was thinking that may be we could do that as a clean-up for v3.11 and just use the original version I posted earlier. Seems cleaner to me.

No let's do that the preprocessor conversion for v3.11.

Quoted 7 lines

Quoted 5 lines

Quoted 2 lines

Hmm looks like there are few more 3430sdp dt nfsroot exposed issues in today's linux next.

I don't even see any ethernet devices defined in the omap3430-sdp.dts file. Is this something that you have added on top?

Oops sorry I meant the ks8851 on SPI on 4430sdp, not 3430.

Ok makes sense.

Quoted 12 lines

Quoted 11 lines

Quoted 5 lines

To get nfsroot to behave, I had to have your earlier fix from this thread and also revert a2797bea (gpio/omap: force restore if context loss is not detectable).

Otherwise nfsroot fails, but not necessarily every time?

Well this patch is going to force a gpio restore everytime we call pm_runtime_get() when the use-count is 0. Yes this is not efficient, however, without this patch you run the risk of context being lost and you would never know. Per the changelog, long term a better solution is needed.

Quoted 4 lines

Quoted 2 lines

It seems that this patch kills the ks8851 GPIO interrupt somehow, at least most of the time.

Hmmm, let me go back and re-test this.

Ok I am seeing the problem. Looks like this patch exposed another bug in the gpio driver. Seems that we never initialise the gpio context during the probe and so on the first pm_runtime_get_sync() during the probe we are restoring crap. Can you try this? If this works, I will add a changelog and post as a fix.

Jon

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Mon, 15 Apr 2013 13:06:54 -0500
Subject: [PATCH] gpio/omap: ensure gpio context is initialised

 drivers/gpio/gpio-omap.c |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

drivers/gpio/gpio-omap.c +41 -1

index 0557529..53bb8d5 100644
@@ -70,6 +70,7 @@ struct gpio_bank {
 	bool is_mpuio;
 	bool dbck_flag;
 	bool loses_context;
+	bool context_setup;
 	int stride;
 	u32 width;
 	int context_loss_count;

@@ -1085,6 +1086,7 @@ static void omap_gpio_chip_init(struct gpio_bank *bank)
 }
 
 static const struct of_device_id omap_gpio_match[];
+static void omap_gpio_setup_context(struct gpio_bank *p);
 
 static int omap_gpio_probe(struct platform_device *pdev)
 {

@@ -1179,8 +1181,10 @@ static int omap_gpio_probe(struct platform_device *pdev)
 	omap_gpio_chip_init(bank);
 	omap_gpio_show_rev(bank);
 
-	if (bank->loses_context)
+	if (bank->loses_context) {
 		bank->get_context_loss_count = pdata->get_context_loss_count;
+		omap_gpio_setup_context(bank);
+	}
 
 	pm_runtime_put(bank->dev);
 

@@ -1385,8 +1389,43 @@ void omap2_gpio_resume_after_idle(void)
 }
 
 #if defined(CONFIG_PM_RUNTIME)
+static void omap_gpio_setup_context(struct gpio_bank *p)
+{
+	struct omap_gpio_reg_offs *regs = p->regs;
+	void __iomem *base = p->base;
+
+	p->context.wake_en = __raw_readl(base + regs->wkup_en);
+	p->context.ctrl = __raw_readl(base + regs->ctrl);
+	p->context.ctrl = __raw_readl(base + regs->ctrl);
+	p->context.leveldetect0 = __raw_readl(base + regs->leveldetect0);
+	p->context.leveldetect1 = __raw_readl(base + regs->leveldetect1);
+	p->context.risingdetect = __raw_readl(base + regs->risingdetect);
+	p->context.fallingdetect = __raw_readl(base + regs->fallingdetect);
+
+	if (regs->set_dataout && p->regs->clr_dataout)
+		p->context.dataout = __raw_readl(base + regs->set_dataout);
+	else
+		p->context.dataout = __raw_readl(base + regs->dataout);
+
+	p->context.oe = __raw_readl(base + regs->direction);
+
+	if (p->dbck_enable_mask) {
+		p->context.debounce = __raw_readl(base + regs->debounce);
+		p->context.debounce_en = __raw_readl(base + regs->debounce_en);
+	}
+
+	p->context.irqenable1 = __raw_readl(base + regs->irqenable);
+	p->context.irqenable2 = __raw_readl(base + regs->irqenable2);
+
+	p->context_setup = true;
+}
+
 static void omap_gpio_restore_context(struct gpio_bank *bank)
 {
+	/* If context has not been initialised yet, return */
+	if (!bank->context_setup)
+		return;
+
 	__raw_writel(bank->context.wake_en,
 				bank->base + bank->regs->wkup_en);
 	__raw_writel(bank->context.ctrl, bank->base + bank->regs->ctrl);

@@ -1422,6 +1461,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
 #else
 #define omap_gpio_runtime_suspend NULL
 #define omap_gpio_runtime_resume NULL
+#define omap_gpio_setup_context NULL
 #endif
 
 static const struct dev_pm_ops gpio_pm_ops = {

Signature · 1 line

1.7.10.4

* Jon Hunter <[email protected]> [130415 11:15]:

Quoted 4 lines

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Mon, 15 Apr 2013 13:06:54 -0500
Subject: [PATCH] gpio/omap: ensure gpio context is initialised

Seems to work thanks:

Tested-by Tony Lindgren <[email protected]>

From 3980952af35054e50d743691fc3e0867de5b0f4d Mon Sep 17 00:00:00 2001

Quoted 1 line · Tony Lindgren

* Jon Hunter <[email protected]> [130415 11:15]:

...

Quoted 5 lines

Quoted 4 lines

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Mon, 15 Apr 2013 13:06:54 -0500
Subject: [PATCH] gpio/omap: ensure gpio context is initialised

Quoted 3 lines

Seems to work thanks:

Tested-by Tony Lindgren <[email protected]>

Thanks. I have been cleaning this up and updating a little. Care to re-test this version? If it is good I will send it out.

By the way, I realise I need to add a similar fix for dmtimer :-p

Quoted 11 lines · Jon Hunter

Quoted 1 line · Tony Lindgren

* Jon Hunter <[email protected]> [130415 11:15]:

...

Quoted 5 lines

Quoted 4 lines

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Mon, 15 Apr 2013 13:06:54 -0500
Subject: [PATCH] gpio/omap: ensure gpio context is initialised

Quoted 6 lines

Quoted 3 lines

Seems to work thanks:

Tested-by Tony Lindgren <[email protected]>

Thanks. I have been cleaning this up and updating a little. Care to re-test this version? If it is good I will send it out.

Yes this works too, you can recycle my Tested-by on this one.

Quoted 1 line

By the way, I realise I need to add a similar fix for dmtimer :-p

OK good to find out now rather than after the merge window.

From 79fb33de1ada7cce7527adb15376bb7c5ddc4f14 Mon Sep 17 00:00:00 2001

Quoted 12 lines · Tony Lindgren

Quoted 11 lines · Jon Hunter

Quoted 1 line · Tony Lindgren

* Jon Hunter <[email protected]> [130415 11:15]:

...

Quoted 5 lines

Quoted 4 lines

From 56598ba51a75481b050433bb38b7ae31a5ed4ae8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Mon, 15 Apr 2013 13:06:54 -0500
Subject: [PATCH] gpio/omap: ensure gpio context is initialised

Quoted 8 lines

Quoted 6 lines

Quoted 3 lines

Seems to work thanks:

Tested-by Tony Lindgren <[email protected]>

Thanks. I have been cleaning this up and updating a little. Care to re-test this version? If it is good I will send it out.

Yes this works too, you can recycle my Tested-by on this one.

Thanks. Final version below to fix build error if pm-runtime is not enabled (this was breaking omap1 build).

Quoted 3 lines

Quoted 1 line

By the way, I realise I need to add a similar fix for dmtimer :-p

OK good to find out now rather than after the merge window.

Actually, I am wrong here. The dmtimer registers that are restored all default to zero and so we don't need a similar fix for dmtimers.

Hi Tony,

Quoted 5 lines · Tony Lindgren

Hi Jon,

Looks like at least 4430sdp nfsroot got broken with commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property).

Thanks for reporting. I am actually amazed that ethernet is working on any OMAP board (with device-tree) that requires a gpio as an interrupt because we have still not come to an agreement on [1]. Looking at the OMAP4 SDP I believe this is working by luck because there are other gpios in the same bank that are active and so the bank is enabled. If that were not the case then this would not work.

Hence, I have not been testing ethernet when booting with device-tree because we need to fix [1] which has been really crippling my testing. So this needs to be resolved so ethernet can work consistently on all omap boards.

Quoted 1 line

Do we need to pass the GPIO edge/level info now?

Yes and here is a patch. I have tested on my OMAP4 SDP this morning. Reviewing all the OMAP/AM dts(i) files I believe that only the SDP and OMAP4-VAR-SOM are impacted by this. I don't see any other boards currently using the gpio as an interrupt-controller.

Cheers
Jon

[1] comments.gmane.org/gmane.linux.ports.arm.omap/92192

From ed3e66bcd4c0cb3df4cb70e75c45fa4462f70565 Mon Sep 17 00:00:00 2001
From: Jon Hunter <[email protected]>
Date: Wed, 10 Apr 2013 11:44:44 -0500
Subject: [PATCH] ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

Commit ff5c9059 (ARM: dts: OMAP3+: Correct gpio #interrupts-cells property) updated the number of interrupt cells required for configuring gpios as interrupts for other devices (such as ethernet controllers). This update allowed the interrupt type (edge, level, etc) to be configured via device-tree (as described in the Documentation/devicetree/bindings/gpio/gpio-omap.txt).

This broke ethernet support on the OMAP4 SDP board that defines a gpio as the ethernet IRQ because the interrupt type (level, edge, etc) was not getting configured correctly. This board use the ks8851 ethernet chip which has an active low interrupt. Fix this by defining the gpio interrupt as active-low in the device-tree binding.

Please note that the OMAP4-VAR-SOM also uses the same ethernet controller and it is expected it will have the same problem. So the same fix is also applied to this board.

Signed-off-by Jon Hunter <[email protected]>

---
 arch/arm/boot/dts/omap4-sdp.dts     |    2 +-
 arch/arm/boot/dts/omap4-var-som.dts |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/omap4-sdp.dts +1 -1

index c387bdc..25cbe43 100644
@@ -363,7 +363,7 @@
 		spi-max-frequency = <24000000>;
 		reg = <0>;
 		interrupt-parent = <&gpio2>;
-		interrupts = <2>; /* gpio line 34 */
+		interrupts = <2 8>; /* gpio line 34, low triggered */
 		vdd-supply = <&vdd_eth>;
 	};
 };

arch/arm/boot/dts/omap4-var-som.dts +1 -1

index 222a413..7e04103 100644
@@ -68,7 +68,7 @@
 		spi-max-frequency = <24000000>;
 		reg = <0>;
 		interrupt-parent = <&gpio6>;
-		interrupts = <11>; /* gpio line 171 */
+		interrupts = <11 8>; /* gpio line 171, low triggered */
 		vdd-supply = <&vdd_eth>;
 	};
 };

Signature · 1 line

1.7.10.4