octeontx2-pf: Add check for non zero mcam flows

This patch ensures that mcam flows are allocated
before adding or destroying the flows.

Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
index 2a25588a01ed874594d8bf80ab4e36cb1f4fc7b2..55802b56e3b925afa35e92a9959582c291694a4a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
@@ -972,6 +972,12 @@ int otx2_add_flow(struct otx2_nic *pfvf, struct ethtool_rxnfc *nfc)
        int err = 0;
        u32 ring;
 
+       if (!flow_cfg->max_flows) {
+               netdev_err(pfvf->netdev,
+                          "Ntuple rule count is 0, allocate and retry\n");
+               return -EINVAL;
+       }
+
        ring = ethtool_get_flow_spec_ring(fsp->ring_cookie);
        if (!(pfvf->flags & OTX2_FLAG_NTUPLE_SUPPORT))
                return -ENOMEM;
@@ -1183,6 +1189,9 @@ int otx2_destroy_ntuple_flows(struct otx2_nic *pfvf)
        if (!(pfvf->flags & OTX2_FLAG_NTUPLE_SUPPORT))
                return 0;
 
+       if (!flow_cfg->max_flows)
+               return 0;
+
        mutex_lock(&pfvf->mbox.lock);
        req = otx2_mbox_alloc_msg_npc_delete_flow(&pfvf->mbox);
        if (!req) {

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index 7dd56c9392ab0a18e032a248e08dad73087e7b17..6fe6b8d9daa175cfa7cfedec343f4804f4e5067c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -1860,6 +1860,22 @@ static int otx2_set_features(struct net_device *netdev,
        if ((changed & NETIF_F_NTUPLE) && !ntuple)
                otx2_destroy_ntuple_flows(pf);
 
+       if ((changed & NETIF_F_NTUPLE) && ntuple) {
+               if (!pf->flow_cfg->max_flows) {
+                       netdev_err(netdev,
+                                  "Can't enable NTUPLE, MCAM entries not allocated\n");
+                       return -EINVAL;
+               }
+       }
+
+       if ((changed & NETIF_F_HW_TC) && tc) {
+               if (!pf->flow_cfg->max_flows) {
+                       netdev_err(netdev,
+                                  "Can't enable TC, MCAM entries not allocated\n");
+                       return -EINVAL;
+               }
+       }
+
        if ((changed & NETIF_F_HW_TC) && !tc &&
            pf->flow_cfg && pf->flow_cfg->nr_flows) {
                netdev_err(netdev, "Can't disable TC hardware offload while flows are active\n");