From: MD Danish Anwar Adds .get_mm(), .set_mm() and .get_mm_stats() to the icssg ethtool ops, along with new PA stats registers for the preemption counters. Also moves the stat table sizes to ARRAY_SIZE() so the counts stay in sync with the tables automatically. emac_set_mm() programs all config fields into hardware before invoking icssg_config_ietfpe(). On failure the fallback path in icssg_config_ietfpe() already disables TX preemption in hardware, so only fpe_enabled is forced off; the other fields (tx_min_frag_size, verify_time_ms, mac_verify_configure) are kept as programmed to keep driver and hardware state consistent. tx_min_frag_size is validated against the four addFragSize-representable values (60/124/188/252) before being programmed, since the firmware requires the fragment size including FCS to be a multiple of 64 bytes. verify_status is initialized to ICSSG_IETFPE_STATE_DISABLED in icssg_qos_init() so that get_mm() reports DISABLED rather than UNKNOWN on a freshly probed interface. icssg_stats.h is made self-contained by directly including linux/ethtool.h, linux/stddef.h, and icssg_switch_map.h, which it uses but previously relied on icssg_prueth.h to pull in transitively. Signed-off-by: MD Danish Anwar Signed-off-by: Meghana Malladi --- v9-v8 changelog: Sashiko comments addressed: - Fix emac_set_mm() error path: on icssg_config_ietfpe() failure only force fpe_enabled = false to match hardware state (TX preempt off); retain other config fields as already programmed in HW registers — prevents silent re-enable on next link event and fixes ethnl_set_mm() retry becoming a no-op - Add icssg_qos_validate_tx_min_frag_size(): reject non-addFragSize-representable values (only 60/124/188/252 valid) with extack before touching any state - Initialise iet->verify_status = ICSSG_IETFPE_STATE_DISABLED in icssg_qos_init() so fresh interface reports DISABLED not UNKNOWN - Make icssg_stats.h self-contained - Mutex lifecycle asymmetry on SR1: already fixed in patch 1 Sashiko commens skipped: - Pre-existing stats readers without stats_lock: pre-existing issue, not introduced by this series — will be tracked separately - emac_get_stat_by_name() return type int → will be posted separately as bug fix drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 127 +++++++++++++++++- drivers/net/ethernet/ti/icssg/icssg_prueth.h | 11 +- drivers/net/ethernet/ti/icssg/icssg_qos.c | 1 + drivers/net/ethernet/ti/icssg/icssg_qos.h | 30 +++++ drivers/net/ethernet/ti/icssg/icssg_stats.h | 86 +++++++----- .../net/ethernet/ti/icssg/icssg_switch_map.h | 5 + 6 files changed, 217 insertions(+), 43 deletions(-) diff --git a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c index b715af21d23ac..26892b603e1db 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c +++ b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c @@ -74,7 +74,8 @@ static int emac_get_sset_count(struct net_device *ndev, int stringset) if (emac->prueth->pa_stats) return ICSSG_NUM_ETHTOOL_STATS; else - return ICSSG_NUM_ETHTOOL_STATS - ICSSG_NUM_PA_STATS; + return ICSSG_NUM_ETHTOOL_STATS - + (ICSSG_NUM_PA_STATS - ICSSG_NUM_PA_STANDARD_STATS); default: return -EOPNOTSUPP; } @@ -93,7 +94,8 @@ static void emac_get_strings(struct net_device *ndev, u32 stringset, u8 *data) ethtool_puts(&p, icssg_all_miig_stats[i].name); if (emac->prueth->pa_stats) for (i = 0; i < ARRAY_SIZE(icssg_all_pa_stats); i++) - ethtool_puts(&p, icssg_all_pa_stats[i].name); + if (!icssg_all_pa_stats[i].standard_stats) + ethtool_puts(&p, icssg_all_pa_stats[i].name); break; default: break; @@ -114,7 +116,8 @@ static void emac_get_ethtool_stats(struct net_device *ndev, if (emac->prueth->pa_stats) for (i = 0; i < ARRAY_SIZE(icssg_all_pa_stats); i++) - *(data++) = emac->pa_stats[i]; + if (!icssg_all_pa_stats[i].standard_stats) + *(data++) = emac->pa_stats[i]; } static int emac_get_ts_info(struct net_device *ndev, @@ -294,6 +297,121 @@ 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; + enum icssg_ietfpe_verify_states verify_status; + + if (emac->is_sr1) + return -EOPNOTSUPP; + + mutex_lock(&iet->fpe_lock); + state->tx_enabled = iet->fpe_enabled; + state->tx_min_frag_size = iet->tx_min_frag_size; + state->verify_enabled = iet->mac_verify_configure; + state->verify_time = iet->verify_time_ms; + state->tx_active = iet->fpe_active; + verify_status = iet->verify_status; + mutex_unlock(&iet->fpe_lock); + + state->rx_min_frag_size = ETH_ZLEN; + state->pmac_enabled = true; + + switch (verify_status) { + case ICSSG_IETFPE_STATE_DISABLED: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_DISABLED; + break; + case ICSSG_IETFPE_STATE_INITIAL: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_INITIAL; + break; + case ICSSG_IETFPE_STATE_VERIFYING: + state->verify_status = ETHTOOL_MM_VERIFY_STATUS_VERIFYING; + 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 (emac->is_sr1) + return -EOPNOTSUPP; + + if (!cfg->pmac_enabled) { + NL_SET_ERR_MSG_MOD(extack, "preemptible MAC is always enabled"); + return -EOPNOTSUPP; + } + + err = icssg_qos_validate_tx_min_frag_size(cfg->tx_min_frag_size, extack); + if (err) + return err; + + mutex_lock(&iet->fpe_lock); + 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; + err = icssg_config_ietfpe(ndev, cfg->tx_enabled); + if (err) { + /* icssg_config_ietfpe fallback disabled TX preemption in HW. + * New config values are already programmed in HW registers, + * so keep them. Only force fpe_enabled off to match HW state + * and prevent silent re-enable on the next link event. + */ + iet->fpe_enabled = false; + } + mutex_unlock(&iet->fpe_lock); + + return err; +} + +static void emac_get_mm_stats(struct net_device *ndev, + struct ethtool_mm_stats *s) +{ + struct prueth_emac *emac = netdev_priv(ndev); + + if (emac->is_sr1) + return; + + if (!emac->prueth->pa_stats) + return; + + emac_update_hardware_stats(emac); + + /* Hold stats_lock to prevent icssg_stats_work_handler from updating + * pa_stats[] between reads, which could yield a torn u64 value on + * 32-bit architectures. + */ + spin_lock(&emac->prueth->stats_lock); + /* MACMergeHoldCount stats is not tracked by the firmware */ + 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"); + spin_unlock(&emac->prueth->stats_lock); +} + const struct ethtool_ops icssg_ethtool_ops = { .get_drvinfo = emac_get_drvinfo, .get_msglevel = emac_get_msglevel, @@ -317,5 +435,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 f73b8f5fca956..549489a631cc3 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,12 +59,16 @@ #define ICSSG_MAX_RFLOWS 8 /* per slice */ -#define ICSSG_NUM_PA_STATS 32 -#define ICSSG_NUM_MIIG_STATS 60 +#define ICSSG_NUM_PA_STATS ARRAY_SIZE(icssg_all_pa_stats) +#define ICSSG_NUM_MIIG_STATS ARRAY_SIZE(icssg_all_miig_stats) /* Number of ICSSG related stats */ #define ICSSG_NUM_STATS (ICSSG_NUM_MIIG_STATS + ICSSG_NUM_PA_STATS) +/* MIIG stats with standard uAPI equivalents (excluded from ethtool -S) */ #define ICSSG_NUM_STANDARD_STATS 31 -#define ICSSG_NUM_ETHTOOL_STATS (ICSSG_NUM_STATS - ICSSG_NUM_STANDARD_STATS) +/* PA stats with standard uAPI equivalents, exposed via get_mm_stats only */ +#define ICSSG_NUM_PA_STANDARD_STATS 5 +#define ICSSG_NUM_ETHTOOL_STATS (ICSSG_NUM_STATS - ICSSG_NUM_STANDARD_STATS - \ + ICSSG_NUM_PA_STANDARD_STATS) #define IEP_DEFAULT_CYCLE_TIME_NS 1000000 /* 1 ms */ diff --git a/drivers/net/ethernet/ti/icssg/icssg_qos.c b/drivers/net/ethernet/ti/icssg/icssg_qos.c index 55ddf7669530c..cb6842d296ce0 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_qos.c +++ b/drivers/net/ethernet/ti/icssg/icssg_qos.c @@ -177,6 +177,7 @@ void icssg_qos_init(struct net_device *ndev) /* Set default values to prevent garbage values during .get_mm() */ iet->verify_time_ms = ICSSG_IET_MAX_VERIFY_TIME; iet->tx_min_frag_size = ETH_ZLEN; + iet->verify_status = ICSSG_IETFPE_STATE_DISABLED; } EXPORT_SYMBOL_GPL(icssg_qos_init); diff --git a/drivers/net/ethernet/ti/icssg/icssg_qos.h b/drivers/net/ethernet/ti/icssg/icssg_qos.h index 0a375c125f4b8..bb0d6e2950dfc 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_qos.h +++ b/drivers/net/ethernet/ti/icssg/icssg_qos.h @@ -14,6 +14,7 @@ #define ICSSG_IET_MAX_VERIFY_TIME 128 #define ICSSG_IET_MIN_VERIFY_TIME 1 #define ICSSG_IET_VERIFY_ATTEMPTS 3 +#define ICSSG_IET_MAX_TX_MIN_FRAG_SIZE 252 /** * enum icssg_ietfpe_verify_states - status of MM Verify returned by firmware @@ -60,6 +61,35 @@ struct prueth_qos { struct prueth_qos_mqprio mqprio; }; +static inline int icssg_qos_validate_tx_min_frag_size(u32 min_frag_size, + struct netlink_ext_ack *extack) +{ + /* Firmware takes min_frag_size including FCS length. + * The firmware requires the fragment size (including FCS) to be + * a multiple of 64 bytes. Since 64 bytes = ETH_ZLEN + ETH_FCS_LEN, + * valid user-facing values are: 60, 124, 188, 252. + */ + if (min_frag_size < ETH_ZLEN) { + NL_SET_ERR_MSG_MOD(extack, + "tx_min_frag_size must be at least 60 bytes"); + return -EINVAL; + } + + if (min_frag_size > ICSSG_IET_MAX_TX_MIN_FRAG_SIZE) { + NL_SET_ERR_MSG_MOD(extack, + "tx_min_frag_size must not exceed 252 bytes"); + return -EINVAL; + } + + if ((min_frag_size + ETH_FCS_LEN) % (ETH_ZLEN + ETH_FCS_LEN)) { + NL_SET_ERR_MSG_MOD(extack, + "tx_min_frag_size must be a multiple of 64 bytes minus 4"); + return -EINVAL; + } + + return 0; +} + void icssg_qos_init(struct net_device *ndev); void icssg_qos_exit(struct net_device *ndev); void icssg_qos_link_state_update(struct net_device *ndev); diff --git a/drivers/net/ethernet/ti/icssg/icssg_stats.h b/drivers/net/ethernet/ti/icssg/icssg_stats.h index 5ec0b38e0c67d..4e73ee04cb1cd 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_stats.h +++ b/drivers/net/ethernet/ti/icssg/icssg_stats.h @@ -8,7 +8,9 @@ #ifndef __NET_TI_ICSSG_STATS_H #define __NET_TI_ICSSG_STATS_H -#include "icssg_prueth.h" +#include +#include +#include "icssg_switch_map.h" #define STATS_TIME_LIMIT_1G_MS 25000 /* 25 seconds @ 1G */ @@ -155,50 +157,60 @@ static const struct icssg_miig_stats icssg_all_miig_stats[] = { ICSSG_MIIG_STATS(tx_bytes, true), }; -#define ICSSG_PA_STATS(field) \ -{ \ - #field, \ - field, \ +#define ICSSG_PA_STATS(field, std) \ +{ \ + #field, \ + field, \ + std, \ } struct icssg_pa_stats { char name[ETH_GSTRING_LEN]; u32 offset; + bool standard_stats; }; static const struct icssg_pa_stats icssg_all_pa_stats[] = { - ICSSG_PA_STATS(FW_RTU_PKT_DROP), - ICSSG_PA_STATS(FW_Q0_OVERFLOW), - ICSSG_PA_STATS(FW_Q1_OVERFLOW), - ICSSG_PA_STATS(FW_Q2_OVERFLOW), - ICSSG_PA_STATS(FW_Q3_OVERFLOW), - ICSSG_PA_STATS(FW_Q4_OVERFLOW), - ICSSG_PA_STATS(FW_Q5_OVERFLOW), - ICSSG_PA_STATS(FW_Q6_OVERFLOW), - ICSSG_PA_STATS(FW_Q7_OVERFLOW), - ICSSG_PA_STATS(FW_DROPPED_PKT), - ICSSG_PA_STATS(FW_RX_ERROR), - ICSSG_PA_STATS(FW_RX_DS_INVALID), - ICSSG_PA_STATS(FW_TX_DROPPED_PACKET), - ICSSG_PA_STATS(FW_TX_TS_DROPPED_PACKET), - ICSSG_PA_STATS(FW_INF_PORT_DISABLED), - ICSSG_PA_STATS(FW_INF_SAV), - ICSSG_PA_STATS(FW_INF_SA_DL), - ICSSG_PA_STATS(FW_INF_PORT_BLOCKED), - ICSSG_PA_STATS(FW_INF_DROP_TAGGED), - 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_RX_EOF_SHORT_FRMERR), - ICSSG_PA_STATS(FW_RX_B0_DROP_EARLY_EOF), - ICSSG_PA_STATS(FW_TX_JUMBO_FRM_CUTOFF), - ICSSG_PA_STATS(FW_RX_EXP_FRAG_Q_DROP), - ICSSG_PA_STATS(FW_RX_FIFO_OVERRUN), - ICSSG_PA_STATS(FW_CUT_THR_PKT), - ICSSG_PA_STATS(FW_HOST_RX_PKT_CNT), - ICSSG_PA_STATS(FW_HOST_TX_PKT_CNT), - ICSSG_PA_STATS(FW_HOST_EGRESS_Q_PRE_OVERFLOW), - ICSSG_PA_STATS(FW_HOST_EGRESS_Q_EXP_OVERFLOW), + ICSSG_PA_STATS(FW_RTU_PKT_DROP, false), + ICSSG_PA_STATS(FW_Q0_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q1_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q2_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q3_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q4_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q5_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q6_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q7_OVERFLOW, false), + ICSSG_PA_STATS(FW_DROPPED_PKT, false), + ICSSG_PA_STATS(FW_RX_ERROR, false), + ICSSG_PA_STATS(FW_RX_DS_INVALID, false), + ICSSG_PA_STATS(FW_TX_DROPPED_PACKET, false), + ICSSG_PA_STATS(FW_TX_TS_DROPPED_PACKET, false), + ICSSG_PA_STATS(FW_INF_PORT_DISABLED, false), + ICSSG_PA_STATS(FW_INF_SAV, false), + ICSSG_PA_STATS(FW_INF_SA_DL, false), + ICSSG_PA_STATS(FW_INF_PORT_BLOCKED, false), + ICSSG_PA_STATS(FW_INF_DROP_TAGGED, false), + ICSSG_PA_STATS(FW_INF_DROP_PRIOTAGGED, false), + ICSSG_PA_STATS(FW_INF_DROP_NOTAG, false), + ICSSG_PA_STATS(FW_INF_DROP_NOTMEMBER, false), + /* MAC Merge counters: exposed via .get_mm_stats standard uAPI, + * not duplicated in the private ethtool -S table. + */ + ICSSG_PA_STATS(FW_PREEMPT_BAD_FRAG, true), + ICSSG_PA_STATS(FW_PREEMPT_ASSEMBLY_ERR, true), + ICSSG_PA_STATS(FW_PREEMPT_FRAG_CNT_TX, true), + ICSSG_PA_STATS(FW_PREEMPT_ASSEMBLY_OK, true), + ICSSG_PA_STATS(FW_PREEMPT_FRAG_CNT_RX, true), + ICSSG_PA_STATS(FW_RX_EOF_SHORT_FRMERR, false), + ICSSG_PA_STATS(FW_RX_B0_DROP_EARLY_EOF, false), + ICSSG_PA_STATS(FW_TX_JUMBO_FRM_CUTOFF, false), + ICSSG_PA_STATS(FW_RX_EXP_FRAG_Q_DROP, false), + ICSSG_PA_STATS(FW_RX_FIFO_OVERRUN, false), + ICSSG_PA_STATS(FW_CUT_THR_PKT, false), + ICSSG_PA_STATS(FW_HOST_RX_PKT_CNT, false), + ICSSG_PA_STATS(FW_HOST_TX_PKT_CNT, false), + ICSSG_PA_STATS(FW_HOST_EGRESS_Q_PRE_OVERFLOW, false), + ICSSG_PA_STATS(FW_HOST_EGRESS_Q_EXP_OVERFLOW, false), }; #endif /* __NET_TI_ICSSG_STATS_H */ diff --git a/drivers/net/ethernet/ti/icssg/icssg_switch_map.h b/drivers/net/ethernet/ti/icssg/icssg_switch_map.h index 7e053b8af3ece..855fd4ed0b3f6 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