From nobody Thu Dec 18 13:01:09 2025 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 7F650C32772 for ; Tue, 23 Aug 2022 08:30:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243834AbiHWIaL (ORCPT ); Tue, 23 Aug 2022 04:30:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245598AbiHWI0q (ORCPT ); Tue, 23 Aug 2022 04:26:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AF5174363; Tue, 23 Aug 2022 01:14:33 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 6706DB81C35; Tue, 23 Aug 2022 08:13:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBCE2C433D7; Tue, 23 Aug 2022 08:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242438; bh=cx2ysTK87stMeHPikefVBj+1WkzeP9H1M67m6Mj+Bvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O2DaQmzjMmxulWANS0qE+HfdpURdv201L5U4segHBZVP+9wGZmKB+i+t8urBEAcQv xxIAk5+wrS9AeNcLrEGy5GMWwB0dgneb9c4XOoUrFYDfGviKttNX+DZdnJgsBh6Grk pVB30e3JGJuSdHM13P2O42rtY78+Nr5dwRE21xtY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanislaw Kardach , Subbaraya Sundeep , Sunil Goutham , Jakub Kicinski Subject: [PATCH 5.19 115/365] octeontx2-af: Apply tx nibble fixup always Date: Tue, 23 Aug 2022 10:00:16 +0200 Message-Id: <20220823080123.019511691@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Stanislaw Kardach commit dd1d1a8a6b29b6b472fd0d449b29eb806c411dd2 upstream. NPC_PARSE_NIBBLE for TX interface has to be equal to the RX one for some silicon revisions. Mistakenly this fixup was only applied to the default MKEX profile while it should also be applied to any loaded profile. Fixes: 1c1935c9945d ("octeontx2-af: Add NIX1 interfaces to NPC") Signed-off-by: Stanislaw Kardach Signed-off-by: Subbaraya Sundeep Signed-off-by: Sunil Goutham Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c @@ -1915,6 +1915,7 @@ static void rvu_npc_hw_init(struct rvu * =20 static void rvu_npc_setup_interfaces(struct rvu *rvu, int blkaddr) { + struct npc_mcam_kex *mkex =3D rvu->kpu.mkex; struct npc_mcam *mcam =3D &rvu->hw->mcam; struct rvu_hwinfo *hw =3D rvu->hw; u64 nibble_ena, rx_kex, tx_kex; @@ -1927,15 +1928,15 @@ static void rvu_npc_setup_interfaces(str mcam->counters.max--; mcam->rx_miss_act_cntr =3D mcam->counters.max; =20 - rx_kex =3D npc_mkex_default.keyx_cfg[NIX_INTF_RX]; - tx_kex =3D npc_mkex_default.keyx_cfg[NIX_INTF_TX]; + rx_kex =3D mkex->keyx_cfg[NIX_INTF_RX]; + tx_kex =3D mkex->keyx_cfg[NIX_INTF_TX]; nibble_ena =3D FIELD_GET(NPC_PARSE_NIBBLE, rx_kex); =20 nibble_ena =3D rvu_npc_get_tx_nibble_cfg(rvu, nibble_ena); if (nibble_ena) { tx_kex &=3D ~NPC_PARSE_NIBBLE; tx_kex |=3D FIELD_PREP(NPC_PARSE_NIBBLE, nibble_ena); - npc_mkex_default.keyx_cfg[NIX_INTF_TX] =3D tx_kex; + mkex->keyx_cfg[NIX_INTF_TX] =3D tx_kex; } =20 /* Configure RX interfaces */