From patchwork Wed Jul 15 15:18:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 29819 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8C099B7B68 for ; Thu, 16 Jul 2009 01:20:57 +1000 (EST) Received: by ozlabs.org (Postfix) id 7DCD7DDDA0; Thu, 16 Jul 2009 01:20:57 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 147E0DDD1C for ; Thu, 16 Jul 2009 01:20:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755350AbZGOPTU (ORCPT ); Wed, 15 Jul 2009 11:19:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755389AbZGOPTA (ORCPT ); Wed, 15 Jul 2009 11:19:00 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:36939 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755325AbZGOPS6 (ORCPT ); Wed, 15 Jul 2009 11:18:58 -0400 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id BDE641C15781; Wed, 15 Jul 2009 17:18:55 +0200 (CEST) Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id AEACD902D7; Wed, 15 Jul 2009 17:18:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from smtp-auth.mnet-online.de ([192.168.3.149]) by localhost (dynscan2.mnet-online.de [192.168.1.215]) (amavisd-new, port 10024) with ESMTP id UCb4oITiWlHf; Wed, 15 Jul 2009 17:18:53 +0200 (CEST) X-Auth-Info: xwrTSHiX4zaE2hm6ta1CcP1ARgBKcr53gL3g4yZi7nY= Received: from diddl.denx.de (ppp-88-217-54-40.dynamic.mnet-online.de [88.217.54.40]) by smtp-auth.mnet-online.de (Postfix) with ESMTP; Wed, 15 Jul 2009 17:18:53 +0200 (CEST) Received: from gemini.denx.de (unknown [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 9133EC913180; Wed, 15 Jul 2009 17:18:53 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id 69981832E416; Wed, 15 Jul 2009 17:18:53 +0200 (CEST) From: Wolfgang Denk To: linuxppc-dev@ozlabs.org Cc: Wolfgang Denk , Grant Likely , Kumar Gala , Subject: [PATCH 1/2 v3] fs_enet/mii-fec.c: fix MII speed calculation Date: Wed, 15 Jul 2009 17:18:52 +0200 Message-Id: <1247671133-12148-1-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1247578966-9847-1-git-send-email-wd@denx.de> References: <1247578966-9847-1-git-send-email-wd@denx.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MII speed calculation was based on the CPU clock (ppc_proc_freq), but for MPC512x we must use the bus clock instead. This patch makes it use the correct clock and makes sure we don't clobber reserved bits in the MII_SPEED register. Signed-off-by: Wolfgang Denk Cc: Grant Likely Cc: Kumar Gala Cc: --- Please ignore patch v2, it's crap. Hope this is a bit better. arch/powerpc/include/asm/mpc5xxx.h | 10 +++++++++ arch/powerpc/sysdev/mpc5xxx_clocks.c | 37 ++++++++++++++++++++++++++++++++++ drivers/net/fs_enet/mii-fec.c | 13 +++++++++-- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/mpc5xxx.h b/arch/powerpc/include/asm/mpc5xxx.h index 5ce9c5f..86ab29f 100644 --- a/arch/powerpc/include/asm/mpc5xxx.h +++ b/arch/powerpc/include/asm/mpc5xxx.h @@ -15,8 +15,18 @@ #ifndef __ASM_POWERPC_MPC5xxx_H__ #define __ASM_POWERPC_MPC5xxx_H__ +#include extern unsigned long mpc5xxx_get_bus_frequency(struct device_node *node); +#if defined(CONFIG_PPC_MPC512x) || defined(CONFIG_PPC_MPC52xx) +extern int mpc5xxx_get_mii_speed(struct of_device *ofdev); +#else +static inline int mpc5xxx_get_mii_speed(struct of_device *ofdev) +{ + return -1; +} +#endif + #endif /* __ASM_POWERPC_MPC5xxx_H__ */ diff --git a/arch/powerpc/sysdev/mpc5xxx_clocks.c b/arch/powerpc/sysdev/mpc5xxx_clocks.c index 34e12f9..e26d12b 100644 --- a/arch/powerpc/sysdev/mpc5xxx_clocks.c +++ b/arch/powerpc/sysdev/mpc5xxx_clocks.c @@ -31,3 +31,40 @@ mpc5xxx_get_bus_frequency(struct device_node *node) return p_bus_freq ? *p_bus_freq : 0; } EXPORT_SYMBOL(mpc5xxx_get_bus_frequency); + +/** + * mpc5xxx_get_mii_speed - Get the MII_SPEED value + * @node: device node + * + * Returns the MII_SPEED value for MPC512x and MPC52xx systems. + * The value gets computed such that the resulting MDC frequency + * is 2.5 MHz or lower. + */ + +int +mpc5xxx_get_mii_speed(struct of_device *ofdev) +{ + unsigned int clock, speed; + + clock = mpc5xxx_get_bus_frequency(ofdev->node); + + if (!clock) { + dev_err(&ofdev->dev, "could not determine IPS/IPB clock\n"); + return -ENODEV; + } + + /* scale for a MII clock <= 2.5 MHz */ + speed = (clock + 2499999) / 2500000; + + /* only 6 bits available for MII speed */ + if (speed > 0x3F) { + speed = 0x3F; + dev_err(&ofdev->dev, + "MII clock (%d MHz) exceeds max (2.5 MHz)\n", + clock / speed); + } + + /* Field is in bits 25:30 of MII_SPEED register */ + return speed << 1; +} +EXPORT_SYMBOL(mpc5xxx_get_mii_speed); diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index 75a0999..a28d39f 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "fs_enet.h" #include "fec.h" @@ -103,7 +104,6 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus) static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, const struct of_device_id *match) { - struct device_node *np = NULL; struct resource res; struct mii_bus *new_bus; struct fec_info *fec; @@ -133,13 +133,20 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, if (!fec->fecp) goto out_fec; - fec->mii_speed = ((ppc_proc_freq + 4999999) / 5000000) << 1; + if (of_device_is_compatible(ofdev->node, "fsl,mpc5121-fec-mdio")) { + i = mpc5xxx_get_mii_speed(ofdev); + if (i < 0) + goto out_unmap_regs; + fec->mii_speed = i; + } else { + fec->mii_speed = ((ppc_proc_freq + 4999999) / 5000000) << 1; + } setbits32(&fec->fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE); setbits32(&fec->fecp->fec_ecntrl, FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN); out_be32(&fec->fecp->fec_ievent, FEC_ENET_MII); - out_be32(&fec->fecp->fec_mii_speed, fec->mii_speed); + clrsetbits_be32(&fec->fecp->fec_mii_speed, 0x7E, fec->mii_speed); new_bus->phy_mask = ~0; new_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);