From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: [PATCH 8/11] ibm_newemac: Correct opb_bus_freq value Date: Fri, 30 Nov 2007 16:40:31 +1100 Message-ID: <20071130054134.A4322DDE32@ozlabs.org> References: <1196401223.5661.297518056501.qpush@grosgo> Cc: , To: Return-path: Received: from ozlabs.org ([203.10.76.45]:48397 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814AbXK3Flf (ORCPT ); Fri, 30 Nov 2007 00:41:35 -0500 In-Reply-To: <1196401223.5661.297518056501.qpush@grosgo> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Valentine Barshak The EMAC4_MR1_OBCI(freq) macro expects freg in MHz, while opb_bus_freq is kept in Hz. Correct this. Signed-off-by: Valentine Barshak Signed-off-by: Benjamin Herrenschmidt --- 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 2007-11-23 21:27:57.000000000 +0300 +++ linux-2.6/drivers/net/ibm_newemac/core.c 2007-11-23 21:47:53.000000000 +0300 @@ -402,7 +402,7 @@ static u32 __emac_calc_base_mr1(struct e static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_size) { u32 ret = EMAC_MR1_VLE | EMAC_MR1_IST | EMAC4_MR1_TR | - EMAC4_MR1_OBCI(dev->opb_bus_freq); + EMAC4_MR1_OBCI(dev->opb_bus_freq / 1000000); DBG2(dev, "__emac4_calc_base_mr1" NL);