Skip to content

Commit 36d0395

Browse files
michichkuba-moo
authored andcommitted
iavf: delete the iavf client interface
The iavf client interface was added in 2017 by commit ed0e894 ("i40evf: add client interface"), but there have never been any in-tree callers. It's not useful for future development either. The Intel out-of-tree iavf and irdma drivers instead use an auxiliary bus, which is a better solution. Remove the iavf client interface code. Also gone are the client_task work and the client_lock mutex. Signed-off-by: Michal Schmidt <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Signed-off-by: Jacob Keller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent b5b219a commit 36d0395

File tree

6 files changed

+1
-871
lines changed

6 files changed

+1
-871
lines changed

drivers/net/ethernet/intel/iavf/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ obj-$(CONFIG_IAVF) += iavf.o
1313

1414
iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \
1515
iavf_adv_rss.o \
16-
iavf_txrx.o iavf_common.o iavf_adminq.o iavf_client.o
16+
iavf_txrx.o iavf_common.o iavf_adminq.o

drivers/net/ethernet/intel/iavf/iavf.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ struct iavf_vsi {
6363
DECLARE_BITMAP(state, __IAVF_VSI_STATE_SIZE__);
6464
int base_vector;
6565
u16 qs_handle;
66-
void *priv; /* client driver data reference. */
6766
};
6867

6968
/* How many Rx Buffers do we bundle into one write to the hardware ? */
@@ -256,7 +255,6 @@ struct iavf_adapter {
256255
struct work_struct reset_task;
257256
struct work_struct adminq_task;
258257
struct work_struct finish_config;
259-
struct delayed_work client_task;
260258
wait_queue_head_t down_waitqueue;
261259
wait_queue_head_t reset_waitqueue;
262260
wait_queue_head_t vc_waitqueue;
@@ -265,7 +263,6 @@ struct iavf_adapter {
265263
int num_vlan_filters;
266264
struct list_head mac_filter_list;
267265
struct mutex crit_lock;
268-
struct mutex client_lock;
269266
/* Lock to protect accesses to MAC and VLAN lists */
270267
spinlock_t mac_vlan_list_lock;
271268
char misc_vector_name[IFNAMSIZ + 9];
@@ -282,10 +279,6 @@ struct iavf_adapter {
282279
u64 hw_csum_rx_error;
283280
u32 rx_desc_count;
284281
int num_msix_vectors;
285-
int num_rdma_msix;
286-
int rdma_base_vector;
287-
u32 client_pending;
288-
struct iavf_client_instance *cinst;
289282
struct msix_entry *msix_entries;
290283

291284
u32 flags;
@@ -294,10 +287,6 @@ struct iavf_adapter {
294287
#define IAVF_FLAG_RESET_PENDING BIT(4)
295288
#define IAVF_FLAG_RESET_NEEDED BIT(5)
296289
#define IAVF_FLAG_WB_ON_ITR_CAPABLE BIT(6)
297-
#define IAVF_FLAG_SERVICE_CLIENT_REQUESTED BIT(9)
298-
#define IAVF_FLAG_CLIENT_NEEDS_OPEN BIT(10)
299-
#define IAVF_FLAG_CLIENT_NEEDS_CLOSE BIT(11)
300-
#define IAVF_FLAG_CLIENT_NEEDS_L2_PARAMS BIT(12)
301290
#define IAVF_FLAG_LEGACY_RX BIT(15)
302291
#define IAVF_FLAG_REINIT_ITR_NEEDED BIT(16)
303292
#define IAVF_FLAG_QUEUES_DISABLED BIT(17)
@@ -388,11 +377,6 @@ struct iavf_adapter {
388377
u32 link_speed_mbps;
389378

390379
enum virtchnl_ops current_op;
391-
#define CLIENT_ALLOWED(_a) ((_a)->vf_res ? \
392-
(_a)->vf_res->vf_cap_flags & \
393-
VIRTCHNL_VF_OFFLOAD_RDMA : \
394-
0)
395-
#define CLIENT_ENABLED(_a) ((_a)->cinst)
396380
/* RSS by the PF should be preferred over RSS via other methods. */
397381
#define RSS_PF(_a) ((_a)->vf_res->vf_cap_flags & \
398382
VIRTCHNL_VF_OFFLOAD_RSS_PF)
@@ -460,12 +444,6 @@ struct iavf_adapter {
460444

461445
/* Ethtool Private Flags */
462446

463-
/* lan device, used by client interface */
464-
struct iavf_device {
465-
struct list_head list;
466-
struct iavf_adapter *vf;
467-
};
468-
469447
/* needed by iavf_ethtool.c */
470448
extern char iavf_driver_name[];
471449

@@ -569,11 +547,6 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
569547
int iavf_config_rss(struct iavf_adapter *adapter);
570548
int iavf_lan_add_device(struct iavf_adapter *adapter);
571549
int iavf_lan_del_device(struct iavf_adapter *adapter);
572-
void iavf_client_subtask(struct iavf_adapter *adapter);
573-
void iavf_notify_client_message(struct iavf_vsi *vsi, u8 *msg, u16 len);
574-
void iavf_notify_client_l2_params(struct iavf_vsi *vsi);
575-
void iavf_notify_client_open(struct iavf_vsi *vsi);
576-
void iavf_notify_client_close(struct iavf_vsi *vsi, bool reset);
577550
void iavf_enable_channels(struct iavf_adapter *adapter);
578551
void iavf_disable_channels(struct iavf_adapter *adapter);
579552
void iavf_add_cloud_filter(struct iavf_adapter *adapter);

0 commit comments

Comments
 (0)