octeontx2-af: Handle PF-VF mac address changes

This patch handles the VF mac address changes as given below.
    1. mac addr configrued by VF will be retained until VF module unload.
    2. mac addr configred by PF for VF will be retained until power cycle.
    3. mac addr confgired by PF for its VF can't be overwritten by VF.

Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Naveen Mamindlapalli <naveenm@marvell.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index e8b5aaf..9f901c0 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -727,6 +727,10 @@ static void rvu_setup_pfvf_macaddress(struct rvu *rvu)
        u64 *mac;
 
        for (pf = 0; pf < hw->total_pfs; pf++) {
+               /* For PF0(AF), Assign MAC address to only VFs (LBKVFs) */
+               if (!pf)
+                       goto lbkvf;
+
                if (!is_pf_cgxmapped(rvu, pf))
                        continue;
                /* Assign MAC address to PF */
@@ -740,8 +744,10 @@ static void rvu_setup_pfvf_macaddress(struct rvu *rvu)
                } else {
                        eth_random_addr(pfvf->mac_addr);
                }
+               ether_addr_copy(pfvf->default_mac, pfvf->mac_addr);
 
-               /* Assign MAC address to VFs */
+lbkvf:
+               /* Assign MAC address to VFs*/
                rvu_get_pf_numvfs(rvu, pf, &numvfs, &hwvf);
                for (vf = 0; vf < numvfs; vf++, hwvf++) {
                        pfvf = &rvu->hwvf[hwvf];
@@ -754,6 +760,7 @@ static void rvu_setup_pfvf_macaddress(struct rvu *rvu)
                        } else {
                                eth_random_addr(pfvf->mac_addr);
                        }
+                       ether_addr_copy(pfvf->default_mac, pfvf->mac_addr);
                }
        }
 }
@@ -1176,6 +1183,9 @@ static void rvu_detach_block(struct rvu *rvu, int pcifunc, int blktype)
        if (blkaddr < 0)
                return;
 
+       if (blktype == BLKTYPE_NIX)
+               rvu_nix_reset_mac(pfvf, pcifunc);
+
        block = &hw->block[blkaddr];
 
        num_lfs = rvu_get_rsrc_mapcount(pfvf, block->addr);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index 90a9529..fd46092 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -211,6 +211,7 @@ struct rvu_pfvf {
 
        u8              pf_set_vf_cfg;
        u8              mac_addr[ETH_ALEN]; /* MAC address of this PF/VF */
+       u8              default_mac[ETH_ALEN]; /* MAC address from FWdata */
 
        /* Broadcast pkt replication info */
        u16                     bcast_mce_idx;
@@ -553,6 +554,7 @@ int nix_get_nixlf(struct rvu *rvu, u16 pcifunc, int *nixlf, int *nix_blkaddr);
 int nix_update_bcast_mce_list(struct rvu *rvu, u16 pcifunc, bool add);
 struct nix_hw *get_nix_hw(struct rvu_hwinfo *hw, int blkaddr);
 int rvu_get_next_nix_blkaddr(struct rvu *rvu, int blkaddr);
+void rvu_nix_reset_mac(struct rvu_pfvf *pfvf, int pcifunc);
 
 /* NPC APIs */
 int rvu_npc_init(struct rvu *rvu);

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index e74bcd8..9444c85 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -3735,3 +3735,12 @@ int rvu_mbox_handler_nix_lso_format_cfg(struct rvu *rvu,
 
        return 0;
 }
+
+void rvu_nix_reset_mac(struct rvu_pfvf *pfvf, int pcifunc)
+{
+       bool from_vf = !!(pcifunc & RVU_PFVF_FUNC_MASK);
+
+       /* overwrite vf mac address with default_mac */
+       if (from_vf)
+               ether_addr_copy(pfvf->mac_addr, pfvf->default_mac);
+}

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
index ca50da7..4ddfdff 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
@@ -938,7 +938,8 @@ static void npc_update_tx_entry(struct rvu *rvu, struct rvu_pfvf *pfvf,
 static int npc_install_flow(struct rvu *rvu, int blkaddr, u16 target,
                            int nixlf, struct rvu_pfvf *pfvf,
                            struct npc_install_flow_req *req,
-                           struct npc_install_flow_rsp *rsp, bool enable)
+                           struct npc_install_flow_rsp *rsp, bool enable,
+                           bool pf_set_vfs_mac)
 {
        struct rvu_npc_mcam_rule *def_ucast_rule = pfvf->def_ucast_rule;
        u64 features, installed_features, missing_features = 0;
@@ -1065,6 +1066,12 @@ update_rule:
        if (req->default_rule)
                pfvf->def_ucast_rule = rule;
 
+       /* VF's MAC address is being changed via PF  */
+       if (pf_set_vfs_mac) {
+               ether_addr_copy(pfvf->default_mac, req->packet.dmac);
+               ether_addr_copy(pfvf->mac_addr, req->packet.dmac);
+       }
+
        if (pfvf->pf_set_vf_cfg && req->vtag0_type == NIX_AF_LFX_RX_VTAG_TYPE7)
                rule->vfvlan_cfg = true;
 
@@ -1078,6 +1085,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu,
        bool from_vf = !!(req->hdr.pcifunc & RVU_PFVF_FUNC_MASK);
        int blkaddr, nixlf, err;
        struct rvu_pfvf *pfvf;
+       bool pf_set_vfs_mac = false;
        bool enable = true;
        u16 target;
 
@@ -1102,8 +1110,11 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu,
        if (!req->hdr.pcifunc)
                target = req->vf;
        /* PF installing for its VF */
-       else if (!from_vf && req->vf)
+       else if (!from_vf && req->vf) {
                target = (req->hdr.pcifunc & ~RVU_PFVF_FUNC_MASK) | req->vf;
+               pf_set_vfs_mac = req->default_rule &&
+                               (req->features & BIT_ULL(NPC_DMAC));
+       }
        /* msg received from PF/VF */
        else
                target = req->hdr.pcifunc;
@@ -1152,7 +1163,7 @@ int rvu_mbox_handler_npc_install_flow(struct rvu *rvu,
                return -EINVAL;
 
        return npc_install_flow(rvu, blkaddr, target, nixlf, pfvf, req, rsp,
-                               enable);
+                               enable, pf_set_vfs_mac);
 }
 
 static int npc_delete_flow(struct rvu *rvu, struct rvu_npc_mcam_rule *rule,