From: Mark Blasko <[email protected]> Introduce the necessary definitions and functions for the device option flag (GVE_DEV_OPT_ID_NIC_TIMESTAMP) to detect hardware timestamping support in the gvnic device.
Signed-off-by: Mark Blasko <[email protected]> Reviewed-by: Joshua Washington <[email protected]> Reviewed-by: Jasper Tran O'Leary <[email protected]> --- drivers/net/gve/base/gve_adminq.c | 41 ++++++++++++++++++++++++++----- drivers/net/gve/base/gve_adminq.h | 9 +++++++ drivers/net/gve/gve_ethdev.h | 3 +++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index 28661fb6cd..c9095fd165 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -38,7 +38,8 @@ void gve_parse_device_option(struct gve_priv *priv, struct gve_device_option_dqo_rda **dev_op_dqo_rda, struct gve_device_option_flow_steering **dev_op_flow_steering, struct gve_device_option_modify_ring **dev_op_modify_ring, - struct gve_device_option_jumbo_frames **dev_op_jumbo_frames) + struct gve_device_option_jumbo_frames **dev_op_jumbo_frames, + struct gve_device_option_nic_timestamp **dev_op_nic_timestamp) { u32 req_feat_mask = be32_to_cpu(option->required_features_mask); u16 option_length = be16_to_cpu(option->option_length); @@ -168,6 +169,24 @@ void gve_parse_device_option(struct gve_priv *priv, } *dev_op_jumbo_frames = RTE_PTR_ADD(option, sizeof(*option)); break; + case GVE_DEV_OPT_ID_NIC_TIMESTAMP: + if (option_length < sizeof(**dev_op_nic_timestamp) || + req_feat_mask != GVE_DEV_OPT_REQ_FEAT_MASK_NIC_TIMESTAMP) { + PMD_DRV_LOG(WARNING, GVE_DEVICE_OPTION_ERROR_FMT, + "Nic Timestamp", + (int)sizeof(**dev_op_nic_timestamp), + GVE_DEV_OPT_REQ_FEAT_MASK_NIC_TIMESTAMP, + option_length, req_feat_mask); + break; + } + + if (option_length > sizeof(**dev_op_nic_timestamp)) { + PMD_DRV_LOG(WARNING, + GVE_DEVICE_OPTION_TOO_BIG_FMT, + "Nic Timestamp"); + } + *dev_op_nic_timestamp = RTE_PTR_ADD(option, sizeof(*option)); + break; default: /* If we don't recognize the option just continue * without doing anything. @@ -186,7 +205,8 @@ gve_process_device_options(struct gve_priv *priv, struct gve_device_option_dqo_rda **dev_op_dqo_rda, struct gve_device_option_flow_steering **dev_op_flow_steering, struct gve_device_option_modify_ring **dev_op_modify_ring, - struct gve_device_option_jumbo_frames **dev_op_jumbo_frames) + struct gve_device_option_jumbo_frames **dev_op_jumbo_frames, + struct gve_device_option_nic_timestamp **dev_op_nic_timestamp) { const int num_options = be16_to_cpu(descriptor->num_device_options); struct gve_device_option *dev_opt; @@ -207,7 +227,8 @@ gve_process_device_options(struct gve_priv *priv, gve_parse_device_option(priv, dev_opt, dev_op_gqi_rda, dev_op_gqi_qpl, dev_op_dqo_rda, dev_op_flow_steering, - dev_op_modify_ring, dev_op_jumbo_frames); + dev_op_modify_ring, dev_op_jumbo_frames, + dev_op_nic_timestamp); dev_opt = next_opt; } @@ -921,7 +942,8 @@ static void gve_enable_supported_features(struct gve_priv *priv, u32 supported_features_mask, const struct gve_device_option_flow_steering *dev_op_flow_steering, const struct gve_device_option_modify_ring *dev_op_modify_ring, - const struct gve_device_option_jumbo_frames *dev_op_jumbo_frames) + const struct gve_device_option_jumbo_frames *dev_op_jumbo_frames, + const struct gve_device_option_nic_timestamp *dev_op_nic_timestamp) { if (dev_op_flow_steering && (supported_features_mask & GVE_SUP_FLOW_STEERING_MASK) && @@ -948,6 +970,11 @@ static void gve_enable_supported_features(struct gve_priv *priv, PMD_DRV_LOG(INFO, "JUMBO FRAMES device option enabled."); priv->max_mtu = be16_to_cpu(dev_op_jumbo_frames->max_mtu); } + if (dev_op_nic_timestamp && + (supported_features_mask & GVE_SUP_NIC_TIMESTAMP_MASK)) { + PMD_DRV_LOG(INFO, "NIC TIMESTAMP device option enabled."); + priv->nic_timestamp_supported = true; + } } int gve_adminq_describe_device(struct gve_priv *priv) @@ -955,6 +982,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) struct gve_device_option_jumbo_frames *dev_op_jumbo_frames = NULL; struct gve_device_option_modify_ring *dev_op_modify_ring = NULL; struct gve_device_option_flow_steering *dev_op_flow_steering = NULL; + struct gve_device_option_nic_timestamp *dev_op_nic_timestamp = NULL; struct gve_device_option_gqi_rda *dev_op_gqi_rda = NULL; struct gve_device_option_gqi_qpl *dev_op_gqi_qpl = NULL; struct gve_device_option_dqo_rda *dev_op_dqo_rda = NULL; @@ -984,7 +1012,8 @@ int gve_adminq_describe_device(struct gve_priv *priv) &dev_op_gqi_qpl, &dev_op_dqo_rda, &dev_op_flow_steering, &dev_op_modify_ring, - &dev_op_jumbo_frames); + &dev_op_jumbo_frames, + &dev_op_nic_timestamp); if (err) goto free_device_descriptor; @@ -1039,7 +1068,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) gve_enable_supported_features(priv, supported_features_mask, dev_op_flow_steering, dev_op_modify_ring, - dev_op_jumbo_frames); + dev_op_jumbo_frames, dev_op_nic_timestamp); free_device_descriptor: gve_free_dma_mem(&descriptor_dma_mem); diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h index d8e5e6a352..eaee5649f2 100644 --- a/drivers/net/gve/base/gve_adminq.h +++ b/drivers/net/gve/base/gve_adminq.h @@ -153,6 +153,12 @@ struct gve_device_option_jumbo_frames { GVE_CHECK_STRUCT_LEN(8, gve_device_option_jumbo_frames); +struct gve_device_option_nic_timestamp { + __be32 supported_features_mask; +}; + +GVE_CHECK_STRUCT_LEN(4, gve_device_option_nic_timestamp); + /* Terminology: * * RDA - Raw DMA Addressing - Buffers associated with SKBs are directly DMA @@ -169,6 +175,7 @@ enum gve_dev_opt_id { GVE_DEV_OPT_ID_MODIFY_RING = 0x6, GVE_DEV_OPT_ID_JUMBO_FRAMES = 0x8, GVE_DEV_OPT_ID_FLOW_STEERING = 0xb, + GVE_DEV_OPT_ID_NIC_TIMESTAMP = 0xd, }; enum gve_dev_opt_req_feat_mask { @@ -179,12 +186,14 @@ enum gve_dev_opt_req_feat_mask { GVE_DEV_OPT_REQ_FEAT_MASK_FLOW_STEERING = 0x0, GVE_DEV_OPT_REQ_FEAT_MASK_MODIFY_RING = 0x0, GVE_DEV_OPT_REQ_FEAT_MASK_JUMBO_FRAMES = 0x0, + GVE_DEV_OPT_REQ_FEAT_MASK_NIC_TIMESTAMP = 0x0, }; enum gve_sup_feature_mask { GVE_SUP_MODIFY_RING_MASK = 1 << 0, GVE_SUP_JUMBO_FRAMES_MASK = 1 << 2, GVE_SUP_FLOW_STEERING_MASK = 1 << 5, + GVE_SUP_NIC_TIMESTAMP_MASK = 1 << 8, }; #define GVE_DEV_OPT_LEN_GQI_RAW_ADDRESSING 0x0 diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 524e48e723..b9b4688367 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -355,6 +355,9 @@ struct gve_priv { void *avail_flow_rule_bmp_mem; /* Backing memory for the bitmap */ pthread_mutex_t flow_rule_lock; /* Lock for bitmap and tailq access */ TAILQ_HEAD(, gve_flow) active_flows; + + /* HW Timestamping Fields */ + bool nic_timestamp_supported; }; static inline bool -- 2.54.0.563.g4f69b47b94-goog
