Re: [PATCH v1 3/6] DynamicTablesPkg: DynamicPlatRepoLib: Adding more token fixers

["Sami Mujawar" <sami.mujawar@arm.com>]

Hi Kun,

Thank you for this patch.

These changes look good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 19/07/2022 01:22 am, Kun Qin wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3996
>
> This change added more token fixers for other node types, including
> NamedComponentNode, RootComplexNode, and SmmuV3Node.
>
> The corresponding entries for tokenFixer functions table is also updated.
>
> Cc: Sami Mujawar <Sami.Mujawar@arm.com>
> Cc: Alexei Fedorov <Alexei.Fedorov@arm.com>
>
> Co-authored-by: Joe Lopez <joelopez@microsoft.com>
> Signed-off-by: Kun Qin <kuqin12@gmail.com>
> ---
>   DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c | 78 +++++++++++++++++++-
>   1 file changed, 75 insertions(+), 3 deletions(-)
>
> diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
> index 84e4bb7e3bc8..345acab53f74 100644
> --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
> +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
> @@ -64,6 +64,78 @@ TokenFixerItsGroup (
>     return EFI_SUCCESS;
>
>   }
>
>   
>
> +/** EArmObjNamedComponent token fixer.
>
> +
>
> +  CmObjectToken fixer function that updates the Tokens in the CmObjects.
>
> +
>
> +  @param [in]  CmObject    Pointer to the Configuration Manager Object.
>
> +  @param [in]  Token       Token to be updated in the CmObject.
>
> +
>
> +  @retval EFI_SUCCESS           Success.
>
> +  @retval EFI_INVALID_PARAMETER A parameter is invalid.
>
> +  @retval EFI_UNSUPPORTED       Not supported.
>
> +**/
>
> +STATIC
>
> +EFI_STATUS
>
> +EFIAPI
>
> +TokenFixerNamedComponentNode (
>
> +  IN  CM_OBJ_DESCRIPTOR  *CmObject,
>
> +  IN  CM_OBJECT_TOKEN    Token
>
> +  )
>
> +{
>
> +  ASSERT (CmObject != NULL);
>
> +  ((CM_ARM_NAMED_COMPONENT_NODE *)CmObject->Data)->Token = Token;
>
> +  return EFI_SUCCESS;
>
> +}
>
> +
>
> +/** EArmObjRootComplex token fixer.
>
> +
>
> +  CmObjectToken fixer function that updates the Tokens in the CmObjects.
>
> +
>
> +  @param [in]  CmObject    Pointer to the Configuration Manager Object.
>
> +  @param [in]  Token       Token to be updated in the CmObject.
>
> +
>
> +  @retval EFI_SUCCESS           Success.
>
> +  @retval EFI_INVALID_PARAMETER A parameter is invalid.
>
> +  @retval EFI_UNSUPPORTED       Not supported.
>
> +**/
>
> +STATIC
>
> +EFI_STATUS
>
> +EFIAPI
>
> +TokenFixerRootComplexNode (
>
> +  IN  CM_OBJ_DESCRIPTOR  *CmObject,
>
> +  IN  CM_OBJECT_TOKEN    Token
>
> +  )
>
> +{
>
> +  ASSERT (CmObject != NULL);
>
> +  ((CM_ARM_ROOT_COMPLEX_NODE *)CmObject->Data)->Token = Token;
>
> +  return EFI_SUCCESS;
>
> +}
>
> +
>
> +/** EArmObjSmmuV3 token fixer.
>
> +
>
> +  CmObjectToken fixer function that updates the Tokens in the CmObjects.
>
> +
>
> +  @param [in]  CmObject    Pointer to the Configuration Manager Object.
>
> +  @param [in]  Token       Token to be updated in the CmObject.
>
> +
>
> +  @retval EFI_SUCCESS           Success.
>
> +  @retval EFI_INVALID_PARAMETER A parameter is invalid.
>
> +  @retval EFI_UNSUPPORTED       Not supported.
>
> +**/
>
> +STATIC
>
> +EFI_STATUS
>
> +EFIAPI
>
> +TokenFixerSmmuV3Node (
>
> +  IN  CM_OBJ_DESCRIPTOR  *CmObject,
>
> +  IN  CM_OBJECT_TOKEN    Token
>
> +  )
>
> +{
>
> +  ASSERT (CmObject != NULL);
>
> +  ((CM_ARM_SMMUV3_NODE *)CmObject->Data)->Token = Token;
>
> +  return EFI_SUCCESS;
>
> +}
>
> +
>
>   /** TokenFixer functions table.
>
>   
>
>     A CmObj having a CM_OBJECT_TOKEN field might need to have its
>
> @@ -90,10 +162,10 @@ CM_OBJECT_TOKEN_FIXER  TokenFixer[EArmObjMax] = {
>     NULL,                             ///< 16 - Hypervisor Vendor Id
>
>     NULL,                             ///< 17 - Fixed feature flags for FADT
>
>     TokenFixerItsGroup,               ///< 18 - ITS Group
>
> -  TokenFixerNotImplemented,         ///< 19 - Named Component
>
> -  TokenFixerNotImplemented,         ///< 20 - Root Complex
>
> +  TokenFixerNamedComponentNode,     ///< 19 - Named Component
>
> +  TokenFixerRootComplexNode,        ///< 20 - Root Complex
>
>     TokenFixerNotImplemented,         ///< 21 - SMMUv1 or SMMUv2
>
> -  TokenFixerNotImplemented,         ///< 22 - SMMUv3
>
> +  TokenFixerSmmuV3Node,             ///< 22 - SMMUv3
>
>     TokenFixerNotImplemented,         ///< 23 - PMCG
>
>     NULL,                             ///< 24 - GIC ITS Identifier Array
>
>     NULL,                             ///< 25 - ID Mapping Array
>