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:   wei.fang@nxp.com
To:     claudiu.manoil@nxp.com, vladimir.oltean@nxp.com,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH net] net: enetc: correct the indexes of highest and 2nd highest TCs
Date:   Tue,  6 Jun 2023 16:46:18 +0800
Message-Id: <20230606084618.1126471-1-wei.fang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dEdq0kYk+wewGE4I/vdCkuogJtL4Xu9bNQp+PISeTW7HZYPxpR8P+uc0pd5f?=
 =?us-ascii?Q?uOSYUashslBDCSKsS1sAn4LSgT93vc4c1pl4yEqc8pNJNl7uJbJmAqQLEFRg?=
 =?us-ascii?Q?HWyqhk7RWjfXi2+nGnP9M7TdP0F4HEc7BEmF3SrB96E/caE+8J221kGbz97f?=
 =?us-ascii?Q?DkqOMF9bZUzSHeIgQv9WzN57ghOi/zew8mZgIzJe5EObsbZdlC5uBD5NBStr?=
 =?us-ascii?Q?Ult9RrMDfGqLUCU86Is9FrJlJDTZCkVgjvdtbL6apEFZXGhA3wRHnacGx3RY?=
 =?us-ascii?Q?A+X35oK0RaAseOdsyKikVUqp6OQggmsEAdh11MwlWaha3tz0l3NfbbgWtPl9?=
 =?us-ascii?Q?5g8a2a9wVlVfiWdNDeTMdRUtj0HXWVh2BsTB17Qk/utN1069tCvkKpbMMtWh?=
 =?us-ascii?Q?8wk21IzVDLMT5nhsKv7M9kChJWsp10t/Jr1AlgOLYFSi/aw8R83rPtOHgXkN?=
 =?us-ascii?Q?kW0SaQ1R077miSgur/yqpC5bJqzP2+NbYZzgSreQF0ods8ls+zv7FdOHAYre?=
 =?us-ascii?Q?13jM0DhijYdHM/y+goEsIIue+rYmZc68OI9k8LapaAYKRv66FqFHitplrmE9?=
 =?us-ascii?Q?eMRkB7WkfqTfuxtl1Oh4aIQPNtS3APgG2v0tfW6pwqwwGen12VqdvN0lyTaM?=
 =?us-ascii?Q?kP6o5dyGYLtRcZHRyRHa7gxE5ATxRFbEV9HqcmU5/XbgFd3Pp7FNcYYpspWO?=
 =?us-ascii?Q?NPj2AZ1h502FdO/rc2tMiySsi/pQGwj6w94RTVfGdVZXZQkP5m0RULUbqBiO?=
 =?us-ascii?Q?Vn25ZiW5vic6u05dz4sILXQOURuYiTK0jgEn63/BXSSk8/VqjCS1aPakEdzI?=
 =?us-ascii?Q?2fq4oXRrRydYTfNc5Y4yqrPcLkaBtpLuvoiKYOTWgryphm6tmpFiFgIoPys3?=
 =?us-ascii?Q?s2x+N8jnfEkC0oYxRqlyvUEVLZDPjvXHxNTom8dyXIeU0Hxn+ZiawvKrNv37?=
 =?us-ascii?Q?7IthMgPW7FxY0emmDXSOmucYA9KIIn9c7x9CfZca0g1lskf4NlJ3wWzIUuWd?=
 =?us-ascii?Q?dUixrtWaS+eCBkFQUKHb6rV/d8FNPesPhLiy/eVcpO8B1KBygZHf72/gNMjQ?=
 =?us-ascii?Q?paPOcSfvZlpwJ1QrODNYVNDrkXnKRsR/XH/PgEg3VuW5L6F4NVBNcl9bIzYL?=
 =?us-ascii?Q?jDE7NoA6Dyq5Lp399vWKRWM3YQ7yotsAHMFGMLQcReojJpp9i0CnOU+gryUu?=
 =?us-ascii?Q?mo3p1gg2lbRXfFxo79BY8PHlOpXToEAJYwOiRA7EtrMTrfj6DxaGJMyw48hX?=
 =?us-ascii?Q?wwbglJgpKjZeJskCUbGRUvfNDrYBTNIfrLNK2A/ksnpQNUQE3Uz+9lODzX2u?=
 =?us-ascii?Q?0uLAsnQGOWfu31QkM2sWPkkvWNSgclbMLO+76OP2tgMcwVNaQvAk3rXg3v+j?=
 =?us-ascii?Q?pwXQ0uH/SEygdXi+QARqPSwLKYpYEmT1Au+uboRH1HuRiOdJ3aUm2vfcQIlM?=
 =?us-ascii?Q?UdS6HxZxsfA3TrojbVey3jAVm9eI4Y3AxgndeJWFsieiTyQ4kgHwclqb94+s?=
 =?us-ascii?Q?Sw3+Cbs63dINqRr5p7THmHF/dpafrAXb46EVNKx/09/tOHO4QChe8PRB9789?=
 =?us-ascii?Q?NRO2tmN7NLehc0Xw+MoUwm8OP+tdnJJpHLvR7m/x?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c5c15ccf-945c-497f-fa42-08db666b3653
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3139.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2023 08:51:26.4831
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: y9JzkeCSkk/VQnAyqhV4rvnEVdTqziF2UQ1vEo816NwyF0FyqCCjT0oJ8j5jep1Qb1w81lokVTvqZtY/aNWmTQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7506
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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

From: Wei Fang <wei.fang@nxp.com>

For ENETC hardware, the TCs are numbered from 0 to N-1, where N
is the number of TCs. Numerically higher TC has higher priority.
It's obvious that the highest priority TC index should be N-1 and
the 2nd highest priority TC index should be N-2.
However, the previous logic uses netdev_get_prio_tc_map() to get
the indexes of highest priority and 2nd highest priority TCs, it
does not make sense and is incorrect. It may get wrong indexes of
the two TCs and make the CBS unconfigurable. e.g.
$ tc qdisc add dev eno0 parent root handle 100: mqprio num_tc 6 \
	map 0 0 1 1 2 3 4 5 queues 1@0 1@1 1@2 1@3 2@4 2@6 hw 1
$ tc qdisc replace dev eno0 parent 100:6 cbs idleslope 100000 \
	sendslope -900000 hicredit 12 locredit -113 offload 1
$ Error: Specified device failed to setup cbs hardware offload.
  ^^^^^

Fixes: c431047c4efe ("enetc: add support Credit Based Shaper(CBS) for hardware offload")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
index 83c27bbbc6ed..126007ab70f6 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
@@ -181,8 +181,8 @@ int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data)
 	int bw_sum = 0;
 	u8 bw;
 
-	prio_top = netdev_get_prio_tc_map(ndev, tc_nums - 1);
-	prio_next = netdev_get_prio_tc_map(ndev, tc_nums - 2);
+	prio_top = tc_nums - 1;
+	prio_next = tc_nums - 2;
 
 	/* Support highest prio and second prio tc in cbs mode */
 	if (tc != prio_top && tc != prio_next)
-- 
2.25.1