From: Sascha Hauer <s.hauer@pengutronix.de> To: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Cc: Mark Rutland <mark.rutland@arm.com>, Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org, Kyungmin Park <kyungmin.park@samsung.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Michael Riesch <michael.riesch@wolfvision.net>, kernel@pengutronix.de, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4 04/21] PM / devfreq: rockchip-dfi: Add SoC specific init function Date: Wed, 17 May 2023 11:20:40 +0200 [thread overview] Message-ID: <20230517092040.GT29365@pengutronix.de> (raw) In-Reply-To: <20230516164017.00002774@Huawei.com> On Tue, May 16, 2023 at 04:40:17PM +0100, Jonathan Cameron wrote: > On Fri, 5 May 2023 13:38:39 +0200 > Sascha Hauer <s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> > 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 <linux/slab.h> > > #include <linux/list.h> > > #include <linux/of.h> > > +#include <linux/of_device.h> > > > > #include <soc/rockchip/rk3399_grf.h> > > > > @@ -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. That's done later for the cases that make sense, but you already noticed that ;) > > > + > > + 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. struct rockchip_dfi_devtype_data will still have a single member by the end of this series. The reason I still prefer a struct type is that I've seen enough drivers that passed a single ad-hoc value in devtype data that I had to convert to pass a struct type because I had to add another value. Well, I just realized that I have configured several values that I could have put in that struct in the SoC specific init function instead, so there's no real point in using a struct type. > > > +}; > > + > > 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() Yes, will change. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de> To: Jonathan Cameron <Jonathan.Cameron@Huawei.com> Cc: Mark Rutland <mark.rutland@arm.com>, Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org, Kyungmin Park <kyungmin.park@samsung.com>, MyungJoo Ham <myungjoo.ham@samsung.com>, Michael Riesch <michael.riesch@wolfvision.net>, kernel@pengutronix.de, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4 04/21] PM / devfreq: rockchip-dfi: Add SoC specific init function Date: Wed, 17 May 2023 11:20:40 +0200 [thread overview] Message-ID: <20230517092040.GT29365@pengutronix.de> (raw) In-Reply-To: <20230516164017.00002774@Huawei.com> On Tue, May 16, 2023 at 04:40:17PM +0100, Jonathan Cameron wrote: > On Fri, 5 May 2023 13:38:39 +0200 > Sascha Hauer <s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> > 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 <linux/slab.h> > > #include <linux/list.h> > > #include <linux/of.h> > > +#include <linux/of_device.h> > > > > #include <soc/rockchip/rk3399_grf.h> > > > > @@ -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. That's done later for the cases that make sense, but you already noticed that ;) > > > + > > + 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. struct rockchip_dfi_devtype_data will still have a single member by the end of this series. The reason I still prefer a struct type is that I've seen enough drivers that passed a single ad-hoc value in devtype data that I had to convert to pass a struct type because I had to add another value. Well, I just realized that I have configured several values that I could have put in that struct in the SoC specific init function instead, so there's no real point in using a struct type. > > > +}; > > + > > 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() Yes, will change. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-05-17 9:21 UTC|newest] Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-05 11:38 [PATCH v4 00/21] Add perf support to the rockchip-dfi driver Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 01/21] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-07 10:08 ` Heiko Stübner 2023-05-07 10:08 ` Heiko Stübner 2023-05-16 15:12 ` Jonathan Cameron 2023-05-16 15:12 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 02/21] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-07 10:22 ` Heiko Stübner 2023-05-07 10:22 ` Heiko Stübner 2023-05-16 15:27 ` Jonathan Cameron 2023-05-16 15:27 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 03/21] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:33 ` Jonathan Cameron 2023-05-16 15:33 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 04/21] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:40 ` Jonathan Cameron 2023-05-16 15:40 ` Jonathan Cameron 2023-05-17 9:20 ` Sascha Hauer [this message] 2023-05-17 9:20 ` Sascha Hauer 2023-05-17 10:19 ` Jonathan Cameron 2023-05-17 10:19 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 05/21] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:43 ` Jonathan Cameron 2023-05-16 15:43 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 06/21] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:48 ` Jonathan Cameron 2023-05-16 15:48 ` Jonathan Cameron 2023-05-17 9:29 ` Sascha Hauer 2023-05-17 9:29 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 07/21] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:50 ` Jonathan Cameron 2023-05-16 15:50 ` Jonathan Cameron 2023-05-17 9:33 ` Sascha Hauer 2023-05-17 9:33 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 08/21] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 15:54 ` Jonathan Cameron 2023-05-16 15:54 ` Jonathan Cameron 2023-05-17 10:51 ` Sascha Hauer 2023-05-17 10:51 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 09/21] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:01 ` Jonathan Cameron 2023-05-16 16:01 ` Jonathan Cameron 2023-05-17 11:11 ` Sascha Hauer 2023-05-17 11:11 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 10/21] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:04 ` Jonathan Cameron 2023-05-16 16:04 ` Jonathan Cameron 2023-05-17 11:38 ` Sascha Hauer 2023-05-17 11:38 ` Sascha Hauer 2023-05-17 14:46 ` Jonathan Cameron 2023-05-17 14:46 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 11/21] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:06 ` Jonathan Cameron 2023-05-16 16:06 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 12/21] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:09 ` Jonathan Cameron 2023-05-16 16:09 ` Jonathan Cameron 2023-05-19 6:14 ` Sascha Hauer 2023-05-19 6:14 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 13/21] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:10 ` Jonathan Cameron 2023-05-16 16:10 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 14/21] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:16 ` Jonathan Cameron 2023-05-16 16:16 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 15/21] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-09 20:04 ` Robin Murphy 2023-05-10 19:56 ` Sascha Hauer 2023-05-16 15:39 ` Sascha Hauer 2023-05-16 15:39 ` Sascha Hauer 2023-05-16 15:27 ` Sascha Hauer 2023-05-16 15:27 ` Sascha Hauer 2023-05-17 10:53 ` Jonathan Cameron 2023-05-17 10:53 ` Jonathan Cameron 2023-05-17 14:26 ` Sascha Hauer 2023-05-17 14:26 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 16/21] PM / devfreq: rockchip-dfi: make register stride SoC specific Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-16 16:18 ` Jonathan Cameron 2023-05-16 16:18 ` Jonathan Cameron 2023-05-19 6:45 ` Sascha Hauer 2023-05-19 6:45 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 17/21] PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-17 10:23 ` Jonathan Cameron 2023-05-17 10:23 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 18/21] PM / devfreq: rockchip-dfi: add support for RK3588 Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-17 10:24 ` Jonathan Cameron 2023-05-17 10:24 ` Jonathan Cameron 2023-05-05 11:38 ` [PATCH v4 19/21] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 20/21] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-05 11:38 ` [PATCH v4 21/21] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer 2023-05-05 11:38 ` Sascha Hauer 2023-05-05 16:29 ` Krzysztof Kozlowski 2023-05-05 16:29 ` Krzysztof Kozlowski 2023-05-05 16:31 ` Krzysztof Kozlowski 2023-05-05 16:31 ` Krzysztof Kozlowski 2023-05-09 9:37 ` Sascha Hauer 2023-05-09 9:40 ` Krzysztof Kozlowski 2023-05-09 10:02 ` Sascha Hauer 2023-05-05 16:38 ` [PATCH v4 00/21] Add perf support to the rockchip-dfi driver Vincent Legoll 2023-05-05 16:38 ` Vincent Legoll
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230517092040.GT29365@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=Jonathan.Cameron@Huawei.com \ --cc=heiko@sntech.de \ --cc=kernel@pengutronix.de \ --cc=kyungmin.park@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=michael.riesch@wolfvision.net \ --cc=myungjoo.ham@samsung.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.