From patchwork Wed Nov 12 00:06:46 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 8211 X-Patchwork-Delegate: jwboyer@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id B00ACDDF7D for ; Wed, 12 Nov 2008 11:07:10 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e35.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 776E3DDDDB for ; Wed, 12 Nov 2008 11:06:52 +1100 (EST) Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e35.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id mAC06C3m032182 for ; Tue, 11 Nov 2008 17:06:12 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id mAC06mot151424 for ; Tue, 11 Nov 2008 17:06:48 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id mAC06JVm006070 for ; Tue, 11 Nov 2008 17:06:19 -0700 Received: from localhost.localdomain (slate.austin.ibm.com [9.53.41.42]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id mAC06Job006038; Tue, 11 Nov 2008 17:06:19 -0700 MIME-Version: 1.0 Subject: [PATCH] [v3] powerpc/4xx: work around CHIP11 errata in a more PAGE_SIZE-friendly way X-Mercurial-Node: 700c59731cf97778d3a41e2d1a11237b8e627d5b Message-Id: <700c59731cf97778d3a4.1226448406@localhost.localdomain> Date: Tue, 11 Nov 2008 18:06:46 -0600 From: Hollis Blanchard To: dwg@au1.ibm.com, jwboyer@linux.vnet.ibm.com Cc: linuxppc-dev@ozlabs.org, kvm-ppc@vger.kernel.org, yanok@emcraft.com X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org The current CHIP11 errata truncates the device tree memory node, and subtracts (hardcoded) 4096 bytes. This breaks kernels with larger PAGE_SIZE, since the bootmem allocator assumes that total memory is a multiple of PAGE_SIZE. Instead, use a device tree memory reservation to reserve only the 256 bytes actually affected by the errata, leaving the total memory size unaltered. Signed-off-by: Hollis Blanchard Acked-by: David Gibson --- Changes from v2: - David pointed out I'd duplicated the fdt_add_mem_rsv() prototype, and that 4xx.c should directly include libfdt/libfdt.h instead. Using large pages results in a huge performance improvement for KVM, and this patch is required to make Ilya's large page patch work. David and/or Josh, please apply. diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c @@ -20,8 +20,9 @@ #include "ops.h" #include "reg.h" #include "dcr.h" +#include "libfdt/libfdt.h" -static unsigned long chip_11_errata(unsigned long memsize) +static void chip_11_errata(unsigned long memsize) { unsigned long pvr; @@ -31,13 +32,11 @@ static unsigned long chip_11_errata(unsi case 0x40000850: case 0x400008d0: case 0x200008d0: - memsize -= 4096; + fdt_add_mem_rsv(fdt, memsize - 256, 256); break; default: break; } - - return memsize; } /* Read the 4xx SDRAM controller to get size of system memory. */ @@ -53,7 +52,7 @@ void ibm4xx_sdram_fixup_memsize(void) memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); } - memsize = chip_11_errata(memsize); + chip_11_errata(memsize); dt_fixup_memory(0, memsize); } @@ -219,7 +218,7 @@ void ibm4xx_denali_fixup_memsize(void) bank = 4; /* 4 banks */ memsize = cs * (1 << (col+row)) * bank * dpath; - memsize = chip_11_errata(memsize); + chip_11_errata(memsize); dt_fixup_memory(0, memsize); } diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c --- a/arch/powerpc/boot/libfdt-wrapper.c +++ b/arch/powerpc/boot/libfdt-wrapper.c @@ -51,7 +51,7 @@ #define devp_offset_find(devp) (((int)(devp))-1) #define devp_offset(devp) (devp ? ((int)(devp))-1 : 0) -static void *fdt; +void *fdt; static void *buf; /* = NULL */ #define EXPAND_GRANULARITY 1024 diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h @@ -14,6 +14,7 @@ #include #include "types.h" #include "string.h" +#include "libfdt_env.h" #define COMMAND_LINE_SIZE 512 #define MAX_PATH_LEN 256 @@ -32,6 +33,9 @@ struct platform_ops { void * (*vmlinux_alloc)(unsigned long size); }; extern struct platform_ops platform_ops; + +/* The device tree itself. Should almost always be accessed via dt_ops. */ +extern void *fdt; /* Device Tree operations */ struct dt_ops {