Re: [PATCH 3/3] powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
On Wed, Aug 18, 2010 at 02:31:42PM -0500, Timur Tabi wrote: > On Tue, Jun 8, 2010 at 2:55 PM, Anton Vorontsov wrote: > > The mpc85xx_mds_setup_arch() function is incomprehensible > > and unmaintainable. Factor out all QE specific stuff into > > mpc85xx_mds_qe_init() and mpc85xx_mds_reset_ucc_phys(). > > > > Also move QE stuff out of mpc85xx_mds_pic_init(). > > > > The diff is unreadable, but only because the code was so. ;-) > > It should be better now, and less indented. > > > > Signed-off-by: Anton Vorontsov > > --- > > This patch introduces breaks mpc85xx_smp_defconfig: > > CC arch/powerpc/platforms/85xx/mpc85xx_mds.o > arch/powerpc/platforms/85xx/mpc85xx_mds.c: In function > 'mpc85xx_mds_setup_arch': > arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: 'np' undeclared > (first use in this function) > arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: (Each undeclared > identifier is reported only once > arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: for each > function it appears in.) Thanks for the report, apparently I tested my patch without CONFIG_PCI... But the issue should be already fixed by powerpc/85xx: Fix compile error in mpc85xx_mds.c http://patchwork.ozlabs.org/patch/60933/ (Though, not in Linus' tree yet.) Thanks, -- Anton Vorontsov email: cbouatmai...@gmail.com irc://irc.freenode.net/bd2 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 3/3] powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
On Tue, Jun 8, 2010 at 2:55 PM, Anton Vorontsov wrote: > The mpc85xx_mds_setup_arch() function is incomprehensible > and unmaintainable. Factor out all QE specific stuff into > mpc85xx_mds_qe_init() and mpc85xx_mds_reset_ucc_phys(). > > Also move QE stuff out of mpc85xx_mds_pic_init(). > > The diff is unreadable, but only because the code was so. ;-) > It should be better now, and less indented. > > Signed-off-by: Anton Vorontsov > --- This patch introduces breaks mpc85xx_smp_defconfig: CC arch/powerpc/platforms/85xx/mpc85xx_mds.o arch/powerpc/platforms/85xx/mpc85xx_mds.c: In function 'mpc85xx_mds_setup_arch': arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: 'np' undeclared (first use in this function) arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: (Each undeclared identifier is reported only once arch/powerpc/platforms/85xx/mpc85xx_mds.c:367: error: for each function it appears in.) Frankly, I've been seeing a lot of build breaks with mpc85xx_[smp_]defconfig. I had a patch that added a p1022_ds_defconfig, but was told instead to update mpc85xx_[smp_]defconfig. However, it appears that no one is really testing mpc85xx_[smp_]defconfig, since there are now *two* failures (this one, and CONFIG_RAPIDIO) with these defconfig files. -- Timur Tabi Linux kernel developer at Freescale ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 3/3] powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
On Jun 8, 2010, at 2:55 PM, Anton Vorontsov wrote: > The mpc85xx_mds_setup_arch() function is incomprehensible > and unmaintainable. Factor out all QE specific stuff into > mpc85xx_mds_qe_init() and mpc85xx_mds_reset_ucc_phys(). > > Also move QE stuff out of mpc85xx_mds_pic_init(). > > The diff is unreadable, but only because the code was so. ;-) > It should be better now, and less indented. > > Signed-off-by: Anton Vorontsov > --- > arch/powerpc/platforms/85xx/mpc85xx_mds.c | 272 +++-- > 1 files changed, 143 insertions(+), 129 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 3/3] powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
The mpc85xx_mds_setup_arch() function is incomprehensible
and unmaintainable. Factor out all QE specific stuff into
mpc85xx_mds_qe_init() and mpc85xx_mds_reset_ucc_phys().
Also move QE stuff out of mpc85xx_mds_pic_init().
The diff is unreadable, but only because the code was so. ;-)
It should be better now, and less indented.
Signed-off-by: Anton Vorontsov
---
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 272 +++--
1 files changed, 143 insertions(+), 129 deletions(-)
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 9dadcff..c8be7b5 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -177,63 +177,89 @@ static void __init mpc85xx_publish_qe_devices(void)
of_platform_bus_probe(NULL, mpc85xx_qe_ids, NULL);
}
-#else
-static void __init mpc85xx_publish_qe_devices(void) { }
-#endif /* CONFIG_QUICC_ENGINE */
-static void __init mpc85xx_mds_setup_arch(void)
+static void __init mpc85xx_mds_reset_ucc_phys(void)
{
struct device_node *np;
- static u8 __iomem *bcsr_regs = NULL;
-#ifdef CONFIG_PCI
- struct pci_controller *hose;
-#endif
- dma_addr_t max = 0x;
-
- if (ppc_md.progress)
- ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
+ static u8 __iomem *bcsr_regs;
/* Map BCSR area */
np = of_find_node_by_name(NULL, "bcsr");
- if (np != NULL) {
- struct resource res;
+ if (!np)
+ return;
- of_address_to_resource(np, 0, &res);
- bcsr_regs = ioremap(res.start, res.end - res.start +1);
- of_node_put(np);
- }
+ bcsr_regs = of_iomap(np, 0);
+ of_node_put(np);
+ if (!bcsr_regs)
+ return;
-#ifdef CONFIG_PCI
- for_each_node_by_type(np, "pci") {
- if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
- of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
- struct resource rsrc;
- of_address_to_resource(np, 0, &rsrc);
- if ((rsrc.start & 0xf) == 0x8000)
- fsl_add_bridge(np, 1);
- else
- fsl_add_bridge(np, 0);
+ if (machine_is(mpc8568_mds)) {
+#define BCSR_UCC1_GETH_EN (0x1 << 7)
+#define BCSR_UCC2_GETH_EN (0x1 << 7)
+#define BCSR_UCC1_MODE_MSK (0x3 << 4)
+#define BCSR_UCC2_MODE_MSK (0x3 << 0)
- hose = pci_find_hose_for_OF_device(np);
- max = min(max, hose->dma_window_base_cur +
- hose->dma_window_size);
+ /* Turn off UCC1 & UCC2 */
+ clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+ clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+
+ /* Mode is RGMII, all bits clear */
+ clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
+BCSR_UCC2_MODE_MSK);
+
+ /* Turn UCC1 & UCC2 on */
+ setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+ setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
+ } else if (machine_is(mpc8569_mds)) {
+#define BCSR7_UCC12_GETHnRST (0x1 << 2)
+#define BCSR8_UEM_MARVELL_RST (0x1 << 1)
+#define BCSR_UCC_RGMII (0x1 << 6)
+#define BCSR_UCC_RTBI (0x1 << 5)
+ /*
+* U-Boot mangles interrupt polarity for Marvell PHYs,
+* so reset built-in and UEM Marvell PHYs, this puts
+* the PHYs into their normal state.
+*/
+ clrbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
+ setbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+
+ setbits8(&bcsr_regs[7], BCSR7_UCC12_GETHnRST);
+ clrbits8(&bcsr_regs[8], BCSR8_UEM_MARVELL_RST);
+
+ for (np = NULL; (np = of_find_compatible_node(np,
+ "network",
+ "ucc_geth")) != NULL;) {
+ const unsigned int *prop;
+ int ucc_num;
+
+ prop = of_get_property(np, "cell-index", NULL);
+ if (prop == NULL)
+ continue;
+
+ ucc_num = *prop - 1;
+
+ prop = of_get_property(np, "phy-connection-type", NULL);
+ if (prop == NULL)
+ continue;
+
+ if (strcmp("rtbi", (const char *)prop) == 0)
+ clrsetbits_8(&bcsr_regs[7 + ucc_num],
+ BCSR_UCC_RGMII, BCSR_UCC_RTBI);
}
+ } else if (machine_is(p1021_mds)) {
+#define BCSR11_ENET_MICRST (0x1 << 5)
+ /* Reset Micrel PHY */
+
