From patchwork Tue Apr 20 19:49:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 93701 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3KJoGOL016848 for ; Tue, 20 Apr 2010 19:50:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755025Ab0DTTuP (ORCPT ); Tue, 20 Apr 2010 15:50:15 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:54121 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755020Ab0DTTuO (ORCPT ); Tue, 20 Apr 2010 15:50:14 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3KJo4Xm016593 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Apr 2010 14:50:04 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3KJo13F004198; Tue, 20 Apr 2010 14:50:01 -0500 (CDT) Received: from senorita (senorita.am.dhcp.ti.com [128.247.75.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o3KJo0Z01568; Tue, 20 Apr 2010 14:50:00 -0500 (CDT) Received: by senorita (Postfix, from userid 1000) id 55726C23F; Tue, 20 Apr 2010 14:50:00 -0500 (CDT) From: Nishanth Menon To: linux-omap Cc: Nishanth Menon , Ambresh K , Benoit Cousson , Eduardo Valentin , Kevin Hilman , Phil Carmody , Sanjeev Premi , Tero Kristo , Thara Gopinath Subject: [PM-WIP-OPP][PATCH 1/2 v2] omap3: pm: cpufreq: BUG_ON cleanup Date: Tue, 20 Apr 2010 14:49:53 -0500 Message-Id: <1271792994-31816-2-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1271792994-31816-1-git-send-email-nm@ti.com> References: <1271792994-31816-1-git-send-email-nm@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Apr 2010 19:50:16 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cpufreq34xx.c b/arch/arm/mach-omap2/cpufreq34xx.c index 189c42e..01cf98f 100644 --- a/arch/arm/mach-omap2/cpufreq34xx.c +++ b/arch/arm/mach-omap2/cpufreq34xx.c @@ -25,6 +25,7 @@ #include #include +#include "omap3-opp.h" static struct omap_opp_def __initdata omap34xx_mpu_rate_table[] = { /* OPP1 */ @@ -109,8 +110,9 @@ static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = { OMAP_OPP_DEF(0, 0, 0) }; -void __init omap3_pm_init_opp_table(void) +int __init omap3_pm_init_opp_table(void) { + int i, r; struct omap_opp_def **omap3_opp_def_list; struct omap_opp_def *omap34xx_opp_def_list[] = { omap34xx_mpu_rate_table, @@ -122,12 +124,38 @@ void __init omap3_pm_init_opp_table(void) omap36xx_l3_rate_table, omap36xx_dsp_rate_table }; + enum opp_t omap3_opps[] = { + OPP_MPU, + OPP_L3, + OPP_DSP + }; omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list : omap34xx_opp_def_list; - BUG_ON(opp_init_list(OPP_MPU, omap3_opp_def_list[0])); - BUG_ON(opp_init_list(OPP_L3, omap3_opp_def_list[1])); - BUG_ON(opp_init_list(OPP_DSP, omap3_opp_def_list[2])); + for (i = 0; i < ARRAY_SIZE(omap3_opps); i++) { + r = opp_init_list(omap3_opps[i], omap3_opp_def_list[i]); + if (r) + break; + } + if (!r) + return 0; + + /* Cascading error handling - disable all enabled OPPs */ + pr_err("%s: Failed to register %d OPP type\n", __func__, + omap3_opps[i]); + i--; + while (i != -1) { + struct omap_opp *opp; + unsigned long freq = 0; + while (!IS_ERR(opp = opp_find_freq_ceil(omap3_opps[i], + &freq))) { + opp_disable(opp); + freq++; + } + i--; + } + + return r; } diff --git a/arch/arm/mach-omap2/omap3-opp.h b/arch/arm/mach-omap2/omap3-opp.h index 1ba85fc..3e88d8c 100644 --- a/arch/arm/mach-omap2/omap3-opp.h +++ b/arch/arm/mach-omap2/omap3-opp.h @@ -9,10 +9,11 @@ * table after the basic initialization */ #ifdef CONFIG_CPU_FREQ -extern void omap3_pm_init_opp_table(void); +extern int omap3_pm_init_opp_table(void); #else -static inline void omap3_pm_init_opp_table(void) +static inline int omap3_pm_init_opp_table(void) { + return 0; } #endif