Skip to contentSkip to conversation

4xx: Fix Haleakala PCIe compatibility problem in dts

PATCH In review Stefan Roese 2 participants 4 messages Feb 20, 2008

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

PATCH 1/1 4xx: Fix Haleakala PCIe compatibility problem in dts

Since the 4xx PCIe driver checks for 405ex compatibility, the PCIe interface was not detected as it is currently defined as "405exr" compatible. This patch changes it to "405ex".

The 405EX and 405EXr are identical exept that the 2nd PCIe and the 2nd EMAC interfaces are missing.

---
 arch/powerpc/boot/dts/haleakala.dts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/boot/dts/haleakala.dts +1 -1
index 5dd3d15..ae68fef 100644
@@ -235,7 +235,7 @@
 			#interrupt-cells = <1>;
 			#size-cells = <2>;
 			#address-cells = <3>;
-			compatible = "ibm,plb-pciex-405exr", "ibm,plb-pciex";
+			compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
 			primary;
 			port = <0>; /* port number */
 			reg = <a0000000 20000000	/* Config space access */
Signature · 1 line
1.5.4.2
#1 lore raw
Quoted 6 lines · On Wed, 20 Feb 2008 11:45:58 +0100 Stefan Roese <[email protected]> wrote:

Since the 4xx PCIe driver checks for 405ex compatibility, the PCIe interface was not detected as it is currently defined as "405exr" compatible. This patch changes it to "405ex".

The 405EX and 405EXr are identical exept that the 2nd PCIe and the 2nd EMAC interfaces are missing.

Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex from 405exr and return the correct number of ports then? It unconditionally returns 2 today.

josh

#2 lore raw
Quoted 10 lines · Josh Boyer
Quoted 6 lines

Since the 4xx PCIe driver checks for 405ex compatibility, the PCIe interface was not detected as it is currently defined as "405exr" compatible. This patch changes it to "405ex".

The 405EX and 405EXr are identical exept that the 2nd PCIe and the 2nd EMAC interfaces are missing.

Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex from 405exr and return the correct number of ports then? It unconditionally returns 2 today.

Yes, this could be done. Right now it works because the 405EXr board (Haleakala) only instantiates one PCIe device in the dts.

A simple solution would be to just do a PVR check. Would this be acceptable?

Best regards,
Stefan

#3 lore raw
Quoted 11 lines · On Wed, 20 Feb 2008 14:16:53 +0100 Stefan Roese <[email protected]> wrote:
Quoted 6 lines
Quoted 2 lines

The 405EX and 405EXr are identical exept that the 2nd PCIe and the 2nd EMAC interfaces are missing.

Does ppc405ex_pciex_core_init need to grow some logic to detect 405ex from 405exr and return the correct number of ports then? It unconditionally returns 2 today.

Yes, this could be done. Right now it works because the 405EXr board (Haleakala) only instantiates one PCIe device in the dts.

A simple solution would be to just do a PVR check. Would this be acceptable?

Looking more at the code, it seems like it's really not needed. Essentially the only thing that is "wrong" is that we allocate an extra structure that goes unused.

As long as the DTS file doesn't list a second bogus port, things work fine. So I'm inclined to take your patch as-is.

josh