From patchwork Thu Nov 15 03:53:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 199127 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 9C0BC2C049A for ; Thu, 15 Nov 2012 14:53:36 +1100 (EST) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 2598D2C0087; Thu, 15 Nov 2012 14:53:13 +1100 (EST) Received: by localhost.localdomain (Postfix, from userid 1000) id 0E165D47DA9; Thu, 15 Nov 2012 14:53:12 +1100 (EST) Received: from neuling.org (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 0C8C7D47D73; Thu, 15 Nov 2012 14:53:12 +1100 (EST) From: Michael Neuling To: Benjamin Herrenschmidt Subject: [PATCH] powerpc/pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET for POWER8 updates In-reply-to: <30008.1352442191@neuling.org> References: <1351661656-6986-1-git-send-email-mikey@neuling.org> <1351661656-6986-4-git-send-email-mikey@neuling.org> <30008.1352442191@neuling.org> Comments: In-reply-to Michael Neuling message dated "Fri, 09 Nov 2012 17:23:11 +1100." X-Mailer: MH-E 8.2; nmh 1.3; GNU Emacs 23.3.1 Date: Thu, 15 Nov 2012 14:53:12 +1100 Message-ID: <23719.1352951592@neuling.org> Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" In supporting POWER8 we added 16 bytes to the start of the ibm_architecture_vec, but forgot to add this to IBM_ARCH_VEC_NRCORES_OFFSET. This caused us to hit this warning in early boot: WARNING ! ibm_architecture_vec structure inconsistent: 805372128 This add this extra 16 bytes of offset. Signed-off-by: Michael Neuling diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 9ffb542..779f340 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -773,7 +773,7 @@ static unsigned char ibm_architecture_vec[] = { * must match by the macro below. Update the definition if * the structure layout changes. */ -#define IBM_ARCH_VEC_NRCORES_OFFSET 101 +#define IBM_ARCH_VEC_NRCORES_OFFSET 117 W(NR_CPUS), /* number of cores supported */ 0, 0,