From patchwork Fri May 13 21:07:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 784002 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4DL8Euu028138 for ; Fri, 13 May 2011 21:08:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759106Ab1EMVIO (ORCPT ); Fri, 13 May 2011 17:08:14 -0400 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:47762 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758570Ab1EMVIN (ORCPT ); Fri, 13 May 2011 17:08:13 -0400 Received: from mail-yx0-f182.google.com ([209.85.213.182]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKTc2duxn6BCL9VNRm77+W2XS+d4PC/+VU@postini.com; Fri, 13 May 2011 14:08:13 PDT Received: by yxl31 with SMTP id 31so1303278yxl.41 for ; Fri, 13 May 2011 14:07:42 -0700 (PDT) Received: by 10.236.197.99 with SMTP id s63mr1985872yhn.325.1305320862186; Fri, 13 May 2011 14:07:42 -0700 (PDT) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id 23sm1306583yhl.101.2011.05.13.14.07.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 May 2011 14:07:41 -0700 (PDT) From: Nishanth Menon To: Kevin Hilman Cc: linux-omap , Nishanth Menon Subject: [PM-WIP-CPUFREQ][PATCH 2/5] OMAP2+: cpufreq: handle invalid cpufreq table Date: Fri, 13 May 2011 14:07:23 -0700 Message-Id: <1305320846-16147-3-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305320846-16147-1-git-send-email-nm@ti.com> References: <1305320846-16147-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.6 (demeter2.kernel.org [140.211.167.43]); Fri, 13 May 2011 21:08:15 +0000 (UTC) Handle the case when cpufreq_frequency_table_cpuinfo fails. freq_table that we passed failed the internal test of cpufreq generic driver, so we should'nt be using the freq_table as such. Instead, warn and fallback to clock functions for validation and operation. Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/omap2plus-cpufreq.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c index e38ebb8..6e3666a 100644 --- a/arch/arm/mach-omap2/omap2plus-cpufreq.c +++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c @@ -182,10 +182,18 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) if (freq_table) { result = cpufreq_frequency_table_cpuinfo(policy, freq_table); - if (!result) + if (!result) { cpufreq_frequency_table_get_attr(freq_table, policy->cpu); - } else { + } else { + WARN(true, "%s: fallback to clk_round(freq_table=%d)\n", + __func__, result); + kfree(freq_table); + freq_table = NULL; + } + } + + if (!freq_table) { policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000; policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;