diff mbox series

mlxsw: spectrum_cnt: Fix 64-bit division in mlxsw_sp_counter_resources_register

Message ID 20200320021638.1916-1-natechancellor@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series mlxsw: spectrum_cnt: Fix 64-bit division in mlxsw_sp_counter_resources_register | expand

Commit Message

Nathan Chancellor March 20, 2020, 2:16 a.m. UTC 
When building arm32 allyesconfig:

ld.lld: error: undefined symbol: __aeabi_uldivmod
>>> referenced by spectrum_cnt.c
>>>               net/ethernet/mellanox/mlxsw/spectrum_cnt.o:(mlxsw_sp_counter_resources_register) in archive drivers/built-in.a
>>> did you mean: __aeabi_uidivmod
>>> defined in: arch/arm/lib/lib.a(lib1funcs.o)

pool_size and bank_size are u64; use div64_u64 so that 32-bit platforms
do not error.

Fixes: ab8c4cc60420 ("mlxsw: spectrum_cnt: Move config validation along with resource register")
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jiri Pirko March 20, 2020, 9:55 a.m. UTC | #1 
Fri, Mar 20, 2020 at 03:16:38AM CET, natechancellor@gmail.com wrote:
>When building arm32 allyesconfig:
>
>ld.lld: error: undefined symbol: __aeabi_uldivmod
>>>> referenced by spectrum_cnt.c
>>>>               net/ethernet/mellanox/mlxsw/spectrum_cnt.o:(mlxsw_sp_counter_resources_register) in archive drivers/built-in.a
>>>> did you mean: __aeabi_uidivmod
>>>> defined in: arch/arm/lib/lib.a(lib1funcs.o)
>
>pool_size and bank_size are u64; use div64_u64 so that 32-bit platforms
>do not error.
>
>Fixes: ab8c4cc60420 ("mlxsw: spectrum_cnt: Move config validation along with resource register")
>Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Acked-by: Jiri Pirko <jiri@mellanox.com>

Thanks!
David Miller March 24, 2020, 3:57 a.m. UTC | #2 
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Thu, 19 Mar 2020 19:16:38 -0700

> When building arm32 allyesconfig:
> 
> ld.lld: error: undefined symbol: __aeabi_uldivmod
>>>> referenced by spectrum_cnt.c
>>>>               net/ethernet/mellanox/mlxsw/spectrum_cnt.o:(mlxsw_sp_counter_resources_register) in archive drivers/built-in.a
>>>> did you mean: __aeabi_uidivmod
>>>> defined in: arch/arm/lib/lib.a(lib1funcs.o)
> 
> pool_size and bank_size are u64; use div64_u64 so that 32-bit platforms
> do not error.
> 
> Fixes: ab8c4cc60420 ("mlxsw: spectrum_cnt: Move config validation along with resource register")
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Applied to net-next.

Please be clear about the intended target GIT tree for your changes in the
Subject line in the future, thank you.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
index 0268f0a6662a..7974982533b5 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c
@@ -303,7 +303,7 @@  int mlxsw_sp_counter_resources_register(struct mlxsw_core *mlxsw_core)
 	}
 
 	/* Check config is valid, no bank over subscription */
-	if (WARN_ON(total_bank_config > pool_size / bank_size + 1))
+	if (WARN_ON(total_bank_config > div64_u64(pool_size, bank_size) + 1))
 		return -EINVAL;
 
 	return 0;