* [PATCH net-next v2 0/2] Add Frame Preemption MAC Merge support for ICSSG @ 2026-02-04 14:00 Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 1/2] net: ti: icssg-prueth: Add Frame Preemption MAC Merge support Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge Meghana Malladi 0 siblings, 2 replies; 4+ messages in thread From: Meghana Malladi @ 2026-02-04 14:00 UTC (permalink / raw) To: vadim.fedorenko, jacob.e.keller, horms, parvathi, afd, m-malladi, vladimir.oltean, rogerq, danishanwar, pabeni, kuba, edumazet, davem, andrew+netdev Cc: linux-arm-kernel, netdev, linux-kernel, srk, Vignesh Raghavendra This patch series adds QoS support to the ICSSG PRUETH driver. The first patch implements mqprio qdisc handling and TC offload hooks so userspace can request TC mappings and queue counts. It also integrates a driver-side mechanism to program the firmware with the IET/FPE preemption mask and to kick the firmware verify state machine when frame preemption is enabled. The second patch adds ethtool perations for the MAC Merge (Frame Preemption) sublayer, exposing .get_mm, .set_mm and .get_mm_stats so admins can view and change MAC Merge parameters and retrieve preemption statistics. MD Danish Anwar (2): net: ti: icssg-prueth: Add Frame Preemption MAC Merge support net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/icssg/icssg_config.h | 9 - drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 86 ++++++- drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 5 +- drivers/net/ethernet/ti/icssg/icssg_qos.c | 216 ++++++++++++++++++ drivers/net/ethernet/ti/icssg/icssg_qos.h | 78 +++++++ drivers/net/ethernet/ti/icssg/icssg_stats.c | 1 - drivers/net/ethernet/ti/icssg/icssg_stats.h | 5 + .../net/ethernet/ti/icssg/icssg_switch_map.h | 5 + 10 files changed, 399 insertions(+), 13 deletions(-) create mode 100644 drivers/net/ethernet/ti/icssg/icssg_qos.c create mode 100644 drivers/net/ethernet/ti/icssg/icssg_qos.h base-commit: 9a9424c756feee9ee6e717405a9d6fa7bacdef08 -- 2.43.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next v2 1/2] net: ti: icssg-prueth: Add Frame Preemption MAC Merge support 2026-02-04 14:00 [PATCH net-next v2 0/2] Add Frame Preemption MAC Merge support for ICSSG Meghana Malladi @ 2026-02-04 14:00 ` Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge Meghana Malladi 1 sibling, 0 replies; 4+ messages in thread From: Meghana Malladi @ 2026-02-04 14:00 UTC (permalink / raw) To: vadim.fedorenko, jacob.e.keller, horms, parvathi, afd, m-malladi, vladimir.oltean, rogerq, danishanwar, pabeni, kuba, edumazet, davem, andrew+netdev Cc: linux-arm-kernel, netdev, linux-kernel, srk, Vignesh Raghavendra From: MD Danish Anwar <danishanwar@ti.com> This patch introduces qos support for the icssg driver. This includes adding support to configure mqprio qdisc and IET FPE. By default all the queues are marked as express which can be overwritten by the mqprio tc mask passed by tc qdisc. icssg_config_ietfpe() work thread takes care of configuring IET FPE in the firmware and triggering the verify state machine based on the MAC Merge sublayer parameters set by the ethtool. The firmware handles the cleanup after successful mac verification. And in case the remote peer fails to respond to verify command before the timeout (5secs), then FPE is disabled by firmware. During link up/down, verify state machine gets triggered again based on the state of fpe_enabled and fpe_active. Signed-off-by: MD Danish Anwar <danishanwar@ti.com> Signed-off-by: Meghana Malladi <m-malladi@ti.com> --- v2-v1: - Move icssg_qos_link_up/down() to if-statement right above as suggested by Vadim Fedorenko <vadim.fedorenko@linux.dev> - Fix p_mqprio dereference without initialization as flagged by Simon Horman <horms@kernel.org> - Following changes as suggested by Vladimir Oltean <vladimir.oltean@nxp.com>: * Provide more detailed commit message * Fix the ordering of the functions to avoid forward declarations * Fix the bug w.r.t scheduling work: fpe_config_task without initialising it * Fix the logic for icssg_iet_set_preempt_mask() - configure the queues based on user requests only. * Remove prueth_mqprio_validate() as this duplicates what "caps->validate_queue_counts = true" does. * Remove clearing PRE_EMPTION_ENABLE_TX on failure which is irrelevant - ACTIVE status never transitions to true. * Fix handling of these flags: iet->configured<->iet->fpe_enabled and iet->fpe_enabled<->iet->fpe_active * Schedule asynchronous work without waiting for any timeout * Remove cancel_fpe_config argument from prueth_qos_iet structure - no reader * Remove mentioning "priv flags" in the comments for prueth_qos_iet struct drivers/net/ethernet/ti/Makefile | 2 +- drivers/net/ethernet/ti/icssg/icssg_config.h | 9 - drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 2 + drivers/net/ethernet/ti/icssg/icssg_qos.c | 216 +++++++++++++++++++ drivers/net/ethernet/ti/icssg/icssg_qos.h | 58 +++++ 6 files changed, 282 insertions(+), 10 deletions(-) create mode 100644 drivers/net/ethernet/ti/icssg/icssg_qos.c create mode 100644 drivers/net/ethernet/ti/icssg/icssg_qos.h diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile index 93c0a4d0e33a..2f588663fdf0 100644 --- a/drivers/net/ethernet/ti/Makefile +++ b/drivers/net/ethernet/ti/Makefile @@ -35,7 +35,7 @@ ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o obj-$(CONFIG_TI_ICSSG_PRUETH) += icssg-prueth.o icssg.o -icssg-prueth-y := icssg/icssg_prueth.o icssg/icssg_switchdev.o +icssg-prueth-y := icssg/icssg_prueth.o icssg/icssg_switchdev.o icssg/icssg_qos.o obj-$(CONFIG_TI_ICSSG_PRUETH_SR1) += icssg-prueth-sr1.o icssg.o icssg-prueth-sr1-y := icssg/icssg_prueth_sr1.o diff --git a/drivers/net/ethernet/ti/icssg/icssg_config.h b/drivers/net/ethernet/ti/icssg/icssg_config.h index 60d69744ffae..1ac202f855ed 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_config.h +++ b/drivers/net/ethernet/ti/icssg/icssg_config.h @@ -323,13 +323,4 @@ struct prueth_fdb_slot { u8 fid; u8 fid_c2; } __packed; - -enum icssg_ietfpe_verify_states { - ICSSG_IETFPE_STATE_UNKNOWN = 0, - ICSSG_IETFPE_STATE_INITIAL, - ICSSG_IETFPE_STATE_VERIFYING, - ICSSG_IETFPE_STATE_SUCCEEDED, - ICSSG_IETFPE_STATE_FAILED, - ICSSG_IETFPE_STATE_DISABLED -}; #endif /* __NET_TI_ICSSG_CONFIG_H */ diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index f65041662173..1e4bc5fd636e 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -374,9 +374,11 @@ static void emac_adjust_link(struct net_device *ndev) spin_unlock_irqrestore(&emac->lock, flags); icssg_config_set_speed(emac); icssg_set_port_state(emac, ICSSG_EMAC_PORT_FORWARD); + icssg_qos_link_up(ndev); } else { icssg_set_port_state(emac, ICSSG_EMAC_PORT_DISABLE); + icssg_qos_link_down(ndev); } } @@ -967,6 +969,8 @@ static int emac_ndo_open(struct net_device *ndev) if (ret) goto destroy_rxq; + icssg_qos_init(ndev); + /* start PHY */ phy_start(ndev->phydev); @@ -1421,6 +1425,7 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_hwtstamp_get = icssg_ndo_get_ts_config, .ndo_hwtstamp_set = icssg_ndo_set_ts_config, .ndo_xsk_wakeup = prueth_xsk_wakeup, + .ndo_setup_tc = icssg_qos_ndo_setup_tc, }; static int prueth_netdev_init(struct prueth *prueth, diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h index 10eadd356650..7a586038adf8 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h @@ -44,6 +44,7 @@ #include "icssg_config.h" #include "icss_iep.h" #include "icssg_switch_map.h" +#include "icssg_qos.h" #define PRUETH_MAX_MTU (2000 - ETH_HLEN - ETH_FCS_LEN) #define PRUETH_MIN_PKT_SIZE (VLAN_ETH_ZLEN) @@ -255,6 +256,7 @@ struct prueth_emac { struct bpf_prog *xdp_prog; struct xdp_attachment_info xdpi; int xsk_qid; + struct prueth_qos qos; }; /* The buf includes headroom compatible with both skb and xdpf */ diff --git a/drivers/net/ethernet/ti/icssg/icssg_qos.c b/drivers/net/ethernet/ti/icssg/icssg_qos.c new file mode 100644 index 000000000000..8d17b28357f8 --- /dev/null +++ b/drivers/net/ethernet/ti/icssg/icssg_qos.c @@ -0,0 +1,216 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Texas Instruments ICSSG PRUETH QoS submodule + * Copyright (C) 2023 Texas Instruments Incorporated - http://www.ti.com/ + */ + +#include "icssg_prueth.h" +#include "icssg_switch_map.h" + +static void icssg_iet_set_preempt_mask(struct prueth_emac *emac, u8 preemptible_tcs) +{ + void __iomem *config = emac->dram.va + ICSSG_CONFIG_OFFSET; + struct prueth_qos_mqprio *p_mqprio = &emac->qos.mqprio; + struct tc_mqprio_qopt *qopt = &p_mqprio->mqprio.qopt; + int prempt_mask = 0, i; + u8 tc; + + /* Configure the queues based on the preemptible tc map set by the user */ + for (tc = 0; tc < p_mqprio->mqprio.qopt.num_tc; tc++) { + /* check if the tc is preemptive or not */ + if (preemptible_tcs & BIT(tc)) { + for (i = qopt->offset[tc]; i < qopt->offset[tc] + qopt->count[tc]; i++) { + /* Set all the queues in this tc as preemptive queues */ + writeb(BIT(4), config + EXPRESS_PRE_EMPTIVE_Q_MAP + i); + prempt_mask &= ~BIT(i); + } + } else { + /* Set all the queues in this tc as express queues */ + for (i = qopt->offset[tc]; i < qopt->offset[tc] + qopt->count[tc]; i++) { + writeb(0, config + EXPRESS_PRE_EMPTIVE_Q_MAP + i); + prempt_mask |= BIT(i); + } + } + writeb(prempt_mask, config + EXPRESS_PRE_EMPTIVE_Q_MASK); + netdev_set_tc_queue(emac->ndev, tc, qopt->count[tc], qopt->offset[tc]); + } +} + +static void icssg_config_ietfpe(struct work_struct *work) +{ + struct prueth_qos_iet *iet = + container_of(work, struct prueth_qos_iet, fpe_config_task); + void __iomem *config = iet->emac->dram.va + ICSSG_CONFIG_OFFSET; + struct prueth_qos_mqprio *p_mqprio = &iet->emac->qos.mqprio; + bool enable = !!atomic_read(&iet->enable_fpe_config); + int ret; + u8 val; + + if (!netif_running(iet->emac->ndev)) + return; + + /* Update FPE Tx enable bit (PRE_EMPTION_ACTIVE_TX) if + * fpe_enabled is set to enable MM in Tx direction + */ + writeb(enable ? 1 : 0, config + PRE_EMPTION_ENABLE_TX); + + /* If FPE is to be enabled, first configure MAC Verify state + * machine in firmware as firmware kicks the Verify process + * as soon as ICSSG_EMAC_PORT_PREMPT_TX_ENABLE command is + * received. + */ + if (enable && iet->mac_verify_configure) { + writeb(1, config + PRE_EMPTION_ENABLE_VERIFY); + writew(iet->tx_min_frag_size, config + PRE_EMPTION_ADD_FRAG_SIZE_LOCAL); + writel(iet->verify_time_ms, config + PRE_EMPTION_VERIFY_TIME); + } + + /* Send command to enable FPE Tx side. Rx is always enabled */ + ret = icssg_set_port_state(iet->emac, + enable ? ICSSG_EMAC_PORT_PREMPT_TX_ENABLE : + ICSSG_EMAC_PORT_PREMPT_TX_DISABLE); + if (ret) { + netdev_err(iet->emac->ndev, "TX preempt %s command failed\n", + str_enable_disable(enable)); + writeb(0, config + PRE_EMPTION_ENABLE_VERIFY); + iet->verify_status = ICSSG_IETFPE_STATE_DISABLED; + return; + } + + if (enable && iet->mac_verify_configure) { + ret = readb_poll_timeout(config + PRE_EMPTION_VERIFY_STATUS, iet->verify_status, + (iet->verify_status == ICSSG_IETFPE_STATE_SUCCEEDED), + USEC_PER_MSEC, 5 * USEC_PER_SEC); + if (ret) { + iet->verify_status = ICSSG_IETFPE_STATE_FAILED; + netdev_err(iet->emac->ndev, + "timeout for MAC Verify: status %x\n", + iet->verify_status); + return; + } + } else if (enable) { + /* Give f/w some time to update PRE_EMPTION_ACTIVE_TX state */ + usleep_range(100, 200); + } + + if (enable) { + val = readb(config + PRE_EMPTION_ACTIVE_TX); + if (val != 1) { + netdev_err(iet->emac->ndev, + "F/w fails to activate IET/FPE\n"); + return; + } + iet->fpe_active = true; + } else { + iet->fpe_active = false; + } + + netdev_info(iet->emac->ndev, "IET FPE %s successfully\n", + str_enable_disable(iet->fpe_active)); + icssg_iet_set_preempt_mask(iet->emac, p_mqprio->preemptible_tcs); +} + +void icssg_qos_init(struct net_device *ndev) +{ + struct prueth_emac *emac = netdev_priv(ndev); + struct prueth_qos_iet *iet = &emac->qos.iet; + + /* Init work queue for IET MAC verify process */ + iet->emac = emac; + INIT_WORK(&iet->fpe_config_task, icssg_config_ietfpe); +} + +static int emac_tc_query_caps(struct net_device *ndev, void *type_data) +{ + struct tc_query_caps_base *base = type_data; + + switch (base->type) { + case TC_SETUP_QDISC_MQPRIO: { + struct tc_mqprio_caps *caps = base->caps; + + caps->validate_queue_counts = true; + return 0; + } + default: + return -EOPNOTSUPP; + } +} + +static int emac_tc_setup_mqprio(struct net_device *ndev, void *type_data) +{ + struct tc_mqprio_qopt_offload *mqprio = type_data; + struct prueth_emac *emac = netdev_priv(ndev); + struct tc_mqprio_qopt *qopt = &mqprio->qopt; + struct prueth_qos_mqprio *p_mqprio; + u8 num_tc = mqprio->qopt.num_tc; + int tc, offset, count; + + p_mqprio = &emac->qos.mqprio; + + if (!num_tc) { + netdev_reset_tc(ndev); + p_mqprio->preemptible_tcs = 0; + goto reset_tcs; + } + + memcpy(&p_mqprio->mqprio, mqprio, sizeof(*mqprio)); + p_mqprio->preemptible_tcs = mqprio->preemptible_tcs; + netdev_set_num_tc(ndev, mqprio->qopt.num_tc); + + for (tc = 0; tc < num_tc; tc++) { + count = qopt->count[tc]; + offset = qopt->offset[tc]; + netdev_set_tc_queue(ndev, tc, count, offset); + } + +reset_tcs: + icssg_iet_set_preempt_mask(emac, p_mqprio->preemptible_tcs); + + return 0; +} + +int icssg_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type, + void *type_data) +{ + switch (type) { + case TC_QUERY_CAPS: + return emac_tc_query_caps(ndev, type_data); + case TC_SETUP_QDISC_MQPRIO: + return emac_tc_setup_mqprio(ndev, type_data); + default: + return -EOPNOTSUPP; + } +} +EXPORT_SYMBOL_GPL(icssg_qos_ndo_setup_tc); + +void icssg_qos_link_up(struct net_device *ndev) +{ + struct prueth_emac *emac = netdev_priv(ndev); + struct prueth_qos_iet *iet = &emac->qos.iet; + + /* Enable FPE if not active but fpe_enabled is true + * and disable FPE if active but fpe_enabled is false + */ + if (!iet->fpe_active && iet->fpe_enabled) { + /* Schedule IET FPE IET FPE enable */ + atomic_set(&iet->enable_fpe_config, 1); + } else if (iet->fpe_active && !iet->fpe_enabled) { + /* Schedule IET FPE IET FPE disable */ + atomic_set(&iet->enable_fpe_config, 0); + } else { + return; + } + schedule_work(&iet->fpe_config_task); +} + +void icssg_qos_link_down(struct net_device *ndev) +{ + struct prueth_emac *emac = netdev_priv(ndev); + struct prueth_qos_iet *iet = &emac->qos.iet; + + /* disable FPE if active during link down */ + if (iet->fpe_active) { + /* Schedule IET FPE IET FPE disable */ + atomic_set(&iet->enable_fpe_config, 0); + schedule_work(&iet->fpe_config_task); + } +} diff --git a/drivers/net/ethernet/ti/icssg/icssg_qos.h b/drivers/net/ethernet/ti/icssg/icssg_qos.h new file mode 100644 index 000000000000..8aa79b68ad54 --- /dev/null +++ b/drivers/net/ethernet/ti/icssg/icssg_qos.h @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2023 Texas Instruments Incorporated - http://www.ti.com/ + */ + +#ifndef __NET_TI_ICSSG_QOS_H +#define __NET_TI_ICSSG_QOS_H + +#include <linux/atomic.h> +#include <linux/netdevice.h> +#include <net/pkt_sched.h> + +enum icssg_ietfpe_verify_states { + ICSSG_IETFPE_STATE_UNKNOWN = 0, + ICSSG_IETFPE_STATE_INITIAL, + ICSSG_IETFPE_STATE_VERIFYING, + ICSSG_IETFPE_STATE_SUCCEEDED, + ICSSG_IETFPE_STATE_FAILED, + ICSSG_IETFPE_STATE_DISABLED +}; + +struct prueth_qos_mqprio { + struct tc_mqprio_qopt_offload mqprio; + u8 preemptible_tcs; +}; + +struct prueth_qos_iet { + struct work_struct fpe_config_task; + struct prueth_emac *emac; + atomic_t enable_fpe_config; + /* Set when IET frame preemption is enabled via ethtool */ + bool fpe_enabled; + /* Set when the IET MAC Verify state machine is enabled + * via ethtool + */ + bool mac_verify_configure; + /* Min TX fragment size, set via ethtool */ + u32 tx_min_frag_size; + /* wait time between verification attempts in ms (according to clause + * 30.14.1.6 aMACMergeVerifyTime), set via ethtool + */ + u32 verify_time_ms; + /* Set if IET FPE is active */ + bool fpe_active; + /* State of verification state machine */ + enum icssg_ietfpe_verify_states verify_status; +}; + +struct prueth_qos { + struct prueth_qos_iet iet; + struct prueth_qos_mqprio mqprio; +}; + +void icssg_qos_init(struct net_device *ndev); +void icssg_qos_link_up(struct net_device *ndev); +void icssg_qos_link_down(struct net_device *ndev); +int icssg_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type, + void *type_data); +#endif /* __NET_TI_ICSSG_QOS_H */ -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge 2026-02-04 14:00 [PATCH net-next v2 0/2] Add Frame Preemption MAC Merge support for ICSSG Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 1/2] net: ti: icssg-prueth: Add Frame Preemption MAC Merge support Meghana Malladi @ 2026-02-04 14:00 ` Meghana Malladi 2026-02-04 23:30 ` kernel test robot 1 sibling, 1 reply; 4+ messages in thread From: Meghana Malladi @ 2026-02-04 14:00 UTC (permalink / raw) To: vadim.fedorenko, jacob.e.keller, horms, parvathi, afd, m-malladi, vladimir.oltean, rogerq, danishanwar, pabeni, kuba, edumazet, davem, andrew+netdev Cc: linux-arm-kernel, netdev, linux-kernel, srk, Vignesh Raghavendra From: MD Danish Anwar <danishanwar@ti.com> Add driver support for viewing / changing the MAC Merge sublayer parameters and dump the Mac Merge stats via ethtool ops: .set_mm(), .get_mm() and .get_mm_stats(). The minimum size of non-final mPacket fragments supported by the firmware without leading errors is 64 Bytes (in octets). Add a check to ensure user passed tx_min_frag_size argument via ethtool, honors this . Add pa stats registers to check statistics for preemption, which can be dumped using ethtool ops. Signed-off-by: MD Danish Anwar <danishanwar@ti.com> Signed-off-by: Meghana Malladi <m-malladi@ti.com> --- v2-v1: - Following changes have been done as suggested by Vladimir Oltean <vladimir.oltean@nxp.com> * Add sanity check to ensure valid min_frag_size is requested by the user. * Add comments wherever applicable w.r.t min_frag_size. * Make it uniform to return all valures from the driver for .get_mm() * Use ETHTOOL_MM_MAX_VERIFY_TIME_MS macro for 128 * Use NL_SET_ERR_MSG_MOD() wherever applicable * Re-schedule the iet work thread whenever there .set_mm() get called based on fpe_enabled flag. drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 86 ++++++++++++++++++- drivers/net/ethernet/ti/icssg/icssg_prueth.h | 3 +- drivers/net/ethernet/ti/icssg/icssg_qos.h | 20 +++++ drivers/net/ethernet/ti/icssg/icssg_stats.c | 1 - drivers/net/ethernet/ti/icssg/icssg_stats.h | 5 ++ .../net/ethernet/ti/icssg/icssg_switch_map.h | 5 ++ 6 files changed, 117 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c index b715af21d23a..3c4ff154f6d1 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c +++ b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c @@ -6,7 +6,6 @@ */ #include "icssg_prueth.h" -#include "icssg_stats.h" static void emac_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info) @@ -294,6 +293,88 @@ static int emac_set_per_queue_coalesce(struct net_device *ndev, u32 queue, return 0; } +static int emac_get_mm(struct net_device *ndev, struct ethtool_mm_state *state) +{ + struct prueth_emac *emac = netdev_priv(ndev); + struct prueth_qos_iet *iet = &emac->qos.iet; + + state->tx_enabled = iet->fpe_enabled; + state->pmac_enabled = true; + state->tx_min_frag_size = iet->tx_min_frag_size; + /* 64Bytes is the minimum fragment size supported + * by the firmware. <64B leads to min frame errors + */ + state->rx_min_frag_size = 64; + state->tx_active = iet->fpe_active; + state->verify_enabled = iet->mac_verify_configure; + state->verify_time = iet->verify_time_ms; + + switch (iet->verify_status) { + case ICSSG_IETFPE_STATE_DISABLED: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_DISABLED; + break; + case ICSSG_IETFPE_STATE_SUCCEEDED: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED; + break; + case ICSSG_IETFPE_STATE_FAILED: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_FAILED; + break; + default: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_UNKNOWN; + break; + } + + /* 802.3-2018 clause 30.14.1.6, says that the aMACMergeVerifyTime + * variable has a range between 1 and 128 ms inclusive. Limit to that. + */ + state->max_verify_time = ETHTOOL_MM_MAX_VERIFY_TIME_MS; + + return 0; +} + +static int emac_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg, + struct netlink_ext_ack *extack) +{ + struct prueth_emac *emac = netdev_priv(ndev); + struct prueth_qos_iet *iet = &emac->qos.iet; + int err; + + if (!cfg->pmac_enabled) + NL_SET_ERR_MSG_MOD(extack, "preemptible MAC is always enabled"); + + err = icssg_qos_frag_size_min_to_add(cfg->tx_min_frag_size, extack); + if (err) + return err; + + iet->verify_time_ms = cfg->verify_time; + iet->tx_min_frag_size = cfg->tx_min_frag_size; + + iet->fpe_enabled = cfg->tx_enabled; + iet->mac_verify_configure = cfg->verify_enabled; + + /* Re-trigger the state machine to incorporate the updated configuration */ + if (iet->fpe_enabled) + atomic_set(&iet->enable_fpe_config, 1); + else + atomic_set(&iet->enable_fpe_config, 0); + + schedule_work(&iet->fpe_config_task); + + return 0; +} + +static void emac_get_mm_stats(struct net_device *ndev, + struct ethtool_mm_stats *s) +{ + struct prueth_emac *emac = netdev_priv(ndev); + + s->MACMergeFrameAssOkCount = emac_get_stat_by_name(emac, "FW_PREEMPT_ASSEMBLY_OK"); + s->MACMergeFrameAssErrorCount = emac_get_stat_by_name(emac, "FW_PREEMPT_ASSEMBLY_ERR"); + s->MACMergeFragCountRx = emac_get_stat_by_name(emac, "FW_PREEMPT_FRAG_CNT_RX"); + s->MACMergeFragCountTx = emac_get_stat_by_name(emac, "FW_PREEMPT_FRAG_CNT_TX"); + s->MACMergeFrameSmdErrorCount = emac_get_stat_by_name(emac, "FW_PREEMPT_BAD_FRAG"); +} + const struct ethtool_ops icssg_ethtool_ops = { .get_drvinfo = emac_get_drvinfo, .get_msglevel = emac_get_msglevel, @@ -317,5 +398,8 @@ const struct ethtool_ops icssg_ethtool_ops = { .set_eee = emac_set_eee, .nway_reset = emac_nway_reset, .get_rmon_stats = emac_get_rmon_stats, + .get_mm = emac_get_mm, + .set_mm = emac_set_mm, + .get_mm_stats = emac_get_mm_stats, }; EXPORT_SYMBOL_GPL(icssg_ethtool_ops); diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h index 7a586038adf8..1309af6aab78 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h @@ -45,6 +45,7 @@ #include "icss_iep.h" #include "icssg_switch_map.h" #include "icssg_qos.h" +#include "icssg_stats.h" #define PRUETH_MAX_MTU (2000 - ETH_HLEN - ETH_FCS_LEN) #define PRUETH_MIN_PKT_SIZE (VLAN_ETH_ZLEN) @@ -58,7 +59,7 @@ #define ICSSG_MAX_RFLOWS 8 /* per slice */ -#define ICSSG_NUM_PA_STATS 32 +#define ICSSG_NUM_PA_STATS ARRAY_SIZE(icssg_all_pa_stats) #define ICSSG_NUM_MIIG_STATS 60 /* Number of ICSSG related stats */ #define ICSSG_NUM_STATS (ICSSG_NUM_MIIG_STATS + ICSSG_NUM_PA_STATS) diff --git a/drivers/net/ethernet/ti/icssg/icssg_qos.h b/drivers/net/ethernet/ti/icssg/icssg_qos.h index 8aa79b68ad54..b18a93f9181a 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_qos.h +++ b/drivers/net/ethernet/ti/icssg/icssg_qos.h @@ -55,4 +55,24 @@ void icssg_qos_link_up(struct net_device *ndev); void icssg_qos_link_down(struct net_device *ndev); int icssg_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type, void *type_data); +static inline int icssg_qos_frag_size_min_to_add(u32 min_frag_size, + struct netlink_ext_ack *extack) +{ + /* The minimum size of the non-final mPacket supported + * by the firmware is 64B and multiples of 64B. + */ + if (min_frag_size < 64) { + NL_SET_ERR_MSG_MOD(extack, + "tx_min_frag_size must be at least 64 bytes"); + return -EINVAL; + } + + if (min_frag_size % (ETH_ZLEN + ETH_FCS_LEN)) { + NL_SET_ERR_MSG_MOD(extack, + "tx_min_frag_size must be a multiple of 64 bytes"); + return -EINVAL; + } + + return 0; +} #endif /* __NET_TI_ICSSG_QOS_H */ diff --git a/drivers/net/ethernet/ti/icssg/icssg_stats.c b/drivers/net/ethernet/ti/icssg/icssg_stats.c index 7159baa0155c..d27e1c48976f 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_stats.c +++ b/drivers/net/ethernet/ti/icssg/icssg_stats.c @@ -6,7 +6,6 @@ */ #include "icssg_prueth.h" -#include "icssg_stats.h" #include <linux/regmap.h> #define ICSSG_TX_PACKET_OFFSET 0xA0 diff --git a/drivers/net/ethernet/ti/icssg/icssg_stats.h b/drivers/net/ethernet/ti/icssg/icssg_stats.h index 5ec0b38e0c67..f35ae1b4f846 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_stats.h +++ b/drivers/net/ethernet/ti/icssg/icssg_stats.h @@ -189,6 +189,11 @@ static const struct icssg_pa_stats icssg_all_pa_stats[] = { ICSSG_PA_STATS(FW_INF_DROP_PRIOTAGGED), ICSSG_PA_STATS(FW_INF_DROP_NOTAG), ICSSG_PA_STATS(FW_INF_DROP_NOTMEMBER), + ICSSG_PA_STATS(FW_PREEMPT_BAD_FRAG), + ICSSG_PA_STATS(FW_PREEMPT_ASSEMBLY_ERR), + ICSSG_PA_STATS(FW_PREEMPT_FRAG_CNT_TX), + ICSSG_PA_STATS(FW_PREEMPT_ASSEMBLY_OK), + ICSSG_PA_STATS(FW_PREEMPT_FRAG_CNT_RX), ICSSG_PA_STATS(FW_RX_EOF_SHORT_FRMERR), ICSSG_PA_STATS(FW_RX_B0_DROP_EARLY_EOF), ICSSG_PA_STATS(FW_TX_JUMBO_FRM_CUTOFF), diff --git a/drivers/net/ethernet/ti/icssg/icssg_switch_map.h b/drivers/net/ethernet/ti/icssg/icssg_switch_map.h index 7e053b8af3ec..855fd4ed0b3f 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_switch_map.h +++ b/drivers/net/ethernet/ti/icssg/icssg_switch_map.h @@ -256,6 +256,11 @@ #define FW_INF_DROP_PRIOTAGGED 0x0148 #define FW_INF_DROP_NOTAG 0x0150 #define FW_INF_DROP_NOTMEMBER 0x0158 +#define FW_PREEMPT_BAD_FRAG 0x0160 +#define FW_PREEMPT_ASSEMBLY_ERR 0x0168 +#define FW_PREEMPT_FRAG_CNT_TX 0x0170 +#define FW_PREEMPT_ASSEMBLY_OK 0x0178 +#define FW_PREEMPT_FRAG_CNT_RX 0x0180 #define FW_RX_EOF_SHORT_FRMERR 0x0188 #define FW_RX_B0_DROP_EARLY_EOF 0x0190 #define FW_TX_JUMBO_FRM_CUTOFF 0x0198 -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge 2026-02-04 14:00 ` [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge Meghana Malladi @ 2026-02-04 23:30 ` kernel test robot 0 siblings, 0 replies; 4+ messages in thread From: kernel test robot @ 2026-02-04 23:30 UTC (permalink / raw) To: Meghana Malladi, vadim.fedorenko, jacob.e.keller, horms, parvathi, afd, vladimir.oltean, rogerq, danishanwar, pabeni, kuba, edumazet, davem, andrew+netdev Cc: oe-kbuild-all, linux-arm-kernel, netdev, linux-kernel, srk, Vignesh Raghavendra Hi Meghana, kernel test robot noticed the following build warnings: [auto build test WARNING on 9a9424c756feee9ee6e717405a9d6fa7bacdef08] url: https://github.com/intel-lab-lkp/linux/commits/Meghana-Malladi/net-ti-icssg-prueth-Add-Frame-Preemption-MAC-Merge-support/20260204-220543 base: 9a9424c756feee9ee6e717405a9d6fa7bacdef08 patch link: https://lore.kernel.org/r/20260204140044.4086725-3-m-malladi%40ti.com patch subject: [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge config: arm64-defconfig (https://download.01.org/0day-ci/archive/20260205/202602050744.pYAnjG71-lkp@intel.com/config) compiler: aarch64-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260205/202602050744.pYAnjG71-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202602050744.pYAnjG71-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from drivers/net/ethernet/ti/icssg/icssg_prueth.h:48, from drivers/net/ethernet/ti/icssg/icssg_prueth.c:34: >> drivers/net/ethernet/ti/icssg/icssg_stats.h:93:38: warning: 'icssg_all_miig_stats' defined but not used [-Wunused-const-variable=] 93 | static const struct icssg_miig_stats icssg_all_miig_stats[] = { | ^~~~~~~~~~~~~~~~~~~~ vim +/icssg_all_miig_stats +93 drivers/net/ethernet/ti/icssg/icssg_stats.h c1e10d5dc7a1be MD Danish Anwar 2023-08-01 92 550ee90ac61c1f MD Danish Anwar 2024-08-22 @93 static const struct icssg_miig_stats icssg_all_miig_stats[] = { c1e10d5dc7a1be MD Danish Anwar 2023-08-01 94 /* Rx */ 550ee90ac61c1f MD Danish Anwar 2024-08-22 95 ICSSG_MIIG_STATS(rx_packets, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 96 ICSSG_MIIG_STATS(rx_broadcast_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 97 ICSSG_MIIG_STATS(rx_multicast_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 98 ICSSG_MIIG_STATS(rx_crc_errors, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 99 ICSSG_MIIG_STATS(rx_mii_error_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 100 ICSSG_MIIG_STATS(rx_odd_nibble_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 101 ICSSG_MIIG_STATS(rx_frame_max_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 102 ICSSG_MIIG_STATS(rx_max_size_error_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 103 ICSSG_MIIG_STATS(rx_frame_min_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 104 ICSSG_MIIG_STATS(rx_min_size_error_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 105 ICSSG_MIIG_STATS(rx_over_errors, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 106 ICSSG_MIIG_STATS(rx_class0_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 107 ICSSG_MIIG_STATS(rx_class1_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 108 ICSSG_MIIG_STATS(rx_class2_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 109 ICSSG_MIIG_STATS(rx_class3_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 110 ICSSG_MIIG_STATS(rx_class4_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 111 ICSSG_MIIG_STATS(rx_class5_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 112 ICSSG_MIIG_STATS(rx_class6_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 113 ICSSG_MIIG_STATS(rx_class7_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 114 ICSSG_MIIG_STATS(rx_class8_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 115 ICSSG_MIIG_STATS(rx_class9_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 116 ICSSG_MIIG_STATS(rx_class10_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 117 ICSSG_MIIG_STATS(rx_class11_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 118 ICSSG_MIIG_STATS(rx_class12_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 119 ICSSG_MIIG_STATS(rx_class13_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 120 ICSSG_MIIG_STATS(rx_class14_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 121 ICSSG_MIIG_STATS(rx_class15_hits, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 122 ICSSG_MIIG_STATS(rx_smd_frags, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 123 ICSSG_MIIG_STATS(rx_bucket1_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 124 ICSSG_MIIG_STATS(rx_bucket2_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 125 ICSSG_MIIG_STATS(rx_bucket3_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 126 ICSSG_MIIG_STATS(rx_bucket4_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 127 ICSSG_MIIG_STATS(rx_64B_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 128 ICSSG_MIIG_STATS(rx_bucket1_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 129 ICSSG_MIIG_STATS(rx_bucket2_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 130 ICSSG_MIIG_STATS(rx_bucket3_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 131 ICSSG_MIIG_STATS(rx_bucket4_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 132 ICSSG_MIIG_STATS(rx_bucket5_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 133 ICSSG_MIIG_STATS(rx_bytes, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 134 ICSSG_MIIG_STATS(rx_tx_total_bytes, false), c1e10d5dc7a1be MD Danish Anwar 2023-08-01 135 /* Tx */ 550ee90ac61c1f MD Danish Anwar 2024-08-22 136 ICSSG_MIIG_STATS(tx_packets, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 137 ICSSG_MIIG_STATS(tx_broadcast_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 138 ICSSG_MIIG_STATS(tx_multicast_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 139 ICSSG_MIIG_STATS(tx_odd_nibble_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 140 ICSSG_MIIG_STATS(tx_underflow_errors, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 141 ICSSG_MIIG_STATS(tx_frame_max_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 142 ICSSG_MIIG_STATS(tx_max_size_error_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 143 ICSSG_MIIG_STATS(tx_frame_min_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 144 ICSSG_MIIG_STATS(tx_min_size_error_frames, false), 550ee90ac61c1f MD Danish Anwar 2024-08-22 145 ICSSG_MIIG_STATS(tx_bucket1_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 146 ICSSG_MIIG_STATS(tx_bucket2_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 147 ICSSG_MIIG_STATS(tx_bucket3_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 148 ICSSG_MIIG_STATS(tx_bucket4_size, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 149 ICSSG_MIIG_STATS(tx_64B_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 150 ICSSG_MIIG_STATS(tx_bucket1_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 151 ICSSG_MIIG_STATS(tx_bucket2_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 152 ICSSG_MIIG_STATS(tx_bucket3_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 153 ICSSG_MIIG_STATS(tx_bucket4_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 154 ICSSG_MIIG_STATS(tx_bucket5_frames, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 155 ICSSG_MIIG_STATS(tx_bytes, true), 550ee90ac61c1f MD Danish Anwar 2024-08-22 156 }; 550ee90ac61c1f MD Danish Anwar 2024-08-22 157 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-02-04 23:31 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-02-04 14:00 [PATCH net-next v2 0/2] Add Frame Preemption MAC Merge support for ICSSG Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 1/2] net: ti: icssg-prueth: Add Frame Preemption MAC Merge support Meghana Malladi 2026-02-04 14:00 ` [PATCH net-next v2 2/2] net: ti: icssg-prueth: Add ethtool ops for Frame Preemption MAC Merge Meghana Malladi 2026-02-04 23:30 ` kernel test robot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox