From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 8C430D81113 for ; Mon, 8 Jan 2024 11:08:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=N1kJiyAbiVf2h9I2XTII9nj78bbLweQ/EjviesmpwqQ=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Authentication-Results-Original:Message-ID:Date:User-Agent:Subject:To:Cc:References:From:In-Reply-To:MIME-Version:NoDisclaimer:Original-Authentication-Results:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1704712130; v=1; b=rJoD8fohVnNpmEQK8sZerHGNXCIuhiykbzg6ESqEtH5vNo3lYyL+OybrgomVSCybwOmyHdkC 23MKgXMCPEaWkm8xYb96U/Cz1q4vSz+Eg0/siAWn6NKoURjU8vdKArpXD5/zBoryeFKX8lYOnmw CZjUUZB8RIkT3zX8ms5QMVcI= X-Received: by 127.0.0.2 with SMTP id RVDBYY7687511xqNa8BhGhoO; Mon, 08 Jan 2024 03:08:50 -0800 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.58]) by mx.groups.io with SMTP id smtpd.web11.4359.1704712129097381268 for ; Mon, 08 Jan 2024 03:08:49 -0800 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=GYmP6HHVJzm2ZQl676zRluVhzpeeNV2p1UkYzWgGRUXAIvikFspQ3HA46XCpj4xhYue+7GwonsR3vIxMXYMxV8NTLOioiqcph8kWuGopao5/Kq4oFQKm+wGPQEtKahtbnIl/sCRhZj9SwdQjpgD82yC2sE5aILLDgqUJBwj3vjWO4Yr4hW2Rgd4mZFxUH9DRf/umSi5ggvRCOrkpBdqPBFTaXwb5nmGgFTRAjE89kjdG1L7tgZ9u9az0mSqjsvuduoVY0QSTfVTf6tw38oXGLyDdBuGo+2NzwLWmBzN6FRHQH17rFatYGq31DUgeVqe/0UMgUk4y89yBa7svZZT4nA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QjdmQGjCspKV4qqWgLRHWfatj0zBQ6cWPM2j5PxAvmU=; b=icyjNxYCt3bQgVdJwVWANXjcYRk2UgNERcT1o0HawsxmjaaL6x5kCqauTpBy5EPF4B+tSLASk/5dyHGo5dyicHX0dEK9RY/kIKRDEfJfboTXqWrIcBBls7b4oqQ4EYPz3Vt4EmcaKkoSwVedySqsFxQytJlcxF1u5O5Q44KHLYDYOVmMSDfW6SpZL+/bGkiFqmniRyf45OFJbhmqw2U7zblEn4YamLG0SiYm8ZaPRoVs5gbB3tTRNbBST5yuNgV4/JG9gYEoqr6OxduCbtczghPmz9aeeml94qc2WdiHvZHYYn+2aQOQqU6lK4r82eqwJkbL8MZgSzgYRFlFIb70fg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) X-Received: from AS9PR05CA0079.eurprd05.prod.outlook.com (2603:10a6:20b:499::19) by AS2PR08MB9870.eurprd08.prod.outlook.com (2603:10a6:20b:595::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 11:08:41 +0000 X-Received: from AMS0EPF000001A7.eurprd05.prod.outlook.com (2603:10a6:20b:499:cafe::84) by AS9PR05CA0079.outlook.office365.com (2603:10a6:20b:499::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21 via Frontend Transport; Mon, 8 Jan 2024 11:08:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AMS0EPF000001A7.mail.protection.outlook.com (10.167.16.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.13 via Frontend Transport; Mon, 8 Jan 2024 11:08:41 +0000 X-Received: ("Tessian outbound 968ce956f8b7:v239"); Mon, 08 Jan 2024 11:08:41 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ff010bfea7755307 X-CR-MTA-TID: 64aa7808 X-Received: from 12118efe4971.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 47CD0DCD-CA8F-4893-9D19-6FD34C0BCE17.1; Mon, 08 Jan 2024 11:08:34 +0000 X-Received: from EUR02-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 12118efe4971.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 08 Jan 2024 11:08:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gRz4u2myCtqRd3P7tZI1djXcyNdf9lJK2C/RMPEg7Pf99/KcoSgCeXi1aVLnic1zbENO+0mubG9+c89PilKnxYGJA+hmgWFpJ4KUOZkpqZkDLD1dUSNrfk+AyKu/VO0uJTPD6izqtJzyEe/9MpBtutONRiY9mXNw/oQokQOlLMdCwgKULoG5Qy5pJ6X01Wrm2KdjPjF3WUcPFO4L1cpd/IpwM0IKG2E6HfHDYMZqKIC8YAC/WnROFH1b8ab6k4WWn5cCa+Y71kMnKaIDnOkXcpRbqyJjNk+aUpeCund9PpnVcOA6ZpAtyswHrH2tMxWApDGgRO4kExR6WjieSv3/9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QjdmQGjCspKV4qqWgLRHWfatj0zBQ6cWPM2j5PxAvmU=; b=I+P5eJl8V1fKk57tPB1+xEJFxPZPy+IkCO9iH5QPpN0ItC/p+0RN2jlFKAOIS4QuXz7Bb85pABwqPf5Cnv8xuVqONQgnwwastuwJFi3l/6RRceTdYPX+gethO7fuQWbMYs3ij744qfiispCVVVlgbVW0d7GjvWEj3NpYpq6rxRUNVRgjRdWt4ogU8ErmwGWAQ1XBZh8j4oDdcxQTNQaB9S+g5CohF8/y71EeASV+o1iHuS/9/Wg8SZ55Vsf2so8U3actFa7IT6KRCnCOcKPj9RCxasCUQ1nFXqJ64Bh1T3cZEV4xhkT1nXXPVwoVyIbKm2gdxigFFzEkFaE0tMw7kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-Received: from AM0PR08MB4289.eurprd08.prod.outlook.com (2603:10a6:208:148::12) by PR3PR08MB5660.eurprd08.prod.outlook.com (2603:10a6:102:8d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 11:08:32 +0000 X-Received: from AM0PR08MB4289.eurprd08.prod.outlook.com ([fe80::50d8:8f44:8189:811f]) by AM0PR08MB4289.eurprd08.prod.outlook.com ([fe80::50d8:8f44:8189:811f%7]) with mapi id 15.20.7159.020; Mon, 8 Jan 2024 11:08:31 +0000 Message-ID: <095d6b34-12d5-47af-9bd3-6f4fa1921e11@arm.com> Date: Mon, 8 Jan 2024 11:08:30 +0000 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [edk2-platforms][PATCH v2 5/7] Platform/Sgi: Add support for RD-N2-Cfg3 platform To: devel@edk2.groups.io, prabin.ca@arm.com Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar References: <20240105153814.427009-1-prabin.ca@arm.com> <20240105153814.427009-6-prabin.ca@arm.com> From: "levi.yun" In-Reply-To: <20240105153814.427009-6-prabin.ca@arm.com> X-ClientProxiedBy: LO4P265CA0030.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ae::15) To AM0PR08MB4289.eurprd08.prod.outlook.com (2603:10a6:208:148::12) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AM0PR08MB4289:EE_|PR3PR08MB5660:EE_|AMS0EPF000001A7:EE_|AS2PR08MB9870:EE_ X-MS-Office365-Filtering-Correlation-Id: e88a4d5d-10a7-45de-d73a-08dc103a2c0b x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 12XbMNMaSgC2laZ2NkUl/WjYRFvnJTgtb+Qjdu3bY3IMJPs7JGloGe4yWY/agtuecMASAkNLgnDWWdH3zo/kqNeyDl1WNW4YSjZDqwCA2HeRaBJS5cSRFfrrJxnPzXM4JDMXc8jCGtnA+VZ2ekWpY4RydM173UnVxw7fZ3dfhTVypaM7BKjcOpagHSKfSiqxcOgkHzEeadgpEsxegTubMfp8u5OFmaxBNKiOszOX/B073kCacP/hSYBeb32W6z2CHzCdiqEiH0c60V48Shu2QG2lSnk6QEQ6ZaIN1cJYLCkzawCcY+nB5/ZA6wEgxtjEp/PsKU6DFh+yQCfKqpKvNoBJFDLxmJzDBnMpaYjfzIZ+2CTZvbLjxjBipOhlMVM1mYnIxLYCtQj4VqfcR5LXk3ulGoaLMogLCjnJNJRNn+u+zC18q1oBA/o58qzDVZTTs6mr4ZFlfM4fO43gyM87FUkmatl5Ifhtq0RTpfz5kIQMZhIuF/eqjlqqRmpR+p30/berxuE5ubfbBo0lN1QJrAUQWRU9C0KxU1Rb5s86jfK9vYk5MkuaxLa2disLPHmWb3ZPVC8rWFTnXOFaliujcNk2BWQMr5LwixIJqh27UNeaiaI1J5GZXE9IXlcKb55kroAGSi6IE/Cd+xzuvdFr2A== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR08MB4289.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(39860400002)(396003)(376002)(346002)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799012)(31696002)(38100700002)(4326008)(2906002)(5660300002)(478600001)(6512007)(6506007)(53546011)(83380400001)(2616005)(26005)(36756003)(54906003)(316002)(6636002)(66946007)(66556008)(66476007)(8936002)(8676002)(6486002)(86362001)(19627235002)(41300700001)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5660 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF000001A7.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: a3d209f0-336e-4f1c-a241-08dc103a25ec X-Microsoft-Antispam-Message-Info: MwYi6ulbLGJUyGysf3XAWdnRYtXsx9b8E/88U2ccWASRRYZ5sVdqW4Q1nyFvpNxDaXEryfCBsgrTIzbQyibKPwfOOrF1Hr6mkC99lyxfZqfEpz7p5J/UEPjnoj67tFybHkmXk3siAjWraeuxN8Lf/uWHo/0oQw7Vt6EKHnsiJJHvarDmup18sWXh3XzXIDNpby9sZfp8NbGfm0N7o4me68HGQfe7P/WSQ1JBjiFhnLCQs8v7IKyN057MRRQmKBw8lbC0s5r4bC42r1pBMdfoKbZbiJMokjmoFJXG2NLt6x7D8Erp91vdf+st+0gMI67g/7r8G/tKeFGIakCAN6utRMp3YsrUFD3B/hlXM+shDqGDV43b18QaF49OCNCgChM/Q55jeJg3Cr7c8cc6qoCoWrHhARUWJxPDXaqEn8vNZoRAWPCsfS+c94I7j+tSwkFWeFTAs5yVMbjT7ygFtVFw8KXPP7cb3PyV4sju8ltsbxfHKUHnQ+KuqUUIErvnad8kYkLcYIwXE5CvrQPv0QNgAKLDnCIErxHxAdZSvhJnS2cEvljLmI9T6AEkDn3KXtW0H2XqJ1ki0fpaCizjGMrLEclfk0sRVwaaFOP/K+NGyUYrY91sJsJIE8S40QtFUXLfNKyPKJlC69f4uj+kZVRjb/SN3QDuR8PfxO961+EuMq59RE+sidNiSh0phCpvGsE622v9TAniwaL1vvNh7ZQnFqYLGnjGDx0tsAO7AavhUMyx9OJb8JEkJIbvXQXsjle2SnqHxS2Wn2SFoLofHTfutw== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 11:08:41.2107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e88a4d5d-10a7-45de-d73a-08dc103a2c0b X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A7.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9870 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 Reply-To: devel@edk2.groups.io,yeoreum.yun@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: KOk5nG4AAvnalnKtZ1mXmOR6x7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=rJoD8foh; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Reviewed-by: levi.yun On 05/01/2024 15:38, Prabin CA via groups.io wrote: > The Neoverse RD-N2-Cfg3 platform is a variant of RD-N2 platform with a > different mesh size and GIC ITS count. As part of the initial platform > support, add the corresponding platform and flash description files. > Use PcdPlatformVariant for the RD-N2-Cfg3 platform to specify the > platform variant. RD-N2-Cfg3 has 12 GIC ITS blocks when compared to the > other RD-N2 variants that have 6 GIC ITS blocks. > > Signed-off-by: Vijayenthiran Subramaniam > Signed-off-by: Prabin CA > --- > Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc = | 58 ++++++++++++++++++++ > Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf = | 3 +- > Platform/ARM/SgiPkg/AcpiTables/{RdN2AcpiTables.inf =3D> RdN2Cfg3AcpiTab= les.inf} | 15 ++--- > Platform/ARM/SgiPkg/AcpiTables/RdN2/Madt.aslc = | 14 ++++- > Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.fdf.inc = | 10 ++++ > 5 files changed, 88 insertions(+), 12 deletions(-) > > diff --git a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc b/Platform/ARM/Sgi= Pkg/RdN2Cfg3/RdN2Cfg3.dsc > new file mode 100644 > index 000000000000..88293b236a32 > --- /dev/null > +++ b/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc > @@ -0,0 +1,58 @@ > +# > +# Copyright (c) 2024, ARM Limited. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +########################################################################= ######## > +# > +# Defines Section - statements that will be processed to create a Makefi= le. > +# > +########################################################################= ######## > +[Defines] > + PLATFORM_NAME =3D RdN2Cfg3 > + PLATFORM_GUID =3D b890ba7d-a256-4820-9d3a-655acbb737c= 9 > + PLATFORM_VERSION =3D 0.1 > + DSC_SPECIFICATION =3D 0x0001001B > + OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) > + SUPPORTED_ARCHITECTURES =3D AARCH64 > + BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE > + SKUID_IDENTIFIER =3D DEFAULT > + FLASH_DEFINITION =3D Platform/ARM/SgiPkg/SgiPlatform.fdf > + BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cf= g3.fdf.inc > + BUILD_NUMBER =3D 1 > + > +# include common definitions from SgiPlatform.dsc > +!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > +!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc > + > +# include common/basic libraries from MdePkg. > +!include MdePkg/MdeLibs.dsc.inc > + > +########################################################################= ######## > +# > +# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# > +########################################################################= ######## > + > +[PcdsFixedAtBuild.common] > + # GIC configurations > + gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 > + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x30300000 > + gArmSgiTokenSpaceGuid.PcdGicSize|0x400000 > + > + # ARM Cores and Clusters > + gArmPlatformTokenSpaceGuid.PcdCoreCount|1 > + gArmPlatformTokenSpaceGuid.PcdClusterCount|16 > + > + # RdN2Cfg3 is the third variant from RdN2 Platform > + gArmSgiTokenSpaceGuid.PcdPlatformVariant|3 > + > +########################################################################= ######## > +# > +# Components Section - list of all EDK II Modules needed by this Platfor= m > +# > +########################################################################= ######## > + > +[Components.common] > + Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg3AcpiTables.inf > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform= /ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf > index 8025ef58171b..afc38385c051 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf > @@ -1,7 +1,7 @@ > ## @file > # ACPI table data and ASL sources required to boot the platform. > # > -# Copyright (c) 2020 - 2023, Arm Ltd. All rights reserved. > +# Copyright (c) 2020 - 2024, Arm Ltd. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -67,6 +67,7 @@ [FixedPcd] > gArmSgiTokenSpaceGuid.PcdMaxAddressBitsPerChip > gArmSgiTokenSpaceGuid.PcdOscLpiEnable > gArmSgiTokenSpaceGuid.PcdOscCppcEnable > + gArmSgiTokenSpaceGuid.PcdPlatformVariant > gArmSgiTokenSpaceGuid.PcdSp804DualTimerBaseAddress > gArmSgiTokenSpaceGuid.PcdSp804DualTimerSize > gArmSgiTokenSpaceGuid.PcdSp804DualTimerInterrupt > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform= /ARM/SgiPkg/AcpiTables/RdN2Cfg3AcpiTables.inf > similarity index 90% > copy from Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf > copy to Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg3AcpiTables.inf > index 8025ef58171b..a703d5a994f7 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg3AcpiTables.inf > @@ -1,7 +1,7 @@ > ## @file > # ACPI table data and ASL sources required to boot the platform. > # > -# Copyright (c) 2020 - 2023, Arm Ltd. All rights reserved. > +# Copyright (c) 2024, Arm Ltd. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -9,7 +9,7 @@ > > [Defines] > INF_VERSION =3D 0x0001001A > - BASE_NAME =3D RdN2AcpiTables > + BASE_NAME =3D RdN2Cfg3AcpiTables > FILE_GUID =3D c712719a-0aaf-438c-9cdd-35ab4d6020= 7d # gArmSgiAcpiTablesGuid > MODULE_TYPE =3D USER_DEFINED > VERSION_STRING =3D 1.0 > @@ -18,16 +18,13 @@ [Sources] > Dbg2.aslc > Fadt.aslc > Gtdt.aslc > - Iort.aslc > - Mcfg.aslc > RdN2/Dsdt.asl > RdN2/Madt.aslc > RdN2/Pptt.aslc > Spcr.aslc > - Ssdt.asl > + SsdtRos.asl > SsdtEvents.asl > SsdtIoVirtSocExp.asl > - SsdtRos.asl > SsdtRosVirtioP9.asl > > [Packages] > @@ -56,17 +53,17 @@ [FixedPcd] > gArmTokenSpaceGuid.PcdPciBusMin > gArmTokenSpaceGuid.PcdPciBusMax > > - gArmSgiTokenSpaceGuid.PcdChipCount > gArmSgiTokenSpaceGuid.PcdGpioController0BaseAddress > gArmSgiTokenSpaceGuid.PcdGpioController0Size > gArmSgiTokenSpaceGuid.PcdGpioController0Interrupt > gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv > gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv > + gArmSgiTokenSpaceGuid.PcdOscLpiEnable > + gArmSgiTokenSpaceGuid.PcdOscCppcEnable > gArmSgiTokenSpaceGuid.PcdIoVirtSocExpBlk0Base > gArmSgiTokenSpaceGuid.PcdIoVirtSocExpBlkUartEnable > gArmSgiTokenSpaceGuid.PcdMaxAddressBitsPerChip > - gArmSgiTokenSpaceGuid.PcdOscLpiEnable > - gArmSgiTokenSpaceGuid.PcdOscCppcEnable > + gArmSgiTokenSpaceGuid.PcdPlatformVariant > gArmSgiTokenSpaceGuid.PcdSp804DualTimerBaseAddress > gArmSgiTokenSpaceGuid.PcdSp804DualTimerSize > gArmSgiTokenSpaceGuid.PcdSp804DualTimerInterrupt > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Madt.aslc b/Platform/ARM= /SgiPkg/AcpiTables/RdN2/Madt.aslc > index cdf8b3f2e953..5fba3fa7d020 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Madt.aslc > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2/Madt.aslc > @@ -6,7 +6,7 @@ > CPU interface, redistributor, distributor and ITS blocks on the Rd-N2= platform > is included in this table. > > - Copyright (c) 2020 - 2022, Arm Limited. All rights reserved. > + Copyright (c) 2020 - 2024, Arm Limited. All rights reserved. > > SPDX-License-Identifier: BSD-2-Clause-Patent > > @@ -23,6 +23,8 @@ > #define CORE_CNT (FixedPcdGet32 (PcdClusterCount) * \ > FixedPcdGet32 (PcdCoreCount)) > > +#define ITS_CNT ((FixedPcdGet32(PcdPlatformVariant) =3D=3D 3) ? 12 : 6) > + > // Multiple APIC Description Table > #pragma pack (1) > > @@ -31,7 +33,7 @@ typedef struct { > EFI_ACPI_6_4_GIC_STRUCTURE GicInterfaces[C= ORE_CNT]; > EFI_ACPI_6_4_GIC_DISTRIBUTOR_STRUCTURE GicDistributor; > EFI_ACPI_6_4_GICR_STRUCTURE GicRedistributo= r; > - EFI_ACPI_6_4_GIC_ITS_STRUCTURE GicIts[6]; > + EFI_ACPI_6_4_GIC_ITS_STRUCTURE GicIts[ITS_CNT]; > } EFI_ACPI_6_4_MULTIPLE_APIC_DESCRIPTION_TABLE; > > #pragma pack () > @@ -134,6 +136,14 @@ STATIC EFI_ACPI_6_4_MULTIPLE_APIC_DESCRIPTION_TABLE = Madt =3D { > EFI_ACPI_6_4_GIC_ITS_INIT(3, 0x30100000), > EFI_ACPI_6_4_GIC_ITS_INIT(4, 0x30140000), > EFI_ACPI_6_4_GIC_ITS_INIT(5, 0x30180000), > +#if (FixedPcdGet32 (PcdPlatformVariant) =3D=3D 3) > + EFI_ACPI_6_4_GIC_ITS_INIT(6, 0x301C0000), > + EFI_ACPI_6_4_GIC_ITS_INIT(7, 0x30200000), > + EFI_ACPI_6_4_GIC_ITS_INIT(8, 0x30240000), > + EFI_ACPI_6_4_GIC_ITS_INIT(9, 0x30280000), > + EFI_ACPI_6_4_GIC_ITS_INIT(10, 0x302C0000), > + EFI_ACPI_6_4_GIC_ITS_INIT(11, 0x30180000), > +#endif > }, > }; > > diff --git a/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.fdf.inc b/Platform/ARM= /SgiPkg/RdN2Cfg3/RdN2Cfg3.fdf.inc > new file mode 100644 > index 000000000000..77288ab1ad93 > --- /dev/null > +++ b/Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.fdf.inc > @@ -0,0 +1,10 @@ > +# > +# Copyright (c) 2024, ARM Limited. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +# Per-platform additional content of the DXE phase firmware volume > + > + # ACPI support > + INF RuleOverride=3DACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg3Ac= piTables.inf IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you. -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113380): https://edk2.groups.io/g/devel/message/113380 Mute This Topic: https://groups.io/mt/103544573/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-