From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13F78C004D4 for ; Wed, 18 Jan 2023 08:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229693AbjARIxL (ORCPT ); Wed, 18 Jan 2023 03:53:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229924AbjARIw1 (ORCPT ); Wed, 18 Jan 2023 03:52:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 614359CBB7 for ; Wed, 18 Jan 2023 00:04:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4DB3B616FF for ; Wed, 18 Jan 2023 08:04:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 961C4C433F0; Wed, 18 Jan 2023 08:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674029078; bh=Df4hMM0enjST14rE99cmCn7ZhwZuNfslgE3D3zD63pY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZLXtEVJKao5G1cKYagsZA2uF22Sww5IOjqfzPdh5xqgEfOB+gz/q5FQqk5ki1SckB BsLfC9rxTJvBavzEmh9ADrsP0VFwfj0xPCDHb2W4zy5gWNdHrHTbYSu/+H0Et8GepL ym5hcALwkLKBTLE+rdobOG3fw3GfRgW/HAYJa0wqtHcYAlr8PNlGsYHcLT1UXnhx6q yWcI7RgTK+GBFVE8sbafqY6L1AfTQ2WBNZLo24lVxH1FIDIQWggGWNo8Anf5wKfVqy NV/xtyBDfhY9//x7BzziMoiarA7uaFBabfpGeGQjIHM04GJeJezFCPMg6iBWvNLTWu WwZ9AKxBkSVEA== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: Saeed Mahameed , netdev@vger.kernel.org, Tariq Toukan , Chris Mi , Roi Dayan Subject: [net 09/10] net/mlx5: E-switch, Fix switchdev mode after devlink reload Date: Wed, 18 Jan 2023 00:04:13 -0800 Message-Id: <20230118080414.77902-10-saeed@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118080414.77902-1-saeed@kernel.org> References: <20230118080414.77902-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Chris Mi The cited commit removes eswitch mode none. So after devlink reload in switchdev mode, eswitch mode is not changed. But actually eswitch is disabled during devlink reload. Fix it by setting eswitch mode to legacy when disabling eswitch which is called by reload_down. Fixes: f019679ea5f2 ("net/mlx5: E-switch, Remove dependency between sriov and eswitch mode") Signed-off-by: Chris Mi Reviewed-by: Roi Dayan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 0dfd5742c6fe..9daf55e90367 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1464,6 +1464,7 @@ void mlx5_eswitch_disable(struct mlx5_eswitch *esw) mlx5_lag_disable_change(esw->dev); down_write(&esw->mode_lock); mlx5_eswitch_disable_locked(esw); + esw->mode = MLX5_ESWITCH_LEGACY; up_write(&esw->mode_lock); mlx5_lag_enable_change(esw->dev); } -- 2.39.0