[PATCH v2] ACPICA: Add values for MADT GIC version field for ACPI 6.0

[PATCH v2] ACPICA: Add values for MADT GIC version field for ACPI 6.0

[Hanjun Guo]

ACPI 6.0 specified MADT generic distributor version values, but
the detail definition is missing in ACPICA version 20150515, add
its support in this patch which is needed for ARM64 ACPI based
GIC init.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
Hi Lv, Rafael,
   Could you help merge this patch for 4.2? It should be in the ACPICA
release of 20150515, but we missed that chance. This patch will be needed
for ARM64 GIC init and I prepare to upstream those patches in 4.3, so if
this patch accpeted in 4.2, it will have less dedenpence for ACPICA core
and ARM64 GIC code in next kernel version.

This patch was accepted by Bob and merged into ACPICA tree, I reworked
it on top of linux ACPICA.

Thanks
Hanjun

 include/acpi/actbl1.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index cadf21c..d382de8 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -834,6 +834,17 @@ struct acpi_madt_generic_distributor {
 	u8 reserved2[3];	/* reserved - must be zero */
 };
 
+/* Values for Version field above */
+
+enum acpi_madt_gic_version {
+	ACPI_MADT_GIC_VERSION_NONE	= 0,
+	ACPI_MADT_GIC_VERSION_V1	= 1,
+	ACPI_MADT_GIC_VERSION_V2	= 2,
+	ACPI_MADT_GIC_VERSION_V3	= 3,
+	ACPI_MADT_GIC_VERSION_V4	= 4,
+	ACPI_MADT_GIC_VERSION_RESERVED	= 5	/* 5 and greater are reserved */
+};
+
 /* 13: Generic MSI Frame (ACPI 5.1) */
 
 struct acpi_madt_generic_msi_frame {
-- 
1.9.1

RE: [PATCH v2] ACPICA: Add values for MADT GIC version field for ACPI 6.0

[Moore, Robert]

It will make it into next weeks acpica release.


> -----Original Message-----
> From: Hanjun Guo [mailto:hanjun.guo@linaro.org]
> Sent: Thursday, June 11, 2015 2:51 AM
> To: Zheng, Lv; Rafael J. Wysocki
> Cc: Moore, Robert; linux-acpi@vger.kernel.org; Hanjun Guo
> Subject: [PATCH v2] ACPICA: Add values for MADT GIC version field for ACPI
> 6.0
> 
> ACPI 6.0 specified MADT generic distributor version values, but the detail
> definition is missing in ACPICA version 20150515, add its support in this
> patch which is needed for ARM64 ACPI based GIC init.
> 
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> Signed-off-by: Bob Moore <robert.moore@intel.com>
> ---
> Hi Lv, Rafael,
>    Could you help merge this patch for 4.2? It should be in the ACPICA
> release of 20150515, but we missed that chance. This patch will be needed
> for ARM64 GIC init and I prepare to upstream those patches in 4.3, so if
> this patch accpeted in 4.2, it will have less dedenpence for ACPICA core
> and ARM64 GIC code in next kernel version.
> 
> This patch was accepted by Bob and merged into ACPICA tree, I reworked it
> on top of linux ACPICA.
> 
> Thanks
> Hanjun
> 
>  include/acpi/actbl1.h | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index
> cadf21c..d382de8 100644
> --- a/include/acpi/actbl1.h
> +++ b/include/acpi/actbl1.h
> @@ -834,6 +834,17 @@ struct acpi_madt_generic_distributor {
>  	u8 reserved2[3];	/* reserved - must be zero */
>  };
> 
> +/* Values for Version field above */
> +
> +enum acpi_madt_gic_version {
> +	ACPI_MADT_GIC_VERSION_NONE	= 0,
> +	ACPI_MADT_GIC_VERSION_V1	= 1,
> +	ACPI_MADT_GIC_VERSION_V2	= 2,
> +	ACPI_MADT_GIC_VERSION_V3	= 3,
> +	ACPI_MADT_GIC_VERSION_V4	= 4,
> +	ACPI_MADT_GIC_VERSION_RESERVED	= 5	/* 5 and greater are
> reserved */
> +};
> +
>  /* 13: Generic MSI Frame (ACPI 5.1) */
> 
>  struct acpi_madt_generic_msi_frame {
> --
> 1.9.1

Re: [PATCH v2] ACPICA: Add values for MADT GIC version field for ACPI 6.0

[Hanjun Guo]

On 06/12/2015 01:28 AM, Moore, Robert wrote:
> It will make it into next weeks acpica release.

Thanks!

Regards
Hanjun