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 723C8740032 for ; Tue, 27 Aug 2024 18:16:43 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=hjzqAhcqmSHGfCpFJbOEKiO8MOjIPtzdRHbp1aD4z7s=; c=relaxed/simple; d=groups.io; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20240206; t=1724782603; v=1; b=VKVzGw+tjxUGpbZ+k/jvuVuX0pWxn6DaDQYLyXl6EmRIdggH3G11coW0N0UQksb8l+pkZ3AY CRAVnJ/xqQwuTXxe5+qua1GNiBAIbkdtZNNQR3dwKUAzPMVR8xs7c/x6RxBXBxyM1ImfEjATCNG ylHZx7Un5GxAwD3IYNvZ78PVBX6a/6j61LY01eyvWlQtGC9KjDIizNiD44S6T1iTYwWum8WpTnm r7IDMfomqI3HTLRGXnJH7MdA7pxhNNa0PjijaHmXI6RMh3c6ekefWHaXaVtHXtLJ58MrE2hrhBy mppzIBP/py5iy4nvopH4HHsx9v8zEUCzBC1slfFJNGD3Q== X-Received: by 127.0.0.2 with SMTP id 6itVYY7687511xbJle7vZbmn; Tue, 27 Aug 2024 11:16:41 -0700 X-Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by mx.groups.io with SMTP id smtpd.web10.2678.1724779704625197755 for ; Tue, 27 Aug 2024 10:28:24 -0700 X-Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6c3982a0c65so110306227b3.1 for ; Tue, 27 Aug 2024 10:28:24 -0700 (PDT) X-Gm-Message-State: m9lnUbmCLNhfvQOgR2SGUJtfx7686176AA= X-Google-Smtp-Source: AGHT+IE7OnyGnRJxmnvfJiPglSfAJ3It5z0tP3DdKBUXSlx2f9tXeNPnMTpKkJcFmlJh9QocIAXI8Tc9 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:7b:198d:ac11:8138]) (user=ardb job=sendgmr) by 2002:a05:690c:2908:b0:65c:1db1:9235 with SMTP id 00721157ae682-6c61eaf1976mr476877b3.0.1724779703280; Tue, 27 Aug 2024 10:28:23 -0700 (PDT) Date: Tue, 27 Aug 2024 19:28:20 +0200 Mime-Version: 1.0 Message-ID: <20240827172820.661646-1-ardb+git@google.com> Subject: [edk2-devel] [PATCH edk2-platforms 1/1] Platform/VExpress: Replace missing ArmGetCpuCountPerCluster() From: "Ard Biesheuvel via groups.io" To: devel@edk2.groups.io Cc: sami.mujawar@arm.com, quic_llindhol@quicinc.com, Ard Biesheuvel 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: Tue, 27 Aug 2024 11:16:41 -0700 Resent-From: ardb+git@google.com Reply-To: devel@edk2.groups.io,ardb+git@google.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=VKVzGw+t; dmarc=pass (policy=none) header.from=groups.io; 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: Ard Biesheuvel Commit 8676e88233d4 ("Platform/ ARM AARCH64: Remove ArmPlatformLib MPCore boilerplate") inadvertently removed the implementation of ArmGetCpuCountPerCluster(), which was hiding in the RTSM ArmPlatformLib implementation, even though it was not part of that library class interface. Given that the implementation just returned PcdCoreCount, fix up the code that got broken by using that value directly. Signed-off-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c index 24275254815a..b564db2693be 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c @@ -15,19 +15,6 @@ #include -/** - Return the core per cluster. The method may differ per core type - - This function might be called from assembler before any stack is set. - - @return Return the core count per cluster - -**/ -UINTN -ArmGetCpuCountPerCluster ( - VOID - ); - ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] = { { // Cluster 0, Core 0 @@ -156,7 +143,7 @@ PrePeiCoreGetMpCoreInfo ( ProcType = MmioRead32 (ARM_VE_SYS_PROCID0_REG) & ARM_VE_SYS_PROC_ID_MASK; if ((ProcType == ARM_VE_SYS_PROC_ID_CORTEX_A9) || (ProcType == ARM_VE_SYS_PROC_ID_CORTEX_A15)) { // Only support one cluster on all but ARMv8 FVP platform. FVP still uses CortexA9 ID. - *CoreCount = ArmGetCpuCountPerCluster (); + *CoreCount = FixedPcdGet32 (PcdCoreCount); *ArmCoreTable = mVersatileExpressMpCoreInfoTable; return EFI_SUCCESS; } else { -- 2.46.0.295.g3b9ea8a38a-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120418): https://edk2.groups.io/g/devel/message/120418 Mute This Topic: https://groups.io/mt/108128468/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-