Patchwork [3/4] Fix incorrect PCI interrupt map in SBC834x DTS

login
register
mail settings
Submitter Paul Gortmaker
Date Aug. 12, 2009, 1:34 p.m.
Message ID <764194b0524e1baccb737668f5aeb198989ac2d1.1250036189.git.paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/31187/
State Accepted, archived
Commit 58dfc497b9357ec00c879b775c02f4eab19bcecb
Delegated to: Kumar Gala
Headers show

Comments

Paul Gortmaker - Aug. 12, 2009, 1:34 p.m.
From: Liang Li <liang.li@windriver.com>

Allows interrupts to occur on the sbc834x. Currently PCI devices
get assigned an incorrect IRQ and so the interrupt count never
increases. This was tested with the 82546GB based dual port E1000
PCI-X NIC which uses two distinct IRQ lines on the one card.

root@localhost:/root> cat /proc/interrupts | grep eth
17:         78   IPIC   Level     eth1
48:      27121   IPIC   Level     eth0

Signed-off-by: Liang Li <liang.li@windriver.com>
Signed-off-by: Yang Shi <yang.shi@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/powerpc/boot/dts/sbc8349.dts |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Kumar Gala - Aug. 14, 2009, 8:21 p.m.
On Aug 12, 2009, at 8:34 AM, Paul Gortmaker wrote:

> From: Liang Li <liang.li@windriver.com>
>
> Allows interrupts to occur on the sbc834x. Currently PCI devices
> get assigned an incorrect IRQ and so the interrupt count never
> increases. This was tested with the 82546GB based dual port E1000
> PCI-X NIC which uses two distinct IRQ lines on the one card.
>
> root@localhost:/root> cat /proc/interrupts | grep eth
> 17:         78   IPIC   Level     eth1
> 48:      27121   IPIC   Level     eth0
>
> Signed-off-by: Liang Li <liang.li@windriver.com>
> Signed-off-by: Yang Shi <yang.shi@windriver.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> arch/powerpc/boot/dts/sbc8349.dts |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)


applied to next

- k

Patch

diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index b83036a..0dc90f9 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -310,10 +310,10 @@ 
 		interrupt-map = <
 
 				/* IDSEL 0x11 */
-				 0x8800 0x0 0x0 0x1 &ipic 20 0x8
-				 0x8800 0x0 0x0 0x2 &ipic 21 0x8
-				 0x8800 0x0 0x0 0x3 &ipic 22 0x8
-				 0x8800 0x0 0x0 0x4 &ipic 23 0x8>;
+				 0x8800 0x0 0x0 0x1 &ipic 48 0x8
+				 0x8800 0x0 0x0 0x2 &ipic 17 0x8
+				 0x8800 0x0 0x0 0x3 &ipic 18 0x8
+				 0x8800 0x0 0x0 0x4 &ipic 19 0x8>;
 
 		interrupt-parent = <&ipic>;
 		interrupts = <0x42 0x8>;