From patchwork Mon Jun 12 19:44:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9782699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A6496602DA for ; Mon, 12 Jun 2017 19:45:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9846E27F86 for ; Mon, 12 Jun 2017 19:45:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CCA1284EE; Mon, 12 Jun 2017 19:45:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5002E27F86 for ; Mon, 12 Jun 2017 19:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=c/MRb5nwbD/7tkmEpHCV9DdZZQL10axMWlyrsmIQSrM=; b=d0ZnjVb39ytmoLeNd58p7RNbxE FEFtg0vSfvTNfmNXzjWjfuneTEYqhQ+W2eBCXt5haApJ+vOg3k0DlzQDcHMd8z/xjUlfQZAwPCREg GRHNsCLZlyL1bP7xpO/wIAhrHzgGQH1Vp5RAHOzaffIXJqKFaVodWd8rUhIfwfLdAZlOPHf2xdn87 u8JXoERLZseBIZuUCrA6kOVDIdeOCkWY2YK0CgjgB3kQEP+ZUi4Edgok/pnMLIYkuaQull3Q5yScH 4RAvfRsALSXhWX0MLlp1hdBtzZp4PuWcNPcz2+ZESydRvlTqfpOIEeBEwRjWbTbdJKAABEr1iF5zn wixGfljQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKVH5-0004o5-TP; Mon, 12 Jun 2017 19:45:19 +0000 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dKVGz-0003RW-1K for linux-amlogic@lists.infradead.org; Mon, 12 Jun 2017 19:45:15 +0000 Received: by mail-wr0-x232.google.com with SMTP id v111so110853711wrc.3 for ; Mon, 12 Jun 2017 12:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7LhEcd30qdqZgGMXPmCNu9yJVbVqFSv4xPbnhzqp4gA=; b=TWDygxWKD/lR4cITU6Pd2zrdepRCPgBu4gZr2xB93Vyf1J+g36SLxN5cF4KmSevUrO U+SCQ+q83btC+jcNWibL3oOHaFaGyZnLigGtvG8Php0VNJjACHUIf1gY+XKTF4aK3CxX Pl1feDYYAIMEufzVKFnIShRDd2vlDV0p2pUwzSwJuaXK1qLvhC+9VgYxauBNBF/dqsUy RqjR6PsCAi1GwCJzINvZk5h7Jr0xlAbDL/N+6r8J7ZB1dfgAuSDa1dVS64bMfT3IFs5u GZh3TwTm38MOZxezrqZ5iAxKcJHbHMKSHoQDw2ZVYOQPE0zir6DWBrTo/km2sOkQ50xV gptg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7LhEcd30qdqZgGMXPmCNu9yJVbVqFSv4xPbnhzqp4gA=; b=ZoOcIehT63tInp3wty/9G+DhgxU53zDFg8R93u5ROwX+JM36Zbc9akN39+O23/KujC NW9rYurZXm0/oHULaFx1A79mMvgTxlaUP6M2wWqd2xBfJK8vkn2lNGQtXLn76vf5SU41 hff+lhJVK26f4NFmfzOz6FVjjW493wo4eVraa56a3cbrGGuu1gX8kEbIlwl1CBYWyFS5 PNxuMKj3S2ip7HwnXJ+cmQOnpXz/DAuf1pvAdiVDvWBWVUguV/49Thv8M5l9j+NSVEeC g9/cJmfBvlByR/yEAChWBwIDP9P106ScLNr2sP3I9yGoGLK8nrDaLWo2RZvP0K3kfuZh arww== X-Gm-Message-State: AKS2vOwG/R8r86v0TGtkhxKYtfzoiVumpBZwW1I0A6C+5v43sOzlcI1j IQnhPTrNgZYhZaTP X-Received: by 10.223.138.204 with SMTP id z12mr371970wrz.50.1497296695649; Mon, 12 Jun 2017 12:44:55 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id 70sm13250797wmu.28.2017.06.12.12.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 12:44:55 -0700 (PDT) From: Jerome Brunet To: Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org Subject: [PATCH v3 07/10] clk: rollback set_rate_range changes on failure Date: Mon, 12 Jun 2017 21:44:35 +0200 Message-Id: <20170612194438.12298-8-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170612194438.12298-1-jbrunet@baylibre.com> References: <20170612194438.12298-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170612_124513_245224_8827E413 X-CRM114-Status: UNSURE ( 9.42 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boris Brezillon , Kevin Hilman , Linus Walleij , Russell King , linux-amlogic@lists.infradead.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jerome Brunet --- drivers/clk/clk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index d91236e70a04..253f1d3f0971 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1864,6 +1864,7 @@ EXPORT_SYMBOL_GPL(clk_set_rate_protect); int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) { int ret = 0; + unsigned int old_min, old_max; if (!clk) return 0; @@ -1881,9 +1882,16 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) clk_core_rate_unprotect(clk->core); if (min != clk->min_rate || max != clk->max_rate) { + old_min = clk->min_rate; + old_max = clk->max_rate; clk->min_rate = min; clk->max_rate = max; ret = clk_core_set_rate_nolock(clk->core, clk->core->req_rate); + if (ret) { + /* undo changes */ + clk->min_rate = old_min; + clk->max_rate = old_max; + } } if (clk->protect_count)