You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.2 KiB
55 lines
2.2 KiB
4 years ago
|
From baaa60a0e32476c4c9c2875a31698a13525fb22f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:54:05 -0400
|
||
|
|
Subject: [PATCH 145/312] [netdrv] net/mlx5e: Fix printk format warning
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-40-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306909
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 039/124] net/mlx5e: Fix printk format warning
|
||
|
|
Bugzilla: 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Upstream: v5.6-rc1
|
||
|
|
|
||
|
|
commit ca9c74ae9be5e78541c2058db9a754947a7d4a9b
|
||
|
|
Author: Olof Johansson <olof@lixom.net>
|
||
|
|
Date: Thu Dec 19 16:15:17 2019 -0800
|
||
|
|
|
||
|
|
net/mlx5e: Fix printk format warning
|
||
|
|
|
||
|
|
Use "%zu" for size_t. Seen on ARM allmodconfig:
|
||
|
|
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/wq.c: In function 'mlx5_wq_cyc_wqe_dump':
|
||
|
|
include/linux/kern_levels.h:5:18: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'size_t' {aka 'unsigned int'} [-Wformat=]
|
||
|
|
|
||
|
|
Fixes: 130c7b46c93d ("net/mlx5e: TX, Dump WQs wqe descriptors on CQE with error events")
|
||
|
|
Signed-off-by: Olof Johansson <olof@lixom.net>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/wq.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
index f2a0e72285ba..02f7e4a39578 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
@@ -89,7 +89,7 @@ void mlx5_wq_cyc_wqe_dump(struct mlx5_wq_cyc *wq, u16 ix, u8 nstrides)
|
||
|
|
len = nstrides << wq->fbc.log_stride;
|
||
|
|
wqe = mlx5_wq_cyc_get_wqe(wq, ix);
|
||
|
|
|
||
|
|
- pr_info("WQE DUMP: WQ size %d WQ cur size %d, WQE index 0x%x, len: %ld\n",
|
||
|
|
+ pr_info("WQE DUMP: WQ size %d WQ cur size %d, WQE index 0x%x, len: %zu\n",
|
||
|
|
mlx5_wq_cyc_get_size(wq), wq->cur_sz, ix, len);
|
||
|
|
print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, wqe, len, false);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|