Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <fb332a94-9983-70b1-4a02-da3c31c68e29@plvision.eu>
Date:   Thu, 3 Aug 2023 12:28:36 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] prestera: fix fallback to previous version on same major
 version
To:     Jonas Gorski <jonas.gorski@bisdn.de>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Andrew Lunn <andrew@lunn.ch>,
        Vadym Kochan <vkochan@marvell.com>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20230802092357.163944-1-jonas.gorski@bisdn.de>
Content-Language: en-US
From:   Taras Chornyi <taras.chornyi@plvision.eu>
In-Reply-To: <20230802092357.163944-1-jonas.gorski@bisdn.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SnYwWDhLdEM1akNVR1VYYm0ra2Y0VHJLa0xJWUxINldTdmZ5V2JveEs1TUZY?=
 =?utf-8?B?NWhQRnpHVkk4czRzdWtST2pTYWJRMnJJZkxIMGxBL3hvNUhNLzZVMkNuUWZv?=
 =?utf-8?B?SDdFV3RIS1hIWW1taU5XaEtSOGVVYTNQQlo4NEtxU3JXaHVxUjhXVUtNTjNT?=
 =?utf-8?B?VzdWOGZ3TjQ3cEJBY1FEc0R5YTdXVEwvaTJkUktTSzV5eVIzNTRBVHVEZWYv?=
 =?utf-8?B?TE1hNElOK01IQ25ZK25TRkgzTlprQ0d1ZG9kTHhwNFQxNnBweVVuUHlJNUhG?=
 =?utf-8?B?UlpVdWlIcjB5cGVrKzJIak41T2YwZnVwSzhuc0FScW9hRzJWSFVVeURxbFRq?=
 =?utf-8?B?WS9mVkRnZG9XallJM1FyL2x0UWx1d2hYZUpxM0tTbHU4MDhnQTB0dUY3Z1l3?=
 =?utf-8?B?UVptS3dsQ2JVYUx6MUU5aXZKTTd4UCtKemZjdUhQNVlLMmhzWDV0MldibVJD?=
 =?utf-8?B?R3hGelU0L0dCbnVYOUdJTlFGZWtJSmRJYmNQRUE4TjNySjJJWGdVam1acWVo?=
 =?utf-8?B?cGpGak0ySFlsTmVjeEtSbVl2Znd4UUpPSGEwVkoxUXFjTWplcE14UGtxMFB6?=
 =?utf-8?B?ZDNwQ1pYSG51SUdzS2IwWldFTk9FcDVnY05IMjFpS2VkZXF1TGJPSUtGS1BM?=
 =?utf-8?B?Si82RTV0Nk1CZkpMTWl2K2JKZmxxeUZ5S1l5MS9HK3hxWFloUkt2S3VSOWw5?=
 =?utf-8?B?ZzVLMEYvRWhhRy8zMlljcXNGMWg5aXpyTUdGTGJtdk9KcVp4Um1zWCtpSUV6?=
 =?utf-8?B?YVRPZXRzRDl0Y0paTlVWbVdUUFkxeE5JSnk0Wm81VGVhSjJIUllKQ3pZRWs5?=
 =?utf-8?B?bHk1M1JBcXVuQ3U2OGlLTkk3QkxBbDlHK0NON3RIZ1RuVG1YUUh5UW0ycGp2?=
 =?utf-8?B?YnN0K1Q0S3RlaVZhY29ZZ3k4dFFmcnFEZmQ2RzVjdkpaVCtpekVxYXlhcWNR?=
 =?utf-8?B?ZjE1MjVxNW52TG5xUkxvNVlvTUZ4U094ZCtKT0ZNK1IzNWlJeFFZSDlwVlIw?=
 =?utf-8?B?RGFiRUprZVo5VTMvZnc3V1ErWEd5RlMycVNwVmRYcUxUSEowdDJvaXhIcUts?=
 =?utf-8?B?Y1lyY3RRSndTOWJaMGhHRzlleW9RRERvYThMSHVYU1BqdEJmb1A2RFgrUHNv?=
 =?utf-8?B?VWhhcVNLaU8zdVprMTVVZnI5TzBkVHRLci8rc2ZhS1FuTWRpQzlRbUZLa1Na?=
 =?utf-8?B?OVA4SDlnTGgvWFBabWNJVnpsb2R5Q3BtZTJKOHIwZElJT0pEY2xqMm8yQ2U4?=
 =?utf-8?B?cDZoaWFMZVNwUEZueGhqRFJpaXFmUng1dkhXTFRoNnUrUXdTS0Q2N0w3TENY?=
 =?utf-8?B?RXB4REl0UXNuT0lVRCtnWHBHUUdrK2QvUCtKcENVMEF6WHN3aWcvR2Y0Ky9D?=
 =?utf-8?B?cHFvVndiYVljR0pZMVlZL25ZTFRPb05wT21hYU1XSFRiOURPeWwvVlBwRlJC?=
 =?utf-8?B?aHBnSzFkcEFDd2JrSWZ1MSt3aTY5aGREb0QvN3E5ejVnbCthem5CVjFnV2I4?=
 =?utf-8?B?b0YxU2hkUGgxa25mSzRQK3l3ajd6SXE3ZFFKT3BYYnR5Y1FFK21xZDg4cTYy?=
 =?utf-8?B?LzM5T0hRUFhDakRqUDNDSFBIUWdPZWVyaWM3cytMR0EzaHF5aUlNLzQ3ckdR?=
 =?utf-8?B?dm16ajRWeGFCNnljWGJmZmM1YzFibXVnRG9ybVp2bmRORlBwQ1FsdGF2RFVy?=
 =?utf-8?B?U3hacU1PWnl0NzBJNE1RQWlZRWdHRHVWYlU2RGZmdjBFWTdJNGlHbExJSFJJ?=
 =?utf-8?B?M1VSdVdLazVyb3R6S0M3U2lFbzZxRXlDOTJBNDdDcHJwSkpmbGQwMVdUN1R3?=
 =?utf-8?B?WmlCSGwrWmFqbWZTdkY1QmJwMkpEZDVTQityenRFcEY4TjJzeDlKU3V2MHRk?=
 =?utf-8?B?K2VKLzk2V0ZiQ1Mya3JEM1ZDU1ZqY1lmTC95Qm1IOXRzVS9RZHRBWjJwNmx4?=
 =?utf-8?B?K3VTTENIY1haN0dJTU5GN2VEdmRCQzF4U3ltRG4zRE1xVm1WMjF3RVZabG5U?=
 =?utf-8?B?N3ZUbHFtZy9jcEo1U3l3V08wZXFaTnlHdHBkbVRWeDJpclZZV2prY1VnQmpl?=
 =?utf-8?B?SnlYZWlzMHlSSTZwRmFneWN3MHpsUnlERjY0OXBicDBCSnJ4SzRBT1ZwVEdx?=
 =?utf-8?B?bmxaSml2RisvYmp6dDRBbW55OWNXYzNrU0NCaVkxWUUzRFdsam85dmZoaXZl?=
 =?utf-8?B?NlE9PQ==?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: 88138595-ba89-411b-afad-08db940404c9
