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 0022B5228; Wed, 5 Feb 2025 14:01:53 +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=1738764114; cv=none; b=cldIPoF+QDxNSLjzF4GXmVbX9PKe5+UafYz5XT9nFYv+wWoEbwFBmO9uGrUksIWErV8YEY/+iwA33NXBpeBeCRT83xRs0zzuIvjTDAXOz3hfwPcbFxUfEydvspUGdm35qVhHkmOrOnK7bge12gYyOwgrNq3soAjoZtj5jUxZrOU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764114; c=relaxed/simple; bh=GCTCYVPFgy948LrSuP4XjFuWDftgkvCWWsjBydEnWnk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MYKzmoFFyGW0jsodIz7eROEX5Kp6GP+44AWlg/WKVmOOQhYzmF1zBc2KfICd22rxC+b3nXBKN0CRGJDcDi2EEclN0x9h+BxcCYS7aWhv3eY/OG/FOKNZHqxXEmqG+6WsaTIg5gzwnQ3im4w68hi5o6r2ehCEhNUddiDLV8rxLjo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TcNRkQ9g; 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="TcNRkQ9g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66034C4CEDD; Wed, 5 Feb 2025 14:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764113; bh=GCTCYVPFgy948LrSuP4XjFuWDftgkvCWWsjBydEnWnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TcNRkQ9gd4ZcHd+wSE034A3oRz0gw6q8NkU8RwoBLqWuGmjZkAJbb8jJjCy+yfb8k GvWVvJLWrejZhBzEm8jJkqfp64IsExWAUGZzMu0TDRTUvpdyR7eVln+UgE0YzWX9// bDS5O7Yh9q16xbIMs74ci1pQLwMM5RK4pT4/BQAE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maher Sanalla , Moshe Shemesh , Ido Schimmel , Michal Swiatkowski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 141/393] net/mlxfw: Drop hard coded max FW flash image size Date: Wed, 5 Feb 2025 14:41:00 +0100 Message-ID: <20250205134425.701584778@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maher Sanalla [ Upstream commit 70d81f25cc92cc4e914516c9935ae752f27d78ad ] Currently, mlxfw kernel module limits FW flash image size to be 10MB at most, preventing the ability to burn recent BlueField-3 FW that exceeds the said size limit. Thus, drop the hard coded limit. Instead, rely on FW's max_component_size threshold that is reported in MCQI register as the size limit for FW image. Fixes: 410ed13cae39 ("Add the mlxfw module for Mellanox firmware flash process") Signed-off-by: Maher Sanalla Signed-off-by: Moshe Shemesh Reviewed-by: Ido Schimmel Tested-by: Ido Schimmel Reviewed-by: Michal Swiatkowski Link: https://patch.msgid.link/1737030796-1441634-1-git-send-email-moshe@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c index 46245e0b24623..43c84900369a3 100644 --- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c +++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c @@ -14,7 +14,6 @@ #define MLXFW_FSM_STATE_WAIT_TIMEOUT_MS 30000 #define MLXFW_FSM_STATE_WAIT_ROUNDS \ (MLXFW_FSM_STATE_WAIT_TIMEOUT_MS / MLXFW_FSM_STATE_WAIT_CYCLE_MS) -#define MLXFW_FSM_MAX_COMPONENT_SIZE (10 * (1 << 20)) static const int mlxfw_fsm_state_errno[] = { [MLXFW_FSM_STATE_ERR_ERROR] = -EIO, @@ -229,7 +228,6 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev, return err; } - comp_max_size = min_t(u32, comp_max_size, MLXFW_FSM_MAX_COMPONENT_SIZE); if (comp->data_size > comp_max_size) { MLXFW_ERR_MSG(mlxfw_dev, extack, "Component size is bigger than limit", -EINVAL); -- 2.39.5