1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] Silicon/AMD Silicon/Hisilicon: remove -ArmGetCpuCountPerCluster()

Ard Biesheuvel posted 1 patch 6 years, 4 months ago
Failed in applying to current master (apply log)
Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S               | 6 ------
Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c                         | 6 ------
Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S | 6 ------
Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 5 -----
4 files changed, 23 deletions(-)
[edk2] [PATCH] Silicon/AMD Silicon/Hisilicon: remove -ArmGetCpuCountPerCluster()
Posted by Ard Biesheuvel 6 years, 4 months ago 
The function ArmGetCpuCountPerCluster () was moved out of ArmPlatformLib
because it was unused (except internally by one of the implementations)
So remove the remaining implementations from edk2-platforms.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S               | 6 ------
 Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c                         | 6 ------
 Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S | 6 ------
 Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 5 -----
 4 files changed, 23 deletions(-)

diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
index b7ec02f0e69f..19a2fc07f3d7 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
@@ -47,12 +47,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
   ldr   w0, PrimaryCoreMpid
   ret
 
-# IN None
-# OUT x0 = number of cores present in the system
-ASM_FUNC(ArmGetCpuCountPerCluster)
-  MOV32 (w0, FixedPcdGet32 (PcdCoreCount))
-  ret
-
 //UINTN
 //ArmPlatformIsPrimaryCore (
 //  IN UINTN MpId
diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
index f17a960d60ad..facfd61ca230 100644
--- a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
+++ b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
@@ -45,12 +45,6 @@
 extern EFI_GUID gAmdStyxMpCoreInfoGuid;
 
 
