From patchwork Thu Jul 2 03:39:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitay Isaacs X-Patchwork-Id: 1320955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49y3kh4blQz9sRN for ; Thu, 2 Jul 2020 13:39:56 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.a=rsa-sha256 header.s=201707 header.b=lLJwOJQi; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49y3kh3h61zDqsl for ; Thu, 2 Jul 2020 13:39:56 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49y3kF4qSMzDqlP for ; Thu, 2 Jul 2020 13:39:33 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.a=rsa-sha256 header.s=201707 header.b=lLJwOJQi; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49y3kF2YT3z9sQt; Thu, 2 Jul 2020 13:39:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1593661173; bh=R3TGTVlz4wyf+LbZerFxJrREutPF2Tg2yMoQ/V5gZ9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lLJwOJQiGGOMYtqAw4RnVJ3rHLI2ey6bphBiIX7xi2hD2sbJjEsyIbQP4tPv7SlND GFEzjXZ5CV2N3ldnPdpSy/ROL/7UqWaVG65zGJxyh7HrcwkNvZ/ZUPgnYPvaCpUxUp 40MUTeX3rNAtrmDdNVfv83PBDeuSYJcPeoJit/+qaPREREcSunUI6Vc/JjArZq0n3b Zc+gNPNtKNjdWU83Ohis6d48pXMdOvtS36jZF/oeEnslYzyVPIuNf2QKkA0ERqGzf8 FEo32EEv/dkDfnozF6oQXevuPPLhxFfTanHu+vbjLGxS0B8XvKjNvv1kgB9nvFVBDs Jwd54ruWjP22g== From: Amitay Isaacs To: pdbg@lists.ozlabs.org Date: Thu, 2 Jul 2020 13:39:03 +1000 Message-Id: <20200702033918.708013-5-amitay@ozlabs.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200702033918.708013-1-amitay@ozlabs.org> References: <20200702033918.708013-1-amitay@ozlabs.org> MIME-Version: 1.0 Subject: [Pdbg] [PATCH 04/19] libpdbg: Add auto-detection for SBEFIFO backend X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 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: Amitay Isaacs Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" Signed-off-by: Amitay Isaacs --- libpdbg/dtb.c | 57 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c index 2ec89e0..c80842f 100644 --- a/libpdbg/dtb.c +++ b/libpdbg/dtb.c @@ -256,6 +256,47 @@ static void bmc_target(struct pdbg_dtb *dtb) } } +static void sbefifo_target(struct pdbg_dtb *dtb) +{ + uint32_t chip_id = 0; + + if (pdbg_backend_option) { + if (!strcmp(pdbg_backend_option, "p9")) { + if (!dtb->backend.fdt) + dtb->backend.fdt = &_binary_bmc_sbefifo_dtb_o_start; + if (!dtb->system.fdt) + dtb->system.fdt = &_binary_p9_dtb_o_start; + } else { + pdbg_log(PDBG_ERROR, "Invalid system type %s\n", pdbg_backend_option); + pdbg_log(PDBG_ERROR, "Use 'p9'\n"); + } + + return; + } + + if (!get_chipid(&chip_id)) + return; + + switch(chip_id) { + case CHIP_ID_P9: + case CHIP_ID_P9P: + pdbg_log(PDBG_INFO, "Found a POWER9 OpenBMC based system\n"); + if (!dtb->backend.fdt) + dtb->backend.fdt = &_binary_bmc_sbefifo_dtb_o_start; + if (!dtb->system.fdt) + dtb->system.fdt = &_binary_p9_dtb_o_start; + break; + + case CHIP_ID_P8: + case CHIP_ID_P8P: + pdbg_log(PDBG_ERROR, "SBEFIFO backend not supported on POWER8/8+ OpenBMC based system\n"); + break; + + default: + pdbg_log(PDBG_ERROR, "Unrecognised Chip ID register 0x%08" PRIx32 "\n", chip_id); + } +} + /* Opens a dtb at the given path */ static void mmap_dtb(const char *file, bool readonly, struct pdbg_mfile *mfile) { @@ -426,21 +467,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) break; case PDBG_BACKEND_SBEFIFO: - if (!pdbg_backend_option) { - pdbg_log(PDBG_ERROR, "No system type specified\n"); - pdbg_log(PDBG_ERROR, "Use p9\n"); - return NULL; - } - - if (!strcmp(pdbg_backend_option, "p9")) { - if (!dtb->backend.fdt) - dtb->backend.fdt = &_binary_bmc_sbefifo_dtb_o_start; - if (!dtb->system.fdt) - dtb->system.fdt = &_binary_p9_dtb_o_start; - } else { - pdbg_log(PDBG_ERROR, "Invalid system type %s\n", pdbg_backend_option); - pdbg_log(PDBG_ERROR, "Use p9\n"); - } + sbefifo_target(dtb); break; default: