Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c86c30 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Cleanup memory allocation macros and configurability. 



In the common case, the ACPI_ALLOCATE and related macros now resolve
directly to their respective acpi_os* OSL interfaces. Two options:
1) The ACPI_ALLOCATE_ZEROED macro defaults to a simple local implementation
   by default, unless overridden by the USE_NATIVE_ALLOCATE_ZEROED define.
2) For ACPI execution simulation environment (AcpiExec) which is not
   shipped with the Linux kernel, the macros can optionally be resolved to
   the local interfaces that track each allocation (used to immediately
   detect memory leaks).

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 73424473

drivers/acpi/acpica/acmacros.h

+0 −31
Original line number Diff line number Diff line
@@ -409,37 +409,6 @@ 
#define ACPI_DEBUGGER_EXEC(a)

#endif



/*

 * Memory allocation tracking (DEBUG ONLY)

 */

#define ACPI_MEM_PARAMETERS         _COMPONENT, _acpi_module_name, __LINE__



#ifndef ACPI_DBG_TRACK_ALLOCATIONS



/* Memory allocation */



#ifndef ACPI_ALLOCATE

#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size) (a), ACPI_MEM_PARAMETERS)

#endif

#ifndef ACPI_ALLOCATE_ZEROED

#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size) (a), ACPI_MEM_PARAMETERS)

#endif

#ifndef ACPI_FREE

#define ACPI_FREE(a)                acpi_os_free(a)

#endif

#define ACPI_MEM_TRACKING(a)



#else



/* Memory allocation */



#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)

#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)

#define ACPI_FREE(a)                acpi_ut_free_and_track(a, ACPI_MEM_PARAMETERS)

#define ACPI_MEM_TRACKING(a)        a



#endif				/* ACPI_DBG_TRACK_ALLOCATIONS */



/*

 * Macros used for ACPICA utilities only

 */

drivers/acpi/acpica/acutils.h

+0 −6
Original line number Diff line number Diff line
@@ -663,12 +663,6 @@ acpi_status 
acpi_ut_initialize_buffer(struct acpi_buffer *buffer,

			  acpi_size required_length);



void *acpi_ut_allocate(acpi_size size,

		       u32 component, const char *module, u32 line);



void *acpi_ut_allocate_zeroed(acpi_size size,

			      u32 component, const char *module, u32 line);



#ifdef ACPI_DBG_TRACK_ALLOCATIONS

void *acpi_ut_allocate_and_track(acpi_size size,

				 u32 component, const char *module, u32 line);

drivers/acpi/acpica/utalloc.c

+34 −79
Original line number Diff line number Diff line
@@ -48,6 +48,39 @@ 
#define _COMPONENT          ACPI_UTILITIES

ACPI_MODULE_NAME("utalloc")



#if !defined (USE_NATIVE_ALLOCATE_ZEROED)

/*******************************************************************************

 *

 * FUNCTION:    acpi_os_allocate_zeroed

 *

 * PARAMETERS:  size                - Size of the allocation

 *

 * RETURN:      Address of the allocated memory on success, NULL on failure.

 *

 * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.

 *              This is the default implementation. Can be overridden via the

 *              USE_NATIVE_ALLOCATE_ZEROED flag.

 *

 ******************************************************************************/

void *acpi_os_allocate_zeroed(acpi_size size)

{

	void *allocation;



	ACPI_FUNCTION_ENTRY();



	allocation = acpi_os_allocate(size);

	if (allocation) {



		/* Clear the memory block */



		ACPI_MEMSET(allocation, 0, size);

	}



	return (allocation);

}



#endif				/* !USE_NATIVE_ALLOCATE_ZEROED */



/*******************************************************************************

 *

 * FUNCTION:    acpi_ut_create_caches
@@ -59,6 +92,7 @@ ACPI_MODULE_NAME("utalloc") 
 * DESCRIPTION: Create all local caches

 *

 ******************************************************************************/



acpi_status acpi_ut_create_caches(void)

