| Message ID | 20221102064750.2609503-1-chenhuacai@loongson.cn (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | Revert "LoongArch: Provisionally add ACPICA data structures" | expand |
On Wed, Nov 2, 2022 at 7:50 AM Huacai Chen <chenhuacai@loongson.cn> wrote: > > This reverts commit af6a1cfa6859dab4a843 ("LoongArch: Provisionally add > ACPICA data structures") to fix build error for linux-next on LoongArch, > since acpica is merged to linux-pm.git now. > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Would you mind if I added this to my acpica branch? There would be no cross-tree dependencies then. > --- > arch/loongarch/include/asm/acpi.h | 142 ------------------------------ > 1 file changed, 142 deletions(-) > > diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h > index 17162f494b9b..825c2519b9d1 100644 > --- a/arch/loongarch/include/asm/acpi.h > +++ b/arch/loongarch/include/asm/acpi.h > @@ -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 > -- > 2.31.1 >
Hi, Rafael, On Thu, Nov 3, 2022 at 3:59 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Wed, Nov 2, 2022 at 7:50 AM Huacai Chen <chenhuacai@loongson.cn> wrote: > > > > This reverts commit af6a1cfa6859dab4a843 ("LoongArch: Provisionally add > > ACPICA data structures") to fix build error for linux-next on LoongArch, > > since acpica is merged to linux-pm.git now. > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> > > Would you mind if I added this to my acpica branch? > > There would be no cross-tree dependencies then. Emm, I hope this patch be merged via your acpi tree, and so does another patch named "ACPI / table: Print CORE_PIC information when MADT is parsed". Huacai > > > --- > > arch/loongarch/include/asm/acpi.h | 142 ------------------------------ > > 1 file changed, 142 deletions(-) > > > > diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h > > index 17162f494b9b..825c2519b9d1 100644 > > --- a/arch/loongarch/include/asm/acpi.h > > +++ b/arch/loongarch/include/asm/acpi.h > > @@ -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 > > -- > > 2.31.1 > > >
On Thu, Nov 3, 2022 at 3:29 AM Huacai Chen <chenhuacai@kernel.org> wrote: > > Hi, Rafael, > > On Thu, Nov 3, 2022 at 3:59 AM Rafael J. Wysocki <rafael@kernel.org> wrote: > > > > On Wed, Nov 2, 2022 at 7:50 AM Huacai Chen <chenhuacai@loongson.cn> wrote: > > > > > > This reverts commit af6a1cfa6859dab4a843 ("LoongArch: Provisionally add > > > ACPICA data structures") to fix build error for linux-next on LoongArch, > > > since acpica is merged to linux-pm.git now. > > > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> > > > > Would you mind if I added this to my acpica branch? > > > > There would be no cross-tree dependencies then. > Emm, I hope this patch be merged via your acpi tree, That's what I was asking about. Applied now. > and so does > another patch named "ACPI / table: Print CORE_PIC information when > MADT is parsed". OK > > > > > --- > > > arch/loongarch/include/asm/acpi.h | 142 ------------------------------ > > > 1 file changed, 142 deletions(-) > > > > > > diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h > > > index 17162f494b9b..825c2519b9d1 100644 > > > --- a/arch/loongarch/include/asm/acpi.h > > > +++ b/arch/loongarch/include/asm/acpi.h > > > @@ -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 > > > -- > > > 2.31.1 > > > > >
diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h index 17162f494b9b..825c2519b9d1 100644 --- a/arch/loongarch/include/asm/acpi.h +++ b/arch/loongarch/include/asm/acpi.h @@ -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
This reverts commit af6a1cfa6859dab4a843 ("LoongArch: Provisionally add ACPICA data structures") to fix build error for linux-next on LoongArch, since acpica is merged to linux-pm.git now. Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> --- arch/loongarch/include/asm/acpi.h | 142 ------------------------------ 1 file changed, 142 deletions(-)