diff mbox

acpi: method: add _IFT and _SRV control method tests (LP: #1255915)

Message ID 1385633838-9491-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show

Commit Message

Alex Hung Nov. 28, 2013, 10:17 a.m. UTC
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 src/acpi/method/method.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

Comments

Colin Ian King Nov. 28, 2013, 10:49 a.m. UTC | #1
On 28/11/13 10:17, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/method/method.c | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index e347378..0f3622c 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -119,7 +119,7 @@
>   * _HPP  6.2.7		Y
>   * _HPX  6.2.8		N
>   * _HRV  6.1.6		Y
> - * _IFT  19.5		N
> + * _IFT  IPMI		Y
>   * _INI  6.5.1		Y
>   * _INT  19.1.8		N
>   * _IRC  7.2.13		Y
> @@ -209,7 +209,7 @@
>   * _SPD  B.4.5		Y
>   * _SRS  6.2.15		n/a
>   * _SRT  9.18.4		n/a
> - * _SRV  IPMI		N
> + * _SRV  IPMI		Y
>   * _SST  9.1.1		n/a
>   * _STA  6.3.7, 7.1.4	Y
>   * _STM  9.8.2.1.2	n/a
> @@ -4860,6 +4860,21 @@ static int method_test_CDM(fwts_framework *fw)
>  }
>  
>  /*
> + * Intelligent Platform Management Interface (IPMI) Specification
> + */
> +static int method_test_IFT(fwts_framework *fw)
> +{
> +	return method_evaluate_method(fw, METHOD_OPTIONAL,
> +		"_IFT", NULL, 0, method_test_integer_return, NULL);
> +}
> +
> +static int method_test_SRV(fwts_framework *fw)
> +{
> +	return method_evaluate_method(fw, METHOD_OPTIONAL,
> +		"_SRV", NULL, 0, method_test_integer_return, NULL);
> +}
> +
> +/*
>   * Tests
>   */
>  static fwts_framework_minor_test method_tests[] = {
> @@ -5137,7 +5152,6 @@ static fwts_framework_minor_test method_tests[] = {
>  	{ method_test_WAK, "Test _WAK (System Wake)." },
>  
>  	/* Section 19 */
> -	/* { method_test_IFT, "Test _IFT (IPMI Interface Type)." }, */
>  	/* { method_test_INT, "Test _INT (Interrupts)." }, */
>  
>  	/* Appendix B, ACPI Extensions for Display Adapters */
> @@ -5160,6 +5174,10 @@ static fwts_framework_minor_test method_tests[] = {
>  	/* From PCI Specification */
>  	{ method_test_CBA, "Test _CBA (Configuration Base Address)." },
>  
> +	/* From IPMI Specification 2.0 */
> +	{ method_test_IFT, "Test _IFT (IPMI Interface Type)." },
> +	{ method_test_SRV, "Test _SRV (IPMI Interface Revision)." },
> +
>  	/* End! */
>  
>  	{ NULL, NULL }
> 

For reference, these are described in
http://www.intel.com/content/www/us/en/servers/ipmi/ipmi-second-gen-interface-spec-v2-rev1-1.html

Looks OK to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
Keng-Yu Lin Dec. 3, 2013, 3:15 a.m. UTC | #2
On Thu, Nov 28, 2013 at 6:17 PM, Alex Hung <alex.hung@canonical.com> wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/method/method.c | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index e347378..0f3622c 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -119,7 +119,7 @@
>   * _HPP  6.2.7         Y
>   * _HPX  6.2.8         N
>   * _HRV  6.1.6         Y
> - * _IFT  19.5          N
> + * _IFT  IPMI          Y
>   * _INI  6.5.1         Y
>   * _INT  19.1.8                N
>   * _IRC  7.2.13                Y
> @@ -209,7 +209,7 @@
>   * _SPD  B.4.5         Y
>   * _SRS  6.2.15                n/a
>   * _SRT  9.18.4                n/a
> - * _SRV  IPMI          N
> + * _SRV  IPMI          Y
>   * _SST  9.1.1         n/a
>   * _STA  6.3.7, 7.1.4  Y
>   * _STM  9.8.2.1.2     n/a
> @@ -4860,6 +4860,21 @@ static int method_test_CDM(fwts_framework *fw)
>  }
>
>  /*
> + * Intelligent Platform Management Interface (IPMI) Specification
> + */
> +static int method_test_IFT(fwts_framework *fw)
> +{
> +       return method_evaluate_method(fw, METHOD_OPTIONAL,
> +               "_IFT", NULL, 0, method_test_integer_return, NULL);
> +}
> +
> +static int method_test_SRV(fwts_framework *fw)
> +{
> +       return method_evaluate_method(fw, METHOD_OPTIONAL,
> +               "_SRV", NULL, 0, method_test_integer_return, NULL);
> +}
> +
> +/*
>   * Tests
>   */
>  static fwts_framework_minor_test method_tests[] = {
> @@ -5137,7 +5152,6 @@ static fwts_framework_minor_test method_tests[] = {
>         { method_test_WAK, "Test _WAK (System Wake)." },
>
>         /* Section 19 */
> -       /* { method_test_IFT, "Test _IFT (IPMI Interface Type)." }, */
>         /* { method_test_INT, "Test _INT (Interrupts)." }, */
>
>         /* Appendix B, ACPI Extensions for Display Adapters */
> @@ -5160,6 +5174,10 @@ static fwts_framework_minor_test method_tests[] = {
>         /* From PCI Specification */
>         { method_test_CBA, "Test _CBA (Configuration Base Address)." },
>
> +       /* From IPMI Specification 2.0 */
> +       { method_test_IFT, "Test _IFT (IPMI Interface Type)." },
> +       { method_test_SRV, "Test _SRV (IPMI Interface Revision)." },
> +
>         /* End! */
>
>         { NULL, NULL }
> --
> 1.8.1.2
>

Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff mbox

Patch

diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index e347378..0f3622c 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -119,7 +119,7 @@ 
  * _HPP  6.2.7		Y
  * _HPX  6.2.8		N
  * _HRV  6.1.6		Y
- * _IFT  19.5		N
+ * _IFT  IPMI		Y
  * _INI  6.5.1		Y
  * _INT  19.1.8		N
  * _IRC  7.2.13		Y
@@ -209,7 +209,7 @@ 
  * _SPD  B.4.5		Y
  * _SRS  6.2.15		n/a
  * _SRT  9.18.4		n/a
- * _SRV  IPMI		N
+ * _SRV  IPMI		Y
  * _SST  9.1.1		n/a
  * _STA  6.3.7, 7.1.4	Y
  * _STM  9.8.2.1.2	n/a
@@ -4860,6 +4860,21 @@  static int method_test_CDM(fwts_framework *fw)
 }
 
 /*
+ * Intelligent Platform Management Interface (IPMI) Specification
+ */
+static int method_test_IFT(fwts_framework *fw)
+{
+	return method_evaluate_method(fw, METHOD_OPTIONAL,
+		"_IFT", NULL, 0, method_test_integer_return, NULL);
+}
+
+static int method_test_SRV(fwts_framework *fw)
+{
+	return method_evaluate_method(fw, METHOD_OPTIONAL,
+		"_SRV", NULL, 0, method_test_integer_return, NULL);
+}
+
+/*
  * Tests
  */
 static fwts_framework_minor_test method_tests[] = {
@@ -5137,7 +5152,6 @@  static fwts_framework_minor_test method_tests[] = {
 	{ method_test_WAK, "Test _WAK (System Wake)." },
 
 	/* Section 19 */
-	/* { method_test_IFT, "Test _IFT (IPMI Interface Type)." }, */
 	/* { method_test_INT, "Test _INT (Interrupts)." }, */
 
 	/* Appendix B, ACPI Extensions for Display Adapters */
@@ -5160,6 +5174,10 @@  static fwts_framework_minor_test method_tests[] = {
 	/* From PCI Specification */
 	{ method_test_CBA, "Test _CBA (Configuration Base Address)." },
 
+	/* From IPMI Specification 2.0 */
+	{ method_test_IFT, "Test _IFT (IPMI Interface Type)." },
+	{ method_test_SRV, "Test _SRV (IPMI Interface Revision)." },
+
 	/* End! */
 
 	{ NULL, NULL }