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;
From:   Elad Nachman <enachman@marvell.com>
To:     Jonas Gorski <jonas.gorski@bisdn.de>,
        Taras Chornyi <taras.chornyi@plvision.eu>,
        "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 [C]" <vkochan@marvell.com>
CC:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [EXT] [PATCH] prestera: fix fallback to previous version on same
 major version
Thread-Topic: [EXT] [PATCH] prestera: fix fallback to previous version on same
 major version
Thread-Index: AQHZxSNHvoGzih8ngEyXRFSXF/Igbq/W1ZTQ
Date:   Wed, 2 Aug 2023 10:56:25 +0000
Message-ID: <BN9PR18MB4251FB3CAB47DB8303112DFEDB0BA@BN9PR18MB4251.namprd18.prod.outlook.com>
References: <20230802092357.163944-1-jonas.gorski@bisdn.de>
In-Reply-To: <20230802092357.163944-1-jonas.gorski@bisdn.de>
Accept-Language: he-IL, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?yg4R1epc85a5DwvvfnZasqq48OLKZkkSx+OHCoKl0JC/DXyMC1UsA6gojO?=
 =?iso-8859-1?Q?ZvngVgHzf6dgX5YfRyW8jF+iDz4ji3Szq0euM0JcfacKVQOy5WY1rTNA3l?=
 =?iso-8859-1?Q?0RngpfhzzlZIunKI7XO70Xo3lWkQphVLdB6xkMLg/g20PDjQNWGAOHr2Ut?=
 =?iso-8859-1?Q?/GEtOUm2ie2yMiyQ3J5uwUurwMpudscM16af9W0WUH+Tt4sUwgxD/nLXNe?=
 =?iso-8859-1?Q?72cXHUGz0ua9hFacnfIIX+SXkWmeKMDhGSBDHkQePxGP2OimHhP1p0ZCYd?=
 =?iso-8859-1?Q?eaUaauPyYaHqwRCnH0o7FKGkI5f0RcY7F1LxaS+ykVv1zeVrui+lbJDV0T?=
 =?iso-8859-1?Q?cJXEazF5sRAl3DkzgZlYSBfKD4r/7K1gC8/NOFHWZr7SIeIpk8oZjLtHeG?=
 =?iso-8859-1?Q?inaQi21b7+B/gLeeke81EiL2qOlh5MhpJ/gIyJa0mMJCXfyB43nEJqFdov?=
 =?iso-8859-1?Q?y97lwcIgw32VVZYzUW20I1boqf4v/Ysl52Z+hZwPidvAFmCfTrjBn6Pb13?=
 =?iso-8859-1?Q?q25sTHnND9d12WhsDpXRZYgoPWFSyhvmouJ/Wap+wbk4YojKCoDTQj5nEk?=
 =?iso-8859-1?Q?VsrrvFAU7ExGSW06yE/UnRknsbWDKGj474lMJ+a4gURXR8Zmp44ocReYNv?=
 =?iso-8859-1?Q?jaZoE6qGhP/Kp46692mFvq3U24AHsaJ/syfo1CEJKLJ7XeKcB9eGPiTgrR?=
 =?iso-8859-1?Q?g+dFpxSmeLjn35pZwyGPdcL736ADSNmrnxx3KLwN+dX34uhvQuZV7kFodo?=
 =?iso-8859-1?Q?JCBEEP0vkYhjoXy6J+Po1STVRPP7wfeKofEBCq1geuPH/iwI9BCP8m3hOh?=
 =?iso-8859-1?Q?zxU2oqFkkIZx9WipZT6KEz2N6+T/CIiHCT/8ynsZDsV/jmFBPrs4YFjAeM?=
 =?iso-8859-1?Q?byLijg6kVLj67liwvlV9PMQTIDUR4F80cuzCPsQqGEmVnaKypoAN+5GOct?=
 =?iso-8859-1?Q?C3A181L97FFGcYLcrMMVnF1hasmekMqyoJ5WNOpoAFXKaelbHjTZeifHrw?=
 =?iso-8859-1?Q?Ps2r+Bq4d89hVHcbvi7lT5fxIVItNNCWwhEzRIMzQe3BGun/U1af9Irudx?=
 =?iso-8859-1?Q?V/tD0oQCKddyDMyQTN5v0S4tn35RBYAgnUg1VN8Cmu2BMlUV04HSXbyuOl?=
 =?iso-8859-1?Q?7vF4TIQT5Z48a5JUqe3TzNuA9gh6NO3LJ73TlnfFpp0WPT6iT51BurnGPC?=
 =?iso-8859-1?Q?LQhZ2SPEcOnJFT6U5pyw1FYpAaDL6BFq1MNAb2Smjhm/gXbXoRAHIPHxCU?=
 =?iso-8859-1?Q?Xfc8Bc0VU7h+T5Dxgn0INrATBft1ZxQ2D4mT5yAZ+GkKpBO8IDwGqQhRbh?=
 =?iso-8859-1?Q?MIBSpk/MeGfaNK0vHgYQ1CNomMvtVmPj1LzW9gO/n0OWwXnoSTyPd4AEaf?=
 =?iso-8859-1?Q?xbyzqfc+U7DzMD2s75yGZ26DwP3O2ttiw9V9TqHurv/QHXIYOXfR2dKz5S?=
 =?iso-8859-1?Q?pdlxEibQPTlpXBr/MPeliP+jjCfHBfObsybQAPaKeoSkt0F+BY2RDcvF2I?=
 =?iso-8859-1?Q?2hySrvbnUTz08ZGzHGeIH/Om7peRzg5pYp7yfTGdFlxvQRMrz8Od7z578B?=
 =?iso-8859-1?Q?C7byiDo936649ha7IWFudjXoxQN1gJK8kiWZ+EAOdqoeyndn5hSvhUnWvk?=
 =?iso-8859-1?Q?p9TS74eCsGjD8VBGtX+2a5rkNDmJ1AUpvE?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN9PR18MB4251.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 006215fc-90f6-4773-6159-08db93471dfc
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2023 10:56:25.7778
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: h3agL1QQ335WUKE+udJc23wn2kMTItAVbT7bKY0qWh3QHRDUWJYCtCfZC3fqclU5iI3EuFaUC/+S1qsals4uIw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR18MB4402
X-Proofpoint-GUID: ldKUN-8gpXMzAcwOQ0YL0_7Iju_A3Ot4
X-Proofpoint-ORIG-GUID: ldKUN-8gpXMzAcwOQ0YL0_7Iju_A3Ot4
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-08-02_06,2023-08-01_01,2023-05-22_02
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,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


