From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B514246D56A; Tue, 21 Jul 2026 19:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784662878; cv=none; b=RG8kPHEbLxbqNdHYfmhCgUKXuLYheK2UM79BMqVeOPY/cr3HDwNTPcjXU6+0JV5UITNeWIXxC3PrFEcq4DjZcU3/6S84DFtYFWqsLp9BuEv7GYvN8jX9ZeLF/bKLwcKGMb+n64FrtGalLdzsLjoEWy445En8L2SbhXynZe1jhug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784662878; c=relaxed/simple; bh=8ciax9MvdAIDGod0O48nOGV1a0L2hwW8fYdv6hY1YeI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g89jdq0oKS3giXbWhBOblGmEhV3ZyAwX6OLG+Jt/a5avgTuiuzPoIhcGLogAbLVmNvhGOld5wUoZTHsLHtQHwvlOO8YVdklczccG6FpgefB8eYf1ckH6K2krMqeu6KyWhNcTdtKKV7O3ePY1l7Ds+Jb8n7jMnSuK+oe5INPx1mQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CuITTjda; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CuITTjda" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 278D11F000E9; Tue, 21 Jul 2026 19:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784662877; bh=doBYobZplIMdk/xJQGZo7FXDegAYW1HItYdrO9IGxLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CuITTjda4A480r8sWswluOlaCDSxOgT+nqFVQ2G0mSZqjntq2bvu2UtIwacCTnWkP ozaxwyfW7jaRMj1AGKgLqFQ6KYGF4o36aI2DHFOOmT4RID8vQIQmuaTceg7/jnsRXK nrYfFHWukD7QZqHoxKp7S2IGaicInQHN1Wvv219Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Geetha sowjanya , Subbaraya Sundeep , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 0612/1276] octeontx2-pf: mcs: Fix mcs resources free on PF shutdown Date: Tue, 21 Jul 2026 17:17:35 +0200 Message-ID: <20260721152459.803208137@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Geetha sowjanya [ Upstream commit 450d0e90b10393bd9f50c127875a9fdd4cc81c30 ] On PF shutdown, the current driver free mcs hardware resources though mcs resources are not allocated to it. This patch checks the mcs resources status and if resources are allocated then only sends mailbox message to free them. Fixes: c54ffc73601c ("octeontx2-pf: mcs: Introduce MACSEC hardware offloading") Signed-off-by: Geetha sowjanya Signed-off-by: Subbaraya Sundeep Link: https://patch.msgid.link/1781636420-19816-3-git-send-email-sbhatta@marvell.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- .../net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c index b288edd9e22db0..8f07d19819cec8 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c @@ -1808,11 +1808,16 @@ int cn10k_mcs_init(struct otx2_nic *pfvf) void cn10k_mcs_free(struct otx2_nic *pfvf) { + struct cn10k_mcs_cfg *cfg = pfvf->macsec_cfg; + if (!test_bit(CN10K_HW_MACSEC, &pfvf->hw.cap_flag)) return; - cn10k_mcs_free_rsrc(pfvf, MCS_TX, MCS_RSRC_TYPE_SECY, 0, true); - cn10k_mcs_free_rsrc(pfvf, MCS_RX, MCS_RSRC_TYPE_SECY, 0, true); + if (!list_empty(&cfg->txsc_list)) { + cn10k_mcs_free_rsrc(pfvf, MCS_TX, MCS_RSRC_TYPE_SECY, 0, true); + cn10k_mcs_free_rsrc(pfvf, MCS_RX, MCS_RSRC_TYPE_SECY, 0, true); + } + kfree(pfvf->macsec_cfg); pfvf->macsec_cfg = NULL; } -- 2.53.0