Commit fa4e1f88 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back ACPICA changes for 6.2-rc1

parents 76dcd734 470188b0

arch/loongarch/include/asm/acpi.h

+0 −142
Original line number Diff line number Diff line
@@ -31,148 +31,6 @@ static inline bool acpi_has_cpu_in_madt(void) 


extern struct list_head acpi_wakeup_device_list;



/*

 * Temporary definitions until the core ACPICA code gets updated (see

 * 1656837932-18257-1-git-send-email-lvjianmin@loongson.cn and its

 * follow-ups for the "rationale").

 *

 * Once the "legal reasons" are cleared and that the code is merged,

 * this can be dropped entierely.

 */

#if (ACPI_CA_VERSION == 0x20220331 && !defined(LOONGARCH_ACPICA_EXT))



#define LOONGARCH_ACPICA_EXT	1



#define	ACPI_MADT_TYPE_CORE_PIC		17

#define	ACPI_MADT_TYPE_LIO_PIC		18

#define	ACPI_MADT_TYPE_HT_PIC		19

#define	ACPI_MADT_TYPE_EIO_PIC		20

#define	ACPI_MADT_TYPE_MSI_PIC		21

#define	ACPI_MADT_TYPE_BIO_PIC		22

#define	ACPI_MADT_TYPE_LPC_PIC		23



/* Values for Version field above */



enum acpi_madt_core_pic_version {

	ACPI_MADT_CORE_PIC_VERSION_NONE = 0,

	ACPI_MADT_CORE_PIC_VERSION_V1 = 1,

	ACPI_MADT_CORE_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_lio_pic_version {

	ACPI_MADT_LIO_PIC_VERSION_NONE = 0,

	ACPI_MADT_LIO_PIC_VERSION_V1 = 1,

	ACPI_MADT_LIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_eio_pic_version {

	ACPI_MADT_EIO_PIC_VERSION_NONE = 0,

	ACPI_MADT_EIO_PIC_VERSION_V1 = 1,

	ACPI_MADT_EIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_ht_pic_version {

	ACPI_MADT_HT_PIC_VERSION_NONE = 0,

	ACPI_MADT_HT_PIC_VERSION_V1 = 1,

	ACPI_MADT_HT_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_bio_pic_version {

	ACPI_MADT_BIO_PIC_VERSION_NONE = 0,

	ACPI_MADT_BIO_PIC_VERSION_V1 = 1,

	ACPI_MADT_BIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_msi_pic_version {

	ACPI_MADT_MSI_PIC_VERSION_NONE = 0,

	ACPI_MADT_MSI_PIC_VERSION_V1 = 1,

	ACPI_MADT_MSI_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



enum acpi_madt_lpc_pic_version {

	ACPI_MADT_LPC_PIC_VERSION_NONE = 0,

	ACPI_MADT_LPC_PIC_VERSION_V1 = 1,

	ACPI_MADT_LPC_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */

};



#pragma pack(1)



/* Core Interrupt Controller */



struct acpi_madt_core_pic {

	struct acpi_subtable_header header;

	u8 version;

	u32 processor_id;

	u32 core_id;

	u32 flags;

};



/* Legacy I/O Interrupt Controller */



struct acpi_madt_lio_pic {

	struct acpi_subtable_header header;

	u8 version;

	u64 address;

	u16 size;

	u8 cascade[2];

	u32 cascade_map[2];

};



/* Extend I/O Interrupt Controller */



struct acpi_madt_eio_pic {

	struct acpi_subtable_header header;

	u8 version;

	u8 cascade;

	u8 node;

	u64 node_map;

};



/* HT Interrupt Controller */



struct acpi_madt_ht_pic {

	struct acpi_subtable_header header;

	u8 version;

	u64 address;

	u16 size;

	u8 cascade[8];

};



/* Bridge I/O Interrupt Controller */



struct acpi_madt_bio_pic {

	struct acpi_subtable_header header;

	u8 version;

	u64 address;

	u16 size;

	u16 id;

	u16 gsi_base;

};



/* MSI Interrupt Controller */



struct acpi_madt_msi_pic {

	struct acpi_subtable_header header;

	u8 version;

	u64 msg_address;

	u32 start;

	u32 count;

};



/* LPC Interrupt Controller */



struct acpi_madt_lpc_pic {

	struct acpi_subtable_header header;

	u8 version;

	u64 address;

	u16 size;

	u8 cascade;

};



#pragma pack()



#endif



#endif /* !CONFIG_ACPI */



#define ACPI_TABLE_UPGRADE_MAX_PHYS ARCH_LOW_ADDRESS_LIMIT

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ acpi-y += \ 
	utalloc.o	\

	utascii.o	\

	utbuffer.o	\

	utcksum.o	\

	utcopy.o	\

	utexcep.o	\

	utdebug.o	\

drivers/acpi/acpica/acglobal.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ ACPI_GLOBAL(struct acpi_table_list, acpi_gbl_root_table_list); 


ACPI_GLOBAL(struct acpi_table_header *, acpi_gbl_DSDT);

ACPI_GLOBAL(struct acpi_table_header, acpi_gbl_original_dsdt_header);

ACPI_INIT_GLOBAL(char *, acpi_gbl_CDAT, NULL);

ACPI_INIT_GLOBAL(u32, acpi_gbl_dsdt_index, ACPI_INVALID_TABLE_INDEX);

ACPI_INIT_GLOBAL(u32, acpi_gbl_facs_index, ACPI_INVALID_TABLE_INDEX);

ACPI_INIT_GLOBAL(u32, acpi_gbl_xfacs_index, ACPI_INVALID_TABLE_INDEX);

drivers/acpi/acpica/actables.h

+0 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ void 
acpi_tb_print_table_header(acpi_physical_address address,

			   struct acpi_table_header *header);



u8 acpi_tb_checksum(u8 *buffer, u32 length);



acpi_status

acpi_tb_verify_checksum(struct acpi_table_header *table, u32 length);



void acpi_tb_check_dsdt_header(void);



struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index);

drivers/acpi/acpica/acutils.h

+13 −0
Original line number Diff line number Diff line
@@ -158,6 +158,19 @@ u8 acpi_ut_valid_name_char(char character, u32 position); 


void acpi_ut_check_and_repair_ascii(u8 *name, char *repaired_name, u32 count);



/*

 * utcksum - Checksum utilities

 */

u8 acpi_ut_generate_checksum(void *table, u32 length, u8 original_checksum);



u8 acpi_ut_checksum(u8 *buffer, u32 length);



acpi_status

acpi_ut_verify_cdat_checksum(struct acpi_table_cdat *cdat_table, u32 length);



acpi_status

acpi_ut_verify_checksum(struct acpi_table_header *table, u32 length);



/*

 * utnonansi - Non-ANSI C library functions

 */