-UINTN
-ArmGetCpuCountPerCluster (
-  VOID
-  );
-
-
 /**
   Return the current Boot Mode
 
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
index 3422df279c73..74e4aeeffc31 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
@@ -29,12 +29,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
   MOV32 (w0, FixedPcdGet32(PcdArmPrimaryCore))
   ret
 
-# IN None
-# OUT x0 = number of cores present in the system
-ASM_FUNC(ArmGetCpuCountPerCluster)
-  MOV32 (w0, FixedPcdGet32(PcdCoreCount))
-  ret
-
 //UINTN
 //ArmPlatformIsPrimaryCore (
 //  IN UINTN MpId
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
index 07ab0d1dc271..b59b9f027573 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
@@ -23,11 +23,6 @@
 
 #include <Ppi/ArmMpCoreInfo.h>
 
-UINTN
-ArmGetCpuCountPerCluster (
-  VOID
-  );
-
 extern  EFI_STATUS MemInitEntry (VOID);
 
 /**
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Silicon/AMD Silicon/Hisilicon: remove -ArmGetCpuCountPerCluster()
Posted by Leif Lindholm 6 years, 4 months ago 
On Tue, Nov 28, 2017 at 05:35:26PM +0000, Ard Biesheuvel wrote:
> The function ArmGetCpuCountPerCluster () was moved out of ArmPlatformLib
> because it was unused (except internally by one of the implementations)
> So remove the remaining implementations from edk2-platforms.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S               | 6 ------
>  Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c                         | 6 ------
>  Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S | 6 ------
>  Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 5 -----
>  4 files changed, 23 deletions(-)
> 
> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
> index b7ec02f0e69f..19a2fc07f3d7 100644
> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
> @@ -47,12 +47,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
>    ldr   w0, PrimaryCoreMpid
>    ret
>  
> -# IN None
> -# OUT x0 = number of cores present in the system
> -ASM_FUNC(ArmGetCpuCountPerCluster)
> -  MOV32 (w0, FixedPcdGet32 (PcdCoreCount))
> -  ret
> -
>  //UINTN
>  //ArmPlatformIsPrimaryCore (
>  //  IN UINTN MpId
> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
> index f17a960d60ad..facfd61ca230 100644
> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
> @@ -45,12 +45,6 @@
>  extern EFI_GUID gAmdStyxMpCoreInfoGuid;
>  
>  
> -UINTN
> -ArmGetCpuCountPerCluster (
> -  VOID
> -  );
> -
> -
>  /**
>    Return the current Boot Mode
>  
> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
> index 3422df279c73..74e4aeeffc31 100644
> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
> @@ -29,12 +29,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
>    MOV32 (w0, FixedPcdGet32(PcdArmPrimaryCore))
>    ret
>  
> -# IN None
> -# OUT x0 = number of cores present in the system
> -ASM_FUNC(ArmGetCpuCountPerCluster)
> -  MOV32 (w0, FixedPcdGet32(PcdCoreCount))
> -  ret
> -
>  //UINTN
>  //ArmPlatformIsPrimaryCore (
>  //  IN UINTN MpId
> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
> index 07ab0d1dc271..b59b9f027573 100644
> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
> @@ -23,11 +23,6 @@
>  
>  #include <Ppi/ArmMpCoreInfo.h>
>  
> -UINTN
> -ArmGetCpuCountPerCluster (
> -  VOID
> -  );
> -
>  extern  EFI_STATUS MemInitEntry (VOID);
>  
>  /**
> -- 
> 2.11.0
> 
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] Silicon/AMD Silicon/Hisilicon: remove -ArmGetCpuCountPerCluster()
Posted by Ard Biesheuvel 6 years, 4 months ago 
On 28 November 2017 at 20:18, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Tue, Nov 28, 2017 at 05:35:26PM +0000, Ard Biesheuvel wrote:
>> The function ArmGetCpuCountPerCluster () was moved out of ArmPlatformLib
>> because it was unused (except internally by one of the implementations)
>> So remove the remaining implementations from edk2-platforms.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>

Thanks. Pushed as 7c4b47ff8212

>> ---
>>  Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S               | 6 ------
>>  Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c                         | 6 ------
>>  Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S | 6 ------
>>  Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c | 5 -----
>>  4 files changed, 23 deletions(-)
>>
>> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
>> index b7ec02f0e69f..19a2fc07f3d7 100644
>> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
>> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/AArch64/Helper.S
>> @@ -47,12 +47,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
>>    ldr   w0, PrimaryCoreMpid
>>    ret
>>
>> -# IN None
>> -# OUT x0 = number of cores present in the system
>> -ASM_FUNC(ArmGetCpuCountPerCluster)
>> -  MOV32 (w0, FixedPcdGet32 (PcdCoreCount))
>> -  ret
>> -
>>  //UINTN
>>  //ArmPlatformIsPrimaryCore (
>>  //  IN UINTN MpId
>> diff --git a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
>> index f17a960d60ad..facfd61ca230 100644
>> --- a/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
>> +++ b/Silicon/AMD/Styx/Library/AmdStyxLib/Styx.c
>> @@ -45,12 +45,6 @@
>>  extern EFI_GUID gAmdStyxMpCoreInfoGuid;
>>
>>
>> -UINTN
>> -ArmGetCpuCountPerCluster (
>> -  VOID
>> -  );
>> -
>> -
>>  /**
>>    Return the current Boot Mode
>>
>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
>> index 3422df279c73..74e4aeeffc31 100644
>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/AArch64/Helper.S
>> @@ -29,12 +29,6 @@ ASM_FUNC(ArmPlatformGetPrimaryCoreMpId)
>>    MOV32 (w0, FixedPcdGet32(PcdArmPrimaryCore))
>>    ret
>>
>> -# IN None
>> -# OUT x0 = number of cores present in the system
>> -ASM_FUNC(ArmGetCpuCountPerCluster)
>> -  MOV32 (w0, FixedPcdGet32(PcdCoreCount))
>> -  ret
>> -
>>  //UINTN
>>  //ArmPlatformIsPrimaryCore (
>>  //  IN UINTN MpId
>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
>> index 07ab0d1dc271..b59b9f027573 100644
>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.c
>> @@ -23,11 +23,6 @@
>>
>>  #include <Ppi/ArmMpCoreInfo.h>
>>
>> -UINTN
>> -ArmGetCpuCountPerCluster (
>> -  VOID
>> -  );
>> -
>>  extern  EFI_STATUS MemInitEntry (VOID);
>>
>>  /**
>> --
>> 2.11.0
>>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.