From patchwork Thu Jun 25 06:25:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitay Isaacs X-Patchwork-Id: 1316739 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.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 49sqlb4BdKz9sSJ for ; Thu, 25 Jun 2020 16:26:03 +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=tQFww8AL; 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 49sqlZ4hPczDqk9 for ; Thu, 25 Jun 2020 16:26:02 +1000 (AEST) X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49sqlL5y11zDqgb for ; Thu, 25 Jun 2020 16:25:50 +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=tQFww8AL; 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 49sqlL1mF2z9sSJ; Thu, 25 Jun 2020 16:25:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1593066350; bh=yGtQPQBT7qISc4EQ3EfP18a6OPoF1M+JCaXyMttlKi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQFww8ALyO43SEsnuO81SQc5iyIG+ZQ+uUAfFcXeh2auFmEcyzL1m0otx1XsYTpLr 7yOb5swHhdwgaX9dWslsgAl1Ep+3ZhdSz8xqEzksIiBGr7bM291gS4drU+17bpyEyY ru3g4irl+8doFKbWzyLL+CHtcCjPHDIriJ3j6Y/K83aXTJDJzavMWPNNTYrUYvJQqH o0OaFm6L2+JdsIlx7+mOhc9lPDW0qrdPJuMNmKnCa8PRpHKxI/Se/QJSucp1kdQFyl A0JQzlHiNAY/fjI/RX1P9M9DOSpu8f+B0oKPjkbh6Vtey4TT+6rS6J42IF3W/zy1On K36eDU8Ujccdg== From: Amitay Isaacs To: pdbg@lists.ozlabs.org Date: Thu, 25 Jun 2020 16:25:44 +1000 Message-Id: <20200625062544.306406-2-amitay@ozlabs.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200625062544.306406-1-amitay@ozlabs.org> References: <20200625062544.306406-1-amitay@ozlabs.org> MIME-Version: 1.0 Subject: [Pdbg] [PATCH v2 2/2] libpdbg: Auto-detect using bmc_target() 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 | 56 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c index 3006cda..e66af94 100644 --- a/libpdbg/dtb.c +++ b/libpdbg/dtb.c @@ -255,6 +255,46 @@ static void bmc_target(struct pdbg_dtb *dtb) } } +static void sbefifo_target(struct pdbg_dtb *dtb) +{ + uint32_t chip_id; + + 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; + } + + chip_id = get_chipid(); + + 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) { @@ -425,21 +465,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: