Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-30 21:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pwm: bcm2835: Allow PWM driver to be used in atomic context

Browse Source 
clk_get_rate() may do a mutex lock. Fetch the clock rate once, and prevent
rate changes using clk_rate_exclusive_get().

Signed-off-by: Sean Young <sean@mess.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Sean Young 2023-12-20 14:24:25 +00:00 committed by Thierry Reding
parent 7170d3beaf
commit fcc7607293
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/pwm/pwm-bcm2835.c
View File

@ -28,6 +28,7 @@ struct bcm2835_pwm {
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
struct clk *clk; struct clk *clk;
unsigned long rate;
}; };
static inline struct bcm2835_pwm *to_bcm2835_pwm(struct pwm_chip *chip) 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); struct bcm2835_pwm *pc = to_bcm2835_pwm(chip);
unsigned long rate = clk_get_rate(pc->clk);
unsigned long long period_cycles; unsigned long long period_cycles;
u64 max_period; u64 max_period;
u32 val; 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 * 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 * 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 < ((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate
* <=> period <= ceil((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate) - 1 * <=> 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) if (state->period > max_period)
return -EINVAL; return -EINVAL;
/* set period */ /* 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 */ /* don't accept a period that is too small */
if (period_cycles < PERIOD_MIN) 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)); writel(period_cycles, pc->base + PERIOD(pwm->hwpwm));
/* set duty cycle */ /* 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)); writel(val, pc->base + DUTY(pwm->hwpwm));
/* set polarity */ /* set polarity */
@ -131,6 +126,13 @@ static const struct pwm_ops bcm2835_pwm_ops = {
.apply = bcm2835_pwm_apply, .apply = bcm2835_pwm_apply,
}; };
static void devm_clk_rate_exclusive_put(void *data)
{
struct clk *clk = data;
clk_rate_exclusive_put(clk);
}
static int bcm2835_pwm_probe(struct platform_device *pdev) static int bcm2835_pwm_probe(struct platform_device *pdev)
{ {
struct bcm2835_pwm *pc; struct bcm2835_pwm *pc;
@ -151,8 +153,26 @@ static int bcm2835_pwm_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk), return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk),
"clock not found\n"); "clock not found\n");
ret = clk_rate_exclusive_get(pc->clk);
if (ret)
return dev_err_probe(&pdev->dev, ret,
"fail to get exclusive rate\n");
ret = devm_add_action_or_reset(&pdev->dev, devm_clk_rate_exclusive_put,
pc->clk);
if (ret) {
clk_rate_exclusive_put(pc->clk);
return ret;
}
pc->rate = clk_get_rate(pc->clk);
if (!pc->rate)
return dev_err_probe(&pdev->dev, -EINVAL,
"failed to get clock rate\n");
pc->chip.dev = &pdev->dev; pc->chip.dev = &pdev->dev;
pc->chip.ops = &bcm2835_pwm_ops; pc->chip.ops = &bcm2835_pwm_ops;
pc->chip.atomic = true;
pc->chip.npwm = 2; pc->chip.npwm = 2;
platform_set_drvdata(pdev, pc); platform_set_drvdata(pdev, pc);