Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-31 06:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

eth: fbnic: add RX packets timestamping support

Browse Source 
Add callbacks to support timestamping configuration via ethtool.
Add processing of RX timestamps.

Signed-off-by: Vadim Fedorenko <vadfed@meta.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Vadim Fedorenko 2024-10-08 11:14:34 -07:00 committed by Paolo Abeni
parent ad8e66a4d9
commit 6a2b3ede95
7 changed files with 194 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
View File

@ -586,6 +586,7 @@ enum {
};
#define FBNIC_RPC_ACT_TBL0_DMA_HINT CSR_GENMASK(24, 16)
#define FBNIC_RPC_ACT_TBL0_TS_ENA CSR_BIT(28)
#define FBNIC_RPC_ACT_TBL0_RSS_CTXT_ID CSR_BIT(30)
#define FBNIC_RPC_ACT_TBL1_DEFAULT 0x0840b /* 0x2102c */

16
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c
View File

@ -10,8 +10,22 @@ static int
fbnic_get_ts_info(struct net_device *netdev,
struct kernel_ethtool_ts_info *tsinfo)
{
struct fbnic_net *fbn = netdev_priv(netdev);
tsinfo->phc_index = ptp_clock_index(fbn->fbd->ptp);
tsinfo->so_timestamping =
SOF_TIMESTAMPING_TX_SOFTWARE;
SOF_TIMESTAMPING_TX_SOFTWARE |
SOF_TIMESTAMPING_RX_HARDWARE |
SOF_TIMESTAMPING_RAW_HARDWARE;
tsinfo->rx_filters =
BIT(HWTSTAMP_FILTER_NONE) |
BIT(HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
BIT(HWTSTAMP_FILTER_PTP_V2_EVENT) |
BIT(HWTSTAMP_FILTER_ALL);
return 0;
}

80
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
View File

@ -324,6 +324,84 @@ void fbnic_clear_rx_mode(struct net_device *netdev)
__dev_mc_unsync(netdev, NULL);
}
static int fbnic_hwtstamp_get(struct net_device *netdev,
struct kernel_hwtstamp_config *config)
{
struct fbnic_net *fbn = netdev_priv(netdev);
*config = fbn->hwtstamp_config;
return 0;
}
static int fbnic_hwtstamp_set(struct net_device *netdev,
struct kernel_hwtstamp_config *config,
struct netlink_ext_ack *extack)
{
struct fbnic_net *fbn = netdev_priv(netdev);
int old_rx_filter;
if (config->source != HWTSTAMP_SOURCE_NETDEV)
return -EOPNOTSUPP;
if (!kernel_hwtstamp_config_changed(config, &fbn->hwtstamp_config))
return 0;
/* Upscale the filters */
switch (config->rx_filter) {
case HWTSTAMP_FILTER_NONE:
case HWTSTAMP_FILTER_ALL:
case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
case HWTSTAMP_FILTER_PTP_V2_EVENT:
break;
case HWTSTAMP_FILTER_NTP_ALL:
config->rx_filter = HWTSTAMP_FILTER_ALL;
break;
case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
config->rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
break;
case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
break;
case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
break;
case HWTSTAMP_FILTER_PTP_V2_SYNC:
case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
config->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
break;
default:
return -ERANGE;
}
/* Configure */
old_rx_filter = fbn->hwtstamp_config.rx_filter;
memcpy(&fbn->hwtstamp_config, config, sizeof(*config));
if (old_rx_filter != config->rx_filter && netif_running(fbn->netdev)) {
fbnic_rss_reinit(fbn->fbd, fbn);
fbnic_write_rules(fbn->fbd);
}
/* Save / report back filter configuration
* Note that our filter configuration is inexact. Instead of
* filtering for a specific UDP port or L2 Ethertype we are
* filtering in all UDP or all non-IP packets for timestamping. So
* if anything other than FILTER_ALL is requested we report
* FILTER_SOME indicating that we will be timestamping a few
* additional packets.
*/
if (config->rx_filter > HWTSTAMP_FILTER_ALL)
config->rx_filter = HWTSTAMP_FILTER_SOME;
return 0;
}
static void fbnic_get_stats64(struct net_device *dev,
struct rtnl_link_stats64 *stats64)
{
@ -401,6 +479,8 @@ static const struct net_device_ops fbnic_netdev_ops = {
.ndo_set_mac_address = fbnic_set_mac,
.ndo_set_rx_mode = fbnic_set_rx_mode,
.ndo_get_stats64 = fbnic_get_stats64,
.ndo_hwtstamp_get = fbnic_hwtstamp_get,
.ndo_hwtstamp_set = fbnic_hwtstamp_set,
};
static void fbnic_get_queue_stats_rx(struct net_device *dev, int idx,

3
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h
View File

@ -54,6 +54,9 @@ struct fbnic_net {
struct fbnic_queue_stats rx_stats;
u64 link_down_events;
/* Time stampinn filter config */
struct kernel_hwtstamp_config hwtstamp_config;
struct list_head napis;
};

31
drivers/net/ethernet/meta/fbnic/fbnic_rpc.c
View File

@ -244,6 +244,12 @@ void fbnic_bmc_rpc_init(struct fbnic_dev *fbd)
((_ip) ? FBNIC_RPC_TCAM_ACT1_IP_VALID : 0) | \
((_v6) ? FBNIC_RPC_TCAM_ACT1_IP_IS_V6 : 0))
#define FBNIC_TSTAMP_MASK(_all, _udp, _ether) \
(((_all) ? ((1u << FBNIC_NUM_HASH_OPT) - 1) : 0) | \
((_udp) ? (1u << FBNIC_UDP6_HASH_OPT) | \
(1u << FBNIC_UDP4_HASH_OPT) : 0) | \
((_ether) ? (1u << FBNIC_ETHER_HASH_OPT) : 0))
void fbnic_rss_reinit(struct fbnic_dev *fbd, struct fbnic_net *fbn)
{
static const u32 act1_value[FBNIC_NUM_HASH_OPT] = {
@ -255,6 +261,7 @@ void fbnic_rss_reinit(struct fbnic_dev *fbd, struct fbnic_net *fbn)
FBNIC_ACT1_INIT(0, 0, 1, 0), /* IP4 */
0 /* Ether */
};
u32 tstamp_mask = 0;
unsigned int i;
/* To support scenarios where a BMC is present we must write the
@ -264,6 +271,28 @@ void fbnic_rss_reinit(struct fbnic_dev *fbd, struct fbnic_net *fbn)
BUILD_BUG_ON(FBNIC_RSS_EN_NUM_UNICAST * 2 != FBNIC_RSS_EN_NUM_ENTRIES);
BUILD_BUG_ON(ARRAY_SIZE(act1_value) != FBNIC_NUM_HASH_OPT);
/* Set timestamp mask with 1b per flow type */
if (fbn->hwtstamp_config.rx_filter != HWTSTAMP_FILTER_NONE) {
switch (fbn->hwtstamp_config.rx_filter) {
case HWTSTAMP_FILTER_ALL:
tstamp_mask = FBNIC_TSTAMP_MASK(1, 1, 1);
break;
case HWTSTAMP_FILTER_PTP_V2_EVENT:
tstamp_mask = FBNIC_TSTAMP_MASK(0, 1, 1);
break;
case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
tstamp_mask = FBNIC_TSTAMP_MASK(0, 1, 0);
break;
case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
tstamp_mask = FBNIC_TSTAMP_MASK(0, 0, 1);
break;
default:
netdev_warn(fbn->netdev, "Unsupported hwtstamp_rx_filter\n");
break;
}
}
/* Program RSS hash enable mask for host in action TCAM/table. */
for (i = fbnic_bmc_present(fbd) ? 0 : FBNIC_RSS_EN_NUM_UNICAST;
i < FBNIC_RSS_EN_NUM_ENTRIES; i++) {
@ -287,6 +316,8 @@ void fbnic_rss_reinit(struct fbnic_dev *fbd, struct fbnic_net *fbn)
if (!dest)
dest = FBNIC_RPC_ACT_TBL0_DROP;
else if (tstamp_mask & (1u << flow_type))
dest |= FBNIC_RPC_ACT_TBL0_TS_ENA;
if (act1_value[flow_type] & FBNIC_RPC_TCAM_ACT1_L4_VALID)
dest |= FIELD_PREP(FBNIC_RPC_ACT_TBL0_DMA_HINT,

63
drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
View File

@ -43,6 +43,46 @@ static void fbnic_ring_wr32(struct fbnic_ring *ring, unsigned int csr, u32 val)
writel(val, csr_base + csr);
}
/**
* fbnic_ts40_to_ns() - convert descriptor timestamp to PHC time
* @fbn: netdev priv of the FB NIC
* @ts40: timestamp read from a descriptor
*
* Return: u64 value of PHC time in nanoseconds
*
* Convert truncated 40 bit device timestamp as read from a descriptor
* to the full PHC time in nanoseconds.
*/
static __maybe_unused u64 fbnic_ts40_to_ns(struct fbnic_net *fbn, u64 ts40)
{
unsigned int s;
u64 time_ns;
s64 offset;
u8 ts_top;
u32 high;
do {
s = u64_stats_fetch_begin(&fbn->time_seq);
offset = READ_ONCE(fbn->time_offset);
} while (u64_stats_fetch_retry(&fbn->time_seq, s));
high = READ_ONCE(fbn->time_high);
/* Bits 63..40 from periodic clock reads, 39..0 from ts40 */
time_ns = (u64)(high >> 8) << 40 | ts40;
/* Compare bits 32-39 between periodic reads and ts40,
* see if HW clock may have wrapped since last read. We are sure
* that periodic reads are always at least ~1 minute behind, so
* this logic works perfectly fine.
*/
ts_top = ts40 >> 32;
if (ts_top < (u8)high && (u8)high - ts_top > U8_MAX / 2)
time_ns += 1ULL << 40;
return time_ns + offset;
}
static unsigned int fbnic_desc_unused(struct fbnic_ring *ring)
{
return (ring->head - ring->tail - 1) & ring->size_mask;
@ -710,6 +750,10 @@ static struct sk_buff *fbnic_build_skb(struct fbnic_napi_vector *nv,
/* Set MAC header specific fields */
skb->protocol = eth_type_trans(skb, nv->napi.dev);
/* Add timestamp if present */
if (pkt->hwtstamp)
skb_hwtstamps(skb)->hwtstamp = pkt->hwtstamp;
return skb;
}
@ -720,6 +764,23 @@ static enum pkt_hash_types fbnic_skb_hash_type(u64 rcd)
PKT_HASH_TYPE_L2;
}
static void fbnic_rx_tstamp(struct fbnic_napi_vector *nv, u64 rcd,
struct fbnic_pkt_buff *pkt)
{
struct fbnic_net *fbn;
u64 ns, ts;
if (!FIELD_GET(FBNIC_RCD_OPT_META_TS, rcd))
return;
fbn = netdev_priv(nv->napi.dev);
ts = FIELD_GET(FBNIC_RCD_OPT_META_TS_MASK, rcd);
ns = fbnic_ts40_to_ns(fbn, ts);
/* Add timestamp to shared info */
pkt->hwtstamp = ns_to_ktime(ns);
}
static void fbnic_populate_skb_fields(struct fbnic_napi_vector *nv,
u64 rcd, struct sk_buff *skb,
struct fbnic_q_triad *qt)
@ -784,6 +845,8 @@ static int fbnic_clean_rcq(struct fbnic_napi_vector *nv,
if (FIELD_GET(FBNIC_RCD_OPT_META_TYPE_MASK, rcd))
break;
fbnic_rx_tstamp(nv, rcd, pkt);
/* We currently ignore the action table index */
break;
case FBNIC_RCD_TYPE_META:

1
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h
View File

@ -47,6 +47,7 @@ struct fbnic_net;
struct fbnic_pkt_buff {
struct xdp_buff buff;
ktime_t hwtstamp;
u32 data_truesize;
u16 data_len;
u16 nr_frags;