From patchwork Thu May 31 02:06:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 923101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40x9nl4zkHz9s1R for ; Thu, 31 May 2018 12:07:07 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40x9nl3Wr2zDrbS for ; Thu, 31 May 2018 12:07:07 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40x9nh12yJzDr30 for ; Thu, 31 May 2018 12:07:04 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 40x9ng5Wlpz9s08; Thu, 31 May 2018 12:07:03 +1000 (AEST) Received: by localhost.localdomain (Postfix, from userid 1000) id 83AE5EE7919; Thu, 31 May 2018 12:07:03 +1000 (AEST) From: Michael Neuling To: alistair@popple.id.au Date: Thu, 31 May 2018 12:06:58 +1000 Message-Id: <20180531020658.18869-1-mikey@neuling.org> X-Mailer: git-send-email 2.17.0 Subject: [Pdbg] [PATCH] Match core numbers to actual hardware on P8 X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pdbg@lists.ozlabs.org MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" This fixes the output of probe and threadstatus commands so that the core numbers match the hardware numbers. Signed-off-by: Michael Neuling --- p8-pib.dts.m4 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/p8-pib.dts.m4 b/p8-pib.dts.m4 index bdc02c5bcc..e5c34041ad 100644 --- a/p8-pib.dts.m4 +++ b/p8-pib.dts.m4 @@ -6,7 +6,7 @@ define(`CORE', `core@CORE_BASE($1) { #size-cells = <0x1>; compatible = "ibm,power8-core"; reg = <0x0 HEX(CORE_BASE($1)) 0xfffff>; - index = <0x$2>; + index = ; chtm@11000 { compatible = "ibm,power8-chtm"; reg = <0x0 0x11000 0xB>; @@ -29,18 +29,18 @@ define(`THREAD',`thread@THREAD_BASE($1) { index = ; }')dnl dnl -define(`PROC_CORES', `CORE(1, 0); -CORE(2, 1); -CORE(3, 2); -CORE(4, 3); -CORE(5, 4); -CORE(6, 5); -CORE(9, 6); -CORE(10, 7); -CORE(11, 8); -CORE(12, 9); -CORE(13, 10); -CORE(14, 11)')dnl +define(`PROC_CORES', `CORE(1, 1); +CORE(2, 2); +CORE(3, 3); +CORE(4, 4); +CORE(5, 5); +CORE(6, 6); +CORE(9, 9); +CORE(10, 10); +CORE(11, 11); +CORE(12, 12); +CORE(13, 13); +CORE(14, 14)')dnl adu@2020000 { compatible = "ibm,power8-adu";