[edk2-devel] [PATCH v2] BaseSynchronizationLib: Fix LoongArch64 synchronization functions
Chao Li
lichao at loongson.cn
Fri Apr 28 04:24:11 UTC 2023
Reviewed-by: Chao Li <lichao at loongson.cn>
Thanks,
Chao
在 2023/4/28 12:20, Dongyan Qian 写道:
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4432
>
> There is a return value bug:
> The sc.w/sc.d instruction will destroy the reg_t0,
> use reg_t1 to avoid context reg_t0 being corrupted.
> Adjust Check that ptr align is UINT16.
> Optimize function SyncIncrement and SyncDecrement.
>
> Cc: Michael D Kinney<michael.d.kinney at intel.com>
> Cc: Liming Gao<gaoliming at byosoft.com.cn>
> Cc: Zhiguang Liu<zhiguang.liu at intel.com>
> Cc: Chao Li<lichao at loongson.cn>
> Signed-off-by: Dongyan Qian<qiandongyan at loongson.cn>
> ---
> .../LoongArch64/AsmSynchronization.S | 30 ++++++++-----------
> .../LoongArch64/Synchronization.c | 2 +-
> 2 files changed, 13 insertions(+), 19 deletions(-)
>
> diff --git a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S
> index fdd50c54b5..03865bf2c9 100644
> --- a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S
> +++ b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S
> @@ -53,9 +53,9 @@ ASM_PFX(AsmInternalSyncCompareExchange32):
> 1:
> ll.w $t0, $a0, 0x0
> bne $t0, $a1, 2f
> - move $t0, $a2
> - sc.w $t0, $a0, 0x0
> - beqz $t0, 1b
> + move $t1, $a2
> + sc.w $t1, $a0, 0x0
> + beqz $t1, 1b
> b 3f
> 2:
> dbar 0
> @@ -76,9 +76,9 @@ ASM_PFX(AsmInternalSyncCompareExchange64):
> 1:
> ll.d $t0, $a0, 0x0
> bne $t0, $a1, 2f
> - move $t0, $a2
> - sc.d $t0, $a0, 0x0
> - beqz $t0, 1b
> + move $t1, $a2
> + sc.d $t1, $a0, 0x0
> + beqz $t1, 1b
> b 3f
> 2:
> dbar 0
> @@ -94,13 +94,10 @@ AsmInternalSyncIncrement (
> )
> **/
> ASM_PFX(AsmInternalSyncIncrement):
> - move $t0, $a0
> - dbar 0
> - ld.w $t1, $t0, 0x0
> - li.w $t2, 1
> - amadd.w $t1, $t2, $t0
> + li.w $t0, 1
> + amadd.w $zero, $t0, $a0
>
> - ld.w $a0, $t0, 0x0
> + ld.w $a0, $a0, 0
> jirl $zero, $ra, 0
>
> /**
> @@ -111,12 +108,9 @@ AsmInternalSyncDecrement (
> )
> **/
> ASM_PFX(AsmInternalSyncDecrement):
> - move $t0, $a0
> - dbar 0
> - ld.w $t1, $t0, 0x0
> - li.w $t2, -1
> - amadd.w $t1, $t2, $t0
> + li.w $t0, -1
> + amadd.w $zero, $t0, $a0
>
> - ld.w $a0, $t0, 0x0
> + ld.w $a0, $a0, 0
> jirl $zero, $ra, 0
> .end
> diff --git a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c
> index d696c8ce10..6baf841c9b 100644
> --- a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c
> +++ b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c
> @@ -81,7 +81,7 @@ InternalSyncCompareExchange16 (
> volatile UINT32 *Ptr32;
>
> /* Check that ptr is naturally aligned */
> - ASSERT (!((UINT64)Value & (sizeof (Value) - 1)));
> + ASSERT (!((UINT64)Value & (sizeof (UINT16) - 1)));
>
> /* Mask inputs to the correct size. */
> Mask = (((~0UL) - (1UL << (0)) + 1) & (~0UL >> (64 - 1 - ((sizeof (UINT16) * 8) - 1))));
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#103746): https://edk2.groups.io/g/devel/message/103746
Mute This Topic: https://groups.io/mt/98552346/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20230428/54bc11d0/attachment-0001.htm>
More information about the edk2-devel-archive
mailing list