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 898A2C77B7A for ; Tue, 16 May 2023 15:40:38 +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:MIME-Version:References:In-Reply-To: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=91r7jni9RmCspTroPLHNKCsjmBsmSm6fLQB+fLeHfzI=; b=bDrUDF3O7jKcyq dz1zWeYt/gr2zFG0zByBTyIwB4RVCn9n9W3MXwqTZP/KEdQ8OQ3UgJ+z62WoUlkBd7TCIvkTFjxXj E7mFk0DfKaeThXIIXRGjZRuVLrOEiRE6uuLUSrK4XYkzwNZhF+mwRxgKktI9dYfGpjHHWoq5zfE1d C8aG67shhQE80BcrDLNlCU80GdcFzvjlsOPDiiAnQEx5+nMISaWJZ9oO2Lv34h2ElF2ZPLkCqQXtH 9RaI4wLbMk3s4uadRZ67cf/++s6ZJ4VvOsg3gmw83iJ+B7zU8owmfLF0fB0M3aBOF8z0gQW6Z6eFn ZBioHDmuAw3GGLLBFTmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pywmq-006I2E-0X; Tue, 16 May 2023 15:40:28 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pywml-006Hzn-2G; Tue, 16 May 2023 15:40:26 +0000 Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4QLL1M6vB9z6J7Bh; Tue, 16 May 2023 23:36:07 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 16 May 2023 16:40:18 +0100 Date: Tue, 16 May 2023 16:40:17 +0100 From: Jonathan Cameron To: Sascha Hauer CC: , , Heiko Stuebner , Kyungmin Park , MyungJoo Ham , Will Deacon , Mark Rutland , , Michael Riesch Subject: Re: [PATCH v4 04/21] PM / devfreq: rockchip-dfi: Add SoC specific init function Message-ID: <20230516164017.00002774@Huawei.com> In-Reply-To: <20230505113856.463650-5-s.hauer@pengutronix.de> References: <20230505113856.463650-1-s.hauer@pengutronix.de> <20230505113856.463650-5-s.hauer@pengutronix.de> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500002.china.huawei.com (7.191.160.78) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230516_084024_029507_843D7C92 X-CRM114-Status: GOOD ( 27.49 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Fri, 5 May 2023 13:38:39 +0200 Sascha Hauer wrote: > Move the RK3399 specifics to a SoC specific init function to make > the way free for supporting other SoCs later. > > Signed-off-by: Sascha Hauer Hi Sascha, A few things inline, Jonathan > --- > drivers/devfreq/event/rockchip-dfi.c | 59 +++++++++++++++++++++------- > 1 file changed, 44 insertions(+), 15 deletions(-) > > diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c > index 47cc9e48dafab..f317d3d063e9c 100644 > --- a/drivers/devfreq/event/rockchip-dfi.c > +++ b/drivers/devfreq/event/rockchip-dfi.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > > #include > > @@ -55,27 +56,21 @@ struct rockchip_dfi { > void __iomem *regs; > struct regmap *regmap_pmu; > struct clk *clk; > + u32 ddr_type; > }; > > static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) > { > struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev); > void __iomem *dfi_regs = dfi->regs; > - u32 val; > - u32 ddr_type; > - > - /* get ddr type */ > - regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); > - ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & > - RK3399_PMUGRF_DDRTYPE_MASK; > > /* clear DDRMON_CTRL setting */ > writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); > > /* set ddr type to dfi */ > - if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) > + if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) > writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); > - else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) > + else if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) > writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); > > /* enable count, use software mode */ > @@ -167,8 +162,34 @@ static const struct devfreq_event_ops rockchip_dfi_ops = { > .set_event = rockchip_dfi_set_event, > }; > > +static int rk3399_dfi_init(struct rockchip_dfi *dfi) > +{ > + struct regmap *regmap_pmu = dfi->regmap_pmu; > + u32 val; > + > + dfi->clk = devm_clk_get(dfi->dev, "pclk_ddr_mon"); > + if (IS_ERR(dfi->clk)) > + return dev_err_probe(dfi->dev, PTR_ERR(dfi->clk), > + "Cannot get the clk pclk_ddr_mon\n"); > + > + /* get ddr type */ > + regmap_read(regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); > + dfi->ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & > + RK3399_PMUGRF_DDRTYPE_MASK; I don't suppose you fancy converting whole driver to FIELD_GET / FIELD_PREP and masks that include the shift? :) Guess probably not or maybe you do it later in this set. > + > + return 0; > +}; > + > +struct rockchip_dfi_devtype_data { > + int (*init)(struct rockchip_dfi *dfi); > +}; > + > +static struct rockchip_dfi_devtype_data rk3399_devtype_data = { > + .init = rk3399_dfi_init, I guess the 'why' will become apparent later in the set, but at this stage a callback to get the ddr type would have made more sense and kept the data local to where it was needed. > +}; > + > static const struct of_device_id rockchip_dfi_id_match[] = { > - { .compatible = "rockchip,rk3399-dfi" }, > + { .compatible = "rockchip,rk3399-dfi", .data = &rk3399_devtype_data }, > { }, > }; > MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match); > @@ -179,6 +200,15 @@ static int rockchip_dfi_probe(struct platform_device *pdev) > struct rockchip_dfi *dfi; > struct devfreq_event_desc *desc; > struct device_node *np = pdev->dev.of_node, *node; > + const struct of_device_id *of_id; > + const struct rockchip_dfi_devtype_data *devtype; > + int ret; > + > + of_id = of_match_device(rockchip_dfi_id_match, &pdev->dev); > + if (!of_id) > + return -ENODEV; > + > + devtype = of_id->data; device_get_match_data() or I guess if you really want stick to the of specific form. of_device_get_match_data() > > dfi = devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL); > if (!dfi) > @@ -188,11 +218,6 @@ static int rockchip_dfi_probe(struct platform_device *pdev) > if (IS_ERR(dfi->regs)) > return PTR_ERR(dfi->regs); > > - dfi->clk = devm_clk_get(dev, "pclk_ddr_mon"); > - if (IS_ERR(dfi->clk)) > - return dev_err_probe(dev, PTR_ERR(dfi->clk), > - "Cannot get the clk pclk_ddr_mon\n"); > - > node = of_parse_phandle(np, "rockchip,pmu", 0); > if (!node) > return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n"); > @@ -208,6 +233,10 @@ static int rockchip_dfi_probe(struct platform_device *pdev) > desc->driver_data = dfi; > desc->name = np->name; > > + ret = devtype->init(dfi); > + if (ret) > + return ret; > + > dfi->edev = devm_devfreq_event_add_edev(&pdev->dev, desc); > if (IS_ERR(dfi->edev)) { > dev_err(&pdev->dev, _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip