| Message ID | 1367914491-17445-1-git-send-email-marek.belisko@streamunlimited.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/07/2013 10:14 AM, Marek Belisko wrote: > When p3 is eual to 0 then result for fOUT is 0. In that case we should > return 0 not parent_rate; > > This issue was causing deadlock in si5351 chip when user set_rate for > ms0->clk0 and then set_rate for ms1->clk1 (both ms sourced from plla). > After that clk1 was 0 and it wasn't possible to enable it again (try also > manually with i2cset commands). Only power cycle helps. Marek, does the fix below also affect the behavior above, i.e. not causing si5351 to hang? Anyway, your fix looks very sane to me and you get my Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Signed-off-by: Marek Belisko<marek.belisko@streamunlimited.com> > --- > drivers/clk/clk-si5351.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c > index fc215ce..a8fc0f4 100644 > --- a/drivers/clk/clk-si5351.c > +++ b/drivers/clk/clk-si5351.c > @@ -607,7 +607,7 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw, > si5351_read_parameters(hwdata->drvdata, reg,&hwdata->params); > > if (hwdata->params.p3 == 0) > - return parent_rate; > + return 0; > > /* > * multisync0-5: fOUT = (128 * P3 * fIN) / (P1*P3 + P2 + 512*P3)
On 05/07/2013 12:03 PM, Sebastian Hesselbarth wrote: > On 05/07/2013 10:14 AM, Marek Belisko wrote: >> When p3 is eual to 0 then result for fOUT is 0. In that case we should >> return 0 not parent_rate; >> >> This issue was causing deadlock in si5351 chip when user set_rate for >> ms0->clk0 and then set_rate for ms1->clk1 (both ms sourced from plla). >> After that clk1 was 0 and it wasn't possible to enable it again (try also >> manually with i2cset commands). Only power cycle helps. > > Marek, > > does the fix below also affect the behavior above, i.e. not causing > si5351 to hang? Yes this fix problems with si5351 hang. Didn't investigate why but I assume some wrong register access or something. > > Anyway, your fix looks very sane to me and you get my > > Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > >> Signed-off-by: Marek Belisko<marek.belisko@streamunlimited.com> >> --- >> drivers/clk/clk-si5351.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c >> index fc215ce..a8fc0f4 100644 >> --- a/drivers/clk/clk-si5351.c >> +++ b/drivers/clk/clk-si5351.c >> @@ -607,7 +607,7 @@ static unsigned long >> si5351_msynth_recalc_rate(struct clk_hw *hw, >> si5351_read_parameters(hwdata->drvdata, reg,&hwdata->params); >> >> if (hwdata->params.p3 == 0) >> - return parent_rate; >> + return 0; >> >> /* >> * multisync0-5: fOUT = (128 * P3 * fIN) / (P1*P3 + P2 + 512*P3) > > ~marek
diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c index fc215ce..a8fc0f4 100644 --- a/drivers/clk/clk-si5351.c +++ b/drivers/clk/clk-si5351.c @@ -607,7 +607,7 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw, si5351_read_parameters(hwdata->drvdata, reg, &hwdata->params); if (hwdata->params.p3 == 0) - return parent_rate; + return 0; /* * multisync0-5: fOUT = (128 * P3 * fIN) / (P1*P3 + P2 + 512*P3)
When p3 is eual to 0 then result for fOUT is 0. In that case we should return 0 not parent_rate; This issue was causing deadlock in si5351 chip when user set_rate for ms0->clk0 and then set_rate for ms1->clk1 (both ms sourced from plla). After that clk1 was 0 and it wasn't possible to enable it again (try also manually with i2cset commands). Only power cycle helps. Signed-off-by: Marek Belisko <marek.belisko@streamunlimited.com> --- drivers/clk/clk-si5351.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)