Skip to content

Commit 1bb7cb6

Browse files
Oskar Schirmerbroonie
authored andcommitted
ASoC: tas2552: Fix fraction overflow in PLL calculation
Setting the PLL involves the calculation of a fixed point ratio with 4 decimal digits fraction, referred to as "J.D". The fraction "D" is stored separately from the integer part "J" and is limited to 0..9999. The current algorithm uses integer registers to calculate the fraction part, but failed to compensate for rounding errors, resulting in values larger than 9999 for the fraction part occasionally, e.g. for 44.1kHz audio rate and pll_clkin = 3763400 it would set J to 11 and D to 10002, which will at best result in wrong pitch. The critical part is the "pll_clkin / 10000", which would be ok with real numbers, but using integer arithmetic the rounding decreases the divisor, thus increasing the final quotient. The issue is solved by linear interpolation over the reciprocal function between the two adjacent points with integer divisor, i.e. pll_clkin / 10000 and pll_clkin / 10000 + 1, and doing all rounding to the lower result. As a side effect to the bug fix, the approximation to the desired frequency is much better, for the above mentioned example we get 11.9993, while the true ratio is 11.9993623. Signed-off-by: Oskar Schirmer <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 5771a8c commit 1bb7cb6

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

sound/soc/codecs/tas2552.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,20 @@ static int tas2552_setup_pll(struct snd_soc_codec *codec,
192192
* pll_clk = (.5 * pll_clkin * J.D) / 2^p
193193
* Need to fill in J and D here based on incoming freq
194194
*/
195-
unsigned int d;
195+
unsigned int d, q, t;
196196
u8 j;
197197
u8 pll_sel = (tas2552->pll_clk_id << 3) & TAS2552_PLL_SRC_MASK;
198198
u8 p = snd_soc_read(codec, TAS2552_PLL_CTRL_1);
199199

200200
p = (p >> 7);
201201

202202
recalc:
203-
j = (pll_clk * 2 * (1 << p)) / pll_clkin;
204-
d = (pll_clk * 2 * (1 << p)) % pll_clkin;
205-
d /= (pll_clkin / 10000);
203+
t = (pll_clk * 2) << p;
204+
j = t / pll_clkin;
205+
d = t % pll_clkin;
206+
t = pll_clkin / 10000;
207+
q = d / (t + 1);
208+
d = q + ((9999 - pll_clkin % 10000) * (d / t - q)) / 10000;
206209

207210
if (d && (pll_clkin < 512000 || pll_clkin > 9200000)) {
208211
if (tas2552->pll_clk_id == TAS2552_PLL_CLKIN_BCLK) {

0 commit comments

Comments
 (0)