From patchwork Wed Oct 21 14:42:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Fontenot X-Patchwork-Id: 36595 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id AA72BB7EA3 for ; Thu, 22 Oct 2009 01:43:22 +1100 (EST) Received: by ozlabs.org (Postfix) id 43F8FB7BC6; Thu, 22 Oct 2009 01:43:16 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e36.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id D784BB7BC1 for ; Thu, 22 Oct 2009 01:43:15 +1100 (EST) Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id n9LEf7Mb024384 for ; Wed, 21 Oct 2009 08:41:07 -0600 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n9LEguum210030 for ; Wed, 21 Oct 2009 08:42:57 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n9LEgjlu021399 for ; Wed, 21 Oct 2009 08:42:46 -0600 Received: from [9.65.210.80] (sig-9-65-210-80.mts.ibm.com [9.65.210.80]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n9LEggbt021139 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 21 Oct 2009 08:42:44 -0600 Message-ID: <4ADF1DE1.2070303@austin.ibm.com> Date: Wed, 21 Oct 2009 09:42:41 -0500 From: Nathan Fontenot User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linuxppc-dev@ozlabs.org Subject: [PATCH 2/5 v4] move of_drconf_cell definition to prom.h References: <4ADF1C49.2030201@austin.ibm.com> In-Reply-To: <4ADF1C49.2030201@austin.ibm.com> Cc: linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 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@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Move the definition of the of_drconf_cell struct from numa.c to prom.h. This is needed so that we can parse the ibm,dynamic-memory device-tree property when DLPAR adding and removing memory. Signed-off-by: Nathan Fontenot Index: powerpc/arch/powerpc/include/asm/prom.h =================================================================== --- powerpc.orig/arch/powerpc/include/asm/prom.h 2009-10-19 11:56:51.000000000 -0500 +++ powerpc/arch/powerpc/include/asm/prom.h 2009-10-19 11:59:31.000000000 -0500 @@ -349,6 +349,18 @@ */ extern void __iomem *of_iomap(struct device_node *device, int index); +struct of_drconf_cell { + u64 base_addr; + u32 drc_index; + u32 reserved; + u32 aa_index; + u32 flags; +}; + +#define DRCONF_MEM_ASSIGNED 0x00000008 +#define DRCONF_MEM_AI_INVALID 0x00000040 +#define DRCONF_MEM_RESERVED 0x00000080 + /* * NB: This is here while we transition from using asm/prom.h * to linux/of.h Index: powerpc/arch/powerpc/mm/numa.c =================================================================== --- powerpc.orig/arch/powerpc/mm/numa.c 2009-10-19 11:56:51.000000000 -0500 +++ powerpc/arch/powerpc/mm/numa.c 2009-10-19 11:59:31.000000000 -0500 @@ -296,18 +296,6 @@ return result; } -struct of_drconf_cell { - u64 base_addr; - u32 drc_index; - u32 reserved; - u32 aa_index; - u32 flags; -}; - -#define DRCONF_MEM_ASSIGNED 0x00000008 -#define DRCONF_MEM_AI_INVALID 0x00000040 -#define DRCONF_MEM_RESERVED 0x00000080 - /* * Read the next lmb list entry from the ibm,dynamic-memory property * and return the information in the provided of_drconf_cell structure.