From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.40]) by mx.groups.io with SMTP id smtpd.web11.21707.1684847084761988049 for ; Tue, 23 May 2023 06:04:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=dUN8fshY; spf=pass (domain: arm.com, ip: 40.107.22.40, 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=qcap7wSCGW9ORJiNCqTSydyFHZhoW/uapzZ67uK0Z1o=; b=dUN8fshYvP2jLLBgexwukAkln61Tu9SUT/Z2RPRCSG8Kf/yi9Ok1EoOaDW4HS+AaWX4WO+/dTdw7kl/Jcer9lnybQgh0IbDMQv7/pKoKGpwAKv+t4xAx8Daao8SPN5RKpwQqw1oC9fzW7jwDoM8O306kP6Qc9nk4d2xri8aFnjo= Received: from AM6PR10CA0035.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::48) by PAVPR08MB9209.eurprd08.prod.outlook.com (2603:10a6:102:30a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29; Tue, 23 May 2023 13:04:39 +0000 Received: from AM7EUR03FT059.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:89:cafe::6d) by AM6PR10CA0035.outlook.office365.com (2603:10a6:209:89::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29 via Frontend Transport; Tue, 23 May 2023 13:04:39 +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 Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT059.mail.protection.outlook.com (100.127.140.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.14 via Frontend Transport; Tue, 23 May 2023 13:04:39 +0000 Received: ("Tessian outbound 5154e9d36775:v136"); Tue, 23 May 2023 13:04:39 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c3988114d93fdc1e X-CR-MTA-TID: 64aa7808 Received: from edad710837c9.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E21155C3-EF89-425A-ABE2-C9BE79A4AA08.1; Tue, 23 May 2023 13:04:27 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id edad710837c9.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 23 May 2023 13:04:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WDfIFpUuPWa7BPLWF6d6oMDZ9GxK7eVvAQeuEYgEMMyEa0lsRz4ieJhjOrpW9+g4pp9jE4YntcYbT684XLZ9nf8NtA693Kkh4QbhMiSeNILyU2kiOGyBfly/sswP93maUGyCq0shfDDyhN1GyGCJjZo9usaIIfqqgDWCGUrt0MnQz7po52tYX4acLSwAXs6RNv7gHa9Y3H3Q5PUjKBM1c35IVyz+tQ0g+2G/nwyBWHh+S/Z3Ick+tGAMNF+NK8xJrBo2OeNRnpEY2yyi0w0llVXEmHueJihLI9jZXNqsKTftnguTBuqHjgYIkh5+CZGGQwVkSFJl/YhbBYlLD+mpdg== 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=qcap7wSCGW9ORJiNCqTSydyFHZhoW/uapzZ67uK0Z1o=; b=OWBYmGP0YG753RnYrSERLTXNHCQWmcxS5i5NC+X9l7ej4F7UactNUsxsBIJ4KKIZN7SoKkwRWr0arUEtDUSNMPXkxrIHtxImQYOEUdIgppfyttgdK5hVAbukvstTT3FBD2EiVNi6Abg0/Op9Zs4VizD+cfRThr61sFbvlyxSmJE8C9ln//x2Abx1oQVpozJo9dKanKYUDugfQOvyMsGyAJ9m7qOKnZxgts/e3D2y1CDuJHP/t2jzHnIwp8JRsa8djGn+Vyn7O104gXDG/Ub8NplZSiGg+eRP/tcMmBJ1yRYQB2Na5rgVW4THLWgZDpoG+4gEMo8MyPbKQ2vb6em1NQ== 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=qcap7wSCGW9ORJiNCqTSydyFHZhoW/uapzZ67uK0Z1o=; b=dUN8fshYvP2jLLBgexwukAkln61Tu9SUT/Z2RPRCSG8Kf/yi9Ok1EoOaDW4HS+AaWX4WO+/dTdw7kl/Jcer9lnybQgh0IbDMQv7/pKoKGpwAKv+t4xAx8Daao8SPN5RKpwQqw1oC9fzW7jwDoM8O306kP6Qc9nk4d2xri8aFnjo= Received: from AS8PR04CA0205.eurprd04.prod.outlook.com (2603:10a6:20b:2f3::30) by DB3PR08MB8985.eurprd08.prod.outlook.com (2603:10a6:10:43f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Tue, 23 May 2023 13:04:25 +0000 Received: from AM7EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f3:cafe::26) by AS8PR04CA0205.outlook.office365.com (2603:10a6:20b:2f3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.29 via Frontend Transport; Tue, 23 May 2023 13:04:25 +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; pr=C Received: from nebula.arm.com (40.67.248.234) by AM7EUR03FT004.mail.protection.outlook.com (100.127.140.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6433.14 via Frontend Transport; Tue, 23 May 2023 13:04:24 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 23 May 2023 13:04:23 +0000 Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Tue, 23 May 2023 13:04:22 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , , , Subject: [PATCH v1 01/12] ArmPkg: Fix data type used for GicDistributorBase Date: Tue, 23 May 2023 14:04:10 +0100 Message-ID: <20230523130421.10804-2-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20230523130421.10804-1-sami.mujawar@arm.com> References: <20230523130421.10804-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AM7EUR03FT004:EE_|DB3PR08MB8985:EE_|AM7EUR03FT059:EE_|PAVPR08MB9209:EE_ X-MS-Office365-Filtering-Correlation-Id: eefe0750-97a5-4f48-9c3b-08db5b8e4489 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: sLBhGF65ZlDvUjyFZ6m29qKHm+2+JM2KhQpgHi9b/inP0Ghk7XsYfHTnlULsySNyJbPLD+gTz/nM0psx6F+wZud3XrWMTUz8w8WKhurOsukG4k9I/xTQ5H3FaXAP3BKK6B1cmrZ2EwtOQP0neGd8G82S0P6UWC9gTA3hJNa+2dL9vewkeTgj2nzJMr6LkpVCo1FJQevZ7GrgkNDoQCQ12UCyS6AUPLqopuGCG2e9tYr+klFWFX3ZyeY2JojLuYiBwm+MZik3a9JmYGIg09h6uDlbbr7o8g3pzYuij9k6qNeBizAstNvZ/sUwK19PKLgPoYYaiCI1lcP/Tx4xs9R0KlBKKMzLVNI2bJuN1AvOPhZwns+uraxwHO3iwUrdPHRqs3flxLCASIMdb0jZEidvEWP7zJpU4dYte3dt35jk/dJzUNyMCAt4fNLycrH+SxAa7SPWTqqYffPPPxjBeJG4197UGzWpPSIIlVKRHZ8c+/C8yqvOwGS3sUsUQhPpEl0t54RxXgbtHFpuDw3JY1SpZ3r53U7XNrBprpmgzSqxnFd9uwYqhAYx64+rWQe0y6KgGZd+ebArNEA3p7KME0wsCuq3iwpYGv53pu2RHfdnmbITTbFIWoO9Cmcx2Ad7+BReM7XtN+Efg3jfSJQJJ6vqq9Sv4L1pi36TE4H6YECgsqsLUdW4svgspBBXIKz/axBIQ5BImgISxaYqAiWoW9peA+kf4DDmRnagW0MzCQZDRkilhNLM8+zDarwjvHcYqoMH 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:(13230028)(4636009)(136003)(396003)(376002)(39860400002)(346002)(451199021)(36840700001)(46966006)(54906003)(82310400005)(41300700001)(7696005)(478600001)(19627235002)(316002)(4326008)(70586007)(6916009)(6666004)(70206006)(86362001)(5660300002)(8936002)(8676002)(44832011)(2906002)(1076003)(26005)(356005)(81166007)(82740400003)(186003)(426003)(336012)(83380400001)(40480700001)(2616005)(36756003)(36860700001)(47076005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR08MB8985 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 2f20e5c6-952b-4015-1c80-08db5b8e3bcc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zNU6O/0fItmVU8aiihPfmWteTex7DuEnyjJPjfRqlb7dXdUznHWr9F+0ZB1wP0JVbZSSmc73RNbyoHCAbkBYAr/U9SA6f/YBSmqgLQ5VJXIBOAab3lvRhucFOsRnStwJBwA7Wt9xCdpzL/Oc4BNC6CelTaMryEpCZywYjKZdFP1BQXvRBRyqLsE7O3bHCB4U8Aed9QcTrUW+3MUgqR1VBS7qVteC+6+6HedD0OcLGMie4Z/+G1l8YkfGc2Mgy9ucKgF0x4a4Gcj7XmT5K+QoMA/T6GAb2lAOw/B2fRKSqcsUE3YqUE++iXW6y77BKbbUKIz5Z5xLzkGilaOH0Ij/v/WpAxrkqGIpPzOkR3xsWZxDJxOgplda4j1ge34XOeOw1K3z25oXBBrDjGzqcLjRrfhxgl/XeUEoI2j1N454wJuKDJSt9UIn8DYs9uMRyX/zGFKmDAGGGKRnE1BoRVBWbnNRUDhbLqmoeI6wGArkEEluNeDtiFOcWkQc9QtIFa1/x69kTWwMX8WP3nNWmG0DVl19GoDj/8LyPTzSWygchT4DxQDan5loipFD5S0eAR+tC4f5IlEN5FsQSxAW5vLsHk/Ags9owQzA67Q43/THF1Urj6lLDbCSXFFFKJOfKL1mpJNEwhiFSU9dlZoXmmmUTCHbo/5Tn1rlL4CR8qBXhQsxcTWbDtx430I+93QPY+clPAF2IlTPJlajaSq4BywUEo05e7bRL4mT1sVnv8OvuwFmXM4+lyWNN8TAsiJI46/E 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:(13230028)(4636009)(376002)(346002)(396003)(136003)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(54906003)(86362001)(41300700001)(7696005)(82310400005)(478600001)(19627235002)(316002)(4326008)(6916009)(6666004)(70586007)(70206006)(5660300002)(8936002)(8676002)(44832011)(81166007)(40460700003)(82740400003)(26005)(186003)(1076003)(426003)(336012)(83380400001)(40480700001)(2906002)(2616005)(36756003)(36860700001)(47076005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2023 13:04:39.4535 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eefe0750-97a5-4f48-9c3b-08db5b8e4489 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: AM7EUR03FT059.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR08MB9209 Content-Type: text/plain The data type used by variables representing the GicDistributorBase has been inconsistently used in the ArmGic driver and the library. The PCD defined for the GIC Distributor base address is UINT64. However, the data types for the variables used is UINTN, INTN, and at some places UINT32. Therefore, update the data types to use UINTN and add necessary typecasts when reading values from the PCD. This should then be consistent across AArch32 and AArch64 builds. Signed-off-by: Sami Mujawar --- ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c | 4 ++-- ArmPkg/Drivers/ArmGic/ArmGicLib.c | 12 ++++++------ ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c | 4 ++-- ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c | 4 ++-- ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c | 4 ++-- ArmPkg/Include/Library/ArmGicLib.h | 18 +++++++++--------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c b/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c index d560c42fc9f3d5e86c2aece504102f43cb841877..9ac073db36ce92fc14de71e9a264059afd63d729 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c @@ -1,6 +1,6 @@ /*++ -Copyright (c) 2013-2017, ARM Ltd. All rights reserved.
+Copyright (c) 2013-2021, Arm Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -61,7 +61,7 @@ GicGetDistributorIcfgBaseAndBit ( RegIndex = Source / ARM_GIC_ICDICFR_F_STRIDE; // NOTE: truncation is significant Field = Source % ARM_GIC_ICDICFR_F_STRIDE; - *RegAddress = PcdGet64 (PcdGicDistributorBase) + *RegAddress = (UINTN)PcdGet64 (PcdGicDistributorBase) + ARM_GIC_ICDICFR + (ARM_GIC_ICDICFR_BYTES * RegIndex); *Config1Bit = ((Field * ARM_GIC_ICDICFR_F_WIDTH) diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmGicLib.c index dd3670c7ccbb18586bb28f4ac02514055471529f..6e44e89390fcdaa89302d6505f75c43c84ce3535 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c @@ -117,7 +117,7 @@ ArmGicGetInterfaceIdentification ( UINTN EFIAPI ArmGicGetMaxNumInterrupts ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ) { UINTN ItLines; @@ -133,10 +133,10 @@ ArmGicGetMaxNumInterrupts ( VOID EFIAPI ArmGicSendSgiTo ( - IN INTN GicDistributorBase, - IN INTN TargetListFilter, - IN INTN CPUTargetList, - IN INTN SgiId + IN UINTN GicDistributorBase, + IN INTN TargetListFilter, + IN INTN CPUTargetList, + IN INTN SgiId ) { MmioWrite32 ( @@ -390,7 +390,7 @@ ArmGicIsInterruptEnabled ( VOID EFIAPI ArmGicDisableDistributor ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ) { // Disable Gic Distributor diff --git a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c index aa4f0e2123929e0a86626b0f068d474065ca67fb..c17cbe041e8a9ceb8c8c3a6b953ff88b75f6f206 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2011-2015, ARM Limited. All rights reserved. +* Copyright (c) 2011-2021, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -13,7 +13,7 @@ VOID EFIAPI ArmGicEnableDistributor ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ) { ARM_GIC_ARCH_REVISION Revision; diff --git a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c index 25290342bde4de907bef050d6f1bdd6e03f8dccc..b7d67d830e46b663e4054990e7456660fb22cda9 100644 --- a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c +++ b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c @@ -2,7 +2,7 @@ Copyright (c) 2009, Hewlett-Packard Company. All rights reserved.
Portions copyright (c) 2010, Apple Inc. All rights reserved.
-Portions copyright (c) 2011-2017, ARM Ltd. All rights reserved.
+Portions copyright (c) 2011-2021, Arm Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -401,7 +401,7 @@ GicV2DxeInitialize ( ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid); mGicInterruptInterfaceBase = PcdGet64 (PcdGicInterruptInterfaceBase); - mGicDistributorBase = PcdGet64 (PcdGicDistributorBase); + mGicDistributorBase = (UINTN)PcdGet64 (PcdGicDistributorBase); mGicNumInterrupts = ArmGicGetMaxNumInterrupts (mGicDistributorBase); for (Index = 0; Index < mGicNumInterrupts; Index++) { diff --git a/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c b/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c index b1f0cd48c752666e8b01eb5a25f8639e49213119..30c3fcbc3eee8e4f41f68a669cbc59650c12ca89 100644 --- a/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c +++ b/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2011-2018, ARM Limited. All rights reserved. +* Copyright (c) 2011-2021, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -381,7 +381,7 @@ GicV3DxeInitialize ( // the system. ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gHardwareInterruptProtocolGuid); - mGicDistributorBase = PcdGet64 (PcdGicDistributorBase); + mGicDistributorBase = (UINTN)PcdGet64 (PcdGicDistributorBase); mGicRedistributorsBase = PcdGet64 (PcdGicRedistributorsBase); mGicNumInterrupts = ArmGicGetMaxNumInterrupts (mGicDistributorBase); diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/ArmGicLib.h index 4ab670967598f21852e46f72116bf4c78ca7dd44..72dbd1ca8d626c69d9bb8727d77fd34b4ab3af28 100644 --- a/ArmPkg/Include/Library/ArmGicLib.h +++ b/ArmPkg/Include/Library/ArmGicLib.h @@ -121,7 +121,7 @@ VOID EFIAPI ArmGicSetupNonSecure ( IN UINTN MpId, - IN INTN GicDistributorBase, + IN UINTN GicDistributorBase, IN INTN GicInterruptInterfaceBase ); @@ -148,28 +148,28 @@ ArmGicDisableInterruptInterface ( VOID EFIAPI ArmGicEnableDistributor ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ); VOID EFIAPI ArmGicDisableDistributor ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ); UINTN EFIAPI ArmGicGetMaxNumInterrupts ( - IN INTN GicDistributorBase + IN UINTN GicDistributorBase ); VOID EFIAPI ArmGicSendSgiTo ( - IN INTN GicDistributorBase, - IN INTN TargetListFilter, - IN INTN CPUTargetList, - IN INTN SgiId + IN UINTN GicDistributorBase, + IN INTN TargetListFilter, + IN INTN CPUTargetList, + IN INTN SgiId ); /* @@ -251,7 +251,7 @@ VOID EFIAPI ArmGicV2SetupNonSecure ( IN UINTN MpId, - IN INTN GicDistributorBase, + IN UINTN GicDistributorBase, IN INTN GicInterruptInterfaceBase ); -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'