MPC8308: Fixup clocks in PCI Host configuration

PATCH Superseded Barry Grussling 5 participants 10 messages Jan 8, 2013 – Jan 18, 2013 PowerPC

Share & tools

Barry Grussling

author

2013-01-08 18:24 UTC #0 lore raw

PATCH 1/1 MPC8308: Fixup clocks in PCI Host configuration

While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the CONFIG_83XX_CLKIN and is not a PCI client, I end up with 0xdeadbeef and hosed clock values.

This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.

Signed-off-by Barry Grussling <[email protected]>

---
 arch/powerpc/cpu/mpc83xx/speed.c |    4 ++++
 1 file changed, 4 insertions(+)

arch/powerpc/cpu/mpc83xx/speed.c +4 -0

index b8c05d1..6f715ea 100644
@@ -160,6 +160,10 @@ int get_clocks(void)
 	} else {
 #if defined(CONFIG_83XX_PCICLK)
 		pci_sync_in = CONFIG_83XX_PCICLK;
+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+	/* 8308 doesn't have the HRCWH_PCI_HOST, but should 
+	 * run off the CONFIG_83XX_CLKIN */
+		pci_sync_in = CONFIG_83XX_CLKIN / (1 + clkin_div);
 #else
 		pci_sync_in = 0xDEADBEEF;
 #endif

Signature · 1 line

1.7.9.5

Kim Phillips

2013-01-09 01:18 UTC #1 lore raw

PATCH 1/1 MPC8308: Fixup clocks in PCI Host configuration

Quoted 9 lines · On Tue, 8 Jan 2013 10:24:05 -0800 Barry Grussling <[email protected]> wrote:

While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the

I don't have an 8308 and nothing relevant shows up in the errata, so modulo modifying the rcwh read with an i/o accessor (in_be32) and it still failing, we ought to amend the comment with this new info.

cc'ing Ilya, in case he can test on his 8308.

arch/powerpc/cpu/mpc83xx/speed.c int get_clocks(void) · line 166

Quoted 4 lines

arch/powerpc/cpu/mpc83xx/speed.c +4 -0

+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+	/* 8308 doesn't have the HRCWH_PCI_HOST, but should 
+	 * run off the CONFIG_83XX_CLKIN */
+		pci_sync_in = CONFIG_83XX_CLKIN / (1 + clkin_div);

/*
* this is the correct multi-line comment
* style
*/

also align comment and code, and omit trailing whitespace:

ERROR: trailing whitespace
#119: FILE: arch/powerpc/cpu/mpc83xx/speed.c:164:
+^I/* 8308 doesn't have the HRCWH_PCI_HOST, but should $

Thanks,

Kim

Barry Grussling

author

2013-01-09 02:25 UTC #2 lore raw

PATCH v2 1/1 MPC8308: Fixup clocks in PCI Host configuration

This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.

Signed-off-by Barry Grussling <[email protected]>

---
Changes since V1:
* Fix multi-line comment style
* Remove trailing whitespace
* Align comment
- All per Kim Phillips recommendation

* Verified output of checkpatch.pl clean now that I know about checkpatch.pl :-)

---
 arch/powerpc/cpu/mpc83xx/speed.c |    6 ++++++
 1 file changed, 6 insertions(+)

arch/powerpc/cpu/mpc83xx/speed.c +6 -0

index b8c05d1..8816d71 100644
@@ -160,6 +160,12 @@ int get_clocks(void)
 	} else {
 #if defined(CONFIG_83XX_PCICLK)
 		pci_sync_in = CONFIG_83XX_PCICLK;
+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+		/*
+		 * 8308 doesn't have the HRCWH_PCI_HOST, but should
+		 * run off the CONFIG_83XX_CLKIN
+		 */
+		pci_sync_in = CONFIG_83XX_CLKIN / (1 + clkin_div);
 #else
 		pci_sync_in = 0xDEADBEEF;
 #endif

Signature · 1 line

1.7.9.5

Kim Phillips

2013-01-15 00:59 UTC #3 lore raw

PATCH v2 1/1 MPC8308: Fixup clocks in PCI Host configuration

Quoted 12 lines · On Tue, 8 Jan 2013 18:25:11 -0800 Barry Grussling <[email protected]> wrote:

While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the CONFIG_83XX_CLKIN and is not a PCI client, I end up with 0xdeadbeef and hosed clock values.

Quoted 6 lines

This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.
Signed-off-by Barry Grussling <[email protected]>
---

can I get an ack from someone else with an 8308 here please? This custom board fix has the possibility of bricking all existing 8308 based mainline boards.

Thanks,

Kim

Gerlando Falauto

2013-01-15 07:15 UTC #4 lore raw

PATCH v2 1/1 MPC8308: Fixup clocks in PCI Host configuration

Quoted 7 lines · Kim Phillips

Quoted 1 line · On Tue, 8 Jan 2013 18:25:11 -0800 Barry Grussling<[email protected]> wrote:
---
can I get an ack from someone else with an 8308 here please? This custom board fix has the possibility of bricking all existing 8308 based mainline boards.

Sorry, we only have an 8309 board here - which I understand would not be affected by this patch anyway.

Regards,
Gerlando

Ira W. Snyder

2013-01-15 19:39 UTC #5 lore raw

PATCH v2 1/1 MPC8308: Fixup clocks in PCI Host configuration

In reply to Kim Phillips

Quoted 22 lines · Kim Phillips

Quoted 12 lines · On Tue, 8 Jan 2013 18:25:11 -0800 Barry Grussling <[email protected]> wrote:
While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the CONFIG_83XX_CLKIN and is not a PCI client, I end up with 0xdeadbeef and hosed clock values.
Quoted 6 lines
This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.
Signed-off-by Barry Grussling <[email protected]>
---

Quoted 8 lines

can I get an ack from someone else with an 8308 here please? This custom board fix has the possibility of bricking all existing 8308 based mainline boards.
Thanks,
Kim

Hi Kim, Barry,

I have an MPC8308RDB board, which is reported by U-Boot as:

CPU:   e300c3, MPC8308, Rev: 1.0 at 400 MHz, CSB: 133.333 MHz
Board: Freescale MPC8308RDB Rev 1.0

Barry: what does your board report as it boots up? Is it a newer version of the MPC8308 chip? Can you also dump the registers shown below? Use "md e0000900 4" to dump them. Also, please send me the output of "hexdump -C u-boot.bin | head" for your U-Boot image.

Dumping the HRCWH register, I get the value a0606c00. => md e0000900 4
e0000900: 44060000 a0606c00 00000000 00000000 D....`l.........

So on my board, the HRCWH_PCI_HOST bit *is* latched just fine. The Freescale manual says the HRCWH register doesn't have this bit, but the comments in include/configs/MPC8308RDB.h say that it must be set for the board to work correctly.

The MPC8308RDB is a standalone board, and does not define CONFIG_83XX_PCICLK. Since the HRCWH_PCI_HOST bit was latched, my U-Boot takes the first branch in the "if (im->reset.rcwh & HRCWH_PCI_HOST) {" path, and continues to work as normal.

In conclusion, the patch doesn't break my board. But I don't know why Barry's board needs the patch.

Ira

Kim Phillips

2013-01-18 00:48 UTC #6 lore raw

PATCH v2 1/1 MPC8308: Fixup clocks in PCI Host configuration

Quoted 52 lines · On Tue, 15 Jan 2013 11:39:51 -0800 "Ira W. Snyder" <[email protected]> wrote:

Quoted 22 lines · Kim Phillips
Quoted 12 lines · On Tue, 8 Jan 2013 18:25:11 -0800 Barry Grussling <[email protected]> wrote:
While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the CONFIG_83XX_CLKIN and is not a PCI client, I end up with 0xdeadbeef and hosed clock values.
Quoted 6 lines
This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.
Signed-off-by Barry Grussling <[email protected]>
---
Quoted 8 lines
can I get an ack from someone else with an 8308 here please? This custom board fix has the possibility of bricking all existing 8308 based mainline boards.
Thanks,
Kim
Hi Kim, Barry,
I have an MPC8308RDB board, which is reported by U-Boot as:
CPU:   e300c3, MPC8308, Rev: 1.0 at 400 MHz, CSB: 133.333 MHz
Board: Freescale MPC8308RDB Rev 1.0
Barry: what does your board report as it boots up? Is it a newer version of the MPC8308 chip? Can you also dump the registers shown below? Use "md e0000900 4" to dump them. Also, please send me the output of "hexdump -C u-boot.bin | head" for your U-Boot image.
Dumping the HRCWH register, I get the value a0606c00. => md e0000900 4
e0000900: 44060000 a0606c00 00000000 00000000 D....`l.........
So on my board, the HRCWH_PCI_HOST bit *is* latched just fine. The Freescale manual says the HRCWH register doesn't have this bit, but the comments in include/configs/MPC8308RDB.h say that it must be set for the board to work correctly.

Quoted 7 lines

The MPC8308RDB is a standalone board, and does not define CONFIG_83XX_PCICLK. Since the HRCWH_PCI_HOST bit was latched, my U-Boot takes the first branch in the "if (im->reset.rcwh & HRCWH_PCI_HOST) {" path, and continues to work as normal.
In conclusion, the patch doesn't break my board. But I don't know why Barry's board needs the patch.

Thanks for taking a look at this, Ira.

Barry, can you post your custom board support code? Does it set HRCWH_PCI_HOST in the RCW in flash? Can you confirm the RCW is being read from flash correctly?

Kim

Barry Grussling

author

2013-01-09 02:29 UTC #7 lore raw

PATCH 1/1 MPC8308: Fixup clocks in PCI Host configuration

In reply to Kim Phillips

Quoted 5 lines

I don't have an 8308 and nothing relevant shows up in the errata, so modulo modifying the rcwh read with an i/o accessor (in_be32) and it still failing, we ought to amend the comment with this new info.
cc'ing Ilya, in case he can test on his 8308.

Sounds good to have more testing. I am not sure how the u-boot is working on 8308s right now :-(

Quoted 11 lines

arch/powerpc/cpu/mpc83xx/speed.c int get_clocks(void) · line 166
Quoted 5 lines
arch/powerpc/cpu/mpc83xx/speed.c +4 -0
+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+     /* 8308 doesn't have the HRCWH_PCI_HOST, but should
+      * run off the CONFIG_83XX_CLKIN */
+             pci_sync_in = CONFIG_83XX_CLKIN / (1 + clkin_div);
/*
* this is the correct multi-line comment
* style
*/

Quoted 5 lines

also align comment and code, and omit trailing whitespace:
ERROR: trailing whitespace
#119: FILE: arch/powerpc/cpu/mpc83xx/speed.c:164:
+^I/* 8308 doesn't have the HRCWH_PCI_HOST, but should $

Sent out a new version with this stuff fixed. Sorry for the newbie errors. I found checkpatch.pl and made my new patch clean.

Thanks,

Barry

Wolfgang Denk

2013-01-09 20:15 UTC #8 lore raw

PATCH 1/1 MPC8308: Fixup clocks in PCI Host configuration

In reply to Barry Grussling

Dear Barry Grussling,

Quoted 12 lines · In message <[email protected]> you wrote:

While trying to bring up a custom MPC8308 based board I found that the clocking was wrong. The comment in include/configs/mpc8308_p1m.h led me to believe
setting HRCWH_PCI_HOST and HRCWH_PCI1_ARBITER_ENABLE in the CONFIG_SYS_HRCW_HIGH should allow the system to work, but on my newer version of the 8308 this is not working. Setting the HRCWH_PCI_HOST bit (which doesn't exist according to the manual) doesn't latch, and as such the im->reset.rcwh & HRCWH_PCI_HOST test in speed.c fails. Since this board is running off the CONFIG_83XX_CLKIN and is not a PCI client, I end up with 0xdeadbeef and hosed clock values.

Quoted 2 lines

This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.

You say this patchis working on "your newer version of the 8308". Can you please be specific what "old" and "new" actually means here?

And has this patch been tested to also work on the "old" versions of the 8308?

arch/powerpc/cpu/mpc83xx/speed.c int get_clocks(void) · line 165

Quoted 3 lines

arch/powerpc/cpu/mpc83xx/speed.c +3 -0

+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+	/* 8308 doesn't have the HRCWH_PCI_HOST, but should 
+	 * run off the CONFIG_83XX_CLKIN */

Incorrect multiline comment style.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"May your future be limited only by your dreams."
- Christa McAuliffe

Barry Grussling

author

2013-01-10 04:13 UTC #9 lore raw

PATCH 1/1 MPC8308: Fixup clocks in PCI Host configuration

Quoted 5 lines

Quoted 2 lines
This patch allows for proper clocks on the 8308 as a workaround for the lack of HRCWH_PCI_HOST support.
You say this patchis working on "your newer version of the 8308". Can you please be specific what "old" and "new" actually means here?

Not exactly unfortunately. On the 8308s I currently have u-boot doesn't work without this patch. I believe before on the 8308 development board I had the PCI_HOST bit of the HRCW_HIGH would latch when set in the #define for CONFIG_SYS_HRCW_HIGH. I don't have the old development board any more, and my new board doesn't appear to latch that bit. I also don't know what rev of the microprocessor the old one was.

It is entirely possible some other change was made and this is a manifestation of that change instead (I was playing around with the 8308 development board in the u-boot 1.3.0 timeframe).

Quoted 2 lines

And has this patch been tested to also work on the "old" versions of the 8308?

No. Don't have the old test board anymore. As such, I have only verified it on the custom board I have currently. I did try playing with the CONFIG_SYS_HRCW_HIGH and setting the PCI_HOST bit
in my current board but that didn't fix it.

Out of curiousity, does anyone have one of the 8308_p1m and is the current u-boot booting on it? I can't figure out why it would work on the p1m and not my board.

Quoted 6 lines

arch/powerpc/cpu/mpc83xx/speed.c int get_clocks(void) · line 165
Quoted 4 lines
arch/powerpc/cpu/mpc83xx/speed.c +3 -0
+#elif defined(CONFIG_83XX_CLKIN) && defined(CONFIG_MPC8308)
+     /* 8308 doesn't have the HRCWH_PCI_HOST, but should
+      * run off the CONFIG_83XX_CLKIN */
Incorrect multiline comment style.

Yea. Sorry about that. Fixed in V2 patch.

Thanks!

Barry