github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 11:33:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iavf: negotiate PTP capabilities

Browse Source 
Add a new extended capabilities negotiation to exchange information from
the PF about what PTP capabilities are supported by this VF. This
requires sending a VIRTCHNL_OP_1588_PTP_GET_CAPS message, and waiting
for the response from the PF. Handle this early on during the VF
initialization.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Co-developed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Jacob Keller 2024-11-06 12:37:22 -05:00 committed by Tony Nguyen
parent 2a86e210f1
commit 3247d65ad9
5 changed files with 178 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/intel/iavf/iavf.h
View File

@ -41,6 +41,7 @@
#include "iavf_txrx.h"
#include "iavf_fdir.h"
#include "iavf_adv_rss.h"
#include "iavf_types.h"
#include <linux/bitmap.h>
#define DEFAULT_DEBUG_LEVEL_SHIFT 3
@ -345,13 +346,16 @@ struct iavf_adapter {
#define IAVF_FLAG_AQ_CFG_QUEUES_QUANTA_SIZE BIT_ULL(40)
#define IAVF_FLAG_AQ_GET_QOS_CAPS BIT_ULL(41)
#define IAVF_FLAG_AQ_GET_SUPPORTED_RXDIDS BIT_ULL(42)
#define IAVF_FLAG_AQ_GET_PTP_CAPS BIT_ULL(43)
#define IAVF_FLAG_AQ_SEND_PTP_CMD BIT_ULL(44)
/* AQ messages that must be sent after IAVF_FLAG_AQ_GET_CONFIG, in
* order to negotiated extended capabilities.
*/
#define IAVF_FLAG_AQ_EXTENDED_CAPS \
(IAVF_FLAG_AQ_GET_OFFLOAD_VLAN_V2_CAPS | \
IAVF_FLAG_AQ_GET_SUPPORTED_RXDIDS)
IAVF_FLAG_AQ_GET_SUPPORTED_RXDIDS | \
IAVF_FLAG_AQ_GET_PTP_CAPS)
/* flags for processing extended capability messages during
* __IAVF_INIT_EXTENDED_CAPS. Each capability exchange requires
@ -365,12 +369,16 @@ struct iavf_adapter {
#define IAVF_EXTENDED_CAP_RECV_VLAN_V2 BIT_ULL(1)
#define IAVF_EXTENDED_CAP_SEND_RXDID BIT_ULL(2)
#define IAVF_EXTENDED_CAP_RECV_RXDID BIT_ULL(3)
#define IAVF_EXTENDED_CAP_SEND_PTP BIT_ULL(4)
#define IAVF_EXTENDED_CAP_RECV_PTP BIT_ULL(5)
#define IAVF_EXTENDED_CAPS \
(IAVF_EXTENDED_CAP_SEND_VLAN_V2 | \
IAVF_EXTENDED_CAP_RECV_VLAN_V2 | \
IAVF_EXTENDED_CAP_SEND_RXDID | \
IAVF_EXTENDED_CAP_RECV_RXDID)
IAVF_EXTENDED_CAP_RECV_RXDID | \
IAVF_EXTENDED_CAP_SEND_PTP | \
IAVF_EXTENDED_CAP_RECV_PTP)
/* Lock to prevent possible clobbering of
* current_netdev_promisc_flags
@ -432,6 +440,8 @@ struct iavf_adapter {
VIRTCHNL_VF_OFFLOAD_QOS)
#define IAVF_RXDID_ALLOWED(a) \
((a)->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC)
#define IAVF_PTP_ALLOWED(a) \
((a)->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_PTP)
struct virtchnl_vf_resource *vf_res; /* incl. all VSIs */
struct virtchnl_vsi_resource *vsi_res; /* our LAN VSI */
struct virtchnl_version_info pf_version;
@ -439,6 +449,7 @@ struct iavf_adapter {
((_a)->pf_version.minor == 1))
struct virtchnl_vlan_caps vlan_v2_caps;
u64 supp_rxdids;
struct iavf_ptp ptp;
u16 msg_enable;
struct iavf_eth_stats current_stats;
struct virtchnl_qos_cap_list *qos_caps;
@ -573,6 +584,8 @@ int iavf_get_vf_vlan_v2_caps(struct iavf_adapter *adapter);
int iavf_send_vf_offload_vlan_v2_msg(struct iavf_adapter *adapter);
int iavf_send_vf_supported_rxdids_msg(struct iavf_adapter *adapter);
int iavf_get_vf_supported_rxdids(struct iavf_adapter *adapter);
int iavf_send_vf_ptp_caps_msg(struct iavf_adapter *adapter);
int iavf_get_vf_ptp_caps(struct iavf_adapter *adapter);
void iavf_set_queue_vlan_tag_loc(struct iavf_adapter *adapter);
u16 iavf_get_num_vlans_added(struct iavf_adapter *adapter);
void iavf_irq_enable(struct iavf_adapter *adapter, bool flush);

