X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseIoLibIntrinsic%2FIoLibArmVirt.c;fp=MdePkg%2FLibrary%2FBaseIoLibIntrinsic%2FIoLibArmVirt.c;h=6360586929b92b89930fc872abe27c4936d80fab;hp=61408407698fd032b780ea4a5a24fd4ffefea926;hb=2f88bd3a1296c522317f1c21377876de63de5be7;hpb=1436aea4d5707e672672a11bda72be2c63c936c3 diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibArmVirt.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibArmVirt.c index 6140840769..6360586929 100644 --- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibArmVirt.c +++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibArmVirt.c @@ -27,7 +27,7 @@ UINT8 EFIAPI MmioRead8Internal ( - IN UINTN Address + IN UINTN Address ); /** @@ -44,8 +44,8 @@ MmioRead8Internal ( VOID EFIAPI MmioWrite8Internal ( - IN UINTN Address, - IN UINT8 Value + IN UINTN Address, + IN UINT8 Value ); /** @@ -63,7 +63,7 @@ MmioWrite8Internal ( UINT16 EFIAPI MmioRead16Internal ( - IN UINTN Address + IN UINTN Address ); /** @@ -80,8 +80,8 @@ MmioRead16Internal ( VOID EFIAPI MmioWrite16Internal ( - IN UINTN Address, - IN UINT16 Value + IN UINTN Address, + IN UINT16 Value ); /** @@ -99,7 +99,7 @@ MmioWrite16Internal ( UINT32 EFIAPI MmioRead32Internal ( - IN UINTN Address + IN UINTN Address ); /** @@ -116,8 +116,8 @@ MmioRead32Internal ( VOID EFIAPI MmioWrite32Internal ( - IN UINTN Address, - IN UINT32 Value + IN UINTN Address, + IN UINT32 Value ); /** @@ -135,7 +135,7 @@ MmioWrite32Internal ( UINT64 EFIAPI MmioRead64Internal ( - IN UINTN Address + IN UINTN Address ); /** @@ -152,8 +152,8 @@ MmioRead64Internal ( VOID EFIAPI MmioWrite64Internal ( - IN UINTN Address, - IN UINT64 Value + IN UINTN Address, + IN UINT64 Value ); /** @@ -173,7 +173,7 @@ MmioWrite64Internal ( UINT8 EFIAPI IoRead8 ( - IN UINTN Port + IN UINTN Port ) { ASSERT (FALSE); @@ -198,8 +198,8 @@ IoRead8 ( UINT8 EFIAPI IoWrite8 ( - IN UINTN Port, - IN UINT8 Value + IN UINTN Port, + IN UINT8 Value ) { ASSERT (FALSE); @@ -223,7 +223,7 @@ IoWrite8 ( UINT16 EFIAPI IoRead16 ( - IN UINTN Port + IN UINTN Port ) { ASSERT (FALSE); @@ -248,8 +248,8 @@ IoRead16 ( UINT16 EFIAPI IoWrite16 ( - IN UINTN Port, - IN UINT16 Value + IN UINTN Port, + IN UINT16 Value ) { ASSERT (FALSE); @@ -273,7 +273,7 @@ IoWrite16 ( UINT32 EFIAPI IoRead32 ( - IN UINTN Port + IN UINTN Port ) { ASSERT (FALSE); @@ -298,8 +298,8 @@ IoRead32 ( UINT32 EFIAPI IoWrite32 ( - IN UINTN Port, - IN UINT32 Value + IN UINTN Port, + IN UINT32 Value ) { ASSERT (FALSE); @@ -324,7 +324,7 @@ IoWrite32 ( UINT64 EFIAPI IoRead64 ( - IN UINTN Port + IN UINTN Port ) { ASSERT (FALSE); @@ -350,8 +350,8 @@ IoRead64 ( UINT64 EFIAPI IoWrite64 ( - IN UINTN Port, - IN UINT64 Value + IN UINTN Port, + IN UINT64 Value ) { ASSERT (FALSE); @@ -378,9 +378,9 @@ IoWrite64 ( VOID EFIAPI IoReadFifo8 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer + IN UINTN Port, + IN UINTN Count, + OUT VOID *Buffer ) { ASSERT (FALSE); @@ -406,9 +406,9 @@ IoReadFifo8 ( VOID EFIAPI IoWriteFifo8 ( - IN UINTN Port, - IN UINTN Count, - IN VOID *Buffer + IN UINTN Port, + IN UINTN Count, + IN VOID *Buffer ) { ASSERT (FALSE); @@ -434,9 +434,9 @@ IoWriteFifo8 ( VOID EFIAPI IoReadFifo16 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer + IN UINTN Port, + IN UINTN Count, + OUT VOID *Buffer ) { ASSERT (FALSE); @@ -462,9 +462,9 @@ IoReadFifo16 ( VOID EFIAPI IoWriteFifo16 ( - IN UINTN Port, - IN UINTN Count, - IN VOID *Buffer + IN UINTN Port, + IN UINTN Count, + IN VOID *Buffer ) { ASSERT (FALSE); @@ -490,9 +490,9 @@ IoWriteFifo16 ( VOID EFIAPI IoReadFifo32 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer + IN UINTN Port, + IN UINTN Count, + OUT VOID *Buffer ) { ASSERT (FALSE); @@ -518,9 +518,9 @@ IoReadFifo32 ( VOID EFIAPI IoWriteFifo32 ( - IN UINTN Port, - IN UINTN Count, - IN VOID *Buffer + IN UINTN Port, + IN UINTN Count, + IN VOID *Buffer ) { ASSERT (FALSE); @@ -543,16 +543,17 @@ IoWriteFifo32 ( UINT8 EFIAPI MmioRead8 ( - IN UINTN Address + IN UINTN Address ) { - UINT8 Value; - BOOLEAN Flag; + UINT8 Value; + BOOLEAN Flag; Flag = FilterBeforeMmIoRead (FilterWidth8, Address, &Value); if (Flag) { Value = MmioRead8Internal (Address); } + FilterAfterMmIoRead (FilterWidth8, Address, &Value); return Value; @@ -574,16 +575,17 @@ MmioRead8 ( UINT8 EFIAPI MmioWrite8 ( - IN UINTN Address, - IN UINT8 Value + IN UINTN Address, + IN UINT8 Value ) { - BOOLEAN Flag; + BOOLEAN Flag; Flag = FilterBeforeMmIoWrite (FilterWidth8, Address, &Value); if (Flag) { MmioWrite8Internal (Address, Value); } + FilterAfterMmIoWrite (FilterWidth8, Address, &Value); return Value; @@ -606,11 +608,11 @@ MmioWrite8 ( UINT16 EFIAPI MmioRead16 ( - IN UINTN Address + IN UINTN Address ) { - BOOLEAN Flag; - UINT16 Value; + BOOLEAN Flag; + UINT16 Value; ASSERT ((Address & 1) == 0); @@ -618,6 +620,7 @@ MmioRead16 ( if (Flag) { Value = MmioRead16Internal (Address); } + FilterAfterMmIoRead (FilterWidth16, Address, &Value); return Value; @@ -639,11 +642,11 @@ MmioRead16 ( UINT16 EFIAPI MmioWrite16 ( - IN UINTN Address, - IN UINT16 Value + IN UINTN Address, + IN UINT16 Value ) { - BOOLEAN Flag; + BOOLEAN Flag; ASSERT ((Address & 1) == 0); @@ -651,6 +654,7 @@ MmioWrite16 ( if (Flag) { MmioWrite16Internal (Address, Value); } + FilterAfterMmIoWrite (FilterWidth16, Address, &Value); return Value; @@ -673,11 +677,11 @@ MmioWrite16 ( UINT32 EFIAPI MmioRead32 ( - IN UINTN Address + IN UINTN Address ) { - BOOLEAN Flag; - UINT32 Value; + BOOLEAN Flag; + UINT32 Value; ASSERT ((Address & 3) == 0); @@ -685,6 +689,7 @@ MmioRead32 ( if (Flag) { Value = MmioRead32Internal (Address); } + FilterAfterMmIoRead (FilterWidth32, Address, &Value); return Value; @@ -706,11 +711,11 @@ MmioRead32 ( UINT32 EFIAPI MmioWrite32 ( - IN UINTN Address, - IN UINT32 Value + IN UINTN Address, + IN UINT32 Value ) { - BOOLEAN Flag; + BOOLEAN Flag; ASSERT ((Address & 3) == 0); @@ -718,6 +723,7 @@ MmioWrite32 ( if (Flag) { MmioWrite32Internal (Address, Value); } + FilterAfterMmIoWrite (FilterWidth32, Address, &Value); return Value; @@ -740,11 +746,11 @@ MmioWrite32 ( UINT64 EFIAPI MmioRead64 ( - IN UINTN Address + IN UINTN Address ) { - BOOLEAN Flag; - UINT64 Value; + BOOLEAN Flag; + UINT64 Value; ASSERT ((Address & 7) == 0); @@ -752,6 +758,7 @@ MmioRead64 ( if (Flag) { Value = MmioRead64Internal (Address); } + FilterAfterMmIoRead (FilterWidth64, Address, &Value); return Value; @@ -773,11 +780,11 @@ MmioRead64 ( UINT64 EFIAPI MmioWrite64 ( - IN UINTN Address, - IN UINT64 Value + IN UINTN Address, + IN UINT64 Value ) { - BOOLEAN Flag; + BOOLEAN Flag; ASSERT ((Address & 7) == 0); @@ -785,6 +792,7 @@ MmioWrite64 ( if (Flag) { MmioWrite64Internal (Address, Value); } + FilterAfterMmIoWrite (FilterWidth64, Address, &Value); return Value;