From patchwork Fri Jul 17 12:27:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Denk X-Patchwork-Id: 29913 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 580DDB7EFA for ; Fri, 17 Jul 2009 22:27:22 +1000 (EST) Received: by ozlabs.org (Postfix) id 4DD5DDDD1B; Fri, 17 Jul 2009 22:27:22 +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 D5AD0DDD0B for ; Fri, 17 Jul 2009 22:27:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934490AbZGQM1L (ORCPT ); Fri, 17 Jul 2009 08:27:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934488AbZGQM1L (ORCPT ); Fri, 17 Jul 2009 08:27:11 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:50152 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934466AbZGQM1K (ORCPT ); Fri, 17 Jul 2009 08:27:10 -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 1268D1C00230; Fri, 17 Jul 2009 14:27:10 +0200 (CEST) Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id 02A08902D4; Fri, 17 Jul 2009 14:27:10 +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 JeXXyT5D-xKK; Fri, 17 Jul 2009 14:27:08 +0200 (CEST) X-Auth-Info: dX6tDkbRQNUkxe/I3/PSiWZbEQkauCnEd7nYm6QrCSw= 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; Fri, 17 Jul 2009 14:27:08 +0200 (CEST) Received: from gemini.denx.de (gemini.denx.de [10.0.0.2]) by diddl.denx.de (Postfix) with ESMTP id 77F57C913181; Fri, 17 Jul 2009 14:27:08 +0200 (CEST) Received: by gemini.denx.de (Postfix, from userid 500) id 66AE5832E425; Fri, 17 Jul 2009 14:27:08 +0200 (CEST) From: Wolfgang Denk To: linuxppc-dev@ozlabs.org Cc: Wolfgang Denk , Grant Likely , Kumar Gala , Subject: [PATCH 2/2 v3] MPC52xx FEC: be more conservative when setting MII_SPEED register Date: Fri, 17 Jul 2009 14:27:08 +0200 Message-Id: <1247833628-15952-2-git-send-email-wd@denx.de> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1247780546-4426-1-git-send-email-wd@denx.de> References: <1247780546-4426-1-git-send-email-wd@denx.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds error checking and prevents clobbering unrelated bits (reserved bits or the DIS_PREAMBLE bit) when writing the MII_SPEED register on MPC52xx systems. Signed-off-by: Wolfgang Denk Cc: Grant Likely Cc: Kumar Gala Cc: --- v3: - use maximum divider in case MPC512x IPS clock is unknown drivers/net/fec_mpc52xx.c | 2 +- drivers/net/fec_mpc52xx_phy.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index cc78633..b69d440 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c @@ -639,7 +639,7 @@ static void mpc52xx_fec_hw_init(struct net_device *dev) /* set phy speed. * this can't be done in phy driver, since it needs to be called * before fec stuff (even on resume) */ - out_be32(&fec->mii_speed, priv->mdio_speed); + clrsetbits_be32(&fec->mii_speed, 0x7E, priv->mdio_speed); } /** diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 31e6d62..d3537e1 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c @@ -70,7 +70,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, struct mpc52xx_fec_mdio_priv *priv; struct resource res = {}; int err; - int i; + int i, clock, speed; bus = mdiobus_alloc(); if (bus == NULL) @@ -105,8 +105,25 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, dev_set_drvdata(dev, bus); /* set MII speed */ - out_be32(&priv->regs->mii_speed, - ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1); + clock = mpc5xxx_get_bus_frequency(of->node); + if (!clock) { + /* Use maximum divider if clock is unknown */ + dev_err(&of->dev, "could not determine IPB clock\n"); + clock = 0x3F * 5000000; + } + + /* + * Scale for a MII clock <= 2.5 MHz + * Note that only 6 bits (25:30) are available for MII speed. + */ + speed = (clock + 4999999) / 5000000; + if (speed > 0x3F) { + speed = 0x3F; + dev_err(&of->dev, "MII clock (%d Hz) exceeds max (2.5 MHz)\n", + clock / speed); + } + + clrsetbits_be32(&priv->regs->mii_speed, 0x7E, speed << 1); err = of_mdiobus_register(bus, np); if (err)