60
drivers/net/ethernet/intel/iavf/iavf_main.c
View File

@ -2109,6 +2109,8 @@ static int iavf_process_aq_command(struct iavf_adapter *adapter)
return iavf_send_vf_offload_vlan_v2_msg(adapter);
if (adapter->aq_required & IAVF_FLAG_AQ_GET_SUPPORTED_RXDIDS)
return iavf_send_vf_supported_rxdids_msg(adapter);
if (adapter->aq_required & IAVF_FLAG_AQ_GET_PTP_CAPS)
return iavf_send_vf_ptp_caps_msg(adapter);
if (adapter->aq_required & IAVF_FLAG_AQ_DISABLE_QUEUES) {
iavf_disable_queues(adapter);
return 0;
@ -2694,6 +2696,55 @@ static void iavf_init_recv_supported_rxdids(struct iavf_adapter *adapter)
iavf_change_state(adapter, __IAVF_INIT_FAILED);
}
/**
* iavf_init_send_ptp_caps - part of querying for extended PTP capabilities
* @adapter: board private structure
*
* Function processes send of the request for 1588 PTP capabilities to the PF.
* Must clear IAVF_EXTENDED_CAP_SEND_PTP if the message is not sent, e.g.
* due to the PF not negotiating VIRTCHNL_VF_PTP_CAP
*/
static void iavf_init_send_ptp_caps(struct iavf_adapter *adapter)
{
if (iavf_send_vf_ptp_caps_msg(adapter) == -EOPNOTSUPP) {
/* PF does not support VIRTCHNL_VF_PTP_CAP. In this case, we
* did not send the capability exchange message and do not
* expect a response.
*/
adapter->extended_caps &= ~IAVF_EXTENDED_CAP_RECV_PTP;
}
/* We sent the message, so move on to the next step */
adapter->extended_caps &= ~IAVF_EXTENDED_CAP_SEND_PTP;
}
/**
* iavf_init_recv_ptp_caps - part of querying for supported PTP capabilities
* @adapter: board private structure
*
* Function processes receipt of the PTP capabilities supported on this VF.
**/
static void iavf_init_recv_ptp_caps(struct iavf_adapter *adapter)
{
memset(&adapter->ptp.hw_caps, 0, sizeof(adapter->ptp.hw_caps));
if (iavf_get_vf_ptp_caps(adapter))
goto err;
/* We've processed the PF response to the VIRTCHNL_OP_1588_PTP_GET_CAPS
* message we sent previously.
*/
adapter->extended_caps &= ~IAVF_EXTENDED_CAP_RECV_PTP;
return;
err:
/* We didn't receive a reply. Make sure we try sending again when
* __IAVF_INIT_FAILED attempts to recover.
*/
adapter->extended_caps |= IAVF_EXTENDED_CAP_SEND_PTP;
iavf_change_state(adapter, __IAVF_INIT_FAILED);
}
/**
* iavf_init_process_extended_caps - Part of driver startup
* @adapter: board private structure
@ -2727,6 +2778,15 @@ static void iavf_init_process_extended_caps(struct iavf_adapter *adapter)
return;
}
/* Process capability exchange for PTP features */
if (adapter->extended_caps & IAVF_EXTENDED_CAP_SEND_PTP) {
iavf_init_send_ptp_caps(adapter);
return;
} else if (adapter->extended_caps & IAVF_EXTENDED_CAP_RECV_PTP) {
iavf_init_recv_ptp_caps(adapter);
return;
}
/* When we reach here, no further extended capabilities exchanges are
* necessary, so we finally transition into __IAVF_INIT_CONFIG_ADAPTER
*/

9
drivers/net/ethernet/intel/iavf/iavf_ptp.h Normal file
View File

@ -0,0 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2024 Intel Corporation. */
#ifndef _IAVF_PTP_H_
#define _IAVF_PTP_H_
#include "iavf_types.h"
#endif /* _IAVF_PTP_H_ */

