Commit daea5b4d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-code-refactoring' 



Alex Maftei says:

====================
sfc: code refactoring

Splitting some of the driver code into different files, which will
later be used in another driver for a new product.
====================

Reviewed-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b9ae5127 17d3b21c

drivers/net/ethernet/sfc/Makefile

+5 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

sfc-y			+= efx.o nic.o farch.o siena.o ef10.o tx.o rx.o \

sfc-y			+= efx.o efx_common.o efx_channels.o nic.o \

			   farch.o siena.o ef10.o \

			   tx.o tx_common.o rx.o rx_common.o \

			   selftest.o ethtool.o ptp.o tx_tso.o \

			   mcdi.o mcdi_port.o mcdi_mon.o

			   mcdi.o mcdi_port.o \

			   mcdi_mon.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o siena_sriov.o ef10_sriov.o

drivers/net/ethernet/sfc/ef10.c

+3 −0
Original line number Diff line number Diff line
@@ -5,14 +5,17 @@ 
 */



#include "net_driver.h"

#include "rx_common.h"

#include "ef10_regs.h"

#include "io.h"

#include "mcdi.h"

#include "mcdi_pcol.h"

#include "mcdi_port_common.h"

#include "nic.h"

#include "workarounds.h"

#include "selftest.h"

#include "ef10_sriov.h"

#include "rx_common.h"

#include <linux/in.h>

#include <linux/jhash.h>

#include <linux/wait.h>

drivers/net/ethernet/sfc/efx.c

+22 −2117

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/efx.h

+3 −36
Original line number Diff line number Diff line
@@ -15,31 +15,19 @@ int efx_net_open(struct net_device *net_dev); 
int efx_net_stop(struct net_device *net_dev);



/* TX */

int efx_probe_tx_queue(struct efx_tx_queue *tx_queue);

void efx_remove_tx_queue(struct efx_tx_queue *tx_queue);

void efx_init_tx_queue(struct efx_tx_queue *tx_queue);

void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue);

void efx_fini_tx_queue(struct efx_tx_queue *tx_queue);

netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,

				struct net_device *net_dev);

netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb);

void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index);

int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,

		 void *type_data);

unsigned int efx_tx_max_skb_descs(struct efx_nic *efx);

extern unsigned int efx_piobuf_size;

extern bool efx_separate_tx_channels;



/* RX */

void efx_set_default_rx_indir_table(struct efx_nic *efx,

				    struct efx_rss_context *ctx);

void efx_rx_config_page_split(struct efx_nic *efx);

int efx_probe_rx_queue(struct efx_rx_queue *rx_queue);

void efx_remove_rx_queue(struct efx_rx_queue *rx_queue);

void efx_init_rx_queue(struct efx_rx_queue *rx_queue);

void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);

void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue, bool atomic);

void efx_rx_slow_fill(struct timer_list *t);

void __efx_rx_packet(struct efx_channel *channel);

void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,

		   unsigned int n_frags, unsigned int len, u16 flags);
@@ -48,7 +36,9 @@ static inline void efx_rx_flush_packet(struct efx_channel *channel) 
	if (channel->rx_pkt_n_frags)

		__efx_rx_packet(channel);

}

void efx_schedule_slow_fill(struct efx_rx_queue *rx_queue);



void efx_init_rx_recycle_ring(struct efx_rx_queue *rx_queue);

struct page *efx_reuse_page(struct efx_rx_queue *rx_queue);



#define EFX_MAX_DMAQ_SIZE 4096UL

#define EFX_DEFAULT_DMAQ_SIZE 1024UL
@@ -80,8 +70,6 @@ static inline bool efx_rss_enabled(struct efx_nic *efx) 


/* Filters */



void efx_mac_reconfigure(struct efx_nic *efx);



/**

 * efx_filter_insert_filter - add or replace a filter

 * @efx: NIC in which to insert the filter
@@ -218,26 +206,10 @@ static inline bool efx_rss_active(struct efx_rss_context *ctx) 
	return ctx->context_id != EFX_EF10_RSS_CONTEXT_INVALID;

}



/* Channels */

int efx_channel_dummy_op_int(struct efx_channel *channel);

void efx_channel_dummy_op_void(struct efx_channel *channel);

int efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries);



/* Ports */

int efx_reconfigure_port(struct efx_nic *efx);

int __efx_reconfigure_port(struct efx_nic *efx);



/* Ethtool support */

extern const struct ethtool_ops efx_ethtool_ops;



/* Reset handling */

int efx_reset(struct efx_nic *efx, enum reset_type method);

void efx_reset_down(struct efx_nic *efx, enum reset_type method);

int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok);

int efx_try_recovery(struct efx_nic *efx);



/* Global */

void efx_schedule_reset(struct efx_nic *efx, enum reset_type type);

unsigned int efx_usecs_to_ticks(struct efx_nic *efx, unsigned int usecs);

unsigned int efx_ticks_to_usecs(struct efx_nic *efx, unsigned int ticks);

int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,
@@ -245,8 +217,6 @@ int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs, 
			    bool rx_may_override_tx);

void efx_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs,

			    unsigned int *rx_usecs, bool *rx_adaptive);

void efx_stop_eventq(struct efx_channel *channel);

void efx_start_eventq(struct efx_channel *channel);



/* Dummy PHY ops for PHY drivers */

int efx_port_dummy_op_int(struct efx_nic *efx);
@@ -293,9 +263,6 @@ static inline void efx_schedule_channel_irq(struct efx_channel *channel) 
	efx_schedule_channel(channel);

}



void efx_link_status_changed(struct efx_nic *efx);

void efx_link_set_advertising(struct efx_nic *efx,

			      const unsigned long *advertising);

void efx_link_clear_advertising(struct efx_nic *efx);

void efx_link_set_wanted_fc(struct efx_nic *efx, u8);

drivers/net/ethernet/sfc/efx_channels.c

0 → 100644
+1232 −0

File added.

Preview size limit exceeded, changes collapsed.