git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: implement TF Identifier search
[dpdk.git]
/
drivers
/
net
/
nfp
/
nfpcore
/
nfp_cppcore.c
diff --git
a/drivers/net/nfp/nfpcore/nfp_cppcore.c
b/drivers/net/nfp/nfpcore/nfp_cppcore.c
index
75d3c97
..
dec4a8b
100644
(file)
--- a/
drivers/net/nfp/nfpcore/nfp_cppcore.c
+++ b/
drivers/net/nfp/nfpcore/nfp_cppcore.c
@@
-801,7
+801,8
@@
__nfp_cpp_model_autodetect(struct nfp_cpp *cpp)
uint32_t arm_id = NFP_CPP_ID(NFP_CPP_TARGET_ARM, 0, 0);
uint32_t model = 0;
uint32_t arm_id = NFP_CPP_ID(NFP_CPP_TARGET_ARM, 0, 0);
uint32_t model = 0;
- nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model);
+ if (nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model))
+ return 0;
if (NFP_CPP_MODEL_IS_6000(model)) {
uint32_t tmp;
if (NFP_CPP_MODEL_IS_6000(model)) {
uint32_t tmp;
@@
-810,8
+811,10
@@
__nfp_cpp_model_autodetect(struct nfp_cpp *cpp)
/* The PL's PluDeviceID revision code is authoratative */
model &= ~0xff;
/* The PL's PluDeviceID revision code is authoratative */
model &= ~0xff;
- nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) +
- NFP_PL_DEVICE_ID, &tmp);
+ if (nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) +
+ NFP_PL_DEVICE_ID, &tmp))
+ return 0;
+
model |= (NFP_PL_DEVICE_ID_MASK & tmp) - 0x10;
}
model |= (NFP_PL_DEVICE_ID_MASK & tmp) - 0x10;
}