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 CD9D430ACFE; Tue, 2 Sep 2025 13:32:39 +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=1756819959; cv=none; b=iZLZBzbSwfmSiytO5LaSlQ8mV2Y9HHjSpi+5um4Dn/12Qw+htPeX8sirfRMccYQmEVnEuBpMGsdu9dABBQNgQbavLIr9ZQEKL5cJ4OTsrQyrw6RMajYQtt2g2RcwGnSjJxAI+4mJHQ3bZOtGUvqSWmoA5ve3WrS4mRKLzwAUAeU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756819959; c=relaxed/simple; bh=GHm69O06Ffvd8I8UpgY+AOSzPInMKhR0d2tJWzyi/6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SmFyWPOtv7ge3Q4ths1jRqqcNcGPMqWji4bBQj43q8rvTkh0c6InIobK0WpdioUI/rcyOEu+Yz7P9i+c2IGcNbxL+TnXT2aR1jKviOuJuoJWRjJjQGQhL/Yz3QjHJE+AP3Ni+4nKo2D2kYf3/c2yN4lITm6UM6+zBt6OMsWgCN8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aCpfgPXk; 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="aCpfgPXk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EEDEC4CEF4; Tue, 2 Sep 2025 13:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756819959; bh=GHm69O06Ffvd8I8UpgY+AOSzPInMKhR0d2tJWzyi/6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aCpfgPXk6YK1qNiHT3Wt9phYEzt/BlFo8kn/rocL3eC/NWk+MP0/Y3vGM4fyuWZBs BaVsc1JW4woRs5DhlbhMqR07McnIJOzKtULwO0e6V32K4soQ1q5MIOSl16OTY6ijJt NTy9qO8+l9gOcxcmR7hCD9hKmhXghmDrSwhgsko4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Moshe Shemesh , Tariq Toukan , Akiva Goldberger , Mark Bloch , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 48/95] net/mlx5: Reload auxiliary drivers on fw_activate Date: Tue, 2 Sep 2025 15:20:24 +0200 Message-ID: <20250902131941.451395038@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131939.601201881@linuxfoundation.org> References: <20250902131939.601201881@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Moshe Shemesh [ Upstream commit 34cc6a54914f478c93e176450fae6313404f9f74 ] The devlink reload fw_activate command performs firmware activation followed by driver reload, while devlink reload driver_reinit triggers only driver reload. However, the driver reload logic differs between the two modes, as on driver_reinit mode mlx5 also reloads auxiliary drivers, while in fw_activate mode the auxiliary drivers are suspended where applicable. Additionally, following the cited commit, if the device has multiple PFs, the behavior during fw_activate may vary between PFs: one PF may suspend auxiliary drivers, while another reloads them. Align devlink dev reload fw_activate behavior with devlink dev reload driver_reinit, to reload all auxiliary drivers. Fixes: 72ed5d5624af ("net/mlx5: Suspend auxiliary devices only in case of PCI device suspend") Signed-off-by: Moshe Shemesh Reviewed-by: Tariq Toukan Reviewed-by: Akiva Goldberger Signed-off-by: Mark Bloch Link: https://patch.msgid.link/20250825143435.598584-6-mbloch@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c index a2cf3e79693dd..7211e65ad2dcc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c @@ -107,7 +107,7 @@ static int mlx5_devlink_reload_fw_activate(struct devlink *devlink, struct netli if (err) return err; - mlx5_unload_one_devl_locked(dev, true); + mlx5_unload_one_devl_locked(dev, false); err = mlx5_health_wait_pci_up(dev); if (err) NL_SET_ERR_MSG_MOD(extack, "FW activate aborted, PCI reads fail after reset"); -- 2.50.1