Commit a623b3a5 authored by Martin Habets's avatar Martin Habets Committed by David S. Miller
Browse files

sfc: Remove some NIC type indirections that are no longer needed 



The special handling for SRIOV reset and FLR is not needed on EF10.

Signed-off-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Acked-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c145a5d

drivers/net/ethernet/sfc/ef10.c

+0 −2
Original line number Diff line number Diff line
@@ -4267,8 +4267,6 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.sriov_init = efx_ef10_sriov_init,

	.sriov_fini = efx_ef10_sriov_fini,

	.sriov_wanted = efx_ef10_sriov_wanted,

	.sriov_reset = efx_ef10_sriov_reset,

	.sriov_flr = efx_ef10_sriov_flr,

	.sriov_set_vf_mac = efx_ef10_sriov_set_vf_mac,

	.sriov_set_vf_vlan = efx_ef10_sriov_set_vf_vlan,

	.sriov_set_vf_spoofchk = efx_ef10_sriov_set_vf_spoofchk,

drivers/net/ethernet/sfc/ef10_sriov.h

+0 −2
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ static inline bool efx_ef10_sriov_wanted(struct efx_nic *efx) 


int efx_ef10_sriov_configure(struct efx_nic *efx, int num_vfs);

int efx_ef10_sriov_init(struct efx_nic *efx);

static inline void efx_ef10_sriov_reset(struct efx_nic *efx) {}

void efx_ef10_sriov_fini(struct efx_nic *efx);

static inline void efx_ef10_sriov_flr(struct efx_nic *efx, unsigned vf_i) {}



int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf, const u8 *mac);

drivers/net/ethernet/sfc/efx_common.c

+0 −2
Original line number Diff line number Diff line
@@ -785,8 +785,6 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok) 
	mutex_unlock(&efx->rss_lock);

	efx->type->filter_table_restore(efx);

	up_write(&efx->filter_sem);

	if (efx->type->sriov_reset)

		efx->type->sriov_reset(efx);



	mutex_unlock(&efx->mac_lock);

drivers/net/ethernet/sfc/mcdi.c

+0 −5
Original line number Diff line number Diff line
@@ -1352,11 +1352,6 @@ void efx_mcdi_process_event(struct efx_channel *channel, 
	case MCDI_EVENT_CODE_MAC_STATS_DMA:

		/* MAC stats are gather lazily.  We can ignore this. */

		break;

	case MCDI_EVENT_CODE_FLR:

		if (efx->type->sriov_flr)

			efx->type->sriov_flr(efx,

					     MCDI_EVENT_FIELD(*event, FLR_VF));

		break;

	case MCDI_EVENT_CODE_PTP_FAULT:

	case MCDI_EVENT_CODE_PTP_PPS:

		efx_ptp_event(efx, event);

drivers/net/ethernet/sfc/net_driver.h

+0 −8
Original line number Diff line number Diff line
@@ -1261,10 +1261,6 @@ struct efx_udp_tunnel { 
 * @remove_port: Free resources allocated by probe_port()

 * @handle_global_event: Handle a "global" event (may be %NULL)

 * @fini_dmaq: Flush and finalise DMA queues (RX and TX queues)

 * @prepare_flush: Prepare the hardware for flushing the DMA queues

 *	(for Falcon architecture)

 * @finish_flush: Clean up after flushing the DMA queues (for Falcon

 *	architecture)

 * @prepare_flr: Prepare for an FLR

 * @finish_flr: Clean up after an FLR

 * @describe_stats: Describe statistics for ethtool
@@ -1411,8 +1407,6 @@ struct efx_nic_type { 
	void (*remove_port)(struct efx_nic *efx);

	bool (*handle_global_event)(struct efx_channel *channel, efx_qword_t *);

	int (*fini_dmaq)(struct efx_nic *efx);

	void (*prepare_flush)(struct efx_nic *efx);

	void (*finish_flush)(struct efx_nic *efx);

	void (*prepare_flr)(struct efx_nic *efx);

	void (*finish_flr)(struct efx_nic *efx);

	size_t (*describe_stats)(struct efx_nic *efx, u8 *names);
@@ -1528,8 +1522,6 @@ struct efx_nic_type { 
	int (*sriov_init)(struct efx_nic *efx);

	void (*sriov_fini)(struct efx_nic *efx);

	bool (*sriov_wanted)(struct efx_nic *efx);

	void (*sriov_reset)(struct efx_nic *efx);

	void (*sriov_flr)(struct efx_nic *efx, unsigned vf_i);

	int (*sriov_set_vf_mac)(struct efx_nic *efx, int vf_i, const u8 *mac);

	int (*sriov_set_vf_vlan)(struct efx_nic *efx, int vf_i, u16 vlan,

				 u8 qos);