From nobody Mon Feb 9 22:18:51 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0152C160798 for ; Fri, 5 Apr 2024 09:52:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712310748; cv=none; b=PRyT/uf1uB9DHfctwdD1CpMByR1QgkIliiowraZJDv6XRJTwr2URL/Po8RXm4Jh6GLPcv9vkdyaT+YXWpezWp7v9/6/NXeZhR4+crxxv7AfDJj84lfkme4yIuK320Ynl/lhHNMmRDhQjHPWqQDqNxoo78QYUI4bPguNya531Hnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712310748; c=relaxed/simple; bh=jRF/wbhWxadLpImtFIjnLIQkxJrsOFnPq3PkVy2pvBw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Sae/DfPw7MrQm+XeG571e+74eRZibseZdIsktLfywewas7O0uh7PG+ykGmvGT7TBn2hsRGARJu5g2RRutvb/n4kckWMgs8764vMT2clrtFvWqDWbEG1UT+gXG8alksazA9QbZTDAaudPSBAZTpItu1A1sAHeVN8z9hXEuuBArnI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rsgFA-0005EF-S9; Fri, 05 Apr 2024 11:52:20 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rsgF8-00AXql-Ek; Fri, 05 Apr 2024 11:52:18 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rsgF8-001U5i-17; Fri, 05 Apr 2024 11:52:18 +0200 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, David Ahern , Simon Horman , Willem de Bruijn , =?UTF-8?q?S=C3=B8ren=20Andersen?= Subject: [PATCH net-next v3 8/9] net: dsa: microchip: init predictable IPV to queue mapping for all non KSZ8xxx variants Date: Fri, 5 Apr 2024 11:52:15 +0200 Message-Id: <20240405095216.353829-9-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240405095216.353829-1-o.rempel@pengutronix.de> References: <20240405095216.353829-1-o.rempel@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Init priority to queue mapping in the way as it shown in IEEE 802.1Q mapping example. Signed-off-by: Oleksij Rempel --- changes v2: - s/ksz_set_default_prio_queue_mapping/ksz9477_set_default_prio_queue_mappi= ng - remove error on queue < 0. --- drivers/net/dsa/microchip/ksz_common.c | 57 +++++++++++++++----------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index dc96931e62da8..3f7977a423407 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include =20 @@ -2685,9 +2686,33 @@ static int ksz_port_mdb_del(struct dsa_switch *ds, i= nt port, return dev->dev_ops->mdb_del(dev, port, mdb, db); } =20 +static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev, + int port) +{ + u32 queue_map =3D 0; + int ipv; + + for (ipv =3D 0; ipv < dev->info->num_ipvs; ipv++) { + int queue; + + /* Traffic Type (TT) is corresponding to the Internal Priority + * Value (IPV) in the switch. Traffic Class (TC) is + * corresponding to the queue in the switch. + */ + queue =3D ieee8021q_tt_to_tc(ipv, dev->info->num_tx_queues); + if (queue < 0) + return queue; + + queue_map |=3D queue << (ipv * KSZ9477_PORT_TC_MAP_S); + } + + return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map); +} + static int ksz_port_setup(struct dsa_switch *ds, int port) { struct ksz_device *dev =3D ds->priv; + int ret; =20 if (!dsa_is_user_port(ds, port)) return 0; @@ -2695,6 +2720,12 @@ static int ksz_port_setup(struct dsa_switch *ds, int= port) /* setup user port */ dev->dev_ops->port_setup(dev, port, false); =20 + if (!is_ksz8(dev)) { + ret =3D ksz9477_set_default_prio_queue_mapping(dev, port); + if (ret) + return ret; + } + /* port_stp_state_set() will be called after to enable the port so * there is no need to do anything. */ @@ -3559,8 +3590,7 @@ static int ksz_tc_ets_add(struct ksz_device *dev, int= port, =20 static int ksz_tc_ets_del(struct ksz_device *dev, int port) { - int ret, queue, tc_prio, s; - u32 queue_map =3D 0; + int ret, queue; =20 /* To restore the default chip configuration, set all queues to use the * WRR scheduler with a weight of 1. @@ -3572,31 +3602,10 @@ static int ksz_tc_ets_del(struct ksz_device *dev, i= nt port) return ret; } =20 - switch (dev->info->num_tx_queues) { - case 2: - s =3D 2; - break; - case 4: - s =3D 1; - break; - case 8: - s =3D 0; - break; - default: - return -EINVAL; - } - /* Revert the queue mapping for TC-priority to its default setting on * the chip. */ - for (tc_prio =3D 0; tc_prio < dev->info->num_ipvs; tc_prio++) { - int queue; - - queue =3D tc_prio >> s; - queue_map |=3D queue << (tc_prio * KSZ9477_PORT_TC_MAP_S); - } - - return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map); + return ksz9477_set_default_prio_queue_mapping(dev, port); } =20 static int ksz_tc_ets_validate(struct ksz_device *dev, int port, --=20 2.39.2