]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
octeon_ep: fix VF MAC address lifecycle handling
authorSathesh B Edara <sedara@marvell.com>
Tue, 16 Sep 2025 13:32:07 +0000 (06:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:13:44 +0000 (11:13 +0200)
[ Upstream commit a72175c985132885573593222a7b088cf49b07ae ]

Currently, VF MAC address info is not updated when the MAC address is
configured from VF, and it is not cleared when the VF is removed. This
leads to stale or missing MAC information in the PF, which may cause
incorrect state tracking or inconsistencies when VFs are hot-plugged
or reassigned.

Fix this by:
 - storing the VF MAC address in the PF when it is set from VF
 - clearing the stored VF MAC address when the VF is removed

This ensures that the PF always has correct VF MAC state.

Fixes: cde29af9e68e ("octeon_ep: add PF-VF mailbox communication")
Signed-off-by: Sathesh B Edara <sedara@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250916133207.21737-1-sedara@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c

index e6eb98d70f3c427c5e01a76a100e70420f0bb7c0..6334b68f28d79660aff945261cd2f891136f3962 100644 (file)
@@ -177,6 +177,7 @@ static void octep_pfvf_get_mac_addr(struct octep_device *oct,  u32 vf_id,
                dev_err(&oct->pdev->dev, "Get VF MAC address failed via host control Mbox\n");
                return;
        }
+       ether_addr_copy(oct->vf_info[vf_id].mac_addr, rsp->s_set_mac.mac_addr);
        rsp->s_set_mac.type = OCTEP_PFVF_MBOX_TYPE_RSP_ACK;
 }
 
@@ -186,6 +187,8 @@ static void octep_pfvf_dev_remove(struct octep_device *oct,  u32 vf_id,
 {
        int err;
 
+       /* Reset VF-specific information maintained by the PF */
+       memset(&oct->vf_info[vf_id], 0, sizeof(struct octep_pfvf_info));
        err = octep_ctrl_net_dev_remove(oct, vf_id);
        if (err) {
                rsp->s.type = OCTEP_PFVF_MBOX_TYPE_RSP_NACK;