diff mbox

[RFC,5/7,v2] acpi: only run ACPI tests if we have ACPI

Message ID 1398648914.287518.639141900974.5.gpush@pablo
State Rejected
Headers show

Commit Message

Jeremy Kerr April 28, 2014, 1:35 a.m. UTC
We only want to run ACPI tests if the firmware has ACPI, so add
the relevant feature bits to ACPI tests run in batch mode.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

---
 src/acpi/acpitables/acpitables.c   |    5 +++--
 src/acpi/checksum/checksum.c       |    5 +++--
 src/acpi/method/method.c           |    3 ++-
 src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
 src/pci/aspm/aspm.c                |    5 +++--
 5 files changed, 13 insertions(+), 8 deletions(-)

Comments

Colin Ian King May 1, 2014, 8:28 a.m. UTC | #1
On 28/04/14 02:35, Jeremy Kerr wrote:
> We only want to run ACPI tests if the firmware has ACPI, so add
> the relevant feature bits to ACPI tests run in batch mode.
> 
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
> 
> ---
>  src/acpi/acpitables/acpitables.c   |    5 +++--
>  src/acpi/checksum/checksum.c       |    5 +++--
>  src/acpi/method/method.c           |    3 ++-
>  src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
>  src/pci/aspm/aspm.c                |    5 +++--
>  5 files changed, 13 insertions(+), 8 deletions(-)

There are a bunch more ACPI related tests that probably need attention too:

src/acpi/apicinstance/apicinstance.c
src/acpi/dmar/dmar.c
src/acpi/fadt/fadt.c
src/acpi/mcfg/mcfg.c
src/acpi/pcc/pcc.c
src/acpi/wmi/wmi.c
etc..

and some utils too:

src/acpi/acpidump/acpidump.c
src/acpi/crsdump/crsdump.c
etc..

> 
> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
> index 439df2a..5f6beb9 100644
> --- a/src/acpi/acpitables/acpitables.c
> +++ b/src/acpi/acpitables/acpitables.c
> @@ -613,7 +613,8 @@ static fwts_framework_minor_test acpi_table_check_tests[] = {
>  
>  static fwts_framework_ops acpi_table_check_ops = {
>  	.description = "ACPI table settings sanity tests.",
> -	.minor_tests = acpi_table_check_tests
> +	.minor_tests = acpi_table_check_tests,
>  };

Any particular reason of this addition comma?

>  
> -FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);

+1 on this.. etc.


> diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
> index bac266d..9845473 100644
> --- a/src/acpi/checksum/checksum.c
> +++ b/src/acpi/checksum/checksum.c
> @@ -152,7 +152,8 @@ static fwts_framework_minor_test checksum_tests[] = {
>  
>  static fwts_framework_ops checksum_ops = {
>  	.description = "ACPI table checksum test.",
> -	.minor_tests = checksum_tests
> +	.minor_tests = checksum_tests,

Addition comma?

>  };
>  
> -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("checksum", &checksum_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 9b789cf..8e4a064 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -5140,4 +5140,5 @@ static fwts_framework_ops method_ops = {
>  	.minor_tests = method_tests
>  };
>  
> -FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("method", &method_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
> index 504e5c6..7137aab 100644
> --- a/src/acpi/syntaxcheck/syntaxcheck.c
> +++ b/src/acpi/syntaxcheck/syntaxcheck.c
> @@ -623,4 +623,5 @@ static fwts_framework_ops syntaxcheck_ops = {
>  	.minor_tests = syntaxcheck_tests
>  };
>  
> -FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
> +FWTS_REGISTER_FEATURES("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
> diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
> index e798c26..6b322d6 100644
> --- a/src/pci/aspm/aspm.c
> +++ b/src/pci/aspm/aspm.c
> @@ -272,7 +272,8 @@ static fwts_framework_minor_test aspm_tests[] = {
>  
>  static fwts_framework_ops aspm_ops = {
>  	.description = "PCIe ASPM test.",
> -	.minor_tests = aspm_tests
> +	.minor_tests = aspm_tests,
>  };
>  
> -FWTS_REGISTER("aspm", &aspm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
> +FWTS_REGISTER_FEATURES("aspm", &aspm_ops, FWTS_TEST_ANYTIME,
> +		FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, FWTS_FW_FEATURE_ACPI);
>
Jeremy Kerr May 1, 2014, 10:49 a.m. UTC | #2
Hi Colin,

>>  src/acpi/acpitables/acpitables.c   |    5 +++--
>>  src/acpi/checksum/checksum.c       |    5 +++--
>>  src/acpi/method/method.c           |    3 ++-
>>  src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
>>  src/pci/aspm/aspm.c                |    5 +++--
>>  5 files changed, 13 insertions(+), 8 deletions(-)
> 
> There are a bunch more ACPI related tests that probably need attention too:

Yep, I was going for an in-principal approval of the concept before
attacking more of the tests :)

>> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
>> index 439df2a..5f6beb9 100644
>> --- a/src/acpi/acpitables/acpitables.c
>> +++ b/src/acpi/acpitables/acpitables.c
>> @@ -613,7 +613,8 @@ static fwts_framework_minor_test acpi_table_check_tests[] = {
>>  
>>  static fwts_framework_ops acpi_table_check_ops = {
>>  	.description = "ACPI table settings sanity tests.",
>> -	.minor_tests = acpi_table_check_tests
>> +	.minor_tests = acpi_table_check_tests,
>>  };
> 
> Any particular reason of this addition comma?

Just a remnant of the original change which added the .init member to do
the feature check. I'll take these out.

Thanks,


Jeremy
Kun Yang July 24, 2014, 8:49 a.m. UTC | #3
Hi Jeremy,

howdy !  could you please let me know if you're going to keep working on 
this v2 , or we can ignore this v2 patch set and looking forward to your 
v3 ?

thanks
-YK

On 2014年05月01日 18:49, Jeremy Kerr wrote:
> Hi Colin,
>
>>>   src/acpi/acpitables/acpitables.c   |    5 +++--
>>>   src/acpi/checksum/checksum.c       |    5 +++--
>>>   src/acpi/method/method.c           |    3 ++-
>>>   src/acpi/syntaxcheck/syntaxcheck.c |    3 ++-
>>>   src/pci/aspm/aspm.c                |    5 +++--
>>>   5 files changed, 13 insertions(+), 8 deletions(-)
>> There are a bunch more ACPI related tests that probably need attention too:
> Yep, I was going for an in-principal approval of the concept before
> attacking more of the tests :)
>
>>> diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
>>> index 439df2a..5f6beb9 100644
>>> --- a/src/acpi/acpitables/acpitables.c
>>> +++ b/src/acpi/acpitables/acpitables.c
>>> @@ -613,7 +613,8 @@ static fwts_framework_minor_test acpi_table_check_tests[] = {
>>>   
>>>   static fwts_framework_ops acpi_table_check_ops = {
>>>   	.description = "ACPI table settings sanity tests.",
>>> -	.minor_tests = acpi_table_check_tests
>>> +	.minor_tests = acpi_table_check_tests,
>>>   };
>> Any particular reason of this addition comma?
> Just a remnant of the original change which added the .init member to do
> the feature check. I'll take these out.
>
> Thanks,
>
>
> Jeremy
>
Jeremy Kerr July 24, 2014, 9:40 a.m. UTC | #4
Hi YK,

> howdy !  could you please let me know if you're going to keep working on
> this v2 , or we can ignore this v2 patch set and looking forward to your
> v3 ?

Thanks for the reminder. I've just sent v3 for the patches that have
changes requested.

Cheers,


Jeremy
Kun Yang July 24, 2014, 10:10 a.m. UTC | #5
On 2014年07月24日 17:40, Jeremy Kerr wrote:
> Hi YK,
>
>> howdy !  could you please let me know if you're going to keep working on
>> this v2 , or we can ignore this v2 patch set and looking forward to your
>> v3 ?
> Thanks for the reminder. I've just sent v3 for the patches that have
> changes requested.
thank you very much Jeremy .

-YK

>
> Cheers,
>
>
> Jeremy
>
diff mbox

Patch

diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c
index 439df2a..5f6beb9 100644
--- a/src/acpi/acpitables/acpitables.c
+++ b/src/acpi/acpitables/acpitables.c
@@ -613,7 +613,8 @@  static fwts_framework_minor_test acpi_table_check_tests[] = {
 
 static fwts_framework_ops acpi_table_check_ops = {
 	.description = "ACPI table settings sanity tests.",
-	.minor_tests = acpi_table_check_tests
+	.minor_tests = acpi_table_check_tests,
 };
 
-FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c
index bac266d..9845473 100644
--- a/src/acpi/checksum/checksum.c
+++ b/src/acpi/checksum/checksum.c
@@ -152,7 +152,8 @@  static fwts_framework_minor_test checksum_tests[] = {
 
 static fwts_framework_ops checksum_ops = {
 	.description = "ACPI table checksum test.",
-	.minor_tests = checksum_tests
+	.minor_tests = checksum_tests,
 };
 
-FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("checksum", &checksum_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index 9b789cf..8e4a064 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -5140,4 +5140,5 @@  static fwts_framework_ops method_ops = {
 	.minor_tests = method_tests
 };
 
-FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("method", &method_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
index 504e5c6..7137aab 100644
--- a/src/acpi/syntaxcheck/syntaxcheck.c
+++ b/src/acpi/syntaxcheck/syntaxcheck.c
@@ -623,4 +623,5 @@  static fwts_framework_ops syntaxcheck_ops = {
 	.minor_tests = syntaxcheck_tests
 };
 
-FWTS_REGISTER("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH);
+FWTS_REGISTER_FEATURES("syntaxcheck", &syntaxcheck_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH, FWTS_FW_FEATURE_ACPI);
diff --git a/src/pci/aspm/aspm.c b/src/pci/aspm/aspm.c
index e798c26..6b322d6 100644
--- a/src/pci/aspm/aspm.c
+++ b/src/pci/aspm/aspm.c
@@ -272,7 +272,8 @@  static fwts_framework_minor_test aspm_tests[] = {
 
 static fwts_framework_ops aspm_ops = {
 	.description = "PCIe ASPM test.",
-	.minor_tests = aspm_tests
+	.minor_tests = aspm_tests,
 };
 
-FWTS_REGISTER("aspm", &aspm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV);
+FWTS_REGISTER_FEATURES("aspm", &aspm_ops, FWTS_TEST_ANYTIME,
+		FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, FWTS_FW_FEATURE_ACPI);