Commit a2befbb2 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: ACPI 6.4: add CSI2Bus resource template 

This commit the result of squashing the following:
ACPICA commit 21a316fdaa46b3fb245a1920f3829cb05d6ced6e
ACPICA commit f5506fc7dad08c2a25ef52cf836c2d67385a612c

Link: https://github.com/acpica/acpica/commit/21a316fd
Link: https://github.com/acpica/acpica/commit/f5506fc7


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Kaneda <erik.kaneda@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cca97d42

drivers/acpi/acpica/acresrc.h

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ typedef enum { 
	ACPI_RSC_1BITFLAG,

	ACPI_RSC_2BITFLAG,

	ACPI_RSC_3BITFLAG,

	ACPI_RSC_6BITFLAG,

	ACPI_RSC_ADDRESS,

	ACPI_RSC_BITMASK,

	ACPI_RSC_BITMASK16,
@@ -102,6 +103,7 @@ typedef enum { 
	ACPI_RSD_1BITFLAG,

	ACPI_RSD_2BITFLAG,

	ACPI_RSD_3BITFLAG,

	ACPI_RSD_6BITFLAG,

	ACPI_RSD_ADDRESS,

	ACPI_RSD_DWORDLIST,

	ACPI_RSD_LITERAL,
@@ -295,6 +297,7 @@ extern struct acpi_rsconvert_info acpi_rs_convert_address64[]; 
extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[];

extern struct acpi_rsconvert_info acpi_rs_convert_gpio[];

extern struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[];

extern struct acpi_rsconvert_info acpi_rs_convert_csi2_serial_bus[];

extern struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[];

extern struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[];

extern struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[];
@@ -349,6 +352,7 @@ extern struct acpi_rsdump_info acpi_rs_dump_gpio[]; 
extern struct acpi_rsdump_info acpi_rs_dump_pin_function[];

extern struct acpi_rsdump_info acpi_rs_dump_fixed_dma[];

extern struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[];

extern struct acpi_rsdump_info acpi_rs_dump_csi2_serial_bus[];

extern struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[];

extern struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[];

extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[];

drivers/acpi/acpica/acutils.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ extern const char *acpi_gbl_max_decode[]; 
extern const char *acpi_gbl_mem_decode[];

extern const char *acpi_gbl_min_decode[];

extern const char *acpi_gbl_mtp_decode[];

extern const char *acpi_gbl_phy_decode[];

extern const char *acpi_gbl_rng_decode[];

extern const char *acpi_gbl_rw_decode[];

extern const char *acpi_gbl_shr_decode[];

drivers/acpi/acpica/amlresrc.h

+18 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define ACPI_RESTAG_IORESTRICTION               "_IOR"

#define ACPI_RESTAG_LENGTH                      "_LEN"

#define ACPI_RESTAG_LINE                        "_LIN"

#define ACPI_RESTAG_LOCALPORT                   "_PRT"

#define ACPI_RESTAG_MEMATTRIBUTES               "_MTP"	/* Memory(0), Reserved(1), ACPI(2), NVS(3) */

#define ACPI_RESTAG_MEMTYPE                     "_MEM"	/* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */

#define ACPI_RESTAG_MAXADDR                     "_MAX"
@@ -49,6 +50,7 @@ 
#define ACPI_RESTAG_MODE                        "_MOD"

#define ACPI_RESTAG_PARITY                      "_PAR"

#define ACPI_RESTAG_PHASE                       "_PHA"

#define ACPI_RESTAG_PHYTYPE                     "_PHY"

#define ACPI_RESTAG_PIN                         "_PIN"

#define ACPI_RESTAG_PINCONFIG                   "_PPI"

#define ACPI_RESTAG_PINCONFIG_TYPE              "_TYP"
@@ -316,12 +318,26 @@ struct aml_resource_gpio { 
#define AML_RESOURCE_I2C_SERIALBUSTYPE          1

#define AML_RESOURCE_SPI_SERIALBUSTYPE          2

#define AML_RESOURCE_UART_SERIALBUSTYPE         3

#define AML_RESOURCE_MAX_SERIALBUSTYPE          3

#define AML_RESOURCE_CSI2_SERIALBUSTYPE         4

#define AML_RESOURCE_MAX_SERIALBUSTYPE          4

#define AML_RESOURCE_VENDOR_SERIALBUSTYPE       192	/* Vendor defined is 0xC0-0xFF (NOT SUPPORTED) */



struct aml_resource_common_serialbus {

AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON};



struct aml_resource_csi2_serialbus {

	AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON

	    /*

	     * Optional fields follow immediately:

	     * 1) Vendor Data bytes

	     * 2) Resource Source String

	     */

};



#define AML_RESOURCE_CSI2_REVISION              1	/* ACPI 6.4 */

#define AML_RESOURCE_CSI2_TYPE_REVISION         1	/* ACPI 6.4 */

#define AML_RESOURCE_CSI2_MIN_DATA_LEN          0	/* ACPI 6.4 */



struct aml_resource_i2c_serialbus {

	AML_RESOURCE_LARGE_HEADER_COMMON

	    AML_RESOURCE_SERIAL_COMMON u32 connection_speed;
@@ -510,6 +526,7 @@ union aml_resource { 
	struct aml_resource_i2c_serialbus i2c_serial_bus;

	struct aml_resource_spi_serialbus spi_serial_bus;

	struct aml_resource_uart_serialbus uart_serial_bus;

	struct aml_resource_csi2_serialbus csi2_serial_bus;

	struct aml_resource_common_serialbus common_serial_bus;

	struct aml_resource_pin_function pin_function;

	struct aml_resource_pin_config pin_config;

drivers/acpi/acpica/rscalc.c

+2 −2
Original line number Diff line number Diff line
@@ -677,10 +677,10 @@ acpi_rs_get_list_length(u8 *aml_buffer, 
		*size_needed += buffer_size;



		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,

				  "Type %.2X, AmlLength %.2X InternalLength %.2X\n",

				  "Type %.2X, AmlLength %.2X InternalLength %.2X%8X\n",

				  acpi_ut_get_resource_type(aml_buffer),

				  acpi_ut_get_descriptor_length(aml_buffer),

				  buffer_size));

				  ACPI_FORMAT_UINT64(*size_needed)));



		/*

		 * Point to the next resource within the AML stream using the length

drivers/acpi/acpica/rsdump.c

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list) 
			    ("Invalid descriptor type (%X) in resource list\n",

			     resource_list->type);

			return;

		} else if (!resource_list->type) {

			ACPI_ERROR((AE_INFO, "Invalid Zero Resource Type"));

			return;

		}



		/* Sanity check the length. It must not be zero, or we loop forever */
@@ -258,6 +261,11 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table) 
					   table->pointer[*target & 0x07]);

			break;



		case ACPI_RSD_6BITFLAG:



			acpi_rs_out_integer8(name, (ACPI_GET8(target) & 0x3F));

			break;



		case ACPI_RSD_SHORTLIST:

			/*

			 * Short byte list (single line output) for DMA and IRQ resources