2023-06-16 09:19:41

by Arnd Bergmann

Subject: [PATCH 4/4] ASoC: loongson: fix compile testing on 32-bit

From: Arnd Bergmann <[email protected]>

DIV_ROUND_CLOSEST() does not work on 64-bit variables when building for
a 32-bit target:

ld.lld: error: undefined symbol: __udivdi3
>>> referenced by loongson_i2s.c
>>> sound/soc/loongson/loongson_i2s.o:(loongson_i2s_hw_params) in archive vmlinux.a

Use DIV_ROUND_CLOSEST_ULL() instead.

Fixes: d24028606e764 ("ASoC: loongson: Add Loongson ASoC Sound Card Support")
Signed-off-by: Arnd Bergmann <[email protected]>
---
sound/soc/loongson/loongson_i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/loongson/loongson_i2s.c b/sound/soc/loongson/loongson_i2s.c
index f73b6d6f16c23..b919f0fe83615 100644
--- a/sound/soc/loongson/loongson_i2s.c
+++ b/sound/soc/loongson/loongson_i2s.c
@@ -89,7 +89,7 @@ static int loongson_i2s_hw_params(struct snd_pcm_substream *substream,
bclk_ratio = DIV_ROUND_CLOSEST(sysclk,
(bits * chans * fs * 2)) - 1;
mclk_ratio = clk_rate / sysclk;
- mclk_ratio_frac = DIV_ROUND_CLOSEST(((u64)clk_rate << 16),
+ mclk_ratio_frac = DIV_ROUND_CLOSEST_ULL(((u64)clk_rate << 16),
sysclk) - (mclk_ratio << 16);

regmap_read(i2s->regmap, LS_I2S_CFG, &val);
--
2.39.2

2023-06-17 04:26:54

by Randy Dunlap

Subject: Re: [PATCH 4/4] ASoC: loongson: fix compile testing on 32-bit

On 6/16/23 02:00, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> DIV_ROUND_CLOSEST() does not work on 64-bit variables when building for
> a 32-bit target:
>
> ld.lld: error: undefined symbol: __udivdi3
>>>> referenced by loongson_i2s.c
>>>> sound/soc/loongson/loongson_i2s.o:(loongson_i2s_hw_params) in archive vmlinux.a
>
> Use DIV_ROUND_CLOSEST_ULL() instead.
>
> Fixes: d24028606e764 ("ASoC: loongson: Add Loongson ASoC Sound Card Support")
> Signed-off-by: Arnd Bergmann <[email protected]>

Acked-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]> # build-tested

Thanks.

> ---
> sound/soc/loongson/loongson_i2s.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/loongson/loongson_i2s.c b/sound/soc/loongson/loongson_i2s.c
> index f73b6d6f16c23..b919f0fe83615 100644
> --- a/sound/soc/loongson/loongson_i2s.c
> +++ b/sound/soc/loongson/loongson_i2s.c
> @@ -89,7 +89,7 @@ static int loongson_i2s_hw_params(struct snd_pcm_substream *substream,
> bclk_ratio = DIV_ROUND_CLOSEST(sysclk,
> (bits * chans * fs * 2)) - 1;
> mclk_ratio = clk_rate / sysclk;
> - mclk_ratio_frac = DIV_ROUND_CLOSEST(((u64)clk_rate << 16),
> + mclk_ratio_frac = DIV_ROUND_CLOSEST_ULL(((u64)clk_rate << 16),
> sysclk) - (mclk_ratio << 16);
>
> regmap_read(i2s->regmap, LS_I2S_CFG, &val);

--
~Randy