From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by mx.groups.io with SMTP id smtpd.web09.62.1614102229217982368 for ; Tue, 23 Feb 2021 09:43:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=odINbkQi; spf=pass (domain: nuviainc.com, ip: 209.85.210.44, mailfrom: rebecca@nuviainc.com) Received: by mail-ot1-f44.google.com with SMTP id d9so2272607ote.12 for ; Tue, 23 Feb 2021 09:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IUlZgsxCtl7jAAAmC6P4iOSMXwH3meooMthPBG33NA8=; b=odINbkQiA21LydVNHh4kz2zNiyeK1ZIsPLulqp26gnw2kKs4rhhHq/HwriweCavgxX hUwd9jfW80vIDk6XQpABnFRsa9xPlwnjaFCnoEa6Qm36MYLcCjpaqn51BfrSjmBIEUgq wK4wmfBvnWL/I9sCeUeFI1eMuO+drdTgBQQ88bYjhEEnWiQexg66mOtfSByueCMWpm/h yLjsdQJZNg50bfIx8QJYUl6NXGV1W08JKw4LmzrMZWjs14yDnEW/c9sRoqlGi+ElPNJX oeuN46mSddz5fvDeJ41RlG+c1YaopmM2HrOfpaCXuwd5HKsc8F025ivB5XF1gQlCL9mF 62Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IUlZgsxCtl7jAAAmC6P4iOSMXwH3meooMthPBG33NA8=; b=XF1T/NlH7CEX1U6Nb3gyhmWYATp+JMLETr0BS+YlNdaMFQOw+Ch5EhBP0AIfnC9arm isPlBYKeAB1TSWidbsRJSlNPSiYSocm6zUpUHoVKY3YA9hClQglYv2ap3yYuWmLj4e0g T8OMr2s1PGY4w2le4c/Mg7BuTV/dzb8kqekEkgHKiARE54R49+fC4gojpcSzsv8WBYb+ hlHMyoWqKlpWENukPbcKRtXJ2ZGpAhLyjAQLZgMwDr7BCzLmlGxSKXQn2W94mGvMnbdX Wp77liKWIyYPUUkq+MWtV/fVR/Ud7B5/j8panLOp2AuZnVGt34Nt9SF/DQaligZn/SPt 08yQ== X-Gm-Message-State: AOAM5310Nhxd6q6DwVx2TNWb3+FwHHcfp/7APUtFHtFkt+SmOKZy93ZN D67BvaxyhKxrvAULdwY6L+f9KZ1TDEvfEza07d/Gj+ZWNA3M9hMp2q8s4vz1CRfQRnYfAVXhXJS 8qsHOcO9tFxkfn/dPNZj/vSvluUc0To8uIb+CDy5eD1/MrRtw1jjLvGoFHIfTMRMvLkFyDw== X-Google-Smtp-Source: ABdhPJxK/ZU/Zzloc7Za2skPwE9WWWACYQUKwhhVHAbP+yY955lWbuyR8ODwfZT95JNZu6gndA4oVg== X-Received: by 2002:a9d:6247:: with SMTP id i7mr8819343otk.75.1614102228063; Tue, 23 Feb 2021 09:43:48 -0800 (PST) Return-Path: Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id s9sm4419918otb.11.2021.02.23.09.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 09:43:47 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Ard Biesheuvel , Leif Lindholm , Graeme Gregory , Radoslaw Biernacki Subject: [edk2-platforms PATCH v5 1/4] SbsaQemu: Add FdtHelperLib Date: Tue, 23 Feb 2021 10:43:39 -0700 Message-Id: <20210223174342.8572-2-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210223174342.8572-1-rebecca@nuviainc.com> References: <20210223174342.8572-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The CountCpusFromFdt function is now used in two places. Create FdtHelperLib for this and similar functions. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 + Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h | 24 ++++++++ Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c | 62 ++++++++++++++++++++ Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf | 28 +++++++++ 4 files changed, 116 insertions(+) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc index f6af3f9111ee..8faad3eda217 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -121,6 +121,8 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE # ARM PL011 UART Driver PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf + FdtHelperLib|Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf + # Debug Support PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf diff --git a/Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h b/Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h new file mode 100644 index 000000000000..e9e7281c1342 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h @@ -0,0 +1,24 @@ +/** @file +* FdtHelperLib.h +* +* Copyright (c) 2021, NUVIA Inc. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + +#ifndef FDT_HELPER_LIB_ +#define FDT_HELPER_LIB_ + +/** Walks through the Device Tree created by Qemu and counts the number + of CPUs present in it. + + @return The number of CPUs present. +**/ +EFIAPI +UINT32 +FdtHelperCountCpus ( + VOID + ); + +#endif /* FDT_HELPER_LIB_ */ diff --git a/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c new file mode 100644 index 000000000000..411f035ee7d8 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c @@ -0,0 +1,62 @@ +/** @file +* FdtHelperLib.c +* +* Copyright (c) 2021, NUVIA Inc. All rights reserved. +* Copyright (c) 2020, Linaro Ltd. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + +#include +#include +#include +#include +#include + +/** Walks through the Device Tree created by Qemu and counts the number + of CPUs present in it. + + @return The number of CPUs present. +**/ +EFIAPI +UINT32 +FdtHelperCountCpus ( + VOID + ) +{ + VOID *DeviceTreeBase; + INT32 Node; + INT32 Prev; + INT32 CpuNode; + UINT32 CpuCount; + + DeviceTreeBase = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeBaseAddress); + ASSERT (DeviceTreeBase != NULL); + + // Make sure we have a valid device tree blob + ASSERT (fdt_check_header (DeviceTreeBase) == 0); + + CpuNode = fdt_path_offset (DeviceTreeBase, "/cpus"); + if (CpuNode <= 0) { + DEBUG ((DEBUG_ERROR, "Unable to locate /cpus in device tree\n")); + return 0; + } + + CpuCount = 0; + + // Walk through /cpus node and count the number of subnodes. + // The count of these subnodes corresponds to the number of + // CPUs created by Qemu. + Prev = fdt_first_subnode (DeviceTreeBase, CpuNode); + while (1) { + CpuCount++; + Node = fdt_next_subnode (DeviceTreeBase, Prev); + if (Node < 0) { + break; + } + Prev = Node; + } + + return CpuCount; +} diff --git a/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf new file mode 100644 index 000000000000..d84c16f888d1 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf @@ -0,0 +1,28 @@ +#/** @file +# +# Component description file for FdtHelperLib module +# +# Copyright (c) 2021, NUVIA Inc. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#**/ + +[Defines] + INF_VERSION = 1.29 + BASE_NAME = FdtHelperLib + FILE_GUID = 34e4396f-c2fc-4f9e-ad58-0f98e99e3875 + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = FdtHelperLib + +[Sources.common] + FdtHelperLib.c + +[Packages] + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/Qemu/SbsaQemu/SbsaQemu.dec + +[FixedPcd] + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress -- 2.26.2