From: Valentine Barshak <vbarshak@ru•mvista.com>
To: linuxppc-dev@ozlabs•org
Subject: [RFC][PATCH] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround
Date: Fri, 22 Feb 2008 22:24:45 +0300 [thread overview]
Message-ID: <20080222192445.GA26177@ru.mvista.com> (raw)
In-Reply-To: <1203634340.10422.203.camel@pasglop>
The PowerPC 440GX Taishan board fails to reset EMAC3 (reset timeout error)
and because of that it can't 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.
Signed-off-by: Valentine Barshak <vbarshak@ru•mvista.com>
---
drivers/net/ibm_newemac/core.c | 16 +++++++++++++++-
drivers/net/ibm_newemac/core.h | 8 ++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff -pruN linux-2.6.orig/drivers/net/ibm_newemac/core.c linux-2.6/drivers/net/ibm_newemac/core.c
--- linux-2.6.orig/drivers/net/ibm_newemac/core.c 2008-02-22 19:56:26.000000000 +0300
+++ linux-2.6/drivers/net/ibm_newemac/core.c 2008-02-22 20:38:47.000000000 +0300
@@ -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"
@@ -2323,6 +2325,10 @@ 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 */
+ if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
+ mtdcri(SDR0, SDR0_MFR, mfdcri(SDR0, SDR0_MFR) | SDR0_MFR_ECS);
+
/* Configure EMAC with defaults so we can at least use MDIO
* This is needed mostly for 440GX
*/
@@ -2355,6 +2361,11 @@ static int __devinit emac_init_phy(struc
if (!emac_mii_phy_probe(&dev->phy, i))
break;
}
+
+ /* Enable external clock source */
+ if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX))
+ mtdcri(SDR0, SDR0_MFR, mfdcri(SDR0, SDR0_MFR) & ~SDR0_MFR_ECS);
+
mutex_unlock(&emac_phy_map_lock);
if (i == 0x20) {
printk(KERN_WARNING "%s: can't find PHY!\n", np->full_name);
@@ -2480,8 +2491,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))
diff -pruN linux-2.6.orig/drivers/net/ibm_newemac/core.h linux-2.6/drivers/net/ibm_newemac/core.h
--- linux-2.6.orig/drivers/net/ibm_newemac/core.h 2008-02-21 16:45:36.000000000 +0300
+++ linux-2.6/drivers/net/ibm_newemac/core.h 2008-02-22 19:57:44.000000000 +0300
@@ -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 |
next prev parent reply other threads:[~2008-02-22 19:26 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 14:46 [RFC][PATCH] PowerPC 4xx: ibm_newemac 440GX phy clock workaround Valentine Barshak
2008-02-21 22:52 ` Benjamin Herrenschmidt
2008-02-22 19:15 ` Valentine Barshak
2008-02-22 20:51 ` Josh Boyer
2008-02-22 19:24 ` Valentine Barshak [this message]
2008-02-22 19:28 ` [RFC][PATCH] ibm_newemac: PowerPC 440EP/440GR EMAC PHY " Valentine Barshak
2008-02-22 20:49 ` Josh Boyer
2008-02-26 12:25 ` Valentine Barshak
2008-02-26 14:10 ` Steven A. Falco
2008-02-26 15:02 ` Josh Boyer
2008-02-28 7:54 ` Benjamin Herrenschmidt
2008-03-05 17:46 ` Valentine Barshak
2008-03-05 18:38 ` [PATCH] PowerPC 4xx: Add dcri_clrset() for locked read/modify/write functionality Valentine Barshak
2008-03-06 0:06 ` Benjamin Herrenschmidt
2008-03-06 1:12 ` Josh Boyer
2008-03-06 11:31 ` Valentine Barshak
2008-03-06 11:50 ` Benjamin Herrenschmidt
2008-03-06 13:37 ` [PATCH] PowerPC 4xx: Use dcri_clrset() for PCIe indirect dcr read/modify/write access Valentine Barshak
2008-03-06 14:08 ` Valentine Barshak
2008-03-06 14:34 ` Valentine Barshak
2008-03-06 13:41 ` [PATCH 1/2] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround Valentine Barshak
2008-03-24 23:21 ` Benjamin Herrenschmidt
2008-03-26 12:36 ` Josh Boyer
2008-03-06 13:43 ` [PATCH 2/2] ibm_newemac: PowerPC 440EP/440GR " Valentine Barshak
2008-03-24 23:22 ` Benjamin Herrenschmidt
2008-03-26 12:35 ` Josh Boyer
2008-03-27 13:50 ` Valentine Barshak
2008-03-27 13:53 ` Josh Boyer
2008-03-27 14:40 ` [PATCH 1/2] ibm_newemac: PowerPC 440GX " Valentine Barshak
2008-03-29 2:18 ` Jeff Garzik
2008-03-29 3:28 ` Benjamin Herrenschmidt
2008-03-29 3:30 ` Josh Boyer
2008-04-11 14:24 ` Josh Boyer
2008-04-12 20:28 ` Jeff Garzik
2008-04-12 20:47 ` Josh Boyer
2008-04-12 21:13 ` Jeff Garzik
2008-03-27 14:42 ` [PATCH 2/2] ibm_newemac: PowerPC 440EP/440GR " Valentine Barshak
2008-03-27 14:43 ` [PATCH] ibm_newemac: emac_tx_csum typo fix Valentine Barshak
2008-03-29 1:54 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080222192445.GA26177@ru.mvista.com \
--to=vbarshak@ru$(echo .)mvista.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox