From: Vineeth Karumanchi <vineeth.karumanchi@amd.com>
To: <theo.lebrun@bootlin.com>, <conor.dooley@microchip.com>,
<andrew+netdev@lunn.ch>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>
Cc: <vineeth.karumanchi@amd.com>, <git@amd.com>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH net-next 4/4] net: macb: Add TSN CBS TC offload support
Date: Fri, 7 Aug 2026 15:20:12 +0530 [thread overview]
Message-ID: <20260807095012.640223-5-vineeth.karumanchi@amd.com> (raw)
In-Reply-To: <20260807095012.640223-1-vineeth.karumanchi@amd.com>
Add Credit-Based Shaper (CBS/IEEE 802.1Qav) TC offload support for
time-sensitive networking on GEM hardware. CBS is restricted to the
two highest-priority queues: Queue A (num_queues - 1) and Queue B
(num_queues - 2), matching hardware capability.
The idle slope register value is computed differently based on hardware
variant: high-speed GEM scales idleslope linearly to the full 32-bit
register range relative to link speed, while standard GEM multiplies
by a port rate factor derived from the interface width (125 for 1G
GMII, 250 for 10/100M MII).
Validate that idleslope is positive and does not exceed the link
speed, preventing negative values from bypassing the bounds check
due to signed-to-unsigned promotion.
Signed-off-by: Vineeth Karumanchi <vineeth.karumanchi@amd.com>
---
drivers/net/ethernet/cadence/macb.h | 9 ++
drivers/net/ethernet/cadence/macb_main.c | 121 +++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index f24df25923d7..d5b28459fd75 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -184,6 +184,9 @@
#define GEM_DCFG8 0x029C /* Design Config 8 */
#define GEM_DCFG10 0x02A4 /* Design Config 10 */
#define GEM_DCFG12 0x02AC /* Design Config 12 */
+#define GEM_CBS_CONTROL 0x04BC /* CBS Control Register */
+#define GEM_CBS_IDLESLOPE_Q_A 0x04C0 /* CBS IdleSlope Queue A */
+#define GEM_CBS_IDLESLOPE_Q_B 0x04C4 /* CBS IdleSlope Queue B */
#define GEM_ENST_CONTROL 0x0880 /* ENST control register */
#define GEM_USX_CONTROL 0x0A80 /* High speed PCS control register */
#define GEM_USX_STATUS 0x0A88 /* High speed PCS status register */
@@ -224,6 +227,12 @@
#define GEM_ENST_ON_TIME(hw_q) (0x0820 + ((hw_q) << 2))
#define GEM_ENST_OFF_TIME(hw_q) (0x0840 + ((hw_q) << 2))
+/* Bitfields in CBS_CONTROL */
+#define GEM_CBS_ENABLE_QUEUE_A_OFFSET 0
+#define GEM_CBS_ENABLE_QUEUE_A_SIZE 1
+#define GEM_CBS_ENABLE_QUEUE_B_OFFSET 1
+#define GEM_CBS_ENABLE_QUEUE_B_SIZE 1
+
/* Bitfields in ENST_CONTROL */
#define GEM_ENST_DISABLE_QUEUE_OFFSET 16
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 00355cc4b434..a0a68490519e 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -99,6 +99,10 @@ struct sifive_fu540_macb_mgmt {
#define MACB_MDIO_TIMEOUT 1000000 /* in usecs */
+/* CBS port transmit rate factors: 1000/interface_width */
+#define MACB_CBS_PORT_RATE_1G 125 /* 1000/8 for GMII (8-bit) */
+#define MACB_CBS_PORT_RATE_10_100M 250 /* 1000/4 for MII (4-bit) */
+
/* DMA buffer descriptor might be different size
* depends on hardware configuration:
*
@@ -4515,6 +4519,121 @@ static int macb_setup_taprio(struct net_device *ndev,
return err;
}
+static int macb_cbs_get_queue_params(struct macb *bp, u8 queue_num,
+ u32 *enable_bit, bool *is_queue_a)
+{
+ /* Queue A is highest priority (num_queues - 1) */
+ if (queue_num == bp->num_queues - 1) {
+ *enable_bit = GEM_BIT(CBS_ENABLE_QUEUE_A);
+ *is_queue_a = true;
+ return 0;
+ }
+
+ /* Queue B is second highest priority (num_queues - 2) */
+ if (queue_num == bp->num_queues - 2) {
+ *enable_bit = GEM_BIT(CBS_ENABLE_QUEUE_B);
+ *is_queue_a = false;
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+static int macb_cbs_add(struct net_device *ndev,
+ struct tc_cbs_qopt_offload *qopt)
+{
+ u32 enable_bit, idleslope, speed_kbps, ctrl;
+ struct macb *bp = netdev_priv(ndev);
+ struct ethtool_link_ksettings kset;
+ bool is_queue_a;
+ int err;
+
+ err = macb_cbs_get_queue_params(bp, qopt->queue, &enable_bit, &is_queue_a);
+ if (err) {
+ netdev_err(ndev, "CBS: Queue %d not eligible (only top 2 queues support CBS)\n",
+ qopt->queue);
+ return -EINVAL;
+ }
+
+ /* idleslope is calibrated for the current link speed; CBS is not
+ * reprogrammed on link-speed changes, so it must be reconfigured
+ * if the link speed changes.
+ */
+ phylink_ethtool_ksettings_get(bp->phylink, &kset);
+
+ if (!kset.base.speed || kset.base.speed == SPEED_UNKNOWN) {
+ netdev_err(ndev, "CBS: Invalid link speed\n");
+ return -EINVAL;
+ }
+
+ speed_kbps = kset.base.speed * 1000;
+
+ if (qopt->idleslope <= 0 || (u32)qopt->idleslope > speed_kbps) {
+ netdev_err(ndev, "CBS: invalid idleslope %d (must be 1..%u kbps)\n",
+ qopt->idleslope, speed_kbps);
+ return -EINVAL;
+ }
+
+ /* Calculate idleslope for hardware register:
+ * - High-speed GEM: scale to full 32-bit register range
+ * - Standard MACB: multiply by port transmit rate factor
+ */
+ if (bp->caps & MACB_CAPS_HIGH_SPEED)
+ idleslope = DIV_ROUND_UP_ULL((u64)qopt->idleslope * U32_MAX, speed_kbps);
+ else
+ idleslope = (u32)qopt->idleslope * (kset.base.speed >= 1000 ?
+ MACB_CBS_PORT_RATE_1G : MACB_CBS_PORT_RATE_10_100M);
+
+ scoped_guard(spinlock_irqsave, &bp->lock) {
+ /* Disable CBS for the queue before updating idleslope */
+ ctrl = gem_readl(bp, CBS_CONTROL) & ~enable_bit;
+ gem_writel(bp, CBS_CONTROL, ctrl);
+ /* Update idleslope for the queue */
+ if (is_queue_a)
+ gem_writel(bp, CBS_IDLESLOPE_Q_A, idleslope);
+ else
+ gem_writel(bp, CBS_IDLESLOPE_Q_B, idleslope);
+
+ /* Re-enable CBS for the queue with new idleslope */
+ gem_writel(bp, CBS_CONTROL, ctrl | enable_bit);
+ }
+
+ netdev_dbg(ndev, "CBS: Configured queue %d with idleslope 0x%x\n",
+ qopt->queue, idleslope);
+
+ return 0;
+}
+
+static void macb_cbs_destroy(struct net_device *ndev, u8 queue_num)
+{
+ struct macb *bp = netdev_priv(ndev);
+ bool is_queue_a;
+ u32 enable_bit;
+
+ if (macb_cbs_get_queue_params(bp, queue_num, &enable_bit, &is_queue_a))
+ return;
+
+ scoped_guard(spinlock_irqsave, &bp->lock) {
+ gem_writel(bp, CBS_CONTROL, gem_readl(bp, CBS_CONTROL) & ~enable_bit);
+ if (is_queue_a)
+ gem_writel(bp, CBS_IDLESLOPE_Q_A, 0);
+ else
+ gem_writel(bp, CBS_IDLESLOPE_Q_B, 0);
+ }
+
+ netdev_dbg(ndev, "CBS: Disabled queue %d\n", queue_num);
+}
+
+static int macb_setup_cbs(struct net_device *ndev,
+ struct tc_cbs_qopt_offload *qopt)
+{
+ if (qopt->enable)
+ return macb_cbs_add(ndev, qopt);
+
+ macb_cbs_destroy(ndev, qopt->queue);
+ return 0;
+}
+
static int macb_setup_mqprio(struct net_device *ndev,
struct tc_mqprio_qopt_offload *mqprio)
{
@@ -4594,6 +4713,8 @@ static int macb_setup_tc(struct net_device *dev, enum tc_setup_type type,
switch (type) {
case TC_SETUP_QDISC_MQPRIO:
return macb_setup_mqprio(dev, type_data);
+ case TC_SETUP_QDISC_CBS:
+ return macb_setup_cbs(dev, type_data);
case TC_SETUP_QDISC_TAPRIO:
return macb_setup_taprio(dev, type_data);
default:
--
2.44.4
next prev parent reply other threads:[~2026-08-07 9:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-07 9:50 [PATCH net-next 0/4] net: macb: Add TSN MQPRIO and CBS traffic-class offload Vineeth Karumanchi
2026-08-07 9:50 ` [PATCH net-next 1/4] net: macb: Rename MACB_CAPS_QBV to MACB_CAPS_TC Vineeth Karumanchi
2026-08-07 17:09 ` Conor Dooley
2026-08-07 18:26 ` Théo Lebrun
2026-08-07 9:50 ` [PATCH net-next 2/4] net: macb: Move TC capability and PM checks to macb_setup_tc() Vineeth Karumanchi
2026-08-07 9:50 ` [PATCH net-next 3/4] net: macb: Add MQPRIO qdisc hardware offload support Vineeth Karumanchi
2026-08-07 9:50 ` Vineeth Karumanchi [this message]
2026-08-07 17:32 ` [PATCH net-next 4/4] net: macb: Add TSN CBS TC " Conor Dooley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260807095012.640223-5-vineeth.karumanchi@amd.com \
--to=vineeth.karumanchi@amd.com \
--cc=andrew+netdev@lunn.ch \
--cc=conor.dooley@microchip.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=git@amd.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=theo.lebrun@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox