| From 997f16bd5d2e9b3456027f96fcadfe1e2bf12f4e Mon Sep 17 00:00:00 2001 |
| From: Martin Sperl <kernel@martin.sperl.org> |
| Date: Mon, 29 Feb 2016 11:39:20 +0000 |
| Subject: clk: bcm2835: divider value has to be 1 or more |
| |
| From: Martin Sperl <kernel@martin.sperl.org> |
| |
| commit 997f16bd5d2e9b3456027f96fcadfe1e2bf12f4e upstream. |
| |
| Current clamping of a normal divider allows a value < 1 to be valid. |
| |
| A divider of < 1 would actually only be possible if we had a PLL... |
| |
| So this patch clamps the divider to 1. |
| |
| Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the |
| audio domain clocks") |
| |
| Signed-off-by: Martin Sperl <kernel@martin.sperl.org> |
| Signed-off-by: Eric Anholt <eric@anholt.net> |
| Reviewed-by: Eric Anholt <eric@anholt.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/clk/bcm/clk-bcm2835.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/clk/bcm/clk-bcm2835.c |
| +++ b/drivers/clk/bcm/clk-bcm2835.c |
| @@ -1194,8 +1194,9 @@ static u32 bcm2835_clock_choose_div(stru |
| div += unused_frac_mask + 1; |
| div &= ~unused_frac_mask; |
| |
| - /* Clamp to the limits. */ |
| - div = max(div, unused_frac_mask + 1); |
| + /* clamp to min divider of 1 */ |
| + div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS); |
| + /* clamp to the highest possible fractional divider */ |
| div = min_t(u32, div, GENMASK(data->int_bits + CM_DIV_FRAC_BITS - 1, |
| CM_DIV_FRAC_BITS - data->frac_bits)); |
| |