From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6AB9F1CBE8E; Thu, 6 Jun 2024 14:22:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683764; cv=none; b=ljn7G1v5ctY8MNnv8vgWx+lQFbuzMS92hEekM8BICkadK9AHVhY/Hl4b3IrQnFyyPWSE/QPTGQXyL4Np5rVjhkyjwiMf/vHJvBD7YPw3BCu583R2TMieG0oNS3z0fj1WjLYqdBbwjjInyDX2YiTyl5duPwT53eFOiUERq8IFKPM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683764; c=relaxed/simple; bh=8IZTFdu3fjFMEv9ZzAdNL9dD/vWvpyl3YdiABDGCPoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j/8YKPxVlJMNH0KeE/AKEJA7pXxb8ZVkIquTg/UZyXnPJZ8tyNaJSfzqBF4EwUbCuFO9m+26PdPQ+d5ehWp2oTRrewv+z8Jq5tpyoQXmG7GDX6ZsHQFB+BSVe5orILceWZnTPp/r0LVl9Pi+3bZR48GtHHTdOReQOaHgJwyhbu4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y9+iNHUJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="y9+iNHUJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49B61C32781; Thu, 6 Jun 2024 14:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683764; bh=8IZTFdu3fjFMEv9ZzAdNL9dD/vWvpyl3YdiABDGCPoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y9+iNHUJyev/kxqrBhzgstaeimsgUVSbg6aQ0jqhg2buReNBDG5Lt78oUB0wLpRsY vj7yC35fG6SiH/TxdymteqWDgpgVvCqybcntydUSVGwcpgTUlVI24uk/G4jXr4qCpQ bReV3tPmVXAGqvxEvknrTRy8lJq1cyMJZ8KATWhg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiaolei Wang , Wei Fang , Andrew Lunn , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 703/744] net:fec: Add fec_enet_deinit() Date: Thu, 6 Jun 2024 16:06:15 +0200 Message-ID: <20240606131755.028233273@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiaolei Wang [ Upstream commit bf0497f53c8535f99b72041529d3f7708a6e2c0d ] When fec_probe() fails or fec_drv_remove() needs to release the fec queue and remove a NAPI context, therefore add a function corresponding to fec_enet_init() and call fec_enet_deinit() which does the opposite to release memory and remove a NAPI context. Fixes: 59d0f7465644 ("net: fec: init multi queue date structure") Signed-off-by: Xiaolei Wang Reviewed-by: Wei Fang Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/20240524050528.4115581-1-xiaolei.wang@windriver.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fec_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index ca50472479f6d..d675f9d5f3612 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -4113,6 +4113,14 @@ static int fec_enet_init(struct net_device *ndev) return ret; } +static void fec_enet_deinit(struct net_device *ndev) +{ + struct fec_enet_private *fep = netdev_priv(ndev); + + netif_napi_del(&fep->napi); + fec_enet_free_queue(ndev); +} + #ifdef CONFIG_OF static int fec_reset_phy(struct platform_device *pdev) { @@ -4509,6 +4517,7 @@ fec_probe(struct platform_device *pdev) fec_enet_mii_remove(fep); failed_mii_init: failed_irq: + fec_enet_deinit(ndev); failed_init: fec_ptp_stop(pdev); failed_reset: @@ -4572,6 +4581,7 @@ fec_drv_remove(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + fec_enet_deinit(ndev); free_netdev(ndev); } -- 2.43.0