From patchwork Sun Nov 29 08:31:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pi-cheng.chen" X-Patchwork-Id: 7718261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7795E9F54F for ; Sun, 29 Nov 2015 08:35:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8C0CC20551 for ; Sun, 29 Nov 2015 08:35:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F1DE20547 for ; Sun, 29 Nov 2015 08:35:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2xPd-0006Zb-Kj; Sun, 29 Nov 2015 08:32:49 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2xP1-000588-Vr for linux-arm-kernel@lists.infradead.org; Sun, 29 Nov 2015 08:32:13 +0000 Received: by padhx2 with SMTP id hx2so152825686pad.1 for ; Sun, 29 Nov 2015 00:31:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sln3sJk6S5tNA6cWD4Jda96veRUX5l74DTq4DHAEH50=; b=2QPRztnhJQsOXuFoOe84dEGurMD5p/F1y4Nor+0ulnc/uINiOU3RHNXXIekgIytMSR XOgPcuo5Ua3dPfdJi/tV/BjD91YtwPM8L16a3I5E39WbK65MWT7XU5nVKcR87C5LggXN Mxo+eS+Dsx64teJFLs6pDewiURCNBC6m5NlO2gK5Z7ec21JQmQKt74a4o9D0/la4DH6V UUy6WfNIsUxGvtpnV7o8gELMMdyz5fUEGXI0ccbEgzJiUD4ZUpx3rjDZz0gJLED7p7AW ZfFSiCRHs/0B2V2u5o8ZT3N/C7u4ZrbWF86wOLIRb3I490NGDiieUNEvmtl/vbPJYO+8 3txw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sln3sJk6S5tNA6cWD4Jda96veRUX5l74DTq4DHAEH50=; b=ayjq0I/r7Si2LAwtU7BPvUqFHEVZSS3tB7ciHeY23Hx7eE1vLGuP+EWvBKQTvkqFBf iKWd7Zvp12Ihv9yDO86n91s0tlW3YWWHBU7prXTMLiMWIFHLlHK5NdcaRe3SrAkVw6zZ ktn6lJ8AiyRBO3esut+HYWnosjGD5xXMDkOLoQn/Nh/0k/hmra1tH6rwWJNn/fMhPSXM oU2JMvnqsbnIpapN3m5gmRA+S6TB2med9BusD/63o8is3ngwCiTdl26cWuaTm6GEuRIj YED2r31tz0pUpZFwYI9N7FDTA4QVfSJCmNL56qszu+j4rLdyHnVZg4UgoP1wRI79wIpd USkQ== X-Gm-Message-State: ALoCoQmVWMcjBHwOK7JtSSE+izTUQPvRxs6MGHtEj3XmUXCaxi0qQ6MnMGVeUczVZfQy+vIdx86O X-Received: by 10.98.18.22 with SMTP id a22mr60592488pfj.54.1448785911325; Sun, 29 Nov 2015 00:31:51 -0800 (PST) Received: from localhost.localdomain ([124.219.30.17]) by smtp.googlemail.com with ESMTPSA id l84sm2516886pfb.15.2015.11.29.00.31.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Nov 2015 00:31:50 -0800 (PST) From: Pi-Cheng Chen To: Viresh Kumar , Matthias Brugger Subject: [PATCH 3/4] cpufreq: mt8173: check return value of regulator_get_voltage() call Date: Sun, 29 Nov 2015 16:31:37 +0800 Message-Id: <1448785898-17838-3-git-send-email-pi-cheng.chen@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448785898-17838-1-git-send-email-pi-cheng.chen@linaro.org> References: <1448785898-17838-1-git-send-email-pi-cheng.chen@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151129_003212_161123_57E38D95 X-CRM114-Status: GOOD ( 11.38 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linaro-kernel@lists.linaro.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Daniel Kurtz , linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sometimes regulator_get_voltage() call returns negative values for reasons(e.g. underlying I2C bus timeout). Add check for the return values and fail out early. Signed-off-by: Pi-Cheng Chen Acked-by: Viresh Kumar --- drivers/cpufreq/mt8173-cpufreq.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/cpufreq/mt8173-cpufreq.c b/drivers/cpufreq/mt8173-cpufreq.c index 750cda7..9d0fe37 100644 --- a/drivers/cpufreq/mt8173-cpufreq.c +++ b/drivers/cpufreq/mt8173-cpufreq.c @@ -59,6 +59,10 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, int old_vproc, old_vsram, new_vsram, vsram, vproc, ret; old_vproc = regulator_get_voltage(proc_reg); + if (old_vproc < 0) { + pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc); + return old_vproc; + } /* Vsram should not exceed the maximum allowed voltage of SoC. */ new_vsram = min(new_vproc + MIN_VOLT_SHIFT, MAX_VOLT_LIMIT); @@ -71,7 +75,17 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, */ do { old_vsram = regulator_get_voltage(sram_reg); + if (old_vsram < 0) { + pr_err("%s: invalid Vsram value: %d\n", + __func__, old_vsram); + return old_vsram; + } old_vproc = regulator_get_voltage(proc_reg); + if (old_vproc < 0) { + pr_err("%s: invalid Vproc value: %d\n", + __func__, old_vproc); + return old_vproc; + } vsram = min(new_vsram, old_vproc + MAX_VOLT_SHIFT); @@ -116,7 +130,17 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, */ do { old_vproc = regulator_get_voltage(proc_reg); + if (old_vproc < 0) { + pr_err("%s: invalid Vproc value: %d\n", + __func__, old_vproc); + return old_vproc; + } old_vsram = regulator_get_voltage(sram_reg); + if (old_vsram < 0) { + pr_err("%s: invalid Vsram value: %d\n", + __func__, old_vsram); + return old_vsram; + } vproc = max(new_vproc, old_vsram - MAX_VOLT_SHIFT); ret = regulator_set_voltage(proc_reg, vproc, @@ -184,6 +208,10 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy, old_freq_hz = clk_get_rate(cpu_clk); old_vproc = regulator_get_voltage(info->proc_reg); + if (old_vproc < 0) { + pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc); + return old_vproc; + } freq_hz = freq_table[index].frequency * 1000;