From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eu-smtp-delivery-143.mimecast.com (eu-smtp-delivery-143.mimecast.com [207.82.80.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A82EB1A1E72 for ; Thu, 20 Oct 2016 22:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eMDWiBgTU2MS+F1iBNsos7O9KPDaxukW//iYhrlpzrM=; b=akHLzzNXEYhsdIxI8+8Fe61w0CZFzg5wwK0alfqbw9mzrH0ao9Y5B97QqCIfCdQZ54nIbehzCSK1NfwVMCzWeJIe6Pao6Y3CO9/3TnLOlJjzvzjiEziS3D1njmxZ1eICVEV+ecumagbStzsraQhoHCQpMsEVqY+qFt+cKZwe1bI= Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp0111.outbound.protection.outlook.com [213.199.154.111]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-30-ynRldCtiNnK6xHueI59VHA-1; Fri, 21 Oct 2016 06:51:17 +0100 Received: from HE1PR0801CA0017.eurprd08.prod.outlook.com (10.167.184.27) by HE1PR08MB0809.eurprd08.prod.outlook.com (10.164.52.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.12; Fri, 21 Oct 2016 05:51:15 +0000 Received: from DB3FFO11FD010.protection.gbl (2a01:111:f400:7e04::129) by HE1PR0801CA0017.outlook.office365.com (2603:10a6:3:6::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16 via Frontend Transport; Fri, 21 Oct 2016 05:51:15 +0000 Received: from nebula.arm.com (217.140.96.140) by DB3FFO11FD010.mail.protection.outlook.com (10.47.216.166) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.669.7 via Frontend Transport; Fri, 21 Oct 2016 05:51:15 +0000 Received: from dennis-ws.asiapac.arm.com (10.1.2.79) by mail.arm.com (10.1.105.66) with Microsoft SMTP Server id 14.3.294.0; Fri, 21 Oct 2016 06:51:02 +0100 From: Dennis Chen To: CC: , Dennis Chen , Ard Biesheuvel , Leif Lindholm Date: Fri, 21 Oct 2016 13:50:54 +0800 Message-ID: <1477029054-31980-1-git-send-email-dennis.chen@arm.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(586003)(11100500001)(2906002)(626004)(104016004)(5003940100001)(4326007)(229853001)(86362001)(2351001)(50466002)(77096005)(50986999)(6916009)(87936001)(6666003)(36756003)(26826002)(8936002)(50226002)(106466001)(305945005)(33646002)(356003)(48376002)(19580405001)(189998001)(47776003)(19580395003)(8676002)(92566002)(5660300001)(246002)(7846002)(110136003)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR08MB0809; H:nebula.arm.com; FPR:; SPF:Pass; PTR:fw-tnat.cambridge.arm.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD010; 1:kcIWS5yaX3W9U7/NFJ7TaHyjMRn8yF4DKl+5cVc3/or+BIGLZKN0BhaiJizZaVu8LKRpbLDCEeAzspGA57LONUj7gEqryvBiQHjCchKsH/1E7MmX0WPIcFzWIUIurtp24Fs/VUkhphyo2BK8XfxuKP5nCh42fdp+SQJKoffbuwPx0wCl7kw+B45HCwd7oq+wrZzr097D4C5nmgMM5PvfCzAfaRpaIadq8ZzI7uO+6lr44Q2oP7XDqNlbqK3x8mWgwy/qdVDeTdtboHgN8j0EK0f2D9H4pbpwU0mj8mLUaWKs+gxxZ+l3NIB/kUXFQ0q95oowejW7T3uuplgJ/QK80jGNvrsgU52fnxYjETvPPAOl/rUGeHvq7vlARjhjOVMr2IOggNQCtnQ6xIPVlJrPb6iZRjkt9NE9AN33nD7OmJ+UUG+f+5rmgJMf0qCOk4kYlD5j9EKFNGtIsHfvMKw62dYFBfuSTvuRulBl/oSLQDclQj8v/DtFEkoSVPPEdBe2/tLFiC2vxd5tSW/9lEvLYNIHytgVw5hR05ojNZQiE84Q9t+yg+QMoecFTlti/m1v/NyjtCmxZu9GIrdFZJsWRhaIFIQrQV6kcTHErXbv10g= X-MS-Office365-Filtering-Correlation-Id: c467a7e2-7b19-4500-d764-08d3f9764557 X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0809; 2:DLWyXcAtfcpPLO4vwZzWaKJOH5HHTmnM1MlNO+nFyXeXe0q/nWARXt5Vp5sOAsOveWG9R06EpTaFm4G6hy2KICS3gPTNyrtSgHobRi/YJWx23ocXUsBkp6LDmK4R7JRwziEf3StlbDHpPB4j5D/WRyUX8+QtyrpQoL3AfD7N9nwlvRMHf9AlvmuAY1+9aopR1Rvxc2eKRBoqilRfgbhEpA==; 3:++fgZI7pmutNSN9oOV377lyi1usEGBiS2uV27H3e3ZrDc7IduUtVawMF3UTrKSO4bUnWcOd18fJ5X+J34c2F/HTGtHlhQDJPvQO8tqM9WMJUlVuTK18RBO89zq7AOYk0LiKIqS88cHYrd4RBdv40JCxwOekCbhOb1lT6Gu6HSbF05h0UG6TwvQfe+Zz5m65N+0+5mjVHpVhMxOhkc6kwYND9DkQkDGSVZTtn7JDX5haBWwb1816st15c2uuFTv/Sq/8nhzByn4AwK5mQVKgJ0tp18NNc2trQxA8BDrWuMxY=; 25:MWsgbsqAnaMGd9wzLTyjl34mQhkWKAtMj/5f/BqUp8APL0+WGKCj1/HkPtG9DxJOUE6xyTzffOMUELZR7Csv8E0D19qxHdOVs1kPmGJZCmpXv2nVo3XLwHNCUTNlB2fmomjCHhtgPH1ONaLy3yKJtWm/f1WxtelYtlvCOV/DyU0wV0IZgzyYto5xuAWeTAfb5KbZ1uILRZJU08aUVPXftKXPKE1FVjNEvL8xR6nGPrZ9Xf6KSsIuJMgOmVMckpPxFa4rxs4i/vCCE6QQj0/Mp3x7oXc6vQ0Fa48UnU1cVCwoU4bm5xThA85hdSmlasQTjAYGhB2w0bKD4kq/JIc6wWXPeDBQvjUe1YR3LkNLfMWXkpj5vgjwO/JDdo0xCwCaOqD7zXWpSS9Lq+p7TA49cYrEDwLwgemJvaV26KvDXb0e4MOSqigWcAY0U794kO2y X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:HE1PR08MB0809; X-LD-Processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0809; 31:8Bi4MKcmVvGuSHKI3QUq3jj3dmRekpL1P1okDIAl56FyPbZZvQOLEUCaZaTEcLCHcTuIyZzrWpAFQDEPv78L7Y5vSyG2ZZUeu7HtVx1gd03FEsfwJ0hrtPaS0WHKvPI1S9o1wZKSE5wbL41g9hxJXxKVHDgZQT8cTdwqLLXdgKobvez8fyrwvQLcpWzGd2XHxzXY+RoKqx+vFUM6bS/eq63p1ODWZ/LL0qcGaqSuEttfR4wY4hwViSRAaaqdT592; 20:Mv7g0HBuMJh1TMHYNR3ehMvx74za3e3MqJRzhlIk3PBOsmRQqwHXwAM+Atg+vDMY+6uIJnBmiF1q9l1j7Kk85pA1vsW5TMk/Kz3bVipUUljl3/Tz5PMHL2J5Mo1Z8/gM4BlmehGizYeqTBeU8lQPRF0gFJac9f3p+UsBVpmPYtVqgfexxmeXeNjZpCGZ+qrQIRKhjBs6GnNDaTvPAgurSdJ1y8RZMcGQHdDBziOUmQvZqH3LVbnYN7s16djhjTi4 NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13024025)(13020025)(13013025)(8121501046)(13023025)(5005006)(3002001)(10201501046)(6055026); SRVR:HE1PR08MB0809; BCL:0; PCL:0; RULEID:; SRVR:HE1PR08MB0809; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0809; 4:/ZeBulTBFHJnhdzE6yceHs4Ot06AklkiS1rF424FXKFhfwkYcaGcJrVRSIVmueL051640Q9G+sRo5k7yCwsn/7LN+VPWudOcVMT9f53Edq8+IJ4p2TG5KwVEG5p16ml6dWSjPBDnPy1dMhxQxGkPc7qAcnYI2SCmEOMG9F9Lg0z0lBhmugYanxFgHWl1qsN5BWW5AwxQj5tEYJJrCPs0UFnmn23OyIP02odN0K+60hfPrUV8dRPmBWVKVgz/lPQWeGAsADbYgWHPYkHq5U43B6rIj6+dGlz9tXVV2YUN/MtXCiJ6Tk9/tol8QWLBmRayWBw74oXnPqyoCWLxgtnXRNFl8oKp7MCC5enMXJn4O/BQfiaXdgF/HuPdVFtGti64DBx0neXIHwS3sqSfMKo7lgYbEWygBP2PcJxfErY6f4ka0s9hpfT0avhluOEwRZrusCcO54iYJ3p5KOWuL1OsUbncLV4kaDEw/7iGZWE3ZWslo0DzQwyxyjBW+M+VbXITLS7x+jJG5//Mo3SnZwR5eU9KKW4qLQIbivBK0KqOcY0= X-Forefront-PRVS: 01026E1310 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB0809; 23:1Lg5qkXWnv+JoGvuPESZ0NVjk0KC7NDUmXMyuYDeX?= =?us-ascii?Q?PiOJTwtVWWG/AeLxqJdgaep14DAPn6nr57s1EmKxNRzLw8DUSLc32yKVpDy+?= =?us-ascii?Q?PTxQrhNNAZuecbpyee6A9XOuOr31mi59m6qatO0l6lHXoFaeWX+CXIe+4ghE?= =?us-ascii?Q?EaFEOqO9JdMHyhNuQlP9yyuW93RUZOetGbqdPYaGwFfvxWTAiHfhXWsj2zEh?= =?us-ascii?Q?S2EMM+eioZ2QdUWNoSqB/tqMlEeN75CNXtt7c4gAVkZszESYHOTlf/Q70Klt?= =?us-ascii?Q?CpZ4toTB21arKY73ZQbtxB9HOuidBhsJ/LoOQOdBeM9knV20N1I++UOQduip?= =?us-ascii?Q?R8aGiibV9K7B8xKIjB7RiuLKCP66datXItKgF6Z3gpNM29F774yPcmcMmg6Z?= =?us-ascii?Q?W/jyYWNH5PShXCvDVRiyOCeFnE8YCo5ATubMz0RcvleEkOKenYRKv4Hpx3kP?= =?us-ascii?Q?kshLT7A71oZp37o3+9KBesqgd/L0Hrj4/S/d1YTALs9ZAYeG0afmuwmhIM/x?= =?us-ascii?Q?WGTVA2/EeaHe9OfCXBUFHUESdrCgu1KWarWz/JTv/i2yTb8yvAuc0OrfrQRO?= =?us-ascii?Q?/9hFQ20DN0BAQNQ5R3E+C4SoYpPFGq3pMyh1n1UVrsRAfzU7VPzI7K8BbFM7?= =?us-ascii?Q?jeDel0Oqnsk64/GeYNPZqO9+Ctm3MsnvL/oY5WgnD4kSEaZzw7FPxXGKPtSM?= =?us-ascii?Q?2Yu4H23ROf+Ht8iaMLOCJRbifiEFycCQfgX+Lj6heERyGcGh6l8Q87RQOV7T?= =?us-ascii?Q?drrGZb2wv/mf6A0VfAgS3nq6Ts0lNEyFsuzj4fl7iCoDe4Kf5sTnEg+opY6U?= =?us-ascii?Q?LuG/WH1l3yxMCOAOc4dXwua5l+uFq3m6KlTiZII2wR+UrNFf5WW8PTxp8Nul?= =?us-ascii?Q?A1nPfv0Q0aHHtrkHgu2FTgyJ96MYWYklPmO0KHpqwjZ1HUzgo40+ioWw7j30?= =?us-ascii?Q?ORYoQyilnOyvnXw3kyZ5p09Xady8F8HPR8mBSOvNAHdPqeAv+7wYWBS5TVI+?= =?us-ascii?Q?A1HfQ6YC8c7ak73RFfAjrgchluEQ4SEX9ecXIUm3tlgR3jEIEhafTenSzsZE?= =?us-ascii?Q?3zU55k=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0809; 6:pC7Ekqapm3ryEQlMGuhfeHAXpmX+YYZJzLh4eYwO6/GAunnqKtxNpChrUwZ0is93V2JOqaGkjotTWpwiPe9O2P8Tsun7XPLsvjCNo401yJp9+CGRPf4uVKr8qs63jUnkpXo6o8thVJtlw1Y9N0Xxj9/0kLjP6u8EHwvuDyJ7rkN2VrZb/ueyPQOGBFSBrx4e7xgounwG6b72V8dcn+a7W2QrkFq1P9+8xdM3FXiYUkP+hU/Db6yD7OZv9lJD0IrYc+JOkFviR90mj1zaBtaxfozCOmD4cMibJ2dW+gQUnYdBr0V+7KD/K/+94Yk2OkH86a2KIJosPJAWNWO0fsg+zK+WJvCwVB5sx5QgTmTmTTg=; 5:KSP1g19xpJGInCr/zbhP5lPM3UV3JoTypEZe4KrdLBdHluzll+Yacsry9TElrXdCVrx56ykyOaoQNS3f3F6MKHLJvPCHBtTPSYX/A+s8ZdD1Al+TdRRNzAsj82bKQ/YEjLeym+eLDf4T+P60zQTUOg==; 24:NoF9jng8S7y74WzIbb67d99rYN5MxeJ2mfyDNK/7tAUcSr71HaGnT5Q0cAbkAENnf+U8lyLSPSAOrhbKWwBSyRtfd5UiHkliJxL9B8kZpAw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB0809; 7:qIenUILfug5L78ioaMoygdx9Hp0TMdO2hGX4iJXPK+MEfVmb9CIT/Qu4sdANgJU2qTy/eiNAfPgkgpM5jFMNU4Jqmf45qmJqhthsa8HZ+dGSEM0V3WFYvEzW5nbywR66mT1hLbJxQ+EnhE9Yo2gugtND2IIzKAz/TsajLzB21unQGqhuNY58FO44wbsO0Qc4jkqNXcJ6bhl/djOzAwmuz6DS3+1nICbai1+872D1o9/vtzlsXXLr69pmmPIrqa0YZ7rOWwxuQxrao97XqAUe7lbnGOwttvpH6pObhqJNoNH59wCQTMzyf+M84HpS4iOivreMEDgkP9ViIeqnmwHOwNX/KYDlyxEIvb/fFuDFEIw= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2016 05:51:15.1717 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB0809 X-MC-Unique: ynRldCtiNnK6xHueI59VHA-1 Subject: [RESEND PATCH] ARMPkg: Unify the GIC base address variables as 64-bit X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2016 05:51:22 -0000 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Since ACPI spec defines the GIC base addresses (CPU interface, Distributor and Redistributor*GICv3 only*) as 64-bit, so we should define these corresponding base address variables as 64-bit instead of 32-bit. This patch redefines them according to the ACPI spec. Contributed-under: TianoCore Contribution Agreement 1.0 Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Dennis Chen --- ArmPkg/Drivers/ArmGic/ArmGicLib.c | 64 ++++++++++---------- ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c | 2 +- ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c | 4 +- ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2NonSecLib.c | 4 +- ArmPkg/Include/Library/ArmGicLib.h | 78 ++++++++++++---------= ---- 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.c b/ArmPkg/Drivers/ArmGic/ArmG= icLib.c index e658e9b..733488c 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicLib.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.c @@ -41,18 +41,18 @@ SourceIsSpi ( * @retval Base address of the associated GIC Redistributor */ STATIC -UINTN +UINT64 GicGetCpuRedistributorBase ( - IN UINTN GicRedistributorBase, - IN ARM_GIC_ARCH_REVISION Revision + IN UINT64 GicRedistributorBase, + IN ARM_GIC_ARCH_REVISION Revision ) { - UINTN Index; - UINTN MpId; - UINTN CpuAffinity; - UINTN Affinity; - UINTN GicRedistributorGranularity; - UINTN GicCpuRedistributorBase; + UINTN Index; + UINTN MpId; + UINTN CpuAffinity; + UINTN Affinity; + UINTN GicRedistributorGranularity; + UINT64 GicCpuRedistributorBase; =20 MpId =3D ArmReadMpidr (); // Define CPU affinity as Affinity0[0:8], Affinity1[9:15], Affinity2[16:= 23], Affinity3[24:32] @@ -87,7 +87,7 @@ GicGetCpuRedistributorBase ( UINTN EFIAPI ArmGicGetInterfaceIdentification ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ) { // Read the GIC Identification Register @@ -97,7 +97,7 @@ ArmGicGetInterfaceIdentification ( UINTN EFIAPI ArmGicGetMaxNumInterrupts ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ) { return 32 * ((MmioRead32 (GicDistributorBase + ARM_GIC_ICDICTR) & 0x1F) = + 1); @@ -106,10 +106,10 @@ ArmGicGetMaxNumInterrupts ( VOID EFIAPI ArmGicSendSgiTo ( - IN INTN GicDistributorBase, - IN INTN TargetListFilter, - IN INTN CPUTargetList, - IN INTN SgiId + IN UINT64 GicDistributorBase, + IN UINTN TargetListFilter, + IN UINTN CPUTargetList, + IN UINTN SgiId ) { MmioWrite32 (GicDistributorBase + ARM_GIC_ICDSGIR, ((TargetListFilter & = 0x3) << 24) | ((CPUTargetList & 0xFF) << 16) | SgiId); @@ -131,8 +131,8 @@ ArmGicSendSgiTo ( UINTN EFIAPI ArmGicAcknowledgeInterrupt ( - IN UINTN GicInterruptInterfaceBase, - OUT UINTN *InterruptId + IN UINT64 GicInterruptInterfaceBase, + OUT UINTN *InterruptId ) { UINTN Value; @@ -162,8 +162,8 @@ ArmGicAcknowledgeInterrupt ( VOID EFIAPI ArmGicEndOfInterrupt ( - IN UINTN GicInterruptInterfaceBase, - IN UINTN Source + IN UINT64 GicInterruptInterfaceBase, + IN UINTN Source ) { ARM_GIC_ARCH_REVISION Revision; @@ -181,9 +181,9 @@ ArmGicEndOfInterrupt ( VOID EFIAPI ArmGicEnableInterrupt ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ) { UINT32 RegOffset; @@ -216,9 +216,9 @@ ArmGicEnableInterrupt ( VOID EFIAPI ArmGicDisableInterrupt ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ) { UINT32 RegOffset; @@ -250,15 +250,15 @@ ArmGicDisableInterrupt ( BOOLEAN EFIAPI ArmGicIsInterruptEnabled ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ) { UINT32 RegOffset; UINTN RegShift; ARM_GIC_ARCH_REVISION Revision; - UINTN GicCpuRedistributorBase; + UINT64 GicCpuRedistributorBase; UINT32 Interrupts; =20 // Calculate enable register offset and bit position @@ -286,7 +286,7 @@ ArmGicIsInterruptEnabled ( VOID EFIAPI ArmGicDisableDistributor ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ) { // Disable Gic Distributor @@ -296,7 +296,7 @@ ArmGicDisableDistributor ( VOID EFIAPI ArmGicEnableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ) { ARM_GIC_ARCH_REVISION Revision; @@ -314,7 +314,7 @@ ArmGicEnableInterruptInterface ( VOID EFIAPI ArmGicDisableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ) { ARM_GIC_ARCH_REVISION Revision; diff --git a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c b/ArmPkg/Drivers/ArmGi= c/ArmGicNonSecLib.c index f90391b..bc01db9 100644 --- a/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSecLib.c @@ -19,7 +19,7 @@ VOID EFIAPI ArmGicEnableDistributor ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ) { ARM_GIC_ARCH_REVISION Revision; diff --git a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c b/ArmPkg/Drivers/Arm= Gic/GicV2/ArmGicV2Dxe.c index b9ecd55..c7c5af1 100644 --- a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c +++ b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c @@ -30,8 +30,8 @@ Abstract: =20 extern EFI_HARDWARE_INTERRUPT_PROTOCOL gHardwareInterruptV2Protocol; =20 -STATIC UINT32 mGicInterruptInterfaceBase; -STATIC UINT32 mGicDistributorBase; +STATIC UINT64 mGicInterruptInterfaceBase; +STATIC UINT64 mGicDistributorBase; =20 /** Enable interrupt source Source. diff --git a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2NonSecLib.c b/ArmPkg/Drive= rs/ArmGic/GicV2/ArmGicV2NonSecLib.c index 92b764f..a7adbaf 100644 --- a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2NonSecLib.c +++ b/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2NonSecLib.c @@ -20,7 +20,7 @@ VOID EFIAPI ArmGicV2EnableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ) { /* @@ -33,7 +33,7 @@ ArmGicV2EnableInterruptInterface ( VOID EFIAPI ArmGicV2DisableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ) { // Disable Gic Interface diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/Ar= mGicLib.h index 4364f3f..bf6405c 100644 --- a/ArmPkg/Include/Library/ArmGicLib.h +++ b/ArmPkg/Include/Library/ArmGicLib.h @@ -101,7 +101,7 @@ UINTN EFIAPI ArmGicGetInterfaceIdentification ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 // @@ -110,56 +110,56 @@ ArmGicGetInterfaceIdentification ( VOID EFIAPI ArmGicSetupNonSecure ( - IN UINTN MpId, - IN INTN GicDistributorBase, - IN INTN GicInterruptInterfaceBase + IN UINTN MpId, + IN UINT64 GicDistributorBase, + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicSetSecureInterrupts ( - IN UINTN GicDistributorBase, - IN UINTN* GicSecureInterruptMask, - IN UINTN GicSecureInterruptMaskSize + IN UINT64 GicDistributorBase, + IN UINTN* GicSecureInterruptMask, + IN UINTN GicSecureInterruptMaskSize ); =20 VOID EFIAPI ArmGicEnableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicDisableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicEnableDistributor ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ); =20 VOID EFIAPI ArmGicDisableDistributor ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ); =20 UINTN EFIAPI ArmGicGetMaxNumInterrupts ( - IN INTN GicDistributorBase + IN UINT64 GicDistributorBase ); =20 VOID EFIAPI ArmGicSendSgiTo ( - IN INTN GicDistributorBase, - IN INTN TargetListFilter, - IN INTN CPUTargetList, - IN INTN SgiId + IN UINT64 GicDistributorBase, + IN UINTN TargetListFilter, + IN UINTN CPUTargetList, + IN UINTN SgiId ); =20 /* @@ -178,46 +178,46 @@ ArmGicSendSgiTo ( UINTN EFIAPI ArmGicAcknowledgeInterrupt ( - IN UINTN GicInterruptInterfaceBase, - OUT UINTN *InterruptId + IN UINT64 GicInterruptInterfaceBase, + OUT UINTN *InterruptId ); =20 VOID EFIAPI ArmGicEndOfInterrupt ( - IN UINTN GicInterruptInterfaceBase, - IN UINTN Source + IN UINT64 GicInterruptInterfaceBase, + IN UINTN Source ); =20 UINTN EFIAPI ArmGicSetPriorityMask ( - IN INTN GicInterruptInterfaceBase, - IN INTN PriorityMask + IN UINT64 GicInterruptInterfaceBase, + IN UINTN PriorityMask ); =20 VOID EFIAPI ArmGicEnableInterrupt ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ); =20 VOID EFIAPI ArmGicDisableInterrupt ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ); =20 BOOLEAN EFIAPI ArmGicIsInterruptEnabled ( - IN UINTN GicDistributorBase, - IN UINTN GicRedistributorBase, - IN UINTN Source + IN UINT64 GicDistributorBase, + IN UINT64 GicRedistributorBase, + IN UINTN Source ); =20 // @@ -230,34 +230,34 @@ ArmGicIsInterruptEnabled ( VOID EFIAPI ArmGicV2SetupNonSecure ( - IN UINTN MpId, - IN INTN GicDistributorBase, - IN INTN GicInterruptInterfaceBase + IN UINTN MpId, + IN UINT64 GicDistributorBase, + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicV2EnableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicV2DisableInterruptInterface ( - IN INTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 UINTN EFIAPI ArmGicV2AcknowledgeInterrupt ( - IN UINTN GicInterruptInterfaceBase + IN UINT64 GicInterruptInterfaceBase ); =20 VOID EFIAPI ArmGicV2EndOfInterrupt ( - IN UINTN GicInterruptInterfaceBase, - IN UINTN Source + IN UINT64 GicInterruptInterfaceBase, + IN UINTN Source ); =20 // --=20 2.7.4