X-MS-Exchange-CrossTenant-AuthSource: AS4P190MB1998.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 09:28:39.1483
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Kmz8vK36EQllY0nbgc8ogmG40KpVWKSFzBa13cEIowJ8CgRlALcDFF9BH1WMEUKY8cenqKY7GAftXSRz6VB9QlzmRx6f9PTllrzAIpjCkmU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9P190MB1466
X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> Fix this by inverting the check to that we aren't yet at the previous
> version, and also check the minor version.
>
> This also catches the case where both versions are the same, as it was
> after commit bb5dbf2cc64d ("net: marvell: prestera: add firmware v4.0
> support").
>
> With this fix applied:
>
>      [   88.499622] Prestera DX 0000:01:00.0: missing latest mrvl/prestera/mvsw_prestera_fw-v4.1.img firmware, fall-back to previous 4.0 version
>      [   88.511995] Prestera DX 0000:01:00.0: failed to request previous firmware: mrvl/prestera/mvsw_prestera_fw-v4.0.img
>      [   88.522403] Prestera DX: probe of 0000:01:00.0 failed with error -2
>
> Fixes: 47f26018a414 ("net: marvell: prestera: try to load previous fw version")
> Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
> ---
>   drivers/net/ethernet/marvell/prestera/prestera_pci.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
> index f328d957b2db..35857dc19542 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
> @@ -727,7 +727,8 @@ static int prestera_fw_get(struct prestera_fw *fw)
>   
>   	err = request_firmware_direct(&fw->bin, fw_path, fw->dev.dev);
>   	if (err) {
> -		if (ver_maj == PRESTERA_SUPP_FW_MAJ_VER) {
> +		if (ver_maj != PRESTERA_PREV_FW_MAJ_VER ||
> +		    ver_min != PRESTERA_PREV_FW_MIN_VER) {
>   			ver_maj = PRESTERA_PREV_FW_MAJ_VER;
>   			ver_min = PRESTERA_PREV_FW_MIN_VER;
>   

Acked-by: Taras Chornyi <taras.chornyi@plvision.eu>