From patchwork Fri Jan 28 17:17:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti de Araujo X-Patchwork-Id: 80876 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CCCD51007D1 for ; Sat, 29 Jan 2011 04:18:15 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PirxV-00046h-UE; Fri, 28 Jan 2011 17:18:05 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PirxT-00046a-MJ for kernel-team@lists.ubuntu.com; Fri, 28 Jan 2011 17:18:03 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PirxT-0004Fz-By; Fri, 28 Jan 2011 17:18:03 +0000 Received: from [201.82.64.149] (helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1PirxS-0006J4-Ga; Fri, 28 Jan 2011 17:18:03 +0000 From: Ricardo Salveti de Araujo To: kernel-team@lists.ubuntu.com Subject: [Natty] [PATCH] OMAP3630: PM: don't warn the user with a trace in case of PM34XX_ERRATUM Date: Fri, 28 Jan 2011 15:17:56 -0200 Message-Id: <1296235076-2570-1-git-send-email-ricardo.salveti@canonical.com> X-Mailer: git-send-email 1.7.2.3 Cc: Ricardo Salveti de Araujo X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com In case in user has a OMAP3630 < ES1.2 the kernel should warn the user about the ERRATUM, but using pr_warning instead of WARN_ON is already enough, as there is nothing else the user can do besides changing the board. With this we avoid having the following calltrace while booting with some Beagle xM revisions: WARNING: at /home/apw/build/ubuntu-natty2/ubuntu-natty2/arch/arm/mach-omap2/cpuidle34xx.c:468 omap_init_power_states+0x230/0x238() omap_init_power_states: core off state C7 disabled due to i583 Modules linked in: [] (unwind_backtrace+0x0/0xfc) from [] (dump_stack+0x18/0x1c) [] (dump_stack+0x18/0x1c) from [] (warn_slowpath_common+0x5c/0x6c) [] (warn_slowpath_common+0x5c/0x6c) from [] (warn_slowpath_fmt+0x38/0x40) [] (warn_slowpath_fmt+0x38/0x40) from [] (omap_init_power_states+0x230/0x238) [] (omap_init_power_states+0x230/0x238) from [] (omap3_idle_init+0x74/0x18c) [] (omap3_idle_init+0x74/0x18c) from [] (omap3_pm_init+0x1ac/0x308) [] (omap3_pm_init+0x1ac/0x308) from [] (do_one_initcall+0x3c/0x1b4) [] (do_one_initcall+0x3c/0x1b4) from [] (kernel_init+0xe0/0x178) [] (kernel_init+0xe0/0x178) from [] (kernel_thread_exit+0x0/0x8) ---[ end trace e639b107cbbc60f1 ]--- Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/mach-omap2/cpuidle34xx.c | 2 +- arch/arm/mach-omap2/pm34xx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index f7b22a1..54ec28e 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -464,7 +464,7 @@ void omap_init_power_states(void) if (IS_PM34XX_ERRATUM(PM_SDRC_WAKEUP_ERRATUM_i583)) { omap3_power_states[OMAP3_STATE_C7].valid = 0; cpuidle_params_table[OMAP3_STATE_C7].valid = 0; - WARN_ONCE(1, "%s: core off state C7 disabled due to i583\n", + pr_warning("%s: core off state C7 disabled due to i583\n", __func__); } } diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 8cbbeade..d1ad1c1 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -927,8 +927,7 @@ void omap3_pm_off_mode_enable(int enable) pwrst->pwrdm == core_pwrdm && state == PWRDM_POWER_OFF) { pwrst->next_state = PWRDM_POWER_RET; - WARN_ONCE(1, - "%s: Core OFF disabled due to errata i583\n", + pr_warning("%s: Core OFF disabled due to errata i583\n", __func__); } else { pwrst->next_state = state;