The function nfp_encode_basic_qdr() takes cpp_tgt as its second argument
and dest_island as its third. However, the implementation of this function
implies the opposite: dest_island should be the second argument, and
cpp_tgt the third.
Furthermore, the implementation compares the second argument against a
negative value, whereas the cpp_tgt parameter — as defined in the
nfp_target.h header file—consists of a set of values that does not
include any negative numbers. The situation is exactly the reverse for
the nfp_decode_basic() function, which receives a value for which these
definitions are not entirely appropriate.
Fix this by swapping the arguments.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: e6858e7e7c ("net/nfp: move shared target logic to own file")
Cc: [email protected]
Signed-off-by: Mark Bulatov <[email protected]>
---
drivers/net/nfp/nfpcore/nfp_target.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/nfp/nfpcore/nfp_target.c
b/drivers/net/nfp/nfpcore/nfp_target.c
index 0e7a5cbb05..239ffff869 100644
--- a/drivers/net/nfp/nfpcore/nfp_target.c
+++ b/drivers/net/nfp/nfpcore/nfp_target.c
@@ -728,7 +728,7 @@ nfp_encode_basic(uint64_t *addr,
* address but we can verify if the existing contents
* will point to a valid island.
*/
- return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
+ return nfp_encode_basic_qdr(*addr, dest_island, cpp_tgt,
mode, addr40, isld1, isld0);
}
@@ -741,7 +741,7 @@ nfp_encode_basic(uint64_t *addr,
return 0;
case 1:
if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
- return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
+ return nfp_encode_basic_qdr(*addr, dest_island, cpp_tgt,
mode, addr40, isld1, isld0);
}
@@ -763,7 +763,7 @@ nfp_encode_basic(uint64_t *addr,
if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
/* iid<0> = addr<30> = channel<0> */
/* channel<1> = addr<31> = Index */
- return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
+ return nfp_encode_basic_qdr(*addr, dest_island, cpp_tgt,
mode, addr40, isld1, isld0);
}
@@ -786,7 +786,7 @@ nfp_encode_basic(uint64_t *addr,
* iid<1> = addr<30> = channel<0>
* channel<1> = addr<31> = Index
*/
- return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
+ return nfp_encode_basic_qdr(*addr, dest_island, cpp_tgt,
mode, addr40, isld1, isld0);
}
--
2.39.5