34
drivers/net/ethernet/intel/iavf/iavf_types.h Normal file
View File

@ -0,0 +1,34 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright(c) 2024 Intel Corporation. */
#ifndef _IAVF_TYPES_H_
#define _IAVF_TYPES_H_
#include "iavf_types.h"
#include <linux/avf/virtchnl.h>
#include <linux/ptp_clock_kernel.h>
/* structure used to queue PTP commands for processing */
struct iavf_ptp_aq_cmd {
struct list_head list;
enum virtchnl_ops v_opcode:16;
u16 msglen;
u8 msg[] __counted_by(msglen);
};
struct iavf_ptp {
wait_queue_head_t phc_time_waitqueue;
struct virtchnl_ptp_caps hw_caps;
struct ptp_clock_info info;
struct ptp_clock *clock;
struct list_head aq_cmds;
u64 cached_phc_time;
unsigned long cached_phc_updated;
/* Lock protecting access to the AQ command list */
struct mutex aq_cmd_lock;
struct kernel_hwtstamp_config hwtstamp_config;
bool phc_time_ready:1;
};
#endif /* _IAVF_TYPES_H_ */

60
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
View File

@ -148,6 +148,7 @@ int iavf_send_vf_config_msg(struct iavf_adapter *adapter)
VIRTCHNL_VF_OFFLOAD_CRC |
VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM |
VIRTCHNL_VF_OFFLOAD_REQ_QUEUES |
VIRTCHNL_VF_CAP_PTP |
VIRTCHNL_VF_OFFLOAD_ADQ |
VIRTCHNL_VF_OFFLOAD_USO |
VIRTCHNL_VF_OFFLOAD_FDIR_PF |
@ -191,6 +192,41 @@ int iavf_send_vf_supported_rxdids_msg(struct iavf_adapter *adapter)
NULL, 0);
}
/**
* iavf_send_vf_ptp_caps_msg - Send request for PTP capabilities
* @adapter: private adapter structure
*
* Send the VIRTCHNL_OP_1588_PTP_GET_CAPS command to the PF to request the PTP
* capabilities available to this device. This includes the following
* potential access:
*
* * READ_PHC - access to read the PTP hardware clock time
* * RX_TSTAMP - access to request Rx timestamps on all received packets
*
* The PF will reply with the same opcode a filled out copy of the
* virtchnl_ptp_caps structure which defines the specifics of which features
* are accessible to this device.
*
* Return: 0 if success, error code otherwise.
*/
int iavf_send_vf_ptp_caps_msg(struct iavf_adapter *adapter)
{
struct virtchnl_ptp_caps hw_caps = {
.caps = VIRTCHNL_1588_PTP_CAP_READ_PHC |
VIRTCHNL_1588_PTP_CAP_RX_TSTAMP
};
adapter->aq_required &= ~IAVF_FLAG_AQ_GET_PTP_CAPS;
if (!IAVF_PTP_ALLOWED(adapter))
return -EOPNOTSUPP;
adapter->current_op = VIRTCHNL_OP_1588_PTP_GET_CAPS;
return iavf_send_pf_msg(adapter, VIRTCHNL_OP_1588_PTP_GET_CAPS,
(u8 *)&hw_caps, sizeof(hw_caps));
}
/**
* iavf_validate_num_queues
* @adapter: adapter structure
@ -294,6 +330,23 @@ int iavf_get_vf_supported_rxdids(struct iavf_adapter *adapter)
return err;
}
int iavf_get_vf_ptp_caps(struct iavf_adapter *adapter)
{
struct virtchnl_ptp_caps caps = {};
struct iavf_arq_event_info event;
int err;
event.msg_buf = (u8 *)&caps;
event.buf_len = sizeof(caps);
err = iavf_poll_virtchnl_msg(&adapter->hw, &event,
VIRTCHNL_OP_1588_PTP_GET_CAPS);
if (!err)
adapter->ptp.hw_caps = caps;
return err;
}
/**
* iavf_configure_queues
* @adapter: adapter structure
@ -2548,6 +2601,13 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
adapter->supp_rxdids = *(u64 *)msg;
break;
case VIRTCHNL_OP_1588_PTP_GET_CAPS:
if (msglen != sizeof(adapter->ptp.hw_caps))
return;
adapter->ptp.hw_caps = *(struct virtchnl_ptp_caps *)msg;
break;
case VIRTCHNL_OP_ENABLE_QUEUES:
/* enable transmits */