> -----Original Message-----
> From: Jonas Gorski <jonas.gorski@bisdn.de>
> Sent: Wednesday, August 2, 2023 12:24 PM
> To: Taras Chornyi <taras.chornyi@plvision.eu>; 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 [C] <vkochan@marvell.com>
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [EXT] [PATCH] prestera: fix fallback to previous version on same
> major version
>=20
> External Email
>=20
> ----------------------------------------------------------------------
> When both supported and previous version have the same major version,
> and the firmwares are missing, the driver ends in a loop requesting the s=
ame
> (previous) version over and over again:
>=20
>     [   76.327413] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.1.img firmware, fall-back to previous
> 4.0 version
>     [   76.339802] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.352162] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.364502] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.376848] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.389183] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.401522] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.413860] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     [   76.426199] Prestera DX 0000:01:00.0: missing latest
> mrvl/prestera/mvsw_prestera_fw-v4.0.img firmware, fall-back to previous
> 4.0 version
>     ...
>=20
> Fix this by inverting the check to that we aren't yet at the previous ver=
sion,
> and also check the minor version.
>=20
> This also catches the case where both versions are the same, as it was af=
ter
> commit bb5dbf2cc64d ("net: marvell: prestera: add firmware v4.0 support")=
.
>=20
> With this fix applied:
>=20
>     [   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
>=20
> 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(-)
>=20
> 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)
>=20
>  	err =3D request_firmware_direct(&fw->bin, fw_path, fw->dev.dev);
>  	if (err) {
> -		if (ver_maj =3D=3D PRESTERA_SUPP_FW_MAJ_VER) {
> +		if (ver_maj !=3D PRESTERA_PREV_FW_MAJ_VER ||
> +		    ver_min !=3D PRESTERA_PREV_FW_MIN_VER) {
>  			ver_maj =3D PRESTERA_PREV_FW_MAJ_VER;
>  			ver_min =3D PRESTERA_PREV_FW_MIN_VER;
>=20
> --
> 2.41.0
>=20
>=20
> --
> BISDN GmbH
> K=F6rnerstra=DFe 7-10
> 10785 Berlin
> Germany
>=20
>=20
> Phone:
> +49-30-6108-1-6100
>=20
>=20
> Managing Directors:
> Dr.-Ing. Hagen Woesner, Andreas
> K=F6psel
>=20
>=20
> Commercial register:
> Amtsgericht Berlin-Charlottenburg HRB 141569
> B
> VAT ID No:=A0DE283257294
>=20

Acked-by: Elad Nachman <enachman@marvell.com>