Commit cc4914d9 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jakub Kicinski
Browse files

sfc: Remove falcon deadcode 



ef4_farch_dimension_resources(), ef4_nic_fix_nodesc_drop_stat(),
ef4_ticks_to_usecs() and ef4_tx_get_copy_buffer_limited() were
copied over from efx_ equivalents in 2016 but never used by
commit 5a6681e2 ("sfc: separate out SFC4000 ("Falcon") support into new
sfc-falcon driver")

EF4_MAX_FLUSH_TIME is also unused.

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Acked-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Link: https://patch.msgid.link/20241102151625.39535-2-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 84bfbfbb

drivers/net/ethernet/sfc/falcon/efx.c

+0 −8
Original line number Diff line number Diff line
@@ -1886,14 +1886,6 @@ unsigned int ef4_usecs_to_ticks(struct ef4_nic *efx, unsigned int usecs) 
	return usecs * 1000 / efx->timer_quantum_ns;

}



unsigned int ef4_ticks_to_usecs(struct ef4_nic *efx, unsigned int ticks)

{

	/* We must round up when converting ticks to microseconds

	 * because we round down when converting the other way.

	 */

	return DIV_ROUND_UP(ticks * efx->timer_quantum_ns, 1000);

}



/* Set interrupt moderation parameters */

int ef4_init_irq_moderation(struct ef4_nic *efx, unsigned int tx_usecs,

			    unsigned int rx_usecs, bool rx_adaptive,

drivers/net/ethernet/sfc/falcon/efx.h

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ int ef4_try_recovery(struct ef4_nic *efx); 
/* Global */

void ef4_schedule_reset(struct ef4_nic *efx, enum reset_type type);

unsigned int ef4_usecs_to_ticks(struct ef4_nic *efx, unsigned int usecs);

unsigned int ef4_ticks_to_usecs(struct ef4_nic *efx, unsigned int ticks);

int ef4_init_irq_moderation(struct ef4_nic *efx, unsigned int tx_usecs,

			    unsigned int rx_usecs, bool rx_adaptive,

			    bool rx_may_override_tx);

drivers/net/ethernet/sfc/falcon/farch.c

+0 −22
Original line number Diff line number Diff line
@@ -1631,28 +1631,6 @@ void ef4_farch_rx_push_indir_table(struct ef4_nic *efx) 
	}

}



/* Looks at available SRAM resources and works out how many queues we

 * can support, and where things like descriptor caches should live.

 *

 * SRAM is split up as follows:

 * 0                          buftbl entries for channels

 * efx->vf_buftbl_base        buftbl entries for SR-IOV

 * efx->rx_dc_base            RX descriptor caches

 * efx->tx_dc_base            TX descriptor caches

 */

void ef4_farch_dimension_resources(struct ef4_nic *efx, unsigned sram_lim_qw)

{

	unsigned vi_count;



	/* Account for the buffer table entries backing the datapath channels

	 * and the descriptor caches for those channels.

	 */

	vi_count = max(efx->n_channels, efx->n_tx_channels * EF4_TXQ_TYPES);



	efx->tx_dc_base = sram_lim_qw - vi_count * TX_DC_ENTRIES;

	efx->rx_dc_base = efx->tx_dc_base - vi_count * RX_DC_ENTRIES;

}



u32 ef4_farch_fpga_ver(struct ef4_nic *efx)

{

	ef4_oword_t altera_build;

drivers/net/ethernet/sfc/falcon/nic.c

+0 −11
Original line number Diff line number Diff line
@@ -511,14 +511,3 @@ void ef4_nic_update_stats(const struct ef4_hw_stat_desc *desc, size_t count, 
		}

	}

}
 


void ef4_nic_fix_nodesc_drop_stat(struct ef4_nic *efx, u64 *rx_nodesc_drops)

{

	/* if down, or this is the first update after coming up */

	if (!(efx->net_dev->flags & IFF_UP) || !efx->rx_nodesc_drops_prev_state)

		efx->rx_nodesc_drops_while_down +=

			*rx_nodesc_drops - efx->rx_nodesc_drops_total;

	efx->rx_nodesc_drops_total = *rx_nodesc_drops;

	efx->rx_nodesc_drops_prev_state = !!(efx->net_dev->flags & IFF_UP);

	*rx_nodesc_drops -= efx->rx_nodesc_drops_while_down;

}

drivers/net/ethernet/sfc/falcon/nic.h

+0 −5
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ void ef4_farch_finish_flr(struct ef4_nic *efx); 
void falcon_start_nic_stats(struct ef4_nic *efx);

void falcon_stop_nic_stats(struct ef4_nic *efx);

int falcon_reset_xaui(struct ef4_nic *efx);

void ef4_farch_dimension_resources(struct ef4_nic *efx, unsigned sram_lim_qw);

void ef4_farch_init_common(struct ef4_nic *efx);

void ef4_farch_rx_push_indir_table(struct ef4_nic *efx);
@@ -502,10 +501,6 @@ size_t ef4_nic_describe_stats(const struct ef4_hw_stat_desc *desc, size_t count, 
void ef4_nic_update_stats(const struct ef4_hw_stat_desc *desc, size_t count,

			  const unsigned long *mask, u64 *stats,

			  const void *dma_buf, bool accumulate);

void ef4_nic_fix_nodesc_drop_stat(struct ef4_nic *efx, u64 *stat);



#define EF4_MAX_FLUSH_TIME 5000



void ef4_farch_generate_event(struct ef4_nic *efx, unsigned int evq,

			      ef4_qword_t *event);