Skip to contentSkip to conversation

PPC405GP Walnut irq patch

PATCH Steven A. Falco 3 participants 5 messages Oct 30, 2007 – Nov 1, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi - I have found a bug in the ARCH=powerpc Walnut BSP. The order of the ethernet interrupts in the walnut.dts file doesn't match the documentation. I discovered this when porting the BSP to a custom board - the ethernet would not work. The attached patch corrects that.

This is the first patch I am submitting, so please advise me if there is anything I should do differently.

Signed-off-by Steve Falco <sfalco at harris.com>
walnut.dts renamed from walnut.dts.orig +2 -2
@@ -67,7 +67,7 @@
 			num-tx-chans = <2>;
 			num-rx-chans = <1>;
 			interrupt-parent = <&UIC0>;
-			interrupts = <a 4 b 4 c 4 d 4 e 4>;
+			interrupts = <b 4 c 4 a 4 d 4 e 4>;
 		};
 
 		POB0: opb {
@@ -117,7 +117,7 @@
 				device_type = "network";
 				compatible = "ibm,emac-405gp", "ibm,emac";
 				interrupt-parent = <&UIC0>;
-				interrupts = <9 4 f 4>;
+				interrupts = <f 4 9 4>;
 				reg = <ef600800 70>;
 				mal-device = <&MAL>;
 				mal-tx-channel = <0 1>;
#1 lore raw

I realized that I should have done this from the root level. So here is the corrected patch.

Signed-off-by Steve Falco <sfalco at harris.com>
Quoted 7 lines · Steven A. Falco

Hi - I have found a bug in the ARCH=powerpc Walnut BSP. The order of the ethernet interrupts in the walnut.dts file doesn't match the documentation. I discovered this when porting the BSP to a custom board - the ethernet would not work. The attached patch corrects that.

This is the first patch I am submitting, so please advise me if there is anything I should do differently.

Signed-off-by Steve Falco <sfalco at harris.com>
arch/powerpc/boot/dts/walnut.dts +2 -2
index 27bef06..dd65115 100644
@@ -67,7 +67,7 @@
 			num-tx-chans = <2>;
 			num-rx-chans = <1>;
 			interrupt-parent = <&UIC0>;
-			interrupts = <a 4 b 4 c 4 d 4 e 4>;
+			interrupts = <b 4 c 4 a 4 d 4 e 4>;
 		};
 
 		POB0: opb {
@@ -117,7 +117,7 @@
 				device_type = "network";
 				compatible = "ibm,emac-405gp", "ibm,emac";
 				interrupt-parent = <&UIC0>;
-				interrupts = <9 4 f 4>;
+				interrupts = <f 4 9 4>;
 				reg = <ef600800 70>;
 				mal-device = <&MAL>;
 				mal-tx-channel = <0 1>;
#2 lore raw
Quoted 31 lines · On Tue, 30 Oct 2007 17:41:27 -0400 "Steven A. Falco" <[email protected]> wrote:

From: "Steven A. Falco" <[email protected]>
To: [email protected]
Subject: Re: PPC405GP Walnut irq patch
Date: Tue, 30 Oct 2007 17:41:27 -0400
Sender: [email protected]
User-Agent: Thunderbird 2.0.0.5 (X11/20070719)

I realized that I should have done this from the root level. So here is the corrected patch.

Signed-off-by Steve Falco <sfalco at harris.com>
Quoted 11 lines · Steven A. Falco

Hi - I have found a bug in the ARCH=powerpc Walnut BSP. The order of the ethernet interrupts in the walnut.dts file doesn't match the documentation. I discovered this when porting the BSP to a custom board - the ethernet would not work. The attached patch corrects that.

This is the first patch I am submitting, so please advise me if there is anything I should do differently.

Signed-off-by Steve Falco <sfalco at harris.com>
arch/powerpc/boot/dts/walnut.dts +0 -0
index 27bef06..dd65115 100644

arch/powerpc/boot/dts/walnut.dts line 71

Quoted 6 lines
arch/powerpc/boot/dts/walnut.dts +1 -1
@@ -67,7 +67,7 @@
 			num-tx-chans = <2>;
 			num-rx-chans = <1>;
 			interrupt-parent = <&UIC0>;
-			interrupts = <a 4 b 4 c 4 d 4 e 4>;
+			interrupts = <b 4 c 4 a 4 d 4 e 4>;
 		};

I fixed this part already. Seems your tree is slightly old.

arch/powerpc/boot/dts/walnut.dts line 120

Quoted 8 lines
arch/powerpc/boot/dts/walnut.dts +1 -1
 		POB0: opb {
@@ -117,7 +117,7 @@
 				device_type = "network";
 				compatible = "ibm,emac-405gp", "ibm,emac";
 				interrupt-parent = <&UIC0>;
-				interrupts = <9 4 f 4>;
+				interrupts = <f 4 9 4>;

Could you redo the patch with just this bit and send it again?

josh

#3 lore raw
Quoted 5 lines

Could you redo the patch with just this bit and send it again?

josh

Ok - this one is based off the Linus tree, and follows your style of one interrupt per line, with a comment indicating which one it is.

Signed-off-by Steve Falco <sfalco at harris.com>
arch/powerpc/boot/dts/walnut.dts +3 -1
index fa681f5..754fa39 100644
@@ -122,7 +122,9 @@
 				device_type = "network";
 				compatible = "ibm,emac-405gp", "ibm,emac";
 				interrupt-parent = <&UIC0>;
-				interrupts = <9 4 f 4>;
+				interrupts = <
+					f 4 /* Ethernet */
+					9 4 /* Ethernet Wake Up */>;
 				local-mac-address = [000000000000]; /* Filled in by zImage */
 				reg = <ef600800 70>;
 				mal-device = <&MAL>;
#4 lore raw
Quoted 7 lines · On Wed, 31 Oct 2007 13:52:53 -0400 "Steven A. Falco" <[email protected]> wrote:
Quoted 4 lines

Could you redo the patch with just this bit and send it again?

josh

Ok - this one is based off the Linus tree, and follows your style of one interrupt per line, with a comment indicating which one it is.

Looks good. Thanks!

josh

Quoted 20 lines
Signed-off-by Steve Falco <sfalco at harris.com>
arch/powerpc/boot/dts/walnut.dts +3 -1
index fa681f5..754fa39 100644
@@ -122,7 +122,9 @@
 				device_type = "network";
 				compatible = "ibm,emac-405gp", "ibm,emac";
 				interrupt-parent = <&UIC0>;
-				interrupts = <9 4 f 4>;
+				interrupts = <
+					f 4 /* Ethernet */
+					9 4 /* Ethernet Wake Up */>;
 				local-mac-address = [000000000000]; /* Filled in by zImage */
 				reg = <ef600800 70>;
 				mal-device = <&MAL>;