Hi Pierre, Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.muja...@arm.com> Regards, Sami Mujawar On 10/10/2022 10:20 am, pierre.gond...@arm.com wrote:
From: Pierre Gondois <pierre.gond...@arm.com> commit 691c5f776274 ("DynamicTablesPkg: Deprecate Crs specific methods in AmlLib") deprecates some APIs. Finally remove them. Signed-off-by: Pierre Gondois <pierre.gond...@arm.com> --- .../Include/Library/AmlLib/AmlLib.h | 138 ------------------ .../Library/Common/AmlLib/Api/AmlApi.c | 85 ----------- .../AmlLib/CodeGen/AmlResourceDataCodeGen.c | 76 ---------- 3 files changed, 299 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h index 0d8446d78256..9210c5091548 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -1390,142 +1390,4 @@ AmlCreateCpcNode ( OUT AML_OBJECT_NODE_HANDLE *NewCpcNode OPTIONAL );-// DEPRECATED APIS-#ifndef DISABLE_NEW_DEPRECATED_INTERFACES - -/** DEPRECATED API - - Get the first Resource Data element contained in a "_CRS" object. - - In the following ASL code, the function will return the Resource Data - node corresponding to the "QWordMemory ()" ASL macro. - Name (_CRS, ResourceTemplate() { - QWordMemory (...) {...}, - Interrupt (...) {...} - } - ) - - Note: - - The "_CRS" object must be declared using ASL "Name (Declare Named Object)". - - "_CRS" declared using ASL "Method (Declare Control Method)" is not - supported. - - @ingroup UserApis - - @param [in] NameOpCrsNode NameOp object node defining a "_CRS" object. - Must have an OpCode=AML_NAME_OP, SubOpCode=0. - NameOp object nodes are defined in ASL - using the "Name ()" function. - @param [out] OutRdNode Pointer to the first Resource Data element of - the "_CRS" object. A Resource Data element - is stored in a data node. - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. -**/ -EFI_STATUS -EFIAPI -AmlNameOpCrsGetFirstRdNode ( - IN AML_OBJECT_NODE_HANDLE NameOpCrsNode, - OUT AML_DATA_NODE_HANDLE *OutRdNode - ); - -/** DEPRECATED API - - Get the Resource Data element following the CurrRdNode Resource Data. - - In the following ASL code, if CurrRdNode corresponds to the first - "QWordMemory ()" ASL macro, the function will return the Resource Data - node corresponding to the "Interrupt ()" ASL macro. - Name (_CRS, ResourceTemplate() { - QwordMemory (...) {...}, - Interrupt (...) {...} - } - ) - - The CurrRdNode Resource Data node must be defined in an object named "_CRS" - and defined by a "Name ()" ASL function. - - @ingroup UserApis - - @param [in] CurrRdNode Pointer to the current Resource Data element of - the "_CRS" variable. - @param [out] OutRdNode Pointer to the Resource Data element following - the CurrRdNode. - Contain a NULL pointer if CurrRdNode is the - last Resource Data element in the list. - The "End Tag" is not considered as a resource - data element and is not returned. - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. -**/ -EFI_STATUS -EFIAPI -AmlNameOpCrsGetNextRdNode ( - IN AML_DATA_NODE_HANDLE CurrRdNode, - OUT AML_DATA_NODE_HANDLE *OutRdNode - ); - -/** DEPRECATED API - - Add an Interrupt Resource Data node. - - This function creates a Resource Data element corresponding to the - "Interrupt ()" ASL function, stores it in an AML Data Node. - - It then adds it after the input CurrRdNode in the list of resource data - element. - - The Resource Data effectively created is an Extended Interrupt Resource - Data. See ACPI 6.3 specification, s6.4.3.6 "Extended Interrupt Descriptor" - for more information about Extended Interrupt Resource Data. - - The Extended Interrupt contains one single interrupt. - - This function allocates memory to create a data node. It is the caller's - responsibility to either: - - attach this node to an AML tree; - - delete this node. - - Note: The _CRS node must be defined using the ASL Name () function. - e.g. Name (_CRS, ResourceTemplate () { - ... - } - - @ingroup CodeGenApis - - @param [in] NameOpCrsNode NameOp object node defining a "_CRS" object. - Must have an OpCode=AML_NAME_OP, SubOpCode=0. - NameOp object nodes are defined in ASL - using the "Name ()" function. - @param [in] ResourceConsumer The device consumes the specified interrupt - or produces it for use by a child device. - @param [in] EdgeTriggered The interrupt is edge triggered or - level triggered. - @param [in] ActiveLow The interrupt is active-high or active-low. - @param [in] Shared The interrupt can be shared with other - devices or not (Exclusive). - @param [in] IrqList Interrupt list. Must be non-NULL. - @param [in] IrqCount Interrupt count. Must be non-zero. - - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. - @retval EFI_OUT_OF_RESOURCES Could not allocate memory. -**/ -EFI_STATUS -EFIAPI -AmlCodeGenCrsAddRdInterrupt ( - IN AML_OBJECT_NODE_HANDLE NameOpCrsNode, - IN BOOLEAN ResourceConsumer, - IN BOOLEAN EdgeTriggered, - IN BOOLEAN ActiveLow, - IN BOOLEAN Shared, - IN UINT32 *IrqList, - IN UINT8 IrqCount - ); - -#endif // DISABLE_NEW_DEPRECATED_INTERFACES - #endif // AML_LIB_H_ diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c b/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c index 519afdc1eafa..9f162abe2d09 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/Api/AmlApi.c @@ -429,88 +429,3 @@ AmlAttachNode ( { return AmlVarListAddTail (ParentNode, NewNode); } - -// DEPRECATED APIS -#ifndef DISABLE_NEW_DEPRECATED_INTERFACES - -/** DEPRECATED API - - Get the first Resource Data element contained in a "_CRS" object. - - In the following ASL code, the function will return the Resource Data - node corresponding to the "QWordMemory ()" ASL macro. - Name (_CRS, ResourceTemplate() { - QWordMemory (...) {...}, - Interrupt (...) {...} - } - ) - - Note: - - The "_CRS" object must be declared using ASL "Name (Declare Named Object)". - - "_CRS" declared using ASL "Method (Declare Control Method)" is not - supported. - - @ingroup UserApis - - @param [in] NameOpCrsNode NameOp object node defining a "_CRS" object. - Must have an OpCode=AML_NAME_OP, SubOpCode=0. - NameOp object nodes are defined in ASL - using the "Name ()" function. - @param [out] OutRdNode Pointer to the first Resource Data element of - the "_CRS" object. A Resource Data element - is stored in a data node. - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. -**/ -EFI_STATUS -EFIAPI -AmlNameOpCrsGetFirstRdNode ( - IN AML_OBJECT_NODE_HANDLE NameOpCrsNode, - OUT AML_DATA_NODE_HANDLE *OutRdNode - ) -{ - return AmlNameOpGetFirstRdNode (NameOpCrsNode, OutRdNode); -} - -/** DEPRECATED API - - Get the Resource Data element following the CurrRdNode Resource Data. - - In the following ASL code, if CurrRdNode corresponds to the first - "QWordMemory ()" ASL macro, the function will return the Resource Data - node corresponding to the "Interrupt ()" ASL macro. - Name (_CRS, ResourceTemplate() { - QwordMemory (...) {...}, - Interrupt (...) {...} - } - ) - - The CurrRdNode Resource Data node must be defined in an object named "_CRS" - and defined by a "Name ()" ASL function. - - @ingroup UserApis - - @param [in] CurrRdNode Pointer to the current Resource Data element of - the "_CRS" variable. - @param [out] OutRdNode Pointer to the Resource Data element following - the CurrRdNode. - Contain a NULL pointer if CurrRdNode is the - last Resource Data element in the list. - The "End Tag" is not considered as a resource - data element and is not returned. - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. -**/ -EFI_STATUS -EFIAPI -AmlNameOpCrsGetNextRdNode ( - IN AML_DATA_NODE_HANDLE CurrRdNode, - OUT AML_DATA_NODE_HANDLE *OutRdNode - ) -{ - return AmlNameOpGetNextRdNode (CurrRdNode, OutRdNode); -} - -#endif // DISABLE_NEW_DEPRECATED_INTERFACES diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen.c index 32c3ab534d0b..332962bed441 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlResourceDataCodeGen.c @@ -1406,79 +1406,3 @@ error_handler:return Status;} - -// DEPRECATED APIS -#ifndef DISABLE_NEW_DEPRECATED_INTERFACES - -/** DEPRECATED API - - Add an Interrupt Resource Data node. - - This function creates a Resource Data element corresponding to the - "Interrupt ()" ASL function, stores it in an AML Data Node. - - It then adds it after the input CurrRdNode in the list of resource data - element. - - The Resource Data effectively created is an Extended Interrupt Resource - Data. See ACPI 6.3 specification, s6.4.3.6 "Extended Interrupt Descriptor" - for more information about Extended Interrupt Resource Data. - - The Extended Interrupt contains one single interrupt. - - This function allocates memory to create a data node. It is the caller's - responsibility to either: - - attach this node to an AML tree; - - delete this node. - - Note: The _CRS node must be defined using the ASL Name () function. - e.g. Name (_CRS, ResourceTemplate () { - ... - } - - @ingroup UserApis - - @param [in] NameOpCrsNode NameOp object node defining a "_CRS" object. - Must have an OpCode=AML_NAME_OP, SubOpCode=0. - NameOp object nodes are defined in ASL - using the "Name ()" function. - @param [in] ResourceConsumer The device consumes the specified interrupt - or produces it for use by a child device. - @param [in] EdgeTriggered The interrupt is edge triggered or - level triggered. - @param [in] ActiveLow The interrupt is active-high or active-low. - @param [in] Shared The interrupt can be shared with other - devices or not (Exclusive). - @param [in] IrqList Interrupt list. Must be non-NULL. - @param [in] IrqCount Interrupt count. Must be non-zero. - - - @retval EFI_SUCCESS The function completed successfully. - @retval EFI_INVALID_PARAMETER Invalid parameter. - @retval EFI_OUT_OF_RESOURCES Could not allocate memory. -**/ -EFI_STATUS -EFIAPI -AmlCodeGenCrsAddRdInterrupt ( - IN AML_OBJECT_NODE_HANDLE NameOpCrsNode, - IN BOOLEAN ResourceConsumer, - IN BOOLEAN EdgeTriggered, - IN BOOLEAN ActiveLow, - IN BOOLEAN Shared, - IN UINT32 *IrqList, - IN UINT8 IrqCount - ) -{ - return AmlCodeGenRdInterrupt ( - ResourceConsumer, - EdgeTriggered, - ActiveLow, - Shared, - IrqList, - IrqCount, - NameOpCrsNode, - NULL - ); -} - -#endif // DISABLE_NEW_DEPRECATED_INTERFACES
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95604): https://edk2.groups.io/g/devel/message/95604 Mute This Topic: https://groups.io/mt/94232526/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
