Patchwork [2/2] acpi: method: remove race delay kludge

login
register
mail settings
Submitter Colin King
Date July 16, 2012, 6:09 p.m.
Message ID <1342462140-16674-3-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/171232/
State Accepted
Headers show

Comments

Colin King - July 16, 2012, 6:09 p.m.
From: Colin Ian King <colin.king@canonical.com>

Since we've fixed the semaphore count race we should remove
this race delay kludge.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/acpi/method/method.c |    8 --------
 1 file changed, 8 deletions(-)
Ivan Hu - July 18, 2012, 2:12 a.m.
On 07/17/2012 02:09 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Since we've fixed the semaphore count race we should remove
> this race delay kludge.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/acpi/method/method.c |    8 --------
>   1 file changed, 8 deletions(-)
>
> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
> index a4ccd3a..fe3aad1 100644
> --- a/src/acpi/method/method.c
> +++ b/src/acpi/method/method.c
> @@ -28,9 +28,6 @@
>   #include "acpi.h"
>   #include "fwts_acpi_method.h"
>
> -/* Add small delay between each test */
> -#define METHOD_DELAY_USECS	(0)
> -
>   /*
>    * ACPI methods + objects used in Linux ACPI driver:
>    *
> @@ -325,11 +322,6 @@ static void method_evaluate_found_method(fwts_framework *fw, char *name,
>   	if (buf.Length && buf.Pointer)
>   		free(buf.Pointer);
>
> -#if METHOD_DELAY_USECS
> -	/* Seen ACPICA core not release locks quickly, so put a delay in. Urgh. */
> -	usleep(METHOD_DELAY_USECS);
> -#endif
> -
>   	fwts_acpica_sem_count_get(&sem_acquired, &sem_released);
>   	if (sem_acquired != sem_released) {
>   		fwts_failed(fw, LOG_LEVEL_MEDIUM, "AMLLocksAcquired",
>

Acked-by: Ivan Hu<ivan.hu@canonical.com>
Alex Hung - July 19, 2012, 7:09 a.m.
On 07/18/2012 10:12 AM, IvanHu wrote:
> On 07/17/2012 02:09 AM, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Since we've fixed the semaphore count race we should remove
>> this race delay kludge.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>   src/acpi/method/method.c |    8 --------
>>   1 file changed, 8 deletions(-)
>>
>> diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
>> index a4ccd3a..fe3aad1 100644
>> --- a/src/acpi/method/method.c
>> +++ b/src/acpi/method/method.c
>> @@ -28,9 +28,6 @@
>>   #include "acpi.h"
>>   #include "fwts_acpi_method.h"
>>
>> -/* Add small delay between each test */
>> -#define METHOD_DELAY_USECS    (0)
>> -
>>   /*
>>    * ACPI methods + objects used in Linux ACPI driver:
>>    *
>> @@ -325,11 +322,6 @@ static void
>> method_evaluate_found_method(fwts_framework *fw, char *name,
>>       if (buf.Length && buf.Pointer)
>>           free(buf.Pointer);
>>
>> -#if METHOD_DELAY_USECS
>> -    /* Seen ACPICA core not release locks quickly, so put a delay in.
>> Urgh. */
>> -    usleep(METHOD_DELAY_USECS);
>> -#endif
>> -
>>       fwts_acpica_sem_count_get(&sem_acquired, &sem_released);
>>       if (sem_acquired != sem_released) {
>>           fwts_failed(fw, LOG_LEVEL_MEDIUM, "AMLLocksAcquired",
>>
>
> Acked-by: Ivan Hu<ivan.hu@canonical.com>
>
Acked-by: Alex Hung <alex.hung@canonical.com>

Patch

diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index a4ccd3a..fe3aad1 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -28,9 +28,6 @@ 
 #include "acpi.h"
 #include "fwts_acpi_method.h"
 
-/* Add small delay between each test */
-#define METHOD_DELAY_USECS	(0)
-
 /*
  * ACPI methods + objects used in Linux ACPI driver:
  *
@@ -325,11 +322,6 @@  static void method_evaluate_found_method(fwts_framework *fw, char *name,
 	if (buf.Length && buf.Pointer)
 		free(buf.Pointer);
 
-#if METHOD_DELAY_USECS
-	/* Seen ACPICA core not release locks quickly, so put a delay in. Urgh. */
-	usleep(METHOD_DELAY_USECS);
-#endif
-
 	fwts_acpica_sem_count_get(&sem_acquired, &sem_released);
 	if (sem_acquired != sem_released) {
 		fwts_failed(fw, LOG_LEVEL_MEDIUM, "AMLLocksAcquired",