X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseIoLibIntrinsic%2FArm%2FArmVirtMmio.asm;h=deba8c1f0c59daf29cc239ffaa3ac90c56875c3c;hp=cff99b86a99cdfc16263d15eea77e74aeaafe6bb;hb=9cabe9d45755fa4e7412e4eba7825d0c46982001;hpb=4134f2bddcb68d2e20ed000cdf54abf3f1140904

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
index cff99b86a9..deba8c1f0c 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
+++ b/MdePkg/Library/BaseIoLibIntrinsic/Arm/ArmVirtMmio.asm
@@ -1,149 +1,151 @@
-;
-;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
-;
-;  This program and the accompanying materials are licensed and made available
-;  under the terms and conditions of the BSD License which accompanies this
-;  distribution.  The full text of the license may be found at
-;  http:;opensource.org/licenses/bsd-license.php
-;
-;  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-;  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-;
-
-
-AREA IoLibMmio, CODE, READONLY
-
-EXPORT MmioRead8Internal
-EXPORT MmioWrite8Internal
-EXPORT MmioRead16Internal
-EXPORT MmioWrite16Internal
-EXPORT MmioRead32Internal
-EXPORT MmioWrite32Internal
-EXPORT MmioRead64Internal
-EXPORT MmioWrite64Internal
-
-;
-;  Reads an 8-bit MMIO register.
-;
-;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead8Internal
-  ldrb    r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes an 8-bit MMIO register.
-;
-;  Writes the 8-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite8Internal
-  dmb     st
-  strb    r1, [r0]
-  bx      lr
-
-;
-;  Reads a 16-bit MMIO register.
-;
-;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead16Internal
-  ldrh    r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 16-bit MMIO register.
-;
-;  Writes the 16-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite16Internal
-  dmb     st
-  strh    r1, [r0]
-  bx      lr
-
-;
-;  Reads a 32-bit MMIO register.
-;
-;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead32Internal
-  ldr     r0, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 32-bit MMIO register.
-;
-;  Writes the 32-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite32Internal
-  dmb     st
-  str     r1, [r0]
-  bx      lr
-
-;
-;  Reads a 64-bit MMIO register.
-;
-;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
-;  returned. This function must guarantee that all MMIO read and write
-;  operations are serialized.
-;
-;  @param  Address The MMIO register to read.
-;
-;  @return The value read.
-;
-MmioRead64Internal
-  ldrd    r0, r1, [r0]
-  dmb
-  bx      lr
-
-;
-;  Writes a 64-bit MMIO register.
-;
-;  Writes the 64-bit MMIO register specified by Address with the value specified
-;  by Value and returns Value. This function must guarantee that all MMIO read
-;  and write operations are serialized.
-;
-;  @param  Address The MMIO register to write.
-;  @param  Value   The value to write to the MMIO register.
-;
-MmioWrite64Internal
-  dmb     st
-  strd    r2, r3, [r0]
-  bx      lr
-
-  END
+;
+;  Copyright (c) 2014-2018, Linaro Limited. All rights reserved.
+;
+;  This program and the accompanying materials are licensed and made available
+;  under the terms and conditions of the BSD License which accompanies this
+;  distribution.  The full text of the license may be found at
+;  http:;opensource.org/licenses/bsd-license.php
+;
+;  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+;  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+;
+
+
+AREA IoLibMmio, CODE, READONLY
+
+EXPORT MmioRead8Internal
+EXPORT MmioWrite8Internal
+EXPORT MmioRead16Internal
+EXPORT MmioWrite16Internal
+EXPORT MmioRead32Internal
+EXPORT MmioWrite32Internal
+EXPORT MmioRead64Internal
+EXPORT MmioWrite64Internal
+
+;
+;  Reads an 8-bit MMIO register.
+;
+;  Reads the 8-bit MMIO register specified by Address. The 8-bit read value is
+;  returned. This function must guarantee that all MMIO read and write
+;  operations are serialized.
+;
+;  @param  Address The MMIO register to read.
+;
+;  @return The value read.
+;
+MmioRead8Internal
+  ldrb    r0, [r0]
+  dmb
+  bx      lr
+
+;
+;  Writes an 8-bit MMIO register.
+;
+;  Writes the 8-bit MMIO register specified by Address with the value specified
+;  by Value and returns Value. This function must guarantee that all MMIO read
+;  and write operations are serialized.
+;
+;  @param  Address The MMIO register to write.
+;  @param  Value   The value to write to the MMIO register.
+;
+MmioWrite8Internal
+  dmb     st
+  strb    r1, [r0]
+  bx      lr
+
+;
+;  Reads a 16-bit MMIO register.
+;
+;  Reads the 16-bit MMIO register specified by Address. The 16-bit read value is
+;  returned. This function must guarantee that all MMIO read and write
+;  operations are serialized.
+;
+;  @param  Address The MMIO register to read.
+;
+;  @return The value read.
+;
+MmioRead16Internal
+  ldrh    r0, [r0]
+  dmb
+  bx      lr
+
+;
+;  Writes a 16-bit MMIO register.
+;
+;  Writes the 16-bit MMIO register specified by Address with the value specified
+;  by Value and returns Value. This function must guarantee that all MMIO read
+;  and write operations are serialized.
+;
+;  @param  Address The MMIO register to write.
+;  @param  Value   The value to write to the MMIO register.
+;
+MmioWrite16Internal
+  dmb     st
+  strh    r1, [r0]
+  bx      lr
+
+;
+;  Reads a 32-bit MMIO register.
+;
+;  Reads the 32-bit MMIO register specified by Address. The 32-bit read value is
+;  returned. This function must guarantee that all MMIO read and write
+;  operations are serialized.
+;
+;  @param  Address The MMIO register to read.
+;
+;  @return The value read.
+;
+MmioRead32Internal
+  ldr     r0, [r0]
+  dmb
+  bx      lr
+
+;
+;  Writes a 32-bit MMIO register.
+;
+;  Writes the 32-bit MMIO register specified by Address with the value specified
+;  by Value and returns Value. This function must guarantee that all MMIO read
+;  and write operations are serialized.
+;
+;  @param  Address The MMIO register to write.
+;  @param  Value   The value to write to the MMIO register.
+;
+MmioWrite32Internal
+  dmb     st
+  str     r1, [r0]
+  bx      lr
+
+;
+;  Reads a 64-bit MMIO register.
+;
+;  Reads the 64-bit MMIO register specified by Address. The 64-bit read value is
+;  returned. This function must guarantee that all MMIO read and write
+;  operations are serialized.
+;
+;  @param  Address The MMIO register to read.
+;
+;  @return The value read.
+;
+MmioRead64Internal
+  ldr     r1, [r0, #4]
+  ldr     r0, [r0]
+  dmb
+  bx      lr
+
+;
+;  Writes a 64-bit MMIO register.
+;
+;  Writes the 64-bit MMIO register specified by Address with the value specified
+;  by Value and returns Value. This function must guarantee that all MMIO read
+;  and write operations are serialized.
+;
+;  @param  Address The MMIO register to write.
+;  @param  Value   The value to write to the MMIO register.
+;
+MmioWrite64Internal
+  dmb     st
+  str     r2, [r0]
+  str     r3, [r0, #4]
+  bx      lr
+
+  END