Commit 520d4a0e authored by Niyas Sait's avatar Niyas Sait Committed by Rafael J. Wysocki
Browse files

ACPICA: add support for ClockInput resource (v6.5) 

ACPICA commit 661feab5ee01a34af95a389a18c82e79f1aba05a

Link: https://github.com/acpica/acpica/commit/661feab5


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 612c2932

drivers/acpi/acpica/aclocal.h

+2 −1
Original line number Diff line number Diff line
@@ -1122,7 +1122,8 @@ struct acpi_port_info { 
#define ACPI_RESOURCE_NAME_PIN_GROUP            0x90

#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION   0x91

#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG     0x92

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x92

#define ACPI_RESOURCE_NAME_CLOCK_INPUT          0x93

#define ACPI_RESOURCE_NAME_LARGE_MAX            0x94



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

 *

drivers/acpi/acpica/acresrc.h

+2 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ extern struct acpi_rsconvert_info acpi_rs_convert_pin_config[]; 
extern struct acpi_rsconvert_info acpi_rs_convert_pin_group[];

extern struct acpi_rsconvert_info acpi_rs_convert_pin_group_function[];

extern struct acpi_rsconvert_info acpi_rs_convert_pin_group_config[];

extern struct acpi_rsconvert_info acpi_rs_convert_clock_input[];



/* These resources require separate get/set tables */
@@ -361,6 +362,7 @@ extern struct acpi_rsdump_info acpi_rs_dump_pin_config[]; 
extern struct acpi_rsdump_info acpi_rs_dump_pin_group[];

extern struct acpi_rsdump_info acpi_rs_dump_pin_group_function[];

extern struct acpi_rsdump_info acpi_rs_dump_pin_group_config[];

extern struct acpi_rsdump_info acpi_rs_dump_clock_input[];

#endif



#endif				/* __ACRESRC_H__ */

drivers/acpi/acpica/acutils.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ extern const char *acpi_gbl_sb_decode[]; 
extern const char *acpi_gbl_fc_decode[];

extern const char *acpi_gbl_pt_decode[];

extern const char *acpi_gbl_ptyp_decode[];

extern const char *acpi_gbl_clock_input_mode[];

extern const char *acpi_gbl_clock_input_scale[];

#endif



/*

drivers/acpi/acpica/amlresrc.h

+17 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 
#define ACPI_RESTAG_TYPE                        "_TTP"	/* Translation(1), Static (0) */

#define ACPI_RESTAG_XFERTYPE                    "_SIZ"	/* 8(0), 8And16(1), 16(2) */

#define ACPI_RESTAG_VENDORDATA                  "_VEN"

#define ACPI_RESTAG_FQN                         "_FQN"

#define ACPI_RESTAG_FQD                         "_FQD"



/* Default sizes for "small" resource descriptors */
@@ -427,6 +429,20 @@ struct aml_resource_pin_config { 
	 */

};



#define AML_RESOURCE_CLOCK_INPUT_REVISION      1	/* ACPI 6.5 */



struct aml_resource_clock_input {

	AML_RESOURCE_LARGE_HEADER_COMMON u8 revision_id;

	u16 flags;

	u16 frequency_divisor;

	u32 frequency_numerator;

	/*

	 * Optional fields follow immediately:

	 * 1) Resource Source index

	 * 2) Resource Source String

	 */

};



#define AML_RESOURCE_PIN_CONFIG_REVISION      1	/* ACPI 6.2 */



struct aml_resource_pin_group {
@@ -533,6 +549,7 @@ union aml_resource { 
	struct aml_resource_pin_group pin_group;

	struct aml_resource_pin_group_function pin_group_function;

	struct aml_resource_pin_group_config pin_group_config;

	struct aml_resource_clock_input clock_input;



	/* Utility overlays */

drivers/acpi/acpica/rscalc.c

+17 −0
Original line number Diff line number Diff line
@@ -320,6 +320,16 @@ acpi_rs_get_aml_length(struct acpi_resource *resource, 


			break;



		case ACPI_RESOURCE_TYPE_CLOCK_INPUT:



			total_size = (acpi_rs_length)(total_size +

						      resource->data.

						      clock_input.

						      resource_source.

						      string_length);



			break;



		case ACPI_RESOURCE_TYPE_SERIAL_BUS:



			total_size =
@@ -650,6 +660,13 @@ acpi_rs_get_list_length(u8 *aml_buffer, 


			break;



		case ACPI_RESOURCE_NAME_CLOCK_INPUT:

			extra_struct_bytes =

			    acpi_rs_stream_option_length(resource_length,

							 minimum_aml_resource_length);



			break;



		default:



			break;