From: Sean Young <sean@mess.org> To: linux-media@vger.kernel.org, linux-pwm@vger.kernel.org, "Ivaylo Dimitrov" <ivo.g.dimitrov.75@gmail.com>, "Thierry Reding" <thierry.reding@gmail.com>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Florian Fainelli" <florian.fainelli@broadcom.com>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com> Cc: Sean Young <sean@mess.org>, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] pwm: bcm2835: allow pwm driver to be used in atomic context Date: Tue, 17 Oct 2023 10:17:38 +0100 [thread overview] Message-ID: <c826281c0ceab8ce8fcc453a5ce777444349ff9a.1697534024.git.sean@mess.org> (raw) In-Reply-To: <cover.1697534024.git.sean@mess.org> clk_get_rate() may do a mutex lock. Since the clock rate cannot change on an rpi, simply fetch it once. Signed-off-by: Sean Young <sean@mess.org> --- drivers/pwm/pwm-bcm2835.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index bdfc2a5ec0d69..bd636ac1c5074 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -28,6 +28,7 @@ struct bcm2835_pwm { struct device *dev; void __iomem *base; struct clk *clk; + unsigned long rate; }; static inline struct bcm2835_pwm *to_bcm2835_pwm(struct pwm_chip *chip) @@ -63,17 +64,11 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, { struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - unsigned long rate = clk_get_rate(pc->clk); unsigned long long period_cycles; u64 max_period; u32 val; - if (!rate) { - dev_err(pc->dev, "failed to get clock rate\n"); - return -EINVAL; - } - /* * period_cycles must be a 32 bit value, so period * rate / NSEC_PER_SEC * must be <= U32_MAX. As U32_MAX * NSEC_PER_SEC < U64_MAX the @@ -88,13 +83,13 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, * <=> period < ((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate * <=> period <= ceil((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate) - 1 */ - max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, rate) - 1; + max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, pc->rate) - 1; if (state->period > max_period) return -EINVAL; /* set period */ - period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * rate, NSEC_PER_SEC); + period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * pc->rate, NSEC_PER_SEC); /* don't accept a period that is too small */ if (period_cycles < PERIOD_MIN) @@ -103,7 +98,7 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, writel(period_cycles, pc->base + PERIOD(pwm->hwpwm)); /* set duty cycle */ - val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * rate, NSEC_PER_SEC); + val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * pc->rate, NSEC_PER_SEC); writel(val, pc->base + DUTY(pwm->hwpwm)); /* set polarity */ @@ -156,18 +151,32 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) if (ret) return ret; + ret = clk_rate_exclusive_get(pc->clk); + if (ret) + goto add_fail; + + pc->rate = clk_get_rate(pc->clk); + if (!pc->rate) { + dev_err(pc->dev, "failed to get clock rate\n"); + ret = -EINVAL; + goto rate_fail; + } + pc->chip.dev = &pdev->dev; pc->chip.ops = &bcm2835_pwm_ops; + pc->chip.atomic = true; pc->chip.npwm = 2; platform_set_drvdata(pdev, pc); ret = pwmchip_add(&pc->chip); if (ret < 0) - goto add_fail; + goto rate_fail; return 0; +rate_fail: + clk_rate_exclusive_put(pc->clk); add_fail: clk_disable_unprepare(pc->clk); return ret; @@ -179,6 +188,7 @@ static void bcm2835_pwm_remove(struct platform_device *pdev) pwmchip_remove(&pc->chip); + clk_rate_exclusive_put(pc->clk); clk_disable_unprepare(pc->clk); } -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Sean Young <sean@mess.org> To: linux-media@vger.kernel.org, linux-pwm@vger.kernel.org, "Ivaylo Dimitrov" <ivo.g.dimitrov.75@gmail.com>, "Thierry Reding" <thierry.reding@gmail.com>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Florian Fainelli" <florian.fainelli@broadcom.com>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com> Cc: Sean Young <sean@mess.org>, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] pwm: bcm2835: allow pwm driver to be used in atomic context Date: Tue, 17 Oct 2023 10:17:38 +0100 [thread overview] Message-ID: <c826281c0ceab8ce8fcc453a5ce777444349ff9a.1697534024.git.sean@mess.org> (raw) In-Reply-To: <cover.1697534024.git.sean@mess.org> clk_get_rate() may do a mutex lock. Since the clock rate cannot change on an rpi, simply fetch it once. Signed-off-by: Sean Young <sean@mess.org> --- drivers/pwm/pwm-bcm2835.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index bdfc2a5ec0d69..bd636ac1c5074 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -28,6 +28,7 @@ struct bcm2835_pwm { struct device *dev; void __iomem *base; struct clk *clk; + unsigned long rate; }; static inline struct bcm2835_pwm *to_bcm2835_pwm(struct pwm_chip *chip) @@ -63,17 +64,11 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, { struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - unsigned long rate = clk_get_rate(pc->clk); unsigned long long period_cycles; u64 max_period; u32 val; - if (!rate) { - dev_err(pc->dev, "failed to get clock rate\n"); - return -EINVAL; - } - /* * period_cycles must be a 32 bit value, so period * rate / NSEC_PER_SEC * must be <= U32_MAX. As U32_MAX * NSEC_PER_SEC < U64_MAX the @@ -88,13 +83,13 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, * <=> period < ((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate * <=> period <= ceil((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate) - 1 */ - max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, rate) - 1; + max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, pc->rate) - 1; if (state->period > max_period) return -EINVAL; /* set period */ - period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * rate, NSEC_PER_SEC); + period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * pc->rate, NSEC_PER_SEC); /* don't accept a period that is too small */ if (period_cycles < PERIOD_MIN) @@ -103,7 +98,7 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, writel(period_cycles, pc->base + PERIOD(pwm->hwpwm)); /* set duty cycle */ - val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * rate, NSEC_PER_SEC); + val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * pc->rate, NSEC_PER_SEC); writel(val, pc->base + DUTY(pwm->hwpwm)); /* set polarity */ @@ -156,18 +151,32 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) if (ret) return ret; + ret = clk_rate_exclusive_get(pc->clk); + if (ret) + goto add_fail; + + pc->rate = clk_get_rate(pc->clk); + if (!pc->rate) { + dev_err(pc->dev, "failed to get clock rate\n"); + ret = -EINVAL; + goto rate_fail; + } + pc->chip.dev = &pdev->dev; pc->chip.ops = &bcm2835_pwm_ops; + pc->chip.atomic = true; pc->chip.npwm = 2; platform_set_drvdata(pdev, pc); ret = pwmchip_add(&pc->chip); if (ret < 0) - goto add_fail; + goto rate_fail; return 0; +rate_fail: + clk_rate_exclusive_put(pc->clk); add_fail: clk_disable_unprepare(pc->clk); return ret; @@ -179,6 +188,7 @@ static void bcm2835_pwm_remove(struct platform_device *pdev) pwmchip_remove(&pc->chip); + clk_rate_exclusive_put(pc->clk); clk_disable_unprepare(pc->clk); } -- 2.42.0
next prev parent reply other threads:[~2023-10-17 9:18 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-17 9:17 [PATCH v3 0/3] Improve pwm-ir-tx precision Sean Young 2023-10-17 9:17 ` [PATCH v3 1/3] pwm: make it possible to apply pwm changes in atomic context Sean Young 2023-10-17 9:17 ` [Intel-gfx] " Sean Young 2023-10-17 9:17 ` Sean Young 2023-10-17 9:17 ` Sean Young 2023-10-18 13:57 ` Hans de Goede 2023-10-18 13:57 ` Hans de Goede 2023-10-18 13:57 ` [Intel-gfx] " Hans de Goede 2023-10-18 13:57 ` Hans de Goede 2023-10-19 10:51 ` Uwe Kleine-König 2023-10-19 10:51 ` Uwe Kleine-König 2023-10-19 10:51 ` [Intel-gfx] " Uwe Kleine-König 2023-10-19 10:51 ` Uwe Kleine-König 2023-10-21 9:08 ` Hans de Goede 2023-10-21 9:08 ` [Intel-gfx] " Hans de Goede 2023-10-21 9:08 ` Hans de Goede 2023-10-21 9:08 ` Hans de Goede 2023-10-22 10:46 ` Sean Young 2023-10-22 10:46 ` [Intel-gfx] " Sean Young 2023-10-22 10:46 ` Sean Young 2023-10-22 10:46 ` Sean Young 2023-10-23 13:17 ` Hans de Goede 2023-10-23 13:17 ` [Intel-gfx] " Hans de Goede 2023-10-23 13:17 ` Hans de Goede 2023-10-23 13:17 ` Hans de Goede 2023-10-23 13:34 ` Daniel Thompson 2023-10-23 13:34 ` Daniel Thompson 2023-10-23 13:34 ` [Intel-gfx] " Daniel Thompson 2023-10-23 13:34 ` Daniel Thompson 2023-10-25 9:53 ` Sean Young 2023-10-25 9:53 ` [Intel-gfx] " Sean Young 2023-10-25 9:53 ` Sean Young 2023-10-25 9:53 ` Sean Young 2023-10-25 10:47 ` Uwe Kleine-König 2023-10-25 10:47 ` [Intel-gfx] " Uwe Kleine-König 2023-10-25 10:47 ` Uwe Kleine-König 2023-10-25 10:47 ` Uwe Kleine-König 2023-10-21 23:55 ` kernel test robot 2023-10-23 10:47 ` Jani Nikula 2023-10-23 10:47 ` Jani Nikula 2023-10-23 10:47 ` [Intel-gfx] " Jani Nikula 2023-10-23 10:47 ` Jani Nikula 2023-10-17 9:17 ` Sean Young [this message] 2023-10-17 9:17 ` [PATCH v3 2/3] pwm: bcm2835: allow pwm driver to be used " Sean Young 2023-10-18 15:00 ` Stefan Wahren 2023-10-18 15:00 ` Stefan Wahren 2023-10-19 11:19 ` Sean Young 2023-10-19 11:19 ` Sean Young 2023-10-17 9:17 ` [PATCH v3 3/3] media: pwm-ir-tx: trigger edges from hrtimer interrupt context Sean Young
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=c826281c0ceab8ce8fcc453a5ce777444349ff9a.1697534024.git.sean@mess.org \ --to=sean@mess.org \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=florian.fainelli@broadcom.com \ --cc=ivo.g.dimitrov.75@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=rjui@broadcom.com \ --cc=sbranden@broadcom.com \ --cc=thierry.reding@gmail.com \ --cc=u.kleine-koenig@pengutronix.de \ /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.