From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 82332740032 for ; Sat, 4 May 2024 21:32:44 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=rwpiCUM93BmiytXmdZbfb/8OelhMJI3LmZ+t3wEAyPw=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20240206; t=1714858363; v=1; b=jKNxyJWRzlzhYeDFJB5aozgr3AP7iHoZz1Offaqu4ziGqM7Wv9hv31dwy6TxVPzOCsIW7QjU UCp8F+3GeqZTcpGEKBZ9be722PhQvVXHRoBctEQOiiq7iBLPY2ls4GcsYbudJSxTAgwT8lvY7bU xOhtEAR1rYPg1/KZjdVeBVMauTRV2KUWnPBc9TGHJwGTSNkA0z1C9ysGgfJXHA1lMW98ueCku0u T4GruC8rvPpIh5HLFdoTKCGN1NCUifoUUjEcXgGEyQyYYzi2Xhm36u0Xie2Ia9xbDtAsN7F7r1A xWf+X6zr6gpAZKPh3nPjO0aA/m5NEJKwjVGMbDdZuZMQw== X-Received: by 127.0.0.2 with SMTP id 9GiAYY7687511x8J0P2M0kzW; Sat, 04 May 2024 14:32:43 -0700 X-Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.148.174]) by mx.groups.io with SMTP id smtpd.web10.6831.1714858359593017850 for ; Sat, 04 May 2024 14:32:39 -0700 X-Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 444LSExR026658; Sat, 4 May 2024 14:32:38 -0700 X-Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3xwjck8x88-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 04 May 2024 14:32:37 -0700 (PDT) X-Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 4 May 2024 14:32:36 -0700 X-Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Sat, 4 May 2024 14:32:36 -0700 X-Received: from MRVL-5Lp9he46Ey.marvell.com (unknown [10.193.11.115]) by maili.marvell.com (Postfix) with ESMTP id F24AF3F708C; Sat, 4 May 2024 14:32:35 -0700 (PDT) From: "Narinder Dhillon" To: CC: , , , , Narinder Dhillon Subject: [edk2-devel] [edk2-platforms PATCH v4 6/7] Silicon/Marvell: Command to dump device tree Date: Sat, 4 May 2024 14:32:29 -0700 Message-ID: <20240504213230.31976-7-ndhillon@marvell.com> In-Reply-To: <20240504213230.31976-1-ndhillon@marvell.com> References: <20240504213230.31976-1-ndhillon@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 8v2Rlzn9UvfTJxoJWknrNkenQh0u3xB_ X-Proofpoint-ORIG-GUID: 8v2Rlzn9UvfTJxoJWknrNkenQh0u3xB_ Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Sat, 04 May 2024 14:32:39 -0700 Resent-From: ndhillon@marvell.com Reply-To: devel@edk2.groups.io,ndhillon@marvell.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: UB2csOWspR4v3peG5APnlTYnx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=jKNxyJWR; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=marvell.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Narinder Dhillon This patch adds an EDK2 shell command to dump configuration device tree. Signed-off-by: Narinder Dhillon --- .../Marvell/Applications/DumpFdt/DumpFdt.c | 344 ++++++++++++++++++ .../Marvell/Applications/DumpFdt/DumpFdt.inf | 52 +++ .../Marvell/Applications/DumpFdt/DumpFdt.uni | 35 ++ 3 files changed, 431 insertions(+) create mode 100644 Silicon/Marvell/Applications/DumpFdt/DumpFdt.c create mode 100644 Silicon/Marvell/Applications/DumpFdt/DumpFdt.inf create mode 100644 Silicon/Marvell/Applications/DumpFdt/DumpFdt.uni diff --git a/Silicon/Marvell/Applications/DumpFdt/DumpFdt.c b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.c new file mode 100644 index 0000000000..7abfb62a2c --- /dev/null +++ b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.c @@ -0,0 +1,344 @@ +/** @file + + SPDX-License-Identifier: BSD-2-Clause-Patent + https://spdx.org/licenses + + Copyright (C) 2023 Marvell + + Copyright (c) 2015, ARM Ltd. All rights reserved.
+ +**/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define CMD_NAME_STRING L"dumpfdt" + +STATIC EFI_HII_HANDLE gShellDumpFdtHiiHandle = NULL; +STATIC VOID *mFdtBlobBase = NULL; +STATIC CONST CHAR16 gShellDumpFdtFileName[] = L"ShellCommands"; + +#define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) +#define PALIGN(p, a) ((void *)(ALIGN ((unsigned long)(p), (a)))) +#define GET_CELL(p) (p += 4, *((const uint32_t *)(p-4))) + +STATIC +UINTN +IsPrintableString ( + IN CONST VOID* data, + IN UINTN len + ) +{ + CONST CHAR8 *s = data; + CONST CHAR8 *ss; + + // Zero length is not + if (len == 0) { + return 0; + } + + // Must terminate with zero + if (s[len - 1] != '\0') { + return 0; + } + + ss = s; + while (*s/* && isprint (*s)*/) { + s++; + } + + // Not zero, or not done yet + if (*s != '\0' || (s + 1 - ss) < len) { + return 0; + } + + return 1; +} + +STATIC +VOID +PrintData ( + IN CONST CHAR8* data, + IN UINTN len + ) +{ + UINTN i; + CONST CHAR8 *p = data; + + // No data, don't print + if (len == 0) + return; + + if (IsPrintableString (data, len)) { + Print (L" = \"%a\"", (const char *)data); + } else if ((len % 4) == 0) { + Print (L" = <"); + for (i = 0; i < len; i += 4) { + Print (L"0x%08x%a", fdt32_to_cpu (GET_CELL (p)), i < (len - 4) ? " " : ""); + } + Print (L">"); + } else { + Print (L" = ["); + for (i = 0; i < len; i++) + Print (L"%02x%a", *p++, i < len - 1 ? " " : ""); + Print (L"]"); + } +} + +STATIC +VOID +DumpFdt ( + IN VOID* FdtBlob + ) +{ + struct fdt_header *bph; + UINT32 off_dt; + UINT32 off_str; + CONST CHAR8* p_struct; + CONST CHAR8* p_strings; + CONST CHAR8* p; + CONST CHAR8* s; + CONST CHAR8* t; + UINT32 tag; + UINTN sz; + UINTN depth; + UINTN shift; + UINT32 version; + + { + // Can 'memreserve' be printed by below code? + INTN num = fdt_num_mem_rsv (FdtBlob); + INTN i, err; + UINT64 addr = 0, size = 0; + + for (i = 0; i < num; i++) { + err = fdt_get_mem_rsv (FdtBlob, i, &addr, &size); + if (err) { + DEBUG ((DEBUG_ERROR, "Error (%d) : Cannot get memreserve section (%d)\n", err, i)); + } + else { + Print (L"/memreserve/ \t0x%lx \t0x%lx;\n", addr, size); + } + } + } + + depth = 0; + shift = 4; + + bph = FdtBlob; + off_dt = fdt32_to_cpu (bph->off_dt_struct); + off_str = fdt32_to_cpu (bph->off_dt_strings); + p_struct = (CONST CHAR8*)FdtBlob + off_dt; + p_strings = (CONST CHAR8*)FdtBlob + off_str; + version = fdt32_to_cpu (bph->version); + + p = p_struct; + while ((tag = fdt32_to_cpu (GET_CELL (p))) != FDT_END) { + if (tag == FDT_BEGIN_NODE) { + s = p; + p = PALIGN (p + AsciiStrLen (s) + 1, 4); + + if (*s == '\0') + s = "/"; + + Print (L"%*s%a {\n", depth * shift, L" ", s); + + depth++; + continue; + } + + if (tag == FDT_END_NODE) { + depth--; + + Print (L"%*s};\n", depth * shift, L" "); + continue; + } + + if (tag == FDT_NOP) { + /* Print (L"%*s// [NOP]\n", depth * shift, L" "); */ + continue; + } + + if (tag != FDT_PROP) { + Print (L"%*s ** Unknown tag 0x%08x\n", depth * shift, L" ", tag); + break; + } + sz = fdt32_to_cpu (GET_CELL (p)); + s = p_strings + fdt32_to_cpu (GET_CELL (p)); + if (version < 16 && sz >= 8) + p = PALIGN (p, 8); + t = p; + + p = PALIGN (p + sz, 4); + + Print (L"%*s%a", depth * shift, L" ", s); + PrintData (t, sz); + Print (L";\n"); + } +} + +STATIC +SHELL_STATUS +EFIAPI +ShellCommandRunDumpFdt ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + SHELL_STATUS ShellStatus; + EFI_STATUS Status; + + ShellStatus = SHELL_SUCCESS; + + Status = ShellInitialize (); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return SHELL_ABORTED; + } + + DumpFdt (mFdtBlobBase); + + return ShellStatus; +} + +/** + Return the file name of the help text file if not using HII. + + @return The string pointer to the file name. +**/ +STATIC +CONST CHAR16* +EFIAPI +ShellCommandGetManFileNameDumpFdt ( + VOID + ) +{ + return gShellDumpFdtFileName; +} + +/** + Install the FDT specified by its device path in text form. + + @retval EFI_SUCCESS The FDT was installed. + @retval EFI_NOT_FOUND Failed to locate a protocol or a file. + @retval EFI_INVALID_PARAMETER Invalid device path. + @retval EFI_UNSUPPORTED Device path not supported. + @retval EFI_OUT_OF_RESOURCES An allocation failed. +**/ +STATIC +EFI_STATUS +InstallFdt ( + VOID +) +{ + EFI_STATUS Status; + VOID *HobList; + EFI_HOB_GUID_TYPE *GuidHob; + + // + // Get the HOB list. If it is not present, then ASSERT. + // + HobList = GetHobList (); + ASSERT (HobList != NULL); + + // + // Search for FDT GUID HOB. If it is not present, then + // there's nothing we can do. It may not exist on the update path. + // + GuidHob = GetNextGuidHob (&gFdtHobGuid, HobList); + if (GuidHob != NULL) { + mFdtBlobBase = (VOID *)*(UINT64 *)(GET_GUID_HOB_DATA (GuidHob)); + + // + // Ensure that the FDT header is valid and that the Size of the Device Tree + // is smaller than the size of the read file + // + if (fdt_check_header (mFdtBlobBase)) { + DEBUG ((DEBUG_ERROR, "InstallFdt() - FDT blob seems to be corrupt\n")); + mFdtBlobBase = NULL; + Status = EFI_LOAD_ERROR; + goto Error; + } + } else { + Status = EFI_NOT_FOUND; + goto Error; + } + + Status = EFI_SUCCESS; + +Error: + return Status; +} + +EFI_STATUS +EFIAPI +ShellDumpFdtCommandConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + Status = InstallFdt(); + if (EFI_ERROR(Status)) { + Print (L"%s: Error while installing FDT\n", CMD_NAME_STRING); + return Status; + } + + gShellDumpFdtHiiHandle = NULL; + + gShellDumpFdtHiiHandle = HiiAddPackages ( + &gShellDumpFdtHiiGuid, + gImageHandle, + UefiShellDumpFdtLibStrings, + NULL + ); + + if (gShellDumpFdtHiiHandle == NULL) { + Print (L"%s: Cannot add Hii package\n", CMD_NAME_STRING); + return EFI_DEVICE_ERROR; + } + + Status = ShellCommandRegisterCommandName ( + CMD_NAME_STRING, + ShellCommandRunDumpFdt, + ShellCommandGetManFileNameDumpFdt, + 0, + CMD_NAME_STRING, + TRUE, + gShellDumpFdtHiiHandle, + STRING_TOKEN (STR_GET_HELP_DUMPFDT) + ); + + if (EFI_ERROR(Status)) { + Print (L"%s: Error while registering command\n", CMD_NAME_STRING); + return Status; + } + + return EFI_SUCCESS; +} + +EFI_STATUS +EFIAPI +ShellDumpFdtCommandDestructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + + if (gShellDumpFdtHiiHandle != NULL) { + HiiRemovePackages (gShellDumpFdtHiiHandle); + } + + return EFI_SUCCESS; +} diff --git a/Silicon/Marvell/Applications/DumpFdt/DumpFdt.inf b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.inf new file mode 100644 index 0000000000..d24adaaae8 --- /dev/null +++ b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.inf @@ -0,0 +1,52 @@ +#/** @file +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# https://spdx.org/licenses +# +# Copyright (C) 2023 Marvell +# +# Copyright (c) 2015, ARM Ltd. All rights reserved.
+# +#**/ + +[Defines] + INF_VERSION = 0x00010006 + BASE_NAME = UefiShellDumpFdtLib + FILE_GUID = 6e9a4c69-57c6-4fcd-b083-4f2c3bdb6051 + MODULE_TYPE = UEFI_DRIVER + VERSION_STRING = 0.1 + LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER + CONSTRUCTOR = ShellDumpFdtCommandConstructor + DESTRUCTOR = ShellDumpFdtCommandDestructor + +[Sources.common] + DumpFdt.c + DumpFdt.uni + +[Packages] + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + Platform/ARM/ARM.dec + Silicon/Marvell/MarvellSiliconPkg/MarvellSiliconPkg.dec + ShellPkg/ShellPkg.dec + +[LibraryClasses] + BaseMemoryLib + DebugLib + UefiLib + FdtLib + UefiBootServicesTableLib + UefiRuntimeServicesTableLib + HiiLib + ShellCommandLib + ShellLib + HobLib + +[Guids] + gFdtHobGuid + gFdtTableGuid + gShellDumpFdtHiiGuid + +[FixedPcd] + gMarvellSiliconTokenSpaceGuid.PcdFdtConfigRootNode diff --git a/Silicon/Marvell/Applications/DumpFdt/DumpFdt.uni b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.uni new file mode 100644 index 0000000000..bbfd44f2e0 --- /dev/null +++ b/Silicon/Marvell/Applications/DumpFdt/DumpFdt.uni @@ -0,0 +1,35 @@ +// *++ +// +// SPDX-License-Identifier: BSD-2-Clause-Patent +// https://spdx.org/licenses +// +// Copyright (C) 2023 Marvell +// +// Copyright (c) 2014, ARM Ltd. All rights reserved.
+// +// +// Module Name: +// +// DumpFdt +// +// Abstract: +// +// String definitions for the EFI Shell 'dumpfdt' command +// +// Revision History: +// +// --*/ + +/=# + +#langdef en-US "English" + +#string STR_GET_HELP_DUMPFDT #language en-US "" +".TH dumpfdt 0 "Dump installed Flat Device Tree (FDT) of the platform."\r\n" +".SH NAME\r\n" +"Dump current Flat Device Tree (FDT)\r\n" +".SH SYNOPSIS\r\n" +"dumpfdt\r\n" +"\r\n" +".SH DESCRIPTION\r\n" +"\r\n" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118573): https://edk2.groups.io/g/devel/message/118573 Mute This Topic: https://groups.io/mt/105913430/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-