[RESEND] data: klog.json: promote EC error so it gets caught before generic handler

From: Colin Ian King <colin.king@canonical.com>

The EC handler check needs to be before the generic handler check so that
the more specific test gets matched first.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 data/klog.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

On 11/29/2012 07:37 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The EC handler check needs to be before the generic handler check so that
> the more specific test gets matched first.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   data/klog.json | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index a6c64c7..db8af00 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -238,6 +238,14 @@
>      "label": "KlogAcpiPstateControlSmiCommandFailed"
>     },
>     {
> +   "compare_mode": "regex",
> +   "log_level": "LOG_LEVEL_HIGH",
> +   "tag": "FWTS_TAG_EMBEDDED_CONTROLLER",
> +   "pattern": "AE_TIME.*Returned by Handler for.*[EmbeddedControl]",
> +   "advice": "This is most probably caused by when a read or write operation to the EC memory has failed because of a timeout waiting for the Embedded Controller to complete the transaction.  Normally, the kernel waits for 500ms for the Embedded Controller status port to indicate that a transaction is complete, but in this case it has not and a AE_TIME error has been returned. ",
> +   "label": "KlogAcpiTimeOutReturnedByHandler"
> +  },
> +  {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_HIGH",
>      "tag": "FWTS_TAG_ACPI",
> @@ -2710,14 +2718,6 @@
>      "label": "KlogAcpiInvalidThrottlingState"
>     },
>     {
> -   "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_HIGH",
> -   "tag": "FWTS_TAG_EMBEDDED_CONTROLLER",
> -   "pattern": "ACPI Exception:.*AE_TIME.*Returned by Handler for.*[EmbeddedControl]",
> -   "advice": "This is most probably caused by when a read or write operation to the EC memory has failed because of a timeout waiting for the Embedded Controller to complete the transaction.  Normally, the kernel waits for 500ms for the Embedded Controller status port to indicate that a transaction is complete, but in this case it has not and a AE_TIME error has been returned. ",
> -   "label": "KlogAcpiTimeOutReturnedByHandler"
> -  },
> -  {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_HIGH",
>      "tag": "FWTS_TAG_ACPI",
>

Acked-by: Alex Hung <alex.hung@canonical.com>

On Thu, Nov 29, 2012 at 7:37 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The EC handler check needs to be before the generic handler check so that
> the more specific test gets matched first.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  data/klog.json | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index a6c64c7..db8af00 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -238,6 +238,14 @@
>     "label": "KlogAcpiPstateControlSmiCommandFailed"
>    },
>    {
> +   "compare_mode": "regex",
> +   "log_level": "LOG_LEVEL_HIGH",
> +   "tag": "FWTS_TAG_EMBEDDED_CONTROLLER",
> +   "pattern": "AE_TIME.*Returned by Handler for.*[EmbeddedControl]",
> +   "advice": "This is most probably caused by when a read or write operation to the EC memory has failed because of a timeout waiting for the Embedded Controller to complete the transaction.  Normally, the kernel waits for 500ms for the Embedded Controller status port to indicate that a transaction is complete, but in this case it has not and a AE_TIME error has been returned. ",
> +   "label": "KlogAcpiTimeOutReturnedByHandler"
> +  },
> +  {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_HIGH",
>     "tag": "FWTS_TAG_ACPI",
> @@ -2710,14 +2718,6 @@
>     "label": "KlogAcpiInvalidThrottlingState"
>    },
>    {
> -   "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_HIGH",
> -   "tag": "FWTS_TAG_EMBEDDED_CONTROLLER",
> -   "pattern": "ACPI Exception:.*AE_TIME.*Returned by Handler for.*[EmbeddedControl]",
> -   "advice": "This is most probably caused by when a read or write operation to the EC memory has failed because of a timeout waiting for the Embedded Controller to complete the transaction.  Normally, the kernel waits for 500ms for the Embedded Controller status port to indicate that a transaction is complete, but in this case it has not and a AE_TIME error has been returned. ",
> -   "label": "KlogAcpiTimeOutReturnedByHandler"
> -  },
> -  {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_HIGH",
>     "tag": "FWTS_TAG_ACPI",
> --
> 1.8.0
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>