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

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

ACPICA: Fix unmerged utility divergences. 



Utility improvements in ACPICA are partial ignored by ACPICA Linux
release.  This will lead to divergences between Linux and ACPICA.
This patch ports the entire "utility" into Linux and makes them
igored in the compilation stage by "ACPI_FUTURE_USAGE".
The following "Utility" files have been ported into the Linux:
  drivers/acpi/uttrack.c
  drivers/acpi/utcache.c
  drivers/acpi/utids.c

This patch will not affect the generated vmlinx binary.
This will decrease 274 lines of 20120913 divergence.diff.

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

drivers/acpi/acpica/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -161,3 +161,6 @@ acpi-y += \ 
	utxfinit.o	\

	utxferror.o	\

	utxfmutex.o



acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o utclib.o

drivers/acpi/acpica/acutils.h

+36 −15
Original line number Diff line number Diff line
@@ -69,6 +69,22 @@ extern const char *acpi_gbl_siz_decode[]; 
extern const char *acpi_gbl_trs_decode[];

extern const char *acpi_gbl_ttp_decode[];

extern const char *acpi_gbl_typ_decode[];

extern const char *acpi_gbl_ppc_decode[];

extern const char *acpi_gbl_ior_decode[];

extern const char *acpi_gbl_dts_decode[];

extern const char *acpi_gbl_ct_decode[];

extern const char *acpi_gbl_sbt_decode[];

extern const char *acpi_gbl_am_decode[];

extern const char *acpi_gbl_sm_decode[];

extern const char *acpi_gbl_wm_decode[];

extern const char *acpi_gbl_cph_decode[];

extern const char *acpi_gbl_cpo_decode[];

extern const char *acpi_gbl_dp_decode[];

extern const char *acpi_gbl_ed_decode[];

extern const char *acpi_gbl_bpb_decode[];

extern const char *acpi_gbl_sb_decode[];

extern const char *acpi_gbl_fc_decode[];

extern const char *acpi_gbl_pt_decode[];

#endif



/* Types for Resource descriptor entries */
@@ -202,7 +218,9 @@ extern const u8 _acpi_ctype[]; 
#define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU))

#define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))



#endif				/* ACPI_USE_SYSTEM_CLIBRARY */

#endif				/* !ACPI_USE_SYSTEM_CLIBRARY */



#define ACPI_IS_ASCII(c)  ((c) < 0x80)



/*

 * utcopy - Object construction and conversion interfaces
@@ -479,6 +497,10 @@ acpi_ut_walk_package_tree(union acpi_operand_object *source_object, 


void acpi_ut_strupr(char *src_string);



void acpi_ut_strlwr(char *src_string);



int acpi_ut_stricmp(char *string1, char *string2);



void acpi_ut_print_string(char *string, u8 max_length);



u8 acpi_ut_valid_acpi_name(u32 name);
@@ -524,8 +546,7 @@ u8 acpi_ut_get_resource_header_length(void *aml); 
u8 acpi_ut_get_resource_type(void *aml);



acpi_status

acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc,

			     u8 ** end_tag);

acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag);



/*

 * utmutex - mutex support

drivers/acpi/acpica/utcache.c

0 → 100644
+323 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Module Name: utcache - local cache allocation routines

 *

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



/*

 * Copyright (C) 2000 - 2012, Intel Corp.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions, and the following disclaimer,

 *    without modification.

 * 2. Redistributions in binary form must reproduce at minimum a disclaimer

 *    substantially similar to the "NO WARRANTY" disclaimer below

 *    ("Disclaimer") and any redistribution must be conditioned upon

 *    including a substantially similar Disclaimer requirement for further

 *    binary redistribution.

 * 3. Neither the names of the above-listed copyright holders nor the names

 *    of any contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2 as published by the Free

 * Software Foundation.

 *

 * NO WARRANTY

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

 * POSSIBILITY OF SUCH DAMAGES.

 */



#include <acpi/acpi.h>

#include "accommon.h"



#define _COMPONENT          ACPI_UTILITIES

ACPI_MODULE_NAME("utcache")



#ifdef ACPI_USE_LOCAL_CACHE

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

 *

 * FUNCTION:    acpi_os_create_cache

 *

 * PARAMETERS:  cache_name      - Ascii name for the cache

 *              object_size     - Size of each cached object

 *              max_depth       - Maximum depth of the cache (in objects)

 *              return_cache    - Where the new cache object is returned

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Create a cache object

 *

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

acpi_status

acpi_os_create_cache(char *cache_name,

		     u16 object_size,

		     u16 max_depth, struct acpi_memory_list ** return_cache)

{

	struct acpi_memory_list *cache;



	ACPI_FUNCTION_ENTRY();



	if (!cache_name || !return_cache || (object_size < 16)) {

		return (AE_BAD_PARAMETER);

	}



	/* Create the cache object */



	cache = acpi_os_allocate(sizeof(struct acpi_memory_list));

	if (!cache) {

		return (AE_NO_MEMORY);

	}



	/* Populate the cache object and return it */



	ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));

	cache->link_offset = 8;

	cache->list_name = cache_name;

	cache->object_size = object_size;

	cache->max_depth = max_depth;



	*return_cache = cache;

	return (AE_OK);

}



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

 *

 * FUNCTION:    acpi_os_purge_cache

 *

 * PARAMETERS:  cache           - Handle to cache object

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Free all objects within the requested cache.

 *

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



acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)

