Patchwork data: klog.json: remove the duplicated KlogEnergyPerfBiasSetToNormal item

login
register
mail settings
Submitter Keng-Yu Lin
Date Nov. 27, 2012, 10:13 a.m.
Message ID <1354011211-4336-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/202170/
State Accepted
Headers show

Comments

Keng-Yu Lin - Nov. 27, 2012, 10:13 a.m.
This patch merges the two duplicated KlogEnergyPerfBiasSetToNormal items
introduced by the following two patches.

    commit a1d8fd49e9c22a12a0bcf1a843631d3c4be882a8
    Author: Colin Ian King <colin.king@canonical.com>
    Date:   Fri Nov 2 07:15:11 2012 +0000

        data: klog.json: Add support for ACPI fan and ACPI processor throttling

    commit c3a9eb921aaa468ff7fbc426d4df0cf55a8ad2e1
    Author: IvanHu <ivan.hu@canonical.com>
    Date:   Wed Oct 24 19:44:26 2012 +0000

        klog: change the MSR_IA32_ENERGY_PERF_BIAS test from fauilure to info

Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 data/klog.json |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
Colin King - Nov. 27, 2012, 10:41 a.m.
On 27/11/12 10:13, Keng-Yu Lin wrote:
> This patch merges the two duplicated KlogEnergyPerfBiasSetToNormal items
> introduced by the following two patches.
>
>      commit a1d8fd49e9c22a12a0bcf1a843631d3c4be882a8
>      Author: Colin Ian King <colin.king@canonical.com>
>      Date:   Fri Nov 2 07:15:11 2012 +0000
>
>          data: klog.json: Add support for ACPI fan and ACPI processor throttling
>
>      commit c3a9eb921aaa468ff7fbc426d4df0cf55a8ad2e1
>      Author: IvanHu <ivan.hu@canonical.com>
>      Date:   Wed Oct 24 19:44:26 2012 +0000
>
>          klog: change the MSR_IA32_ENERGY_PERF_BIAS test from fauilure to info
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   data/klog.json |   12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 1566cdb..ee02e04 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -1430,10 +1430,10 @@
>     },
>     {
>      "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_HIGH",
> +   "log_level": "LOG_LEVEL_INFO",
>      "tag": "FWTS_TAG_BIOS",
>      "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
> -   "advice": "The MSR_IA32_ENERGY_PERF_BIAS was initialized incorrectly and was defaulted to a high performance bias setting.  The kernel has detected this and changed it down to a 'normal' bias setting.  The BIOS vendor should be informed that the MSR is not defaulted to the normal bias setting.",
> +   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting.",
>      "label": "KlogEnergyPerfBiasSetToNormal"
>     },
>     {
> @@ -1510,14 +1510,6 @@
>     },
>     {
>      "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_INFO",
> -   "tag": "FWTS_TAG_BIOS",
> -   "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
> -   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting."
> -   "label": "KlogEnergyPerfBiasSetToNormal"
> -  },
> -  {
> -   "compare_mode": "regex",
>      "log_level": "LOG_LEVEL_CRITICAL",
>      "tag": "FWTS_TAG_ACPI",
>      "pattern": "pnp.*can't evaluate _CRS: 12311",
>
Good catch.

Acked-by: Colin King <colin.king@canonical.com>
Ivan Hu - Nov. 27, 2012, 2:52 p.m.
On 11/27/2012 06:13 PM, Keng-Yu Lin wrote:
> This patch merges the two duplicated KlogEnergyPerfBiasSetToNormal items
> introduced by the following two patches.
>
>      commit a1d8fd49e9c22a12a0bcf1a843631d3c4be882a8
>      Author: Colin Ian King <colin.king@canonical.com>
>      Date:   Fri Nov 2 07:15:11 2012 +0000
>
>          data: klog.json: Add support for ACPI fan and ACPI processor throttling
>
>      commit c3a9eb921aaa468ff7fbc426d4df0cf55a8ad2e1
>      Author: IvanHu <ivan.hu@canonical.com>
>      Date:   Wed Oct 24 19:44:26 2012 +0000
>
>          klog: change the MSR_IA32_ENERGY_PERF_BIAS test from fauilure to info
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   data/klog.json |   12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 1566cdb..ee02e04 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -1430,10 +1430,10 @@
>     },
>     {
>      "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_HIGH",
> +   "log_level": "LOG_LEVEL_INFO",
>      "tag": "FWTS_TAG_BIOS",
>      "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
> -   "advice": "The MSR_IA32_ENERGY_PERF_BIAS was initialized incorrectly and was defaulted to a high performance bias setting.  The kernel has detected this and changed it down to a 'normal' bias setting.  The BIOS vendor should be informed that the MSR is not defaulted to the normal bias setting.",
> +   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting.",
>      "label": "KlogEnergyPerfBiasSetToNormal"
>     },
>     {
> @@ -1510,14 +1510,6 @@
>     },
>     {
>      "compare_mode": "regex",
> -   "log_level": "LOG_LEVEL_INFO",
> -   "tag": "FWTS_TAG_BIOS",
> -   "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
> -   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting."
> -   "label": "KlogEnergyPerfBiasSetToNormal"
> -  },
> -  {
> -   "compare_mode": "regex",
>      "log_level": "LOG_LEVEL_CRITICAL",
>      "tag": "FWTS_TAG_ACPI",
>      "pattern": "pnp.*can't evaluate _CRS: 12311",
>
Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/data/klog.json b/data/klog.json
index 1566cdb..ee02e04 100644
--- a/data/klog.json
+++ b/data/klog.json
@@ -1430,10 +1430,10 @@ 
   },
   {
    "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_HIGH",
+   "log_level": "LOG_LEVEL_INFO",
    "tag": "FWTS_TAG_BIOS",
    "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
-   "advice": "The MSR_IA32_ENERGY_PERF_BIAS was initialized incorrectly and was defaulted to a high performance bias setting.  The kernel has detected this and changed it down to a 'normal' bias setting.  The BIOS vendor should be informed that the MSR is not defaulted to the normal bias setting.",
+   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting.",
    "label": "KlogEnergyPerfBiasSetToNormal"
   },
   {
@@ -1510,14 +1510,6 @@ 
   },
   {
    "compare_mode": "regex",
-   "log_level": "LOG_LEVEL_INFO",
-   "tag": "FWTS_TAG_BIOS",
-   "pattern": "ENERGY_PERF_BIAS.*Set to 'normal'.* was 'performance'",
-   "advice": "This is not exactly a failure but a warning from the kernel. The MSR_IA32_ENERGY_PERF_BIAS was initialized and defaulted to a high performance bias setting. The kernel has detected this and changed it down to a 'normal' bias setting."
-   "label": "KlogEnergyPerfBiasSetToNormal"
-  },
-  {
-   "compare_mode": "regex",
    "log_level": "LOG_LEVEL_CRITICAL",
    "tag": "FWTS_TAG_ACPI",
    "pattern": "pnp.*can't evaluate _CRS: 12311",