octeontx2-af: Cleanup CGX config permission checks

Most of the CGX register config is restricted to mapped RVU PFs,
this patch cleans up these permission checks spread across
the rvu_cgx.c file by moving the checks to a common fn().

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

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
index 11e5921c55b9057f74167aa17c9e48a7ebb1075e..b8e8f337316f015258dfd46b4cb7207fe6929282 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
@@ -350,6 +350,18 @@ int rvu_cgx_exit(struct rvu *rvu)
        return 0;
 }
 
+/* Most of the CGX configuration is restricted to the mapped PF only,
+ * VF's of mapped PF and other PFs are not allowed. This fn() checks
+ * whether a PFFUNC is permitted to do the config or not.
+ */
+static bool is_cgx_config_permitted(struct rvu *rvu, u16 pcifunc)
+{
+       if ((pcifunc & RVU_PFVF_FUNC_MASK) ||
+           !is_pf_cgxmapped(rvu, rvu_get_pf(pcifunc)))
+               return false;
+       return true;
+}
+
 void rvu_cgx_enadis_rx_bp(struct rvu *rvu, int pf, bool enable)
 {
        u8 cgx_id, lmac_id;
@@ -373,11 +385,8 @@ int rvu_cgx_config_rxtx(struct rvu *rvu, u16 pcifunc, bool start)
        int pf = rvu_get_pf(pcifunc);
        u8 cgx_id, lmac_id;
 
-       /* This msg is expected only from PFs that are mapped to CGX LMACs,
-        * if received from other PF/VF simply ACK, nothing to do.
-        */
-       if ((pcifunc & RVU_PFVF_FUNC_MASK) || !is_pf_cgxmapped(rvu, pf))
-               return -ENODEV;
+       if (!is_cgx_config_permitted(rvu, pcifunc))
+               return -EPERM;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
 
@@ -409,8 +418,7 @@ int rvu_mbox_handler_cgx_stats(struct rvu *rvu, struct msg_req *req,
        u8 cgx_idx, lmac;
        void *cgxd;
 
-       if ((req->hdr.pcifunc & RVU_PFVF_FUNC_MASK) ||
-           !is_pf_cgxmapped(rvu, pf))
+       if (!is_cgx_config_permitted(rvu, req->hdr.pcifunc))
                return -ENODEV;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_idx, &lmac);
@@ -477,12 +485,8 @@ int rvu_mbox_handler_cgx_promisc_enable(struct rvu *rvu, struct msg_req *req,
        int pf = rvu_get_pf(pcifunc);
        u8 cgx_id, lmac_id;
 
-       /* This msg is expected only from PFs that are mapped to CGX LMACs,
-        * if received from other PF/VF simply ACK, nothing to do.
-        */
-       if ((req->hdr.pcifunc & RVU_PFVF_FUNC_MASK) ||
-           !is_pf_cgxmapped(rvu, pf))
-               return -ENODEV;
+       if (!is_cgx_config_permitted(rvu, req->hdr.pcifunc))
+               return -EPERM;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
 
@@ -493,16 +497,11 @@ int rvu_mbox_handler_cgx_promisc_enable(struct rvu *rvu, struct msg_req *req,
 int rvu_mbox_handler_cgx_promisc_disable(struct rvu *rvu, struct msg_req *req,
                                         struct msg_rsp *rsp)
 {
-       u16 pcifunc = req->hdr.pcifunc;
-       int pf = rvu_get_pf(pcifunc);
+       int pf = rvu_get_pf(req->hdr.pcifunc);
        u8 cgx_id, lmac_id;
 
-       /* This msg is expected only from PFs that are mapped to CGX LMACs,
-        * if received from other PF/VF simply ACK, nothing to do.
-        */
-       if ((req->hdr.pcifunc & RVU_PFVF_FUNC_MASK) ||
-           !is_pf_cgxmapped(rvu, pf))
-               return -ENODEV;
+       if (!is_cgx_config_permitted(rvu, req->hdr.pcifunc))
+               return -EPERM;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
 
@@ -515,11 +514,8 @@ static int rvu_cgx_config_linkevents(struct rvu *rvu, u16 pcifunc, bool en)
        int pf = rvu_get_pf(pcifunc);
        u8 cgx_id, lmac_id;
 
-       /* This msg is expected only from PFs that are mapped to CGX LMACs,
-        * if received from other PF/VF simply ACK, nothing to do.
-        */
-       if ((pcifunc & RVU_PFVF_FUNC_MASK) || !is_pf_cgxmapped(rvu, pf))
-               return -ENODEV;
+       if (!is_cgx_config_permitted(rvu, pcifunc))
+               return -EPERM;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);
 
@@ -571,11 +567,8 @@ static int rvu_cgx_config_intlbk(struct rvu *rvu, u16 pcifunc, bool en)
        int pf = rvu_get_pf(pcifunc);
        u8 cgx_id, lmac_id;
 
-       /* This msg is expected only from PFs that are mapped to CGX LMACs,
-        * if received from other PF/VF simply ACK, nothing to do.
-        */
-       if ((pcifunc & RVU_PFVF_FUNC_MASK) || !is_pf_cgxmapped(rvu, pf))
-               return -ENODEV;
+       if (!is_cgx_config_permitted(rvu, pcifunc))
+               return -EPERM;
 
        rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);