From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5ED39CDB465 for ; Thu, 19 Oct 2023 11:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:References:MIME-Version:Message-ID:Date :Subject:In-Reply-To:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4Y6eDJJIamUQNJ7qooKNQFlg/9muXHFOvSJF99Wv3lk=; b=tedZXzrsC3jYnB JS6NSwSoakQZlPjymmKS3j9i3bQzXvpT8x36HVh2GdqG67myVMvtsJJVvqjgDAzRydUt17HOMxSMk FnEbS2FtKwNdLS5cEz4i9cUInD+qGzOkl1Lm6y9KzvHrSoaxJrhQJwRWN5N8yF8lh3ff7M94pICGr n7H2QsMy7zWa6+1SZ/Ikz8vcHvaXaedtk7+JKskDRMMrTjePUa6MOiYS7Kin3hVbUdfxNKuwPjcUD yMb9A/DUZxtg905HWn5sphrB47tlQ06lqPSUrNjpflIU0QYQYbjHbLiPaGM62PEBIhg+TpqJMgEWd cSz36dbs66onKyrDWLdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qtRfh-00HEYD-2V; Thu, 19 Oct 2023 11:58:37 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qtRfd-00HEXG-21 for linux-arm-kernel@lists.infradead.org; Thu, 19 Oct 2023 11:58:36 +0000 Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20231019115829epoutp04b65fd213b853003c38098b353bd2e932~PgFpO7Diw0631906319epoutp04d for ; Thu, 19 Oct 2023 11:58:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20231019115829epoutp04b65fd213b853003c38098b353bd2e932~PgFpO7Diw0631906319epoutp04d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1697716709; bh=ccFnxQ/4QOewwa6GKl0dvdiK5KIe7gLbSAatJOrblZ0=; h=From:To:Cc:In-Reply-To:Subject:Date:References:From; b=SSka+Q4XbsdJ/yu9rxd7BUDoDD5qGYlqZzKzobxdXZQVYcJicJShJ9XoJV2+sNnRO 7SE6fHV6TTTZKMWIDQDN57WofEAALzWZva6UnIzbw9kdzAUWDvF7GP/JMPEYDObu9C f+LLTrWqYmNji89rctVoNKXpFUFi7ce2UYkheC3s= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20231019115829epcas1p166fa0f293f9d62668a8cd4084c6d2d18~PgFojKGmJ0985509855epcas1p1Z; Thu, 19 Oct 2023 11:58:29 +0000 (GMT) Received: from epsmgec1p1-new.samsung.com (unknown [182.195.36.144]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4SB5pD1j7Pz4x9Pp; Thu, 19 Oct 2023 11:58:28 +0000 (GMT) Received: from epcas1p2.samsung.com ( [182.195.41.46]) by epsmgec1p1-new.samsung.com (Symantec Messaging Gateway) with SMTP id FA.0E.19104.4E911356; Thu, 19 Oct 2023 20:58:28 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p4.samsung.com (KnoxPortal) with ESMTPA id 20231019115827epcas1p46278913c6a55f8a1181c05d06c6086a1~PgFnFUDFe3097630976epcas1p4g; Thu, 19 Oct 2023 11:58:27 +0000 (GMT) Received: from epsmgmc1p1new.samsung.com (unknown [182.195.42.40]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20231019115827epsmtrp1529dda33050218a4af18d1363b5f3402~PgFnEVCkX2182621826epsmtrp1Z; Thu, 19 Oct 2023 11:58:27 +0000 (GMT) X-AuditID: b6c32a4c-80dff70000004aa0-38-653119e498a1 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgmc1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id AD.E8.07368.3E911356; Thu, 19 Oct 2023 20:58:27 +0900 (KST) Received: from cw00choi03 (unknown [10.113.111.106]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20231019115827epsmtip292a974f54e7aae558a4406fcef1dd1d5~PgFms9csO0706207062epsmtip2D; Thu, 19 Oct 2023 11:58:27 +0000 (GMT) From: "Chanwoo Choi" To: "'Sascha Hauer'" , Cc: , , , "'Heiko Stuebner'" , "'Chanwoo Choi'" , "'Kyungmin Park'" , "'MyungJoo Ham'" , "'Will Deacon'" , "'Mark Rutland'" , , "'Michael Riesch'" , "'Robin Murphy'" , "'Vincent Legoll'" , "'Rob Herring'" , "'Krzysztof Kozlowski'" , "'Conor Dooley'" , , "'Sebastian Reichel'" In-Reply-To: <20231018061714.3553817-15-s.hauer@pengutronix.de> Subject: RE: [PATCH v8 14/26] PM / devfreq: rockchip-dfi: Prepare for multiple users Date: Thu, 19 Oct 2023 20:58:27 +0900 Message-ID: <001901da0283$91f90b80$b5eb2280$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Content-Language: ko Thread-Index: AQFYMiMsP3soeW2GlDsie1R9CxInBwFFM3QSAUhOkoGxQDa4oA== X-Brightmail-Tracker: H4sIAAAAAAAAA01Tf0xTVxTO7Xt9LRj0rWC8AnH4ABMJP/oEysWBkun0oWQSifvBdNjRJ2VA 27RlinOuW+RHCwoMcKOgBSZkIMisOMDJEGQDk8k0juoi3QpWHQNUcCCEsI7ycOO/73znfOec 794cISaaJjyFqQotq1ZI0ynCFf/u+sbgIPtamhUP24So+N6vOGrs6OchU08/HzmGR/mooawd R6f+HMLQzc/HBMj8wMJHd65UEuj5yR6AJm0ODNXevc1DXdV+6P5n3xAou6NHgLqe2flovtWM I+vom6i36RGBTgyGx3gwjWcbAdNmPQeYdqNVwJgb9AQzaLlKMJfOfcoUzouZUy0NgGm1nMWY 5+Z1jGnuAYhfkZgWJWelMlbtwyqSlbJURUo0tTshaVtSuERMB9GRKILyUUgz2Ghqe1x80I7U 9AWDlM9H0vTMBSpeqtFQIVui1MpMLesjV2q00RSrkqWrwlXBGmmGJlOREqxgtZtpsXhT+ELh wTR5Re7vuCo/8Ei54xahA71+BuAihGQYHPv7W2AArkIReRXAvIpSjAsmAdQbbgq4YBrAp1OX iZeSS5aHS5IOAOfyanBnQkSOAPjTmMwAhEKCDIRVM/uctAe5Dxb2tfGcGCOn+fCZI9aJXcit sLPcLHBid/ItWN5RsdgGJ/1hl2NgkXcjI+HErB1w+BV4o9yOc31eha3jlRi3jw+cfVjH53gP WKHPwbi5r0Pb8I1FN5A0ucBbNVM4J9gOL+vvLmF3+Fdvi4DDnnCkMEfACUoAvD06uqRuBvBi /YmlcaGws7aE53SJkRth85UQjl4P2+fOAG6LlfDJVAHfWQJJN5iXI+JKfOEdm5XH4bXw61w9 UQQo4zJvxmXejMv8GP8fVgXwBuDJqjQZKWwyraKDFOzh/348WZlhBosHEBDXBl40zwd3A54Q dAMoxCgPN39GzIrcZNKso6xamaTOTGc13SB84cWLMc/VycqFC1Jok+iwSHGYZFNoGKIlNLXG bf9krkxEpki1bBrLqlj1Sx1P6OKp423Tvr2n1S/ixf01O58UjJsOWOVlqdmFY3HBsdXe+gK/ upjh87U7DVEDR8HEzJbHh/wTXfvq8eI9Kw9cYEu7LWg2/g/TtZKZaf/s0+djma6igakLF48F bq3P/uVjiWus/YyrjfpKAhMEXzbtemf1e7qsYmtRn/snv801f6Gdvj53r1Rv9sWP58c4BHvX zdqKJCuUbxzerBvKyrHxH1GEtyWi42la0+OxmuINrMlrR9zxH2aq/klc9VrSqkO9lW3H6PqQ 8eayXQGD/QnlLkP79x6pDciNPP3zh9FeG97H5BN11XGdjUbf2O/XhxparqXJf9xd94EO1Op8 4cjBd0e98728sMx8CtfIpXQAptZI/wXtK4L3iQQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNIsWRmVeSWpSXmKPExsWy7bCSvO5jScNUg5sLJS0m3rjCYrFm7zkm i/lHzrFa/H/0mtVi1dSdLBZ9Lx4yW5xtesNusenxNVaLy7vmsFl87j3CaPHpwX9mi6XXLzJZ HFyoYnG7cQWbReveI+wWBz88YbX4u30Ti8Xd134Wx9c+Y7NouWPqIOKxZt4aRo8dd5cweuyc dZfdY9OqTjaPO9f2sHlsXlLv0f/XwKNvyypGj+3X5jF7fN4k5zH/92PGAO4oLpuU1JzMstQi fbsErozZ7fdYCrp1Kmb+v8DWwHhcpYuRk0NCwERi87WnjF2MXBxCArsZJRqetzNCJCQlpl08 ytzFyAFkC0scPlwMUfOcUeLcxzPsIHE2AR2JBT9CQcpFBEIl+k/sYAKpYRZoYZPYtewzG0TD IUaJK9f6WUCqOAXsJfbP3MQOYgsLhEhMmfQdLM4ioCpx8P9VsDivgKXEx59PGCFsQYmTM5+w gCxjFtCTaNsIFmYWkJfY/nYOM8SdChI/ny5jhYiLSMzubGOGOMhJ4sGjk8wTGIVnIZk0C2HS LCSTZiHpXsDIsopRMrWgODc9N9mwwDAvtVyvODG3uDQvXS85P3cTIzj+tTR2MN6b/0/vECMT ByPQixzMSiK8qh4GqUK8KYmVValF+fFFpTmpxYcYpTlYlMR5DWfMThESSE8sSc1OTS1ILYLJ MnFwSjUw3fE0TzwqP/nN0yDTs09Pvj5TJndRS1Lpp0jFlhS3ZcYWno+eLnLnY9TcU5tvs0K0 Zd7X2Zm77sf5eE+q0OtROvDPyyK8/2ZHyRE1/8lTEyokX0Q83/qm+sWBLz+tb35JXcB4eW1b VGfohsK7jBZrm+5/Y9uT1PpKszXsa33V8a/it/QPBxm2VdjxLF12IkXp7LvMsLWK75V07oke fSnQvCFkSvvsjVPOvy/aayt3TLj1HaNkzMyfAcJ/fCWzFebLRggL3VqwwHz73o/rdn3k16x5 r/lwcUiide10V/5XthulLqwRMnyldJXVJ/Vr8odKxtUb7WIN2B7oSz1d8jdqypTWzdzLf6V6 P7zEx7btmBJLcUaioRZzUXEiAIPRq3tuAwAA X-CMS-MailID: 20231019115827epcas1p46278913c6a55f8a1181c05d06c6086a1 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20231018063817epcas1p46805fa64ee2bba269696390b250bba91 References: <20231018061714.3553817-1-s.hauer@pengutronix.de> <20231018061714.3553817-15-s.hauer@pengutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231019_045835_239255_BBF864AD X-CRM114-Status: GOOD ( 33.04 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org > -----Original Message----- > From: Sascha Hauer > Sent: Wednesday, October 18, 2023 3:17 PM > To: linux-rockchip@lists.infradead.org > Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; > linux-pm@vger.kernel.org; Heiko Stuebner ; Chanwoo Choi > ; Kyungmin Park ; MyungJoo > Ham ; Will Deacon ; Mark > Rutland ; kernel@pengutronix.de; Michael Riesch > ; Robin Murphy ; > Vincent Legoll ; Rob Herring > ; Krzysztof Kozlowski > ; Conor Dooley ; > devicetree@vger.kernel.org; Sebastian Reichel > ; Sascha Hauer ; > Jonathan Cameron ; Chanwoo Choi > > Subject: [PATCH v8 14/26] PM / devfreq: rockchip-dfi: Prepare for multiple > users > > When adding perf support later the DFI must be enabled when either of > devfreq-event or perf is active. Prepare for that by adding a usage > counter for the DFI. Also move enabling and disabling of the clock away > from the devfreq-event specific functions to which the perf specific part > won't have access. > > Reviewed-by: Jonathan Cameron > Reviewed-by: Sebastian Reichel > Acked-by: Chanwoo Choi > Signed-off-by: Sascha Hauer > --- > drivers/devfreq/event/rockchip-dfi.c | 57 +++++++++++++++++++--------- > 1 file changed, 40 insertions(+), 17 deletions(-) > > diff --git a/drivers/devfreq/event/rockchip-dfi.c > b/drivers/devfreq/event/rockchip-dfi.c > index d56a33d03db4c..7a4f1901314d4 100644 > --- a/drivers/devfreq/event/rockchip-dfi.c > +++ b/drivers/devfreq/event/rockchip-dfi.c > @@ -68,14 +68,29 @@ struct rockchip_dfi { > void __iomem *regs; > struct regmap *regmap_pmu; > struct clk *clk; > + int usecount; > + struct mutex mutex; > u32 ddr_type; > unsigned int channel_mask; > unsigned int max_channels; > }; > > -static void rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi) > +static int rockchip_dfi_enable(struct rockchip_dfi *dfi) > { > void __iomem *dfi_regs = dfi->regs; > + int ret = 0; > + > + mutex_lock(&dfi->mutex); > + > + dfi->usecount++; > + if (dfi->usecount > 1) > + goto out; > + > + ret = clk_prepare_enable(dfi->clk); > + if (ret) { > + dev_err(&dfi->edev->dev, "failed to enable dfi clk: %d\n", > ret); > + goto out; > + } > > /* clear DDRMON_CTRL setting */ > writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_TIMER_CNT_EN | > DDRMON_CTRL_SOFTWARE_EN | @@ -100,14 +115,30 @@ static void > rockchip_dfi_start_hardware_counter(struct rockchip_dfi *dfi) > /* enable count, use software mode */ > writel_relaxed(HIWORD_UPDATE(DDRMON_CTRL_SOFTWARE_EN, > DDRMON_CTRL_SOFTWARE_EN), > dfi_regs + DDRMON_CTRL); > +out: > + mutex_unlock(&dfi->mutex); > + > + return ret; > } > > -static void rockchip_dfi_stop_hardware_counter(struct rockchip_dfi *dfi) > +static void rockchip_dfi_disable(struct rockchip_dfi *dfi) > { > void __iomem *dfi_regs = dfi->regs; > > + mutex_lock(&dfi->mutex); > + > + dfi->usecount--; > + > + WARN_ON_ONCE(dfi->usecount < 0); > + > + if (dfi->usecount > 0) > + goto out; > + > writel_relaxed(HIWORD_UPDATE(0, DDRMON_CTRL_SOFTWARE_EN), > dfi_regs + DDRMON_CTRL); > + clk_disable_unprepare(dfi->clk); > +out: > + mutex_unlock(&dfi->mutex); > } > > static void rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct > dmc_count *count) @@ -125,29 +156,20 @@ static void > rockchip_dfi_read_counters(struct rockchip_dfi *dfi, struct dmc_coun > } > } > > -static int rockchip_dfi_disable(struct devfreq_event_dev *edev) > +static int rockchip_dfi_event_disable(struct devfreq_event_dev *edev) > { > struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); > > - rockchip_dfi_stop_hardware_counter(dfi); > - clk_disable_unprepare(dfi->clk); > + rockchip_dfi_disable(dfi); > > return 0; > } > > -static int rockchip_dfi_enable(struct devfreq_event_dev *edev) > +static int rockchip_dfi_event_enable(struct devfreq_event_dev *edev) > { > struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); > - int ret; > - > - ret = clk_prepare_enable(dfi->clk); > - if (ret) { > - dev_err(&edev->dev, "failed to enable dfi clk: %d\n", ret); > - return ret; > - } > > - rockchip_dfi_start_hardware_counter(dfi); > - return 0; > + return rockchip_dfi_enable(dfi); > } > > static int rockchip_dfi_set_event(struct devfreq_event_dev *edev) @@ - > 191,8 +213,8 @@ static int rockchip_dfi_get_event(struct devfreq_event_dev > *edev, } > > static const struct devfreq_event_ops rockchip_dfi_ops = { > - .disable = rockchip_dfi_disable, > - .enable = rockchip_dfi_enable, > + .disable = rockchip_dfi_event_disable, > + .enable = rockchip_dfi_event_enable, > .get_event = rockchip_dfi_get_event, > .set_event = rockchip_dfi_set_event, > }; > @@ -280,6 +302,7 @@ static int rockchip_dfi_probe(struct platform_device > *pdev) > return PTR_ERR(dfi->regmap_pmu); > > dfi->dev = dev; > + mutex_init(&dfi->mutex); > > desc = &dfi->desc; > desc->ops = &rockchip_dfi_ops; > -- > 2.39.2 Applied it. Thanks Best Regards, Chanwoo Choi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel