mirror of
				https://gitlab.com/qemu-project/edk2.git
				synced 2025-10-30 07:56:39 +08:00 
			
		
		
		
	ArmPkg: Remove ARM32 Support from ArmMonitorLib
edk2 is dropping support for the ARM32 architecture. This commit removes ARM32 files from ArmMonitorLib. Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
This commit is contained in:
		 Oliver Smith-Denny
					Oliver Smith-Denny
				
			
				
					committed by
					
						![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
			
				
	
			
			
			![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
						parent
						
							4bd1f47642
						
					
				
				
					commit
					889676ac60
				
			| @ -23,7 +23,6 @@ typedef struct { | ||||
|   UINTN    Arg5; | ||||
|   UINTN    Arg6; | ||||
|   UINTN    Arg7; | ||||
|  #ifdef MDE_CPU_AARCH64 | ||||
|   UINTN    Arg8; | ||||
|   UINTN    Arg9; | ||||
|   UINTN    Arg10; | ||||
| @ -34,7 +33,6 @@ typedef struct { | ||||
|   UINTN    Arg15; | ||||
|   UINTN    Arg16; | ||||
|   UINTN    Arg17; | ||||
|  #endif | ||||
| } ARM_MONITOR_ARGS; | ||||
|  | ||||
| /** Monitor call. | ||||
|  | ||||
| @ -1,49 +0,0 @@ | ||||
| // | ||||
| //  Copyright (c) 2024, Google Llc. All rights reserved. | ||||
| // | ||||
| //  SPDX-License-Identifier: BSD-2-Clause-Patent | ||||
| // | ||||
| // | ||||
|  | ||||
| #include <AsmMacroLib.h> | ||||
|  | ||||
| /** Monitor call. | ||||
|  | ||||
|   An HyperVisor Call (HVC) or System Monitor Call (SMC) will be issued | ||||
|   depending on the default conduit. PcdMonitorConduitHvc determines the type | ||||
|   of the call: if true, do an HVC. | ||||
|  | ||||
|   @param [in,out]  Args    Arguments for the HVC/SMC. | ||||
| **/ | ||||
| ASM_FUNC(ArmMonitorCall) | ||||
|   push  {r4-r7} | ||||
|  | ||||
|   // Preserve R0 for later use | ||||
|   mov   ip, r0 | ||||
|  | ||||
|   // Load the SMCCC arguments values into the appropriate registers | ||||
|   ldm   r0, {r0-r7} | ||||
|  | ||||
| #if !defined(_PCD_VALUE_PcdMonitorConduitHvc) | ||||
| #error | ||||
| #elif _PCD_VALUE_PcdMonitorConduitHvc == 0 | ||||
|   .arch_extension sec | ||||
|   smc   #0 | ||||
| #elif _PCD_VALUE_PcdMonitorConduitHvc == 1 | ||||
|   .arch_extension virt | ||||
|   hvc   #0 | ||||
| #else | ||||
| #error | ||||
| #endif | ||||
|  | ||||
|   // A SMCCC SMC32/HVC32 call can return up to 8 values. | ||||
|   stm   ip, {r0-r7} | ||||
|  | ||||
|   // Clear return values from registers | ||||
|   mov   r0, #0 | ||||
|   mov   r1, #0 | ||||
|   mov   r2, #0 | ||||
|   mov   r3, #0 | ||||
|  | ||||
|   pop   {r4-r7} | ||||
|   bx    lr | ||||
| @ -14,9 +14,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   LIBRARY_CLASS                  = ArmMonitorLib | ||||
|  | ||||
| [Sources.ARM] | ||||
|   Arm/ArmMonitorLib.S | ||||
|  | ||||
| [Sources.AARCH64] | ||||
|   AArch64/ArmMonitorLib.S | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user