From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.74]) by mx.groups.io with SMTP id smtpd.web08.10433.1636541809254541019 for ; Wed, 10 Nov 2021 02:56:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=G+qYskDU; spf=pass (domain: arm.com, ip: 40.107.15.74, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1cuPBtKThRFRRUtihAGjhnPc5YbAovJxuxzv8RohF+Q=; b=G+qYskDUugqv8I2Mj9Fmiy//kPAdEbTfODpkr+alcADOkoyJgvBJyI907bVrMe83u3HdGiI6M/oYuJMb/yeaWraQhVfwny+/EycHSQ0MamHijKcPQqCmzn39aJ2nwn/2EcLwNpUs7LOX2+u6pNeb/bx748BV3nYJTjPx2+eCC3s= Received: from AM5PR0101CA0018.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::31) by AM5PR0801MB1713.eurprd08.prod.outlook.com (2603:10a6:203:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 10:56:46 +0000 Received: from AM5EUR03FT045.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:16:cafe::97) by AM5PR0101CA0018.outlook.office365.com (2603:10a6:206:16::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16 via Frontend Transport; Wed, 10 Nov 2021 10:56:46 +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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT045.mail.protection.outlook.com (10.152.17.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Wed, 10 Nov 2021 10:56:46 +0000 Received: ("Tessian outbound d49ee2bec50d:v108"); Wed, 10 Nov 2021 10:56:45 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4b5e38f3fee99a49 X-CR-MTA-TID: 64aa7808 Received: from 8fc8ef87a881.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 3FEF2204-17A9-4E2C-9C99-11F8B8E74175.1; Wed, 10 Nov 2021 10:56:37 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8fc8ef87a881.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 10 Nov 2021 10:56:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HGdddbMuPXYRtksrm26ZiESI8RbYL/hRmkeJ8sDjWKzxyfpoWfJlOyzmMsuyZfpHVSqjFr6/A7uryNkh14xELZY0F6aK6hmLGpkpj9F+LAIv0GwiHzf9LEFOkX8DFlI0PaIZv7iTWI5+SwUa1x4JV1CHt/fieTWcunZVPRlXGBAsDukDughjMftzKcBLu2E/NmorCgF8H9dBlZyy+vToJgBHtXiXzwvPJxsABLJrzfhisT82sRAVycoRZml8tGMgg1qSGjno51zQNO10htNjmneWZKPlt1SK2mlvPg5iAilPBGP+TbSEShrPXTAcR1UZiM6FgdCGQFPYTOdgzvoojg== 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=1cuPBtKThRFRRUtihAGjhnPc5YbAovJxuxzv8RohF+Q=; b=X2GbtcoN8FMa6mFTSMWdtJOWud7GBtVGrpR9DlP3OMyVzmLK29Qk0jv+kW9evUWFRTnGpIIhDEb05J+Z20BjFkoBtg4zjGh6CymbTxsfLnCF5zCktxXjoBrDMoChWtW2icl2GRWehfphz5iWjSTvWJFkXwnQrJyomv2Ih6yOCjrovwspJcZbAgo3cW/V8A9Cir1ghXpBvKr8tWBSu1DzDhKA554cUty21jThu94Sz1ESvoDdT8lys0T24jaieZ/4EAOMgbsd7igY3SuOFCeuLO2X/Skx8eCJrCULdsWqoeLuLdLXFXAg0b5oGSZwZineVSXzSPenCXxK4Mk6VPkXYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1cuPBtKThRFRRUtihAGjhnPc5YbAovJxuxzv8RohF+Q=; b=G+qYskDUugqv8I2Mj9Fmiy//kPAdEbTfODpkr+alcADOkoyJgvBJyI907bVrMe83u3HdGiI6M/oYuJMb/yeaWraQhVfwny+/EycHSQ0MamHijKcPQqCmzn39aJ2nwn/2EcLwNpUs7LOX2+u6pNeb/bx748BV3nYJTjPx2+eCC3s= Received: from DB7PR05CA0042.eurprd05.prod.outlook.com (2603:10a6:10:2e::19) by GV1PR08MB7346.eurprd08.prod.outlook.com (2603:10a6:150:21::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 10:56:32 +0000 Received: from DB5EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2e:cafe::30) by DB7PR05CA0042.outlook.office365.com (2603:10a6:10:2e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 10:56:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT038.mail.protection.outlook.com (10.152.21.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4649.14 via Frontend Transport; Wed, 10 Nov 2021 10:56:32 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Wed, 10 Nov 2021 10:55:30 +0000 Received: from E114225.Arm.com (10.1.196.43) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Wed, 10 Nov 2021 10:55:30 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH v3 5/8] DynamicTablesPkg: IORT set reference to Id array only if present Date: Wed, 10 Nov 2021 10:55:29 +0000 Message-ID: <20211110105532.38696-6-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20211110105532.38696-1-sami.mujawar@arm.com> References: <20211110105532.38696-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90500c12-5f40-4701-a4f5-08d9a438c9f1 X-MS-TrafficTypeDiagnostic: GV1PR08MB7346:|AM5PR0801MB1713: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: qEcL/Vb9m0DmKgG4aVU5vXX7aGDAZuan+t84/dhSXEBF2/N5aZ0zpkq284XfbKmThShghRzrB7wjD+1/kKolu44i6BhFya5oYhWEH2abdtXfLT3X+ALk9Z205jlYjbV6K7ct7D9yMIMmKZBfrdnqJDch437MSonylw1VulqWFO4cfKjqDj9YM66LTxTttIPP9K5h4uERJ746+tiyhelTTUXSbnlFo0hNgNWE3Vfd71aXxIr10yL/TbX774jN3IDOCDLz0NTgxbnJlC72amstFs0IVylvAX1k8FF5nQ87JrWh1MvGYVtdzTm9HrNBuzOq5PvQhQLt4SI2IhcRQ51XYMo9q1HoBZ0ltLkPt9Oyl2ID3w8GkWFRRg9wggLAIk/LqXwaB7GAE/c/0rf4RlzW7Ww1oGTs3iGnB2JukX4zSfpbiinScADOHEyAq5sXHc++zCVf1+/bJrBbXR10d/iGiD1YEuOEMy5ce1wIYnPukKvXYRDYYQUILCsPi726C3Z6tQZgCq97/0dymAIxBrq+yXI9WMduwarjIttO9BC8caPcSlHuWQXjKCBRUKNlbc7yDcN/PT/XucB4H1n3BcXam47LbN9+ge3qoz2h7T0YYM+aUI6dkoQFvC1/mJAIp+AMd6WY/IKh4z2ETUkiGm/Df4k5ha8plXlFPrYlGpmfJbuLy61rN03uGTrZZPHjysIQ+AjXt1Cra2+X30Otm5YqlP8YG9jv2Y1Oer/Y8Ktzz58= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(508600001)(26005)(6916009)(356005)(36860700001)(83380400001)(4326008)(81166007)(2906002)(1076003)(44832011)(2616005)(336012)(47076005)(8676002)(36756003)(8936002)(316002)(70206006)(186003)(82310400003)(7696005)(5660300002)(86362001)(426003)(54906003)(70586007)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7346 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT045.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: f08ac0a9-09c2-4293-93aa-08d9a438c190 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1fA4rU6ajfDDytl38O8fE5AJrMrdV9N91bRscUYT27y6mCO7LAD1QgomkX5OIr4fpihgqf9qtcVPI/wmV3srKKmh9l3wnANGvjk2kH1wNaFmtVPYgLQGriYc9DX2C8geSlfxwyiezeDW2fRMCKfEsAXq6odFI9/HI5azKtKZ+kRd1KI1RPf4KDHTi6wJVHsxCwSscctmozmOf3iZ4UERs4Db7o+HdXVusOLSCiP4qOdv8GpRjpoZhAnB/AQDxACx65gxwmHkSZFldwgnVzLlv7j+tqA4qdUGPoMueNZ2vY6xfase2kT6HgLtYLgW+MTQjO/USVOFmj9U3liACHFaLyr9tl1aZJF3ARhT7TpuptGzuZn5AoAcU9+F3t55f2/B8LtEM3U3cvmNbBSNCudIaYQWzpcmjDLBR8Sz9THaBGuygiCWq0Dr2uE9iwtwrl+mfJcBmYGtWppWI5esrJLEFaA2aLN4i7ap7A00DVm7qCe02j2Mmz4zGlU7WOdH7RJxPI4hxoxusV417KnT+qe+up82DLdxxKN3nSMp2KJIy2GfTZU+hgmZ6ma5sBbPs6abWtDDYcE3qLCSBWVpB+5Efl5A0mRJZCYaykVzxAJWBMvN0AlKS0/vgOizP+64ewfys8dGfgTLHd8qOIstkhAtSco4GioSyLIoGgbxRqBMvxUuED/7apkX6BZPvVRcfLv79FAU7Oabo28b3H3KMWonKA== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(1076003)(508600001)(8936002)(26005)(336012)(426003)(47076005)(2616005)(36756003)(4326008)(82310400003)(83380400001)(70586007)(70206006)(44832011)(5660300002)(7696005)(316002)(6916009)(2906002)(54906003)(186003)(81166007)(8676002)(86362001)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 10:56:46.2186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90500c12-5f40-4701-a4f5-08d9a438c9f1 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: AM5EUR03FT045.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1713 Content-Type: text/plain The IORT table generator is setting up a reference to ID array for nodes even when the ID Mapping count is zero. This is not an issue as an OS would only access the ID Reference if the ID mapping count is not zero. However, it would be good to set the reference to ID array to zero when the ID Mapping count is zero rather than populating it with an incorrect value. Signed-off-by: Sami Mujawar Reviewed-by: Pierre Gondois --- Notes: v2: - No code change since v1. Re-sending with v2 series. [SAMI] v3: - No code change since v1. Re-sending with v3 series. [SAMI] DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 29 +++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index a1714dbedd3e34e2716e828092aac169461c43c9..46ff1e6d03852daa2058b8bd13f4b18f775aba6e 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -1,7 +1,7 @@ /** @file IORT Table Generator - Copyright (c) 2017 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -870,9 +870,9 @@ AddNamedComponentNodes ( NcNode->Node.NumIdMappings = NodeList->IdMappingCount; ObjectNameLength = AsciiStrLen (NodeList->ObjectName) + 1; - NcNode->Node.IdReference = - (UINT32)(sizeof (EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE) + - (ALIGN_VALUE (ObjectNameLength, 4))); + NcNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : ((UINT32)(sizeof (EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE) + + (ALIGN_VALUE (ObjectNameLength, 4)))); // Named Component specific data NcNode->Flags = NodeList->Flags; @@ -1001,7 +1001,8 @@ AddRootComplexNodes ( RcNode->Node.Revision = 1; RcNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; RcNode->Node.NumIdMappings = NodeList->IdMappingCount; - RcNode->Node.IdReference = sizeof (EFI_ACPI_6_0_IO_REMAPPING_RC_NODE); + RcNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_RC_NODE); // Root Complex specific data RcNode->CacheCoherent = NodeList->CacheCoherent; @@ -1182,11 +1183,12 @@ AddSmmuV1V2Nodes ( SmmuNode->Node.Revision = 0; SmmuNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; SmmuNode->Node.NumIdMappings = NodeList->IdMappingCount; - SmmuNode->Node.IdReference = sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_NODE) + - (NodeList->ContextInterruptCount * - sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT)) + - (NodeList->PmuInterruptCount * - sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT)); + SmmuNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : (sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_NODE) + + (NodeList->ContextInterruptCount * + sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT)) + + (NodeList->PmuInterruptCount * + sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT))); // SMMU v1/v2 specific data SmmuNode->Base = NodeList->BaseAddress; @@ -1352,8 +1354,8 @@ AddSmmuV3Nodes ( SmmuV3Node->Node.Revision = 2; SmmuV3Node->Node.Reserved = EFI_ACPI_RESERVED_DWORD; SmmuV3Node->Node.NumIdMappings = NodeList->IdMappingCount; - SmmuV3Node->Node.IdReference = - sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE); + SmmuV3Node->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE); // SMMUv3 specific data SmmuV3Node->Base = NodeList->BaseAddress; @@ -1482,7 +1484,8 @@ AddPmcgNodes ( PmcgNode->Node.Revision = 1; PmcgNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; PmcgNode->Node.NumIdMappings = NodeList->IdMappingCount; - PmcgNode->Node.IdReference = sizeof (EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE); + PmcgNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE); // PMCG specific data PmcgNode->Base = NodeList->BaseAddress; -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'