* [PATCH 5/6] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
@ 2008-04-22 0:46 Benjamin Herrenschmidt
2008-06-13 12:43 ` Luis Machado
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2008-04-22 0:46 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, linuxppc-dev
From: Valentine Barshak <vbarshak@ru.mvista.com>
The PowerPC 440GX Taishan board fails to reset EMAC3 (reset timeout error)
if there's no link. Because of that it fails to find PHY chip. The older ibm_emac
driver had a workaround for that: the EMAC_CLK_INTERNAL/EMAC_CLK_EXTERNAL macros,
which toggle the Ethernet Clock Select bit in the SDR0_MFR register. This patch
does the same for "ibm,emac-440gx" compatible chips. The workaround forces
clock on -all- EMACs, so we select clock under global emac_phy_map_lock.
BenH: Made that #ifdef CONFIG_PPC_DCR_NATIVE for now as dcri_* stuff doesn't
exist for MMIO type DCRs like Cell. Some future rework & improvements of the
DCR infrastructure will make that cleaner but for now, this makes it work.
Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/net/ibm_newemac/core.c | 18 +++++++++++++++++-
drivers/net/ibm_newemac/core.h | 8 ++++++--
2 files changed, 23 insertions(+), 3 deletions(-)
--- linux-work.orig/drivers/net/ibm_newemac/core.c 2008-04-22 10:11:59.000000000 +1000
+++ linux-work/drivers/net/ibm_newemac/core.c 2008-04-22 10:31:18.000000000 +1000
@@ -43,6 +43,8 @@
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
+#include <asm/dcr.h>
+#include <asm/dcr-regs.h>
#include "core.h"
@@ -2333,6 +2335,11 @@ static int __devinit emac_init_phy(struc
dev->phy.mdio_read = emac_mdio_read;
dev->phy.mdio_write = emac_mdio_write;
+ /* Enable internal clock source */
+#ifdef CONFIG_PPC_DCR_NATIVE
+ if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
+ dcri_clrset(SDR0, SDR0_MFR, 0, SDR0_MFR_ECS);
+#endif
/* Configure EMAC with defaults so we can at least use MDIO
* This is needed mostly for 440GX
*/
@@ -2365,6 +2372,12 @@ static int __devinit emac_init_phy(struc
if (!emac_mii_phy_probe(&dev->phy, i))
break;
}
+
+ /* Enable external clock source */
+#ifdef CONFIG_PPC_DCR_NATIVE
+ if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
+ dcri_clrset(SDR0, SDR0_MFR, SDR0_MFR_ECS, 0);
+#endif
mutex_unlock(&emac_phy_map_lock);
if (i == 0x20) {
printk(KERN_WARNING "%s: can't find PHY!\n", np->full_name);
@@ -2490,8 +2503,11 @@ static int __devinit emac_init_config(st
}
/* Check EMAC version */
- if (of_device_is_compatible(np, "ibm,emac4"))
+ if (of_device_is_compatible(np, "ibm,emac4")) {
dev->features |= EMAC_FTR_EMAC4;
+ if (of_device_is_compatible(np, "ibm,emac-440gx"))
+ dev->features |= EMAC_FTR_440GX_PHY_CLK_FIX;
+ }
/* Fixup some feature bits based on the device tree */
if (of_get_property(np, "has-inverted-stacr-oc", NULL))
Index: linux-work/drivers/net/ibm_newemac/core.h
===================================================================
--- linux-work.orig/drivers/net/ibm_newemac/core.h 2008-04-22 10:06:31.000000000 +1000
+++ linux-work/drivers/net/ibm_newemac/core.h 2008-04-22 10:30:03.000000000 +1000
@@ -301,6 +301,10 @@ struct emac_instance {
* Set if we have new type STACR with STAOPC
*/
#define EMAC_FTR_HAS_NEW_STACR 0x00000040
+/*
+ * Set if we need phy clock workaround for 440gx
+ */
+#define EMAC_FTR_440GX_PHY_CLK_FIX 0x00000080
/* Right now, we don't quite handle the always/possible masks on the
@@ -312,8 +316,8 @@ enum {
EMAC_FTRS_POSSIBLE =
#ifdef CONFIG_IBM_NEW_EMAC_EMAC4
- EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR |
- EMAC_FTR_STACR_OC_INVERT |
+ EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR |
+ EMAC_FTR_STACR_OC_INVERT | EMAC_FTR_440GX_PHY_CLK_FIX |
#endif
#ifdef CONFIG_IBM_NEW_EMAC_TAH
EMAC_FTR_HAS_TAH |
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 5/6] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
2008-04-22 0:46 [PATCH 5/6] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround Benjamin Herrenschmidt
@ 2008-06-13 12:43 ` Luis Machado
0 siblings, 0 replies; 2+ messages in thread
From: Luis Machado @ 2008-06-13 12:43 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: netdev, jgarzik, linuxppc-dev
Did this show up on 2.6.26 recently? Or we're expecting it to show up a
bit later?
Thanks,
Luis
On Tue, 2008-04-22 at 10:46 +1000, Benjamin Herrenschmidt wrote:
> From: Valentine Barshak <vbarshak@ru.mvista.com>
>
> The PowerPC 440GX Taishan board fails to reset EMAC3 (reset timeout error)
> if there's no link. Because of that it fails to find PHY chip. The older ibm_emac
> driver had a workaround for that: the EMAC_CLK_INTERNAL/EMAC_CLK_EXTERNAL macros,
> which toggle the Ethernet Clock Select bit in the SDR0_MFR register. This patch
> does the same for "ibm,emac-440gx" compatible chips. The workaround forces
> clock on -all- EMACs, so we select clock under global emac_phy_map_lock.
>
> BenH: Made that #ifdef CONFIG_PPC_DCR_NATIVE for now as dcri_* stuff doesn't
> exist for MMIO type DCRs like Cell. Some future rework & improvements of the
> DCR infrastructure will make that cleaner but for now, this makes it work.
>
> Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> ---
> drivers/net/ibm_newemac/core.c | 18 +++++++++++++++++-
> drivers/net/ibm_newemac/core.h | 8 ++++++--
> 2 files changed, 23 insertions(+), 3 deletions(-)
>
> --- linux-work.orig/drivers/net/ibm_newemac/core.c 2008-04-22 10:11:59.000000000 +1000
> +++ linux-work/drivers/net/ibm_newemac/core.c 2008-04-22 10:31:18.000000000 +1000
> @@ -43,6 +43,8 @@
> #include <asm/io.h>
> #include <asm/dma.h>
> #include <asm/uaccess.h>
> +#include <asm/dcr.h>
> +#include <asm/dcr-regs.h>
>
> #include "core.h"
>
> @@ -2333,6 +2335,11 @@ static int __devinit emac_init_phy(struc
> dev->phy.mdio_read = emac_mdio_read;
> dev->phy.mdio_write = emac_mdio_write;
>
> + /* Enable internal clock source */
> +#ifdef CONFIG_PPC_DCR_NATIVE
> + if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
> + dcri_clrset(SDR0, SDR0_MFR, 0, SDR0_MFR_ECS);
> +#endif
> /* Configure EMAC with defaults so we can at least use MDIO
> * This is needed mostly for 440GX
> */
> @@ -2365,6 +2372,12 @@ static int __devinit emac_init_phy(struc
> if (!emac_mii_phy_probe(&dev->phy, i))
> break;
> }
> +
> + /* Enable external clock source */
> +#ifdef CONFIG_PPC_DCR_NATIVE
> + if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
> + dcri_clrset(SDR0, SDR0_MFR, SDR0_MFR_ECS, 0);
> +#endif
> mutex_unlock(&emac_phy_map_lock);
> if (i == 0x20) {
> printk(KERN_WARNING "%s: can't find PHY!\n", np->full_name);
> @@ -2490,8 +2503,11 @@ static int __devinit emac_init_config(st
> }
>
> /* Check EMAC version */
> - if (of_device_is_compatible(np, "ibm,emac4"))
> + if (of_device_is_compatible(np, "ibm,emac4")) {
> dev->features |= EMAC_FTR_EMAC4;
> + if (of_device_is_compatible(np, "ibm,emac-440gx"))
> + dev->features |= EMAC_FTR_440GX_PHY_CLK_FIX;
> + }
>
> /* Fixup some feature bits based on the device tree */
> if (of_get_property(np, "has-inverted-stacr-oc", NULL))
> Index: linux-work/drivers/net/ibm_newemac/core.h
> ===================================================================
> --- linux-work.orig/drivers/net/ibm_newemac/core.h 2008-04-22 10:06:31.000000000 +1000
> +++ linux-work/drivers/net/ibm_newemac/core.h 2008-04-22 10:30:03.000000000 +1000
> @@ -301,6 +301,10 @@ struct emac_instance {
> * Set if we have new type STACR with STAOPC
> */
> #define EMAC_FTR_HAS_NEW_STACR 0x00000040
> +/*
> + * Set if we need phy clock workaround for 440gx
> + */
> +#define EMAC_FTR_440GX_PHY_CLK_FIX 0x00000080
>
>
> /* Right now, we don't quite handle the always/possible masks on the
> @@ -312,8 +316,8 @@ enum {
>
> EMAC_FTRS_POSSIBLE =
> #ifdef CONFIG_IBM_NEW_EMAC_EMAC4
> - EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR |
> - EMAC_FTR_STACR_OC_INVERT |
> + EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR |
> + EMAC_FTR_STACR_OC_INVERT | EMAC_FTR_440GX_PHY_CLK_FIX |
> #endif
> #ifdef CONFIG_IBM_NEW_EMAC_TAH
> EMAC_FTR_HAS_TAH |
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
--
Luis Machado
Software Engineer
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-13 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-22 0:46 [PATCH 5/6] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround Benjamin Herrenschmidt
2008-06-13 12:43 ` Luis Machado
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).