diff mbox series

[2/2] acpi/method/time: replace buffer size checks with function calls

Message ID 20200515201536.979293-2-alex.hung@canonical.com
State Accepted
Headers show
Series [1/2] fwts_acpi_object_eval: add a function to check buffer size | expand

Commit Message

Alex Hung May 15, 2020, 8:15 p.m. UTC 
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 src/acpi/devices/time/time.c |  8 +-----
 src/acpi/method/method.c     | 54 +++++-------------------------------
 2 files changed, 8 insertions(+), 54 deletions(-)

Comments

Colin Ian King May 15, 2020, 9:39 p.m. UTC | #1 
On 15/05/2020 21:15, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/devices/time/time.c |  8 +-----
>  src/acpi/method/method.c     | 54 +++++-------------------------------
>  2 files changed, 8 insertions(+), 54 deletions(-)
> 
> diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c
> index c60264c2..4f776cf6 100644
> --- a/src/acpi/devices/time/time.c
> +++ b/src/acpi/devices/time/time.c
> @@ -121,14 +121,8 @@ static void method_test_GRT_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 16) {
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_GRTBadBufferSize",
> -			"%s should return a buffer of 16 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> +	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
>  		return;
> -	}
>  
>  	/*
>  	 * Should sanity check this, but we can't read the
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 637f99bb..2fe85439 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -3137,11 +3137,7 @@ static void method_test_GTM_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != (5 * sizeof(uint32_t)))
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM, "Method_GTMBadBufferSize",
> -			"%s should return a buffer with size of 20.",
> -			name);
> -	else
> +	if (fwts_method_buffer_size(fw, name, obj, 20) == FWTS_OK)
>  		fwts_method_passed_sane(fw, name, "buffer");
>  }
>  
> @@ -3248,14 +3244,8 @@ static void method_test_GRT_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 16) {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			"Method_GRTBadBufferSize",
> -			"%s should return a buffer of 16 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> +	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
>  		return;
> -	}
>  
>  	/*
>  	 * Should sanity check this, but we can't read the
> @@ -3440,14 +3430,8 @@ static void method_test_NBS_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NBSBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nbs_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3479,14 +3463,8 @@ static void method_test_NCH_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NCHBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nch_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3525,14 +3503,8 @@ static void method_test_NIC_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NICBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nic_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3570,14 +3542,8 @@ static void method_test_NIH_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NIHBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nih_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3635,14 +3601,8 @@ static void method_test_NIG_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NIGBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nig_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu May 22, 2020, 3:15 a.m. UTC | #2 
On 5/16/20 4:15 AM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/devices/time/time.c |  8 +-----
>  src/acpi/method/method.c     | 54 +++++-------------------------------
>  2 files changed, 8 insertions(+), 54 deletions(-)
> 
> diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c
> index c60264c2..4f776cf6 100644
> --- a/src/acpi/devices/time/time.c
> +++ b/src/acpi/devices/time/time.c
> @@ -121,14 +121,8 @@ static void method_test_GRT_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 16) {
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_GRTBadBufferSize",
> -			"%s should return a buffer of 16 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> +	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
>  		return;
> -	}
>  
>  	/*
>  	 * Should sanity check this, but we can't read the
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index 637f99bb..2fe85439 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -3137,11 +3137,7 @@ static void method_test_GTM_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != (5 * sizeof(uint32_t)))
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM, "Method_GTMBadBufferSize",
> -			"%s should return a buffer with size of 20.",
> -			name);
> -	else
> +	if (fwts_method_buffer_size(fw, name, obj, 20) == FWTS_OK)
>  		fwts_method_passed_sane(fw, name, "buffer");
>  }
>  
> @@ -3248,14 +3244,8 @@ static void method_test_GRT_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 16) {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			"Method_GRTBadBufferSize",
> -			"%s should return a buffer of 16 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> +	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
>  		return;
> -	}
>  
>  	/*
>  	 * Should sanity check this, but we can't read the
> @@ -3440,14 +3430,8 @@ static void method_test_NBS_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NBSBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nbs_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3479,14 +3463,8 @@ static void method_test_NCH_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NCHBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nch_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3525,14 +3503,8 @@ static void method_test_NIC_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NICBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nic_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3570,14 +3542,8 @@ static void method_test_NIH_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NIHBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nih_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> @@ -3635,14 +3601,8 @@ static void method_test_NIG_return(
>  	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
>  		return;
>  
> -	if (obj->Buffer.Length != 64) {
> +	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
>  		failed = true;
> -		fwts_failed(fw, LOG_LEVEL_CRITICAL,
> -			"Method_NIGBadBufferSize",
> -			"%s should return a buffer of 64 bytes, but "
> -			"instead just returned %" PRIu32,
> -			name, obj->Buffer.Length);
> -	}
>  
>  	ret = (nig_return_t *) obj->Buffer.Pointer;
>  	check_nvdimm_status(fw, name, ret->status, &failed);
> 

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox series

Patch

diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c
index c60264c2..4f776cf6 100644
--- a/src/acpi/devices/time/time.c
+++ b/src/acpi/devices/time/time.c
@@ -121,14 +121,8 @@  static void method_test_GRT_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 16) {
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_GRTBadBufferSize",
-			"%s should return a buffer of 16 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
+	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
 		return;
-	}
 
 	/*
 	 * Should sanity check this, but we can't read the
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index 637f99bb..2fe85439 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -3137,11 +3137,7 @@  static void method_test_GTM_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != (5 * sizeof(uint32_t)))
-		fwts_failed(fw, LOG_LEVEL_MEDIUM, "Method_GTMBadBufferSize",
-			"%s should return a buffer with size of 20.",
-			name);
-	else
+	if (fwts_method_buffer_size(fw, name, obj, 20) == FWTS_OK)
 		fwts_method_passed_sane(fw, name, "buffer");
 }
 
@@ -3248,14 +3244,8 @@  static void method_test_GRT_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 16) {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			"Method_GRTBadBufferSize",
-			"%s should return a buffer of 16 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
+	if (fwts_method_buffer_size(fw, name, obj, 16) != FWTS_OK)
 		return;
-	}
 
 	/*
 	 * Should sanity check this, but we can't read the
@@ -3440,14 +3430,8 @@  static void method_test_NBS_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 64) {
+	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
 		failed = true;
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_NBSBadBufferSize",
-			"%s should return a buffer of 64 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
-	}
 
 	ret = (nbs_return_t *) obj->Buffer.Pointer;
 	check_nvdimm_status(fw, name, ret->status, &failed);
@@ -3479,14 +3463,8 @@  static void method_test_NCH_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 64) {
+	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
 		failed = true;
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_NCHBadBufferSize",
-			"%s should return a buffer of 64 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
-	}
 
 	ret = (nch_return_t *) obj->Buffer.Pointer;
 	check_nvdimm_status(fw, name, ret->status, &failed);
@@ -3525,14 +3503,8 @@  static void method_test_NIC_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 64) {
+	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
 		failed = true;
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_NICBadBufferSize",
-			"%s should return a buffer of 64 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
-	}
 
 	ret = (nic_return_t *) obj->Buffer.Pointer;
 	check_nvdimm_status(fw, name, ret->status, &failed);
@@ -3570,14 +3542,8 @@  static void method_test_NIH_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 64) {
+	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
 		failed = true;
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_NIHBadBufferSize",
-			"%s should return a buffer of 64 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
-	}
 
 	ret = (nih_return_t *) obj->Buffer.Pointer;
 	check_nvdimm_status(fw, name, ret->status, &failed);
@@ -3635,14 +3601,8 @@  static void method_test_NIG_return(
 	if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_BUFFER) != FWTS_OK)
 		return;
 
-	if (obj->Buffer.Length != 64) {
+	if (fwts_method_buffer_size(fw, name, obj, 64) != FWTS_OK)
 		failed = true;
-		fwts_failed(fw, LOG_LEVEL_CRITICAL,
-			"Method_NIGBadBufferSize",
-			"%s should return a buffer of 64 bytes, but "
-			"instead just returned %" PRIu32,
-			name, obj->Buffer.Length);
-	}
 
 	ret = (nig_return_t *) obj->Buffer.Pointer;
 	check_nvdimm_status(fw, name, ret->status, &failed);