| Message ID | ecb00ddd1197b4f8a4882090206bd2eee1eb8b5b.1657005206.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 55ae465222d0296e81f707c2b9447e715b59b9ac |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net/mlx5: fix 32bit build | expand |
On 05 Jul 09:17, Paolo Abeni wrote: >We can't use the division operator on 64 bits integers, that breaks >32 bits build. Instead use the relevant helper. > >Fixes: 6ddac26cf763 ("net/mlx5e: Add support to modify hardware flow meter parameters") >Signed-off-by: Paolo Abeni <pabeni@redhat.com> Acked-by: Saeed Mahameed <saeedm@nvidia.com> sorry for the mess. I sent v2 too soon, forgot to squash the 2nd fix to it.
On Tue, 2022-07-05 at 00:39 -0700, Saeed Mahameed wrote: > On 05 Jul 09:17, Paolo Abeni wrote: > > We can't use the division operator on 64 bits integers, that breaks > > 32 bits build. Instead use the relevant helper. > > > > Fixes: 6ddac26cf763 ("net/mlx5e: Add support to modify hardware flow meter parameters") > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > Acked-by: Saeed Mahameed <saeedm@nvidia.com> > > sorry for the mess. I sent v2 too soon, forgot to squash the 2nd fix to it. No problems, it happens. Unless someone raises some concerns soon, I'm going to merge this one well before the usual 24h staging time, to keep PW and the tree okish. Cheers, Paolo
Hello: This patch was applied to netdev/net-next.git (master) by Paolo Abeni <pabeni@redhat.com>: On Tue, 5 Jul 2022 09:17:04 +0200 you wrote: > We can't use the division operator on 64 bits integers, that breaks > 32 bits build. Instead use the relevant helper. > > Fixes: 6ddac26cf763 ("net/mlx5e: Add support to modify hardware flow meter parameters") > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Here is the summary with links: - [net-next] net/mlx5: fix 32bit build https://git.kernel.org/netdev/net-next/c/55ae465222d0 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c index 28962b2134c7..ca33f673396f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB // Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +#include <linux/math64.h> #include "lib/aso.h" #include "en/tc/post_act.h" #include "meter.h" @@ -61,7 +62,7 @@ mlx5e_flow_meter_cir_calc(u64 cir, u8 *man, u8 *exp) m = cir << e; if ((s64)m < 0) /* overflow */ break; - m /= MLX5_CONST_CIR; + m = div64_u64(m, MLX5_CONST_CIR); if (m > 0xFF) /* man width 8 bit */ continue; _cir = MLX5_CALC_CIR(m, e);
We can't use the division operator on 64 bits integers, that breaks 32 bits build. Instead use the relevant helper. Fixes: 6ddac26cf763 ("net/mlx5e: Add support to modify hardware flow meter parameters") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)