From patchwork Thu Mar 18 14:42:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 12148377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69F04C433DB for ; Thu, 18 Mar 2021 14:44:53 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 036BF64EFD for ; Thu, 18 Mar 2021 14:44:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 036BF64EFD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=8WKIV5BwAJRSkMdWviJjHbP05e032hDVuZaB06ls0pQ=; b=gZnI23ysfWcAn2srUC7cPx8Phi qxMjNwfunVz9PpV+kqRzqe90XtHi9bE0cdlp1uAOc/0RhUe+bQKHAZW3e7St+y3x6hWBoUMUBo/jX Lc/04jmMNK188OacQI+cMJoIK867J1+6IvVU3hMJdUJpF+Ek9QW4+3olb0f4wu+hY2w28nnlPZxA9 Kx1emW7Ka06ImCY7o6qbx0VDPZmjpPNEA0ergieSbybkKEBxXHnfWF6cCo1i4iZdQRDHTT0XZ1l1a fdSqChACQAO3LgteJegG/xZGfr0KJ/fi8e2HJfSVy1eI8FxULb2f5hN23jLPCWkyqWJsdj4PKbbxw JrWPSCZg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMtrG-005VXJ-Mq; Thu, 18 Mar 2021 14:42:42 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMtr9-005VWg-JL for linux-arm-kernel@lists.infradead.org; Thu, 18 Mar 2021 14:42:37 +0000 Received: from [2a0a:edc0:0:c01:1d::a2] (helo=drehscheibe.grey.stw.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lMtr5-0005zS-9Q; Thu, 18 Mar 2021 15:42:31 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lMtr4-0000UH-2H; Thu, 18 Mar 2021 15:42:30 +0100 Received: from mtr by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lMtr4-00EQOY-15; Thu, 18 Mar 2021 15:42:30 +0100 From: Michael Tretter To: colin.king@canonical.com, sboyd@kernel.org, linux-clk@vger.kernel.org Cc: m.tretter@pengutronix.de, mturquette@baylibre.com, michal.simek@xilinx.com, linux-arm-kernel@lists.infradead.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: xilinx: vcu: rewrite and fix xvcu_clk_hw_unregister_leaf Date: Thu, 18 Mar 2021 15:42:30 +0100 Message-Id: <20210318144230.3438009-1-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mtr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210318_144235_729908_6C346B82 X-CRM114-Status: GOOD ( 14.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The xvcu_clk_hw_unregister_leaf function was missing a check if the clock mux exits before unregistering the clock mux. Fix the error by rewriting the entire function. The function now first finds all clocks that are part of the output clock and afterwards unregisters all found clocks. This avoids mixing the unregister calls with get_parent calls and makes the code more readable. Reported-by: Colin Ian King Fixes: 9c789deea206 ("soc: xilinx: vcu: implement clock provider for output clocks") Signed-off-by: Michael Tretter --- Hi, This is a cleanup and rewrite of the function following the issue reported by Colin [0]. Hopefully, this is going to clear up the confusion and makes the code easier to follow. [0] https://lore.kernel.org/kernel-janitors/20210211095700.158960-1-colin.king@canonical.com/ Michael --- drivers/clk/xilinx/xlnx_vcu.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/drivers/clk/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c index d66b1315114e..266ee797fdb7 100644 --- a/drivers/clk/xilinx/xlnx_vcu.c +++ b/drivers/clk/xilinx/xlnx_vcu.c @@ -499,23 +499,22 @@ static struct clk_hw *xvcu_clk_hw_register_leaf(struct device *dev, static void xvcu_clk_hw_unregister_leaf(struct clk_hw *hw) { struct clk_hw *gate = hw; - struct clk_hw *divider; - struct clk_hw *mux; - - if (!gate) - return; - - divider = clk_hw_get_parent(gate); - clk_hw_unregister_gate(gate); - if (!divider) - return; - - mux = clk_hw_get_parent(divider); - clk_hw_unregister_mux(mux); - if (!divider) - return; + struct clk_hw *divider = NULL; + struct clk_hw *mux = NULL; - clk_hw_unregister_divider(divider); + /* Get all clocks of this output clock */ + if (gate) + divider = clk_hw_get_parent(gate); + if (divider) + mux = clk_hw_get_parent(divider); + + /* Unregister clocks of this output clock if they have been found */ + if (gate) + clk_hw_unregister_gate(gate); + if (divider) + clk_hw_unregister_divider(divider); + if (mux) + clk_hw_unregister_mux(mux); } static int xvcu_register_clock_provider(struct xvcu_device *xvcu)