From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from farnsworth.org (xyzzy.farnsworth.org [65.39.95.219]) by ozlabs.org (Postfix) with SMTP id 754D6DDEC0 for ; Tue, 30 Oct 2007 09:39:03 +1100 (EST) From: "Dale Farnsworth" Date: Mon, 29 Oct 2007 15:39:01 -0700 To: "Luis R. Rodriguez" Subject: Re: [PATCH] pegasos_eth.c: Fix compile error over MV643XX_ defines Message-ID: <20071029223900.GA7097@xyzzy.farnsworth.org> References: <20071029212729.GA4074@pogo> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20071029212729.GA4074@pogo> Cc: Tzachi Perelstein , Jeff Garzik , netdev@vger.kernel.org, linuxppc-dev@ozlabs.org, Lennert Buytenhek List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, Oct 29, 2007 at 05:27:29PM -0400, Luis R. Rodriguez wrote: > This commit made an incorrect assumption: > -- > Author: Lennert Buytenhek > Date: Fri Oct 19 04:10:10 2007 +0200 > > mv643xx_eth: Move ethernet register definitions into private header > > Move the mv643xx's ethernet-related register definitions from > include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since > they aren't of any use outside the ethernet driver. > > Signed-off-by: Lennert Buytenhek > Acked-by: Tzachi Perelstein > Signed-off-by: Dale Farnsworth > -- > > arch/powerpc/platforms/chrp/pegasos_eth.c made use of a 3 defines there. > > mcgrof@pogo:~/devel/wireless-2.6$ git-describe > > v2.6.24-rc1-138-g0119130 > > This patch fixes this by internalizing 3 defines onto pegasos which are > simply no longer available elsewhere. Without this your compile will fail That compile failure was fixed in commit 30e69bf4cce16d4c2dcfd629a60fcd8e1aba9fee by Al Viro. However, as I examine that commit, I see that it defines offsets from the eth block in the chip, rather than the full chip registeri block as the Pegasos 2 code expects. So, I think it fixes the compile failure, but leaves the Pegasos 2 broken. Luis, do you have Pegasos 2 hardware? Can you (or anyone) verify that the following patch is needed for the Pegasos 2? Thanks, -Dale --------------------------------- mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2 In the mv643xx_eth driver, we now use offsets from the ethernet register block within the chip, but the pegasos 2 platform still needs offsets from the full chip's register base address. Signed-off-by: Dale Farnsworth --- include/linux/mv643xx_eth.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 8df230a..30e11aa 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -8,9 +8,9 @@ #define MV643XX_ETH_NAME "mv643xx_eth" #define MV643XX_ETH_SHARED_REGS 0x2000 #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 -#define MV643XX_ETH_BAR_4 0x220 -#define MV643XX_ETH_SIZE_REG_4 0x224 -#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x0290 +#define MV643XX_ETH_BAR_4 0x2220 +#define MV643XX_ETH_SIZE_REG_4 0x2224 +#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 struct mv643xx_eth_platform_data { int port_number;