Commit 84fb2c97 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Split acpi_format_exception into two parts 



Split acpi_format_exception into two parts. New
function is acpi_ut_verify_exception and will be used to
verify exception codes returned by user.

Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 69874165

drivers/acpi/utilities/utglobal.c

+36 −82
Original line number Diff line number Diff line
@@ -50,87 +50,6 @@ ACPI_EXPORT_SYMBOL(acpi_gbl_FADT) 
#define _COMPONENT          ACPI_UTILITIES

    ACPI_MODULE_NAME("utglobal")



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

 *

 * FUNCTION:    acpi_format_exception

 *

 * PARAMETERS:  Status       - The acpi_status code to be formatted

 *

 * RETURN:      A string containing the exception text. A valid pointer is

 *              always returned.

 *

 * DESCRIPTION: This function translates an ACPI exception into an ASCII string.

 *

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

const char *acpi_format_exception(acpi_status status)

{

	acpi_status sub_status;

	const char *exception = NULL;



	ACPI_FUNCTION_ENTRY();



	/*

	 * Status is composed of two parts, a "type" and an actual code

	 */

	sub_status = (status & ~AE_CODE_MASK);



	switch (status & AE_CODE_MASK) {

	case AE_CODE_ENVIRONMENTAL:



		if (sub_status <= AE_CODE_ENV_MAX) {

			exception = acpi_gbl_exception_names_env[sub_status];

		}

		break;



	case AE_CODE_PROGRAMMER:



		if (sub_status <= AE_CODE_PGM_MAX) {

			exception =

			    acpi_gbl_exception_names_pgm[sub_status - 1];

		}

		break;



	case AE_CODE_ACPI_TABLES:



		if (sub_status <= AE_CODE_TBL_MAX) {

			exception =

			    acpi_gbl_exception_names_tbl[sub_status - 1];

		}

		break;



	case AE_CODE_AML:



		if (sub_status <= AE_CODE_AML_MAX) {

			exception =

			    acpi_gbl_exception_names_aml[sub_status - 1];

		}

		break;



	case AE_CODE_CONTROL:



		if (sub_status <= AE_CODE_CTRL_MAX) {

			exception =

			    acpi_gbl_exception_names_ctrl[sub_status - 1];

		}

		break;



	default:

		break;

	}



	if (!exception) {



		/* Exception code was not recognized */



		ACPI_ERROR((AE_INFO,

			    "Unknown exception code: 0x%8.8X", status));



		exception = "UNKNOWN_STATUS_CODE";

	}



	return (ACPI_CAST_PTR(const char, exception));

}



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

 *

 * Static global variable initialization.
@@ -182,10 +101,45 @@ const char *acpi_gbl_highest_dstate_names[4] = { 


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

 *

 * Namespace globals

 * FUNCTION:    acpi_format_exception

 *

 * PARAMETERS:  Status       - The acpi_status code to be formatted

 *

 * RETURN:      A string containing the exception text. A valid pointer is

 *              always returned.

 *

 * DESCRIPTION: This function translates an ACPI exception into an ASCII string

 *              It is here instead of utxface.c so it is always present.

 *

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



const char *acpi_format_exception(acpi_status status)

{

	const char *exception = NULL;



	ACPI_FUNCTION_ENTRY();



	exception = acpi_ut_validate_exception(status);

	if (!exception) {



		/* Exception code was not recognized */



		ACPI_ERROR((AE_INFO,

			    "Unknown exception code: 0x%8.8X", status));



		exception = "UNKNOWN_STATUS_CODE";

	}



	return (ACPI_CAST_PTR(const char, exception));

}



ACPI_EXPORT_SYMBOL(acpi_format_exception)



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

 *

 * Namespace globals

 *

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

/*

 * Predefined ACPI Names (Built-in to the Interpreter)

 *

drivers/acpi/utilities/utmisc.c

+73 −0
Original line number Diff line number Diff line
@@ -49,6 +49,78 @@ 
#define _COMPONENT          ACPI_UTILITIES

ACPI_MODULE_NAME("utmisc")



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

 *

 * FUNCTION:    acpi_ut_validate_exception

 *

 * PARAMETERS:  Status       - The acpi_status code to be formatted

 *

 * RETURN:      A string containing the exception text. NULL if exception is

 *              not valid.

 *

 * DESCRIPTION: This function validates and translates an ACPI exception into

 *              an ASCII string.

 *

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

const char *acpi_ut_validate_exception(acpi_status status)

{

	acpi_status sub_status;

	const char *exception = NULL;



	ACPI_FUNCTION_ENTRY();



	/*

	 * Status is composed of two parts, a "type" and an actual code

	 */

	sub_status = (status & ~AE_CODE_MASK);



	switch (status & AE_CODE_MASK) {

	case AE_CODE_ENVIRONMENTAL:



		if (sub_status <= AE_CODE_ENV_MAX) {

			exception = acpi_gbl_exception_names_env[sub_status];

		}

		break;



	case AE_CODE_PROGRAMMER:



		if (sub_status <= AE_CODE_PGM_MAX) {

			exception =

			    acpi_gbl_exception_names_pgm[sub_status - 1];

		}

		break;



	case AE_CODE_ACPI_TABLES:



		if (sub_status <= AE_CODE_TBL_MAX) {

			exception =

			    acpi_gbl_exception_names_tbl[sub_status - 1];

		}

		break;



	case AE_CODE_AML:



		if (sub_status <= AE_CODE_AML_MAX) {

			exception =

			    acpi_gbl_exception_names_aml[sub_status - 1];

		}

		break;



	case AE_CODE_CONTROL:



		if (sub_status <= AE_CODE_CTRL_MAX) {

			exception =

			    acpi_gbl_exception_names_ctrl[sub_status - 1];

		}

		break;



	default:

		break;

	}



	return (ACPI_CAST_PTR(const char, exception));

}



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

 *

 * FUNCTION:    acpi_ut_is_aml_table
@@ -62,6 +134,7 @@ ACPI_MODULE_NAME("utmisc") 
 *              data tables that do not contain AML code.

 *

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



u8 acpi_ut_is_aml_table(struct acpi_table_header *table)

{

include/acpi/acglobal.h

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,14 @@ extern const char *acpi_gbl_highest_dstate_names[4]; 
extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];

extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];



/* Exception codes */



extern char const *acpi_gbl_exception_names_env[];

extern char const *acpi_gbl_exception_names_pgm[];

extern char const *acpi_gbl_exception_names_tbl[];

extern char const *acpi_gbl_exception_names_aml[];

extern char const *acpi_gbl_exception_names_ctrl[];



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

 *

 * Namespace globals

include/acpi/acutils.h

+2 −0
Original line number Diff line number Diff line
@@ -453,6 +453,8 @@ acpi_ut_short_divide(acpi_integer in_dividend, 
/*

 * utmisc

 */

const char *acpi_ut_validate_exception(acpi_status status);



u8 acpi_ut_is_aml_table(struct acpi_table_header *table);



acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id);