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 B02AEC433F5 for ; Mon, 6 Dec 2021 15:33:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243175AbhLFPgD (ORCPT ); Mon, 6 Dec 2021 10:36:03 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:47520 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387140AbhLFPaq (ORCPT ); Mon, 6 Dec 2021 10:30:46 -0500 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 56B9761310; Mon, 6 Dec 2021 15:27:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 388F8C34901; Mon, 6 Dec 2021 15:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638804436; bh=KTCtJMeFMBN3q2EGNe/+FDI/POUAygWGJoTQBv/la8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dFzFgDwHT7k75Yqgz3ZDHrXznUIQiqKUi25MDiKNbUB0XAuzsCW18z/jLp5OgZvT0 NFgU+GKFwDYWH33mTUGi5+R89x9EvtmJI7/9eXzq2ibdWUNUJ9wj6/DWsqgJEOA+gS hOMOCSxQl3gY9Yrdq3lUYHSjbbeg/F9Xq49H2Mhs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sameer Saurabh , Sudarsana Reddy Kalluru , Igor Russkikh , "David S. Miller" Subject: [PATCH 5.15 147/207] atlantic: Fix to display FW bundle version instead of FW mac version. Date: Mon, 6 Dec 2021 15:56:41 +0100 Message-Id: <20211206145615.325883600@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211206145610.172203682@linuxfoundation.org> References: <20211206145610.172203682@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sameer Saurabh commit 2465c802232bc8d2b5bd83b55b08d05c11808704 upstream. The correct way to reflect firmware version is to use bundle version. Hence populating the same instead of MAC fw version. Fixes: c1be0bf092bd2 ("net: atlantic: common functions needed for basic A2 init/deinit hw_ops") Signed-off-by: Sameer Saurabh Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Igor Russkikh Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c @@ -500,9 +500,9 @@ u32 hw_atl2_utils_get_fw_version(struct hw_atl2_shared_buffer_read_safe(self, version, &version); /* A2 FW version is stored in reverse order */ - return version.mac.major << 24 | - version.mac.minor << 16 | - version.mac.build; + return version.bundle.major << 24 | + version.bundle.minor << 16 | + version.bundle.build; } int hw_atl2_utils_get_action_resolve_table_caps(struct aq_hw_s *self,