From patchwork Tue Apr 14 02:47:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitay Isaacs X-Patchwork-Id: 1270059 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 491VrP5wtkz9sSG for ; Tue, 14 Apr 2020 13:11:33 +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=prDWT37U; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 491VrP3wL9zDqGW for ; Tue, 14 Apr 2020 13:11:33 +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 491VKb705yzDqL8 for ; Tue, 14 Apr 2020 12:48:19 +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=prDWT37U; 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 491VKW6492z9sT5; Tue, 14 Apr 2020 12:48:15 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1586832495; bh=TDGhFqJ6mrc95kJQVyPlRMYodTxYEt6oblf0rvkKx2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=prDWT37UD/9J4/H1W3uUrpcwp7KWY5sDDg/SnIl2j9931A7IFmM1pAblB704i31Ag DheQbBVejrgbb3bd6uccFQ1Z+JELqJ69e5/MkflxlEn78aSAIw038k7ojpYsjwWXkx jq6dVxe/CW6mQ7NyljIyYRpkh7IvLFFnnPq9uqqi2OWmJiazm1hqDcNaUVIYnWspLX UPJo+f1ZejrLFQUzDG0QrN62fuRO5RCv0F0WYjKwBfcN2OraiQSg+EMzVb1xPozQb6 PeRXfLAQH9qmSGGlgV/Vyr5EO1sEre3RAQ4VpYJzH92JEEle1SAVIxWz448V2yIaoA PQmvQ3jL0OEeA== From: Amitay Isaacs To: pdbg@lists.ozlabs.org Date: Tue, 14 Apr 2020 12:47:32 +1000 Message-Id: <20200414024750.20170-6-amitay@ozlabs.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200414024750.20170-1-amitay@ozlabs.org> References: <20200414024750.20170-1-amitay@ozlabs.org> MIME-Version: 1.0 Subject: [Pdbg] [PATCH 05/23] libpdbg: Backend device tree cannot be overriden 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" With drivers getting registered per backend, backend needs to be initialised before any device tree can be parsed. PDBG_BACKEND_DTB allowed to override backend device tree without specifying backend, which cannot work any more. To be able to dynamically update backend introduce PDBG_BACKEND and PDBG_BACKEND_OPTION variables instead of PDBG_BACKEND_DTB. Signed-off-by: Amitay Isaacs --- libpdbg/dtb.c | 32 ++++++++++++++++++++++--------- tests/test_p9_fapi_translation.sh | 2 +- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c index 70b7962..077bc62 100644 --- a/libpdbg/dtb.c +++ b/libpdbg/dtb.c @@ -234,7 +234,7 @@ static void bmc_target(struct pdbg_dtb *dtb) } /* Opens a dtb at the given path */ -static void mmap_dtb(char *file, bool readonly, struct pdbg_mfile *mfile) +static void mmap_dtb(const char *file, bool readonly, struct pdbg_mfile *mfile) { int fd; void *dtb; @@ -308,21 +308,36 @@ const char *pdbg_get_backend_option(void) struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) { struct pdbg_dtb *dtb = &pdbg_dtb; - char *fdt; + const char *fdt, *backend; dtb->backend.fdt = NULL; dtb->system.fdt = system_fdt; - fdt = getenv("PDBG_BACKEND_DTB"); - if (fdt) - mmap_dtb(fdt, false, &dtb->backend); - fdt = getenv("PDBG_DTB"); if (fdt) mmap_dtb(fdt, false, &dtb->system); - if (dtb->backend.fdt && dtb->system.fdt) - goto done; + backend = getenv("PDBG_BACKEND"); + if (backend) { + const char *arg; + + arg = getenv("PDBG_BACKEND_OPTION"); + + if (!strcmp(backend, "fsi")) + pdbg_set_backend(PDBG_BACKEND_FSI, arg); + else if (!strcmp(backend, "i2c")) + pdbg_set_backend(PDBG_BACKEND_I2C, arg); + else if (!strcmp(backend, "kernel")) + pdbg_set_backend(PDBG_BACKEND_KERNEL, arg); + else if (!strcmp(backend, "fake")) + pdbg_set_backend(PDBG_BACKEND_FAKE, arg); + else if (!strcmp(backend, "host")) + pdbg_set_backend(PDBG_BACKEND_HOST, arg); + else if (!strcmp(backend, "cronus")) + pdbg_set_backend(PDBG_BACKEND_CRONUS, arg); + else + pdbg_log(PDBG_ERROR, "Invalid backend '%s', ignoring\n", backend); + } if (!pdbg_backend) pdbg_backend = default_backend(); @@ -412,7 +427,6 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) break; } -done: return dtb; } diff --git a/tests/test_p9_fapi_translation.sh b/tests/test_p9_fapi_translation.sh index a5a09b1..9891d39 100755 --- a/tests/test_p9_fapi_translation.sh +++ b/tests/test_p9_fapi_translation.sh @@ -4,7 +4,7 @@ test_group "p9 fapi translation tests" -export PDBG_BACKEND_DTB=p9-kernel.dtb +export PDBG_BACKEND=kernel export PDBG_DTB=p9.dtb test_result 0 <