nfp: flower: read extra feature support from fw

Extract the _abi_flower_extra_features symbol from the fw which gives a 64
bit bitmap of new features (on top of the flower base support) that the fw
can offload. Store this bitmap in the priv data associated with each app.
If the symbol does not exist, set the bitmap to 0.

Signed-off-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.c b/drivers/net/ethernet/netronome/nfp/flower/main.c
index 8fcc90c0d2d3ad1a3f48348ca2d9c02e190133cb..63160e9754d4afb478f742bfee5364af9326a144 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.c
@@ -381,7 +381,7 @@ static int nfp_flower_init(struct nfp_app *app)
 {
        const struct nfp_pf *pf = app->pf;
        struct nfp_flower_priv *app_priv;
-       u64 version;
+       u64 version, features;
        int err;
 
        if (!pf->eth_tbl) {
@@ -424,6 +424,14 @@ static int nfp_flower_init(struct nfp_app *app)
        if (err)
                goto err_free_app_priv;
 
+       /* Extract the extra features supported by the firmware. */
+       features = nfp_rtsym_read_le(app->pf->rtbl,
+                                    "_abi_flower_extra_features", &err);
+       if (err)
+               app_priv->flower_ext_feats = 0;
+       else
+               app_priv->flower_ext_feats = features;
+
        return 0;
 
 err_free_app_priv:

diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index e6b26c5ae6e0f11b8bdbe5593603e117bd1d5a4a..87be25ae8d19e362be9c11c81d78d03c4d52096b 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -77,6 +77,7 @@ struct nfp_fl_stats_id {
  * @nn:                        Pointer to vNIC
  * @mask_id_seed:      Seed used for mask hash table
  * @flower_version:    HW version of flower
+ * @flower_ext_feats:  Bitmap of extra features the HW supports
  * @stats_ids:         List of free stats ids
  * @mask_ids:          List of free mask ids
  * @mask_table:                Hash table used to store masks
@@ -101,6 +102,7 @@ struct nfp_flower_priv {
        struct nfp_net *nn;
        u32 mask_id_seed;
        u64 flower_version;
+       u64 flower_ext_feats;
        struct nfp_fl_stats_id stats_ids;
        struct nfp_fl_mask_id mask_ids;
        DECLARE_HASHTABLE(mask_table, NFP_FLOWER_MASK_HASH_BITS);