{

	acpi_status status;
@@ -302,82 +336,3 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer, 
	ACPI_MEMSET(buffer->pointer, 0, required_length);

	return (AE_OK);

}
 


#ifdef NOT_USED_BY_LINUX

/*******************************************************************************

 *

 * FUNCTION:    acpi_ut_allocate

 *

 * PARAMETERS:  size                - Size of the allocation

 *              component           - Component type of caller

 *              module              - Source file name of caller

 *              line                - Line number of caller

 *

 * RETURN:      Address of the allocated memory on success, NULL on failure.

 *

 * DESCRIPTION: Subsystem equivalent of malloc.

 *

 ******************************************************************************/



void *acpi_ut_allocate(acpi_size size,

		       u32 component, const char *module, u32 line)

{

	void *allocation;



	ACPI_FUNCTION_TRACE_U32(ut_allocate, size);



	/* Check for an inadvertent size of zero bytes */



	if (!size) {

		ACPI_WARNING((module, line,

			      "Attempt to allocate zero bytes, allocating 1 byte"));

		size = 1;

	}



	allocation = acpi_os_allocate(size);

	if (!allocation) {



		/* Report allocation error */



		ACPI_WARNING((module, line,

			      "Could not allocate size %u", (u32) size));



		return_PTR(NULL);

	}



	return_PTR(allocation);

}



/*******************************************************************************

 *

 * FUNCTION:    acpi_ut_allocate_zeroed

 *

 * PARAMETERS:  size                - Size of the allocation

 *              component           - Component type of caller

 *              module              - Source file name of caller

 *              line                - Line number of caller

 *

 * RETURN:      Address of the allocated memory on success, NULL on failure.

 *

 * DESCRIPTION: Subsystem equivalent of calloc. Allocate and zero memory.

 *

 ******************************************************************************/



void *acpi_ut_allocate_zeroed(acpi_size size,

			      u32 component, const char *module, u32 line)

{

	void *allocation;



	ACPI_FUNCTION_ENTRY();



	allocation = acpi_ut_allocate(size, component, module, line);

	if (allocation) {



		/* Clear the memory block */



		ACPI_MEMSET(allocation, 0, size);

	}



	return (allocation);

}

#endif

drivers/acpi/acpica/uttrack.c

+25 −4
Original line number Diff line number Diff line
@@ -130,10 +130,23 @@ void *acpi_ut_allocate_and_track(acpi_size size, 
	struct acpi_debug_mem_block *allocation;

	acpi_status status;



	/* Check for an inadvertent size of zero bytes */



	if (!size) {

		ACPI_WARNING((module, line,

			      "Attempt to allocate zero bytes, allocating 1 byte"));

		size = 1;

	}



	allocation =

	    acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),

			     component, module, line);

	    acpi_os_allocate(size + sizeof(struct acpi_debug_mem_header));

	if (!allocation) {



		/* Report allocation error */



		ACPI_WARNING((module, line,

			      "Could not allocate size %u", (u32)size));



		return (NULL);

	}
@@ -179,9 +192,17 @@ void *acpi_ut_allocate_zeroed_and_track(acpi_size size, 
	struct acpi_debug_mem_block *allocation;

	acpi_status status;



	/* Check for an inadvertent size of zero bytes */



	if (!size) {

		ACPI_WARNING((module, line,

			      "Attempt to allocate zero bytes, allocating 1 byte"));

		size = 1;

	}



	allocation =

	    acpi_ut_allocate_zeroed(size + sizeof(struct acpi_debug_mem_header),

				    component, module, line);

	    acpi_os_allocate_zeroed(size +

				    sizeof(struct acpi_debug_mem_header));

	if (!allocation) {



		/* Report allocation error */

include/acpi/acpiosxf.h

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ void acpi_os_release_mutex(acpi_mutex handle); 
 */

void *acpi_os_allocate(acpi_size size);



void *acpi_os_allocate_zeroed(acpi_size size);



void acpi_os_free(void *memory);



void __iomem *acpi_os_map_memory(acpi_physical_address where,