Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp873273pxu; Mon, 23 Nov 2020 06:20:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjjz66UeFB4vgdJ4RBo+HhhIVSxGqNtfJaov89FqdxdWnWigXhtBBvPA+JdAj+S/jzhBBP X-Received: by 2002:a17:906:bcf9:: with SMTP id op25mr42770349ejb.223.1606141257596; Mon, 23 Nov 2020 06:20:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606141257; cv=none; d=google.com; s=arc-20160816; b=cu1SBzMXnzGa01Oe1KwW+FsRM4P8GOxDwEfHExc015Du4x2QuavRyJukV8Q/fh78Bn bQaqyqdzRSolCg/eVkZlYMi/A2y5TSBl7RZN/kfJ3/tY5zJjLRKhqX28IP6nldU/gm5t HCtcFPBUBFfAbkAERLJ7TCuC6FN8k2NZInFABgsiZhbdRuS46dVb/qL/549P+nhNZj02 hdYXnbEaWg9pPgc47t5sbjSCdY7KiamAhD+S7nAUESi4rhtVWqS2eeozA45gtXOcZJkM DMMVpd3a7gM+aXetyg0Pd7AC+++cJBpfOnSmTkdxVKhAHlqInCP8w/eIGx66CQ9NuouJ vutQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:user-agent:references:in-reply-to :subject:cc:to:from:date:content-transfer-encoding:mime-version :dkim-signature; bh=3WB3+Sr+eJwa2WFnUmUIWE5P9Vlb5r0OddysFn4/3Mo=; b=lnyYeiUzJItoMtIgtdvugfin3sDRyu6ulfXPFrIajrW29un/KgZw9DWy2IYbj/1vg1 GCLMB8N9CpjGNier0zQdblTxbOdUaCvSAuQS9okNoixnn5fXja56axDkyhv+5ZTXX8L5 ikPMrdJL8zkmSE3ar4O9qiGOftThpGd3wqyCH8L4ck+aiFwr8lFjkbNrwnu4yJ6HfHxp MfQiu1tTKi4ZCJLUYcK89xv9ngiI9JQ/jTzx3CrWJoF5wQZL3X/CnFIWVcAII6chPENG ySvD7cae213QIxVIWCHOsH5dquEw11H/nFW+OzJB/HI6FWh6R4gI/nXgEPODS+FMoW13 8hsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fxeh1kpp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id sa10si6451774ejb.31.2020.11.23.06.20.32; Mon, 23 Nov 2020 06:20:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fxeh1kpp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388811AbgKWOPs (ORCPT + 99 others); Mon, 23 Nov 2020 09:15:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:43460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730113AbgKWOPs (ORCPT ); Mon, 23 Nov 2020 09:15:48 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B42120781; Mon, 23 Nov 2020 14:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606140947; bh=8rpJx5QRw4RH0PddIzzUPjibWCFpM1TlEugxUnbUh3w=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fxeh1kppeBrBLSEKbdR/gqH+4lKVGDv9ByAYQwPqryRdXqiSV6BHomjTzrQpxxn7F 0X2v5od5ENGszhqM5pBaAc+lqDMo/IhzvuZsa59VoTL0NVoaercBVLEUcU/T/7OW7o N3p4LRTmbI10qkzi0bKBHpF2wmj25VwpNbRWStqE= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1khCd7-00CyGd-69; Mon, 23 Nov 2020 14:15:45 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 23 Nov 2020 14:15:45 +0000 From: Marc Zyngier To: Jerome Brunet Cc: Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Guillaume Tucker , kernel-team@android.com, dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] drm/meson: dw-hdmi: Disable clocks on driver teardown In-Reply-To: <1jwnyc41c6.fsf@starbuckisacylon.baylibre.com> References: <20201120094205.525228-1-maz@kernel.org> <20201120094205.525228-2-maz@kernel.org> <1jwnyc41c6.fsf@starbuckisacylon.baylibre.com> User-Agent: Roundcube Webmail/1.4.9 Message-ID: <763f505eececa3b02bd794aec5e36d22@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: jbrunet@baylibre.com, narmstrong@baylibre.com, khilman@baylibre.com, martin.blumenstingl@googlemail.com, guillaume.tucker@collabora.com, kernel-team@android.com, dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-11-23 14:03, Jerome Brunet wrote: > On Fri 20 Nov 2020 at 10:42, Marc Zyngier wrote: > >> The HDMI driver request clocks early, but never disable them, leaving >> the clocks on even when the driver is removed. >> >> Fix it by slightly refactoring the clock code, and register a devm >> action that will eventually disable/unprepare the enabled clocks. >> >> Signed-off-by: Marc Zyngier >> --- >> drivers/gpu/drm/meson/meson_dw_hdmi.c | 43 >> ++++++++++++++++++--------- >> 1 file changed, 29 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c >> b/drivers/gpu/drm/meson/meson_dw_hdmi.c >> index 7f8eea494147..29623b309cb1 100644 >> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c >> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c >> @@ -145,8 +145,6 @@ struct meson_dw_hdmi { >> struct reset_control *hdmitx_apb; >> struct reset_control *hdmitx_ctrl; >> struct reset_control *hdmitx_phy; >> - struct clk *hdmi_pclk; >> - struct clk *venci_clk; >> struct regulator *hdmi_supply; >> u32 irq_stat; >> struct dw_hdmi *hdmi; >> @@ -946,6 +944,29 @@ static void meson_disable_regulator(void *data) >> regulator_disable(data); >> } >> >> +static void meson_disable_clk(void *data) >> +{ >> + clk_disable_unprepare(data); >> +} >> + >> +static int meson_enable_clk(struct device *dev, char *name) >> +{ >> + struct clk *clk; >> + int ret; >> + >> + clk = devm_clk_get(dev, name); >> + if (IS_ERR(clk)) { >> + dev_err(dev, "Unable to get %s pclk\n", name); >> + return PTR_ERR(clk); >> + } >> + >> + ret = clk_prepare_enable(clk); >> + if (!ret) >> + ret = devm_add_action_or_reset(dev, meson_disable_clk, >> clk); > > Thanks for fixing this Marc. > > FYI, while it is fine to declare a function to disable the clocks, a > quick > cast may avoid it > > devm_add_action_or_reset(dev, (void(*)(void *))clk_disable_unprepare, > clk); While this works for now, a change to the clk_disable_unprepare() prototype (such as adding a second argument) would now go completely unnoticed (after all, you've cast the function, it *must* be correct, right?), and someone would spend a few hours trying to track down memory corruption or some other interesting results. Yes, casting C functions can be hilarious. I can see a few uses of this hack in the tree, and I have my pop-corn ready. Thanks, M. -- Jazz is not dead. It just smells funny...