diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-13 13:29:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-13 13:29:13 -0700 |
| commit | d371465e81fc740cfa67ef47fbf692350c6b0113 (patch) | |
| tree | 1db0fcbf574d3374f19777428d5cb5edad1661e0 /drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | |
| parent | 255cd50f207ae8ec7b22663246c833407744e634 (diff) | |
| parent | 7dbd5b7517376c4395a9ed0b26cf6b4db80d8415 (diff) | |
Merge branch 'nfp-card-init'
Jakub Kicinski says:
====================
nfp: wait more carefully for card init
The first patch is a small fix for flower offload, we need a whitelist
of supported matches, otherwise the unsupported ones will be ignored.
The second and the third patch are adding wait/polling to the probe path.
We had reports of driver failing probe because it couldn't find the
control process (NSP) on the card. Turns out the NSP will only announce
its existence after it's fully initialized. Until now we assumed it
will be reachable, just not processing commands (hence we wait for
a NOOP command to execute successfully).
v2:
- fix a bad merge which resulted in a build warning and retest.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h index 1a8d04a1e113..3ce51f03126f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h @@ -97,6 +97,8 @@ nfp_resource_acquire(struct nfp_cpp *cpp, const char *name); void nfp_resource_release(struct nfp_resource *res); +int nfp_resource_wait(struct nfp_cpp *cpp, const char *name, unsigned int secs); + u32 nfp_resource_cpp_id(struct nfp_resource *res); const char *nfp_resource_name(struct nfp_resource *res); |