{

	char *next;

	acpi_status status;



	ACPI_FUNCTION_ENTRY();



	if (!cache) {

		return (AE_BAD_PARAMETER);

	}



	status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);

	if (ACPI_FAILURE(status)) {

		return (status);

	}



	/* Walk the list of objects in this cache */



	while (cache->list_head) {



		/* Delete and unlink one cached state object */



		next = *(ACPI_CAST_INDIRECT_PTR(char,

						&(((char *)cache->

						   list_head)[cache->

							      link_offset])));

		ACPI_FREE(cache->list_head);



		cache->list_head = next;

		cache->current_depth--;

	}



	(void)acpi_ut_release_mutex(ACPI_MTX_CACHES);

	return (AE_OK);

}



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

 *

 * FUNCTION:    acpi_os_delete_cache

 *

 * PARAMETERS:  cache           - Handle to cache object

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Free all objects within the requested cache and delete the

 *              cache object.

 *

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



acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)

{

	acpi_status status;



	ACPI_FUNCTION_ENTRY();



	/* Purge all objects in the cache */



	status = acpi_os_purge_cache(cache);

	if (ACPI_FAILURE(status)) {

		return (status);

	}



	/* Now we can delete the cache object */



	acpi_os_free(cache);

	return (AE_OK);

}



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

 *

 * FUNCTION:    acpi_os_release_object

 *

 * PARAMETERS:  cache       - Handle to cache object

 *              object      - The object to be released

 *

 * RETURN:      None

 *

 * DESCRIPTION: Release an object to the specified cache.  If cache is full,

 *              the object is deleted.

 *

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



acpi_status

acpi_os_release_object(struct acpi_memory_list * cache, void *object)

{

	acpi_status status;



	ACPI_FUNCTION_ENTRY();



	if (!cache || !object) {

		return (AE_BAD_PARAMETER);

	}



	/* If cache is full, just free this object */



	if (cache->current_depth >= cache->max_depth) {

		ACPI_FREE(object);

		ACPI_MEM_TRACKING(cache->total_freed++);

	}



	/* Otherwise put this object back into the cache */



	else {

		status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);

		if (ACPI_FAILURE(status)) {

			return (status);

		}



		/* Mark the object as cached */



		ACPI_MEMSET(object, 0xCA, cache->object_size);

		ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);



		/* Put the object at the head of the cache list */



		*(ACPI_CAST_INDIRECT_PTR(char,

					 &(((char *)object)[cache->

							    link_offset]))) =

		    cache->list_head;

		cache->list_head = object;

		cache->current_depth++;



		(void)acpi_ut_release_mutex(ACPI_MTX_CACHES);

	}



	return (AE_OK);

}



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

 *

 * FUNCTION:    acpi_os_acquire_object

 *

 * PARAMETERS:  cache           - Handle to cache object

 *

 * RETURN:      the acquired object.  NULL on error

 *

 * DESCRIPTION: Get an object from the specified cache.  If cache is empty,

 *              the object is allocated.

 *

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



void *acpi_os_acquire_object(struct acpi_memory_list *cache)

{

	acpi_status status;

	void *object;



	ACPI_FUNCTION_NAME(os_acquire_object);



	if (!cache) {

		return (NULL);

	}



	status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);

	if (ACPI_FAILURE(status)) {

		return (NULL);

	}



	ACPI_MEM_TRACKING(cache->requests++);



	/* Check the cache first */



	if (cache->list_head) {



		/* There is an object available, use it */



		object = cache->list_head;

		cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char,

							    &(((char *)

							       object)[cache->

								       link_offset])));



		cache->current_depth--;



		ACPI_MEM_TRACKING(cache->hits++);

		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,

				  "Object %p from %s cache\n", object,

				  cache->list_name));



		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);

		if (ACPI_FAILURE(status)) {

			return (NULL);

		}



		/* Clear (zero) the previously used Object */



		ACPI_MEMSET(object, 0, cache->object_size);

	} else {

		/* The cache is empty, create a new object */



		ACPI_MEM_TRACKING(cache->total_allocated++);



#ifdef ACPI_DBG_TRACK_ALLOCATIONS

		if ((cache->total_allocated - cache->total_freed) >

		    cache->max_occupied) {

			cache->max_occupied =

			    cache->total_allocated - cache->total_freed;

		}

#endif



		/* Avoid deadlock with ACPI_ALLOCATE_ZEROED */



		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);

		if (ACPI_FAILURE(status)) {

			return (NULL);

		}



		object = ACPI_ALLOCATE_ZEROED(cache->object_size);

		if (!object) {

			return (NULL);

		}

	}



	return (object);

}

#endif				/* ACPI_USE_LOCAL_CACHE */

drivers/acpi/acpica/utclib.c

0 → 100644
+748 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/acpi/acpica/utdebug.c

+5 −4
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ 


#define _COMPONENT          ACPI_UTILITIES

ACPI_MODULE_NAME("utdebug")



#ifdef ACPI_DEBUG_OUTPUT

static acpi_thread_id acpi_gbl_prev_thread_id;

static acpi_thread_id acpi_gbl_prev_thread_id = (acpi_thread_id) 0xFFFFFFFF;

static char *acpi_gbl_fn_entry_str = "----Entry";

static char *acpi_gbl_fn_exit_str = "----Exit-";
@@ -109,7 +110,7 @@ void acpi_ut_track_stack_ptr(void) 
 * RETURN:      Updated pointer to the function name

 *

 * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.

 *              This allows compiler macros such as __func__ to be used

 *              This allows compiler macros such as __FUNCTION__ to be used

 *              with no change to the debug output.

 *

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