Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86094f7f authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Move and rename Falcon/Siena common NIC operations 



Add efx_nic_type operations for the many efx_nic functions that need
to be implemented different on EF10.  For now, change most of the
existing efx_nic_*() functions into inline wrappers.  As a later step,
we may be able to improve branch prediction for operations used on the
fast path by copying the pointers into each queue/channel structure.

Move the Falcon/Siena implementations to new file farch.c and rename
the functions and static data to use a prefix of 'efx_farch_'.

Move efx_may_push_tx_desc() to nic.h, as the EF10 TX code will also
use it.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent e42c3d85

drivers/net/ethernet/sfc/Makefile

+2 −1
Original line number Diff line number Diff line 
sfc-y			+= efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \

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

			   filter.o \

			   selftest.o ethtool.o qt202x_phy.o mdio_10g.o \

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_port.o mcdi_mon.o ptp.o

drivers/net/ethernet/sfc/efx.c

+2 −2
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ static void efx_enable_interrupts(struct efx_nic *efx) 
		efx->eeh_disabled_legacy_irq = false;

	}



	efx_nic_enable_interrupts(efx);

	efx->type->irq_enable_master(efx);



	efx_for_each_channel(channel, efx) {

		if (channel->type->keep_eventq)
@@ -1407,7 +1407,7 @@ static void efx_disable_interrupts(struct efx_nic *efx) 
			efx_fini_eventq(channel);

	}



	efx_nic_disable_interrupts(efx);

	efx->type->irq_disable_non_ev(efx);

}



static void efx_remove_interrupts(struct efx_nic *efx)

drivers/net/ethernet/sfc/falcon.c

+51 −7
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static inline void falcon_irq_ack_a1(struct efx_nic *efx) 
}





irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)

static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)

{

	struct efx_nic *efx = dev_id;

	efx_oword_t *int_ker = efx->irq_status.addr;
@@ -373,7 +373,7 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 
	/* Check to see if we have a serious error condition */

	syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);

	if (unlikely(syserr))

		return efx_nic_fatal_interrupt(efx);

		return efx_farch_fatal_interrupt(efx);



	/* Determine interrupting queues, clear interrupt status

	 * register and acknowledge the device interrupt.
@@ -1558,7 +1558,7 @@ static int falcon_test_nvram(struct efx_nic *efx) 
	return falcon_read_nvram(efx, NULL);

}



static const struct efx_nic_register_test falcon_b0_register_tests[] = {

static const struct efx_farch_register_test falcon_b0_register_tests[] = {

	{ FR_AZ_ADR_REGION,

	  EFX_OWORD32(0x0003FFFF, 0x0003FFFF, 0x0003FFFF, 0x0003FFFF) },

	{ FR_AZ_RX_CFG,
@@ -1618,7 +1618,7 @@ falcon_b0_test_chip(struct efx_nic *efx, struct efx_self_tests *tests) 
	efx_reset_down(efx, reset_method);



	tests->registers =

		efx_nic_test_registers(efx, falcon_b0_register_tests,

		efx_farch_test_registers(efx, falcon_b0_register_tests,

					 ARRAY_SIZE(falcon_b0_register_tests))

		? -1 : 1;
@@ -1984,7 +1984,7 @@ static int falcon_probe_nic(struct efx_nic *efx) 


	rc = -ENODEV;



	if (efx_nic_fpga_ver(efx) != 0) {

	if (efx_farch_fpga_ver(efx) != 0) {

		netif_err(efx, probe, efx->net_dev,

			  "Falcon FPGA not supported\n");

		goto fail1;
@@ -2218,7 +2218,7 @@ static int falcon_init_nic(struct efx_nic *efx) 
		efx_writeo(efx, &temp, FR_BZ_DP_CTRL);

	}



	efx_nic_init_common(efx);

	efx_farch_init_common(efx);



	return 0;

}
@@ -2367,6 +2367,28 @@ const struct efx_nic_type falcon_a1_nic_type = { 
	.set_wol = falcon_set_wol,

	.resume_wol = efx_port_dummy_op_void,

	.test_nvram = falcon_test_nvram,

	.irq_enable_master = efx_farch_irq_enable_master,

	.irq_test_generate = efx_farch_irq_test_generate,

	.irq_disable_non_ev = efx_farch_irq_disable_master,

	.irq_handle_msi = efx_farch_msi_interrupt,

	.irq_handle_legacy = falcon_legacy_interrupt_a1,

	.tx_probe = efx_farch_tx_probe,

	.tx_init = efx_farch_tx_init,

	.tx_remove = efx_farch_tx_remove,

	.tx_write = efx_farch_tx_write,

	.rx_push_indir_table = efx_farch_rx_push_indir_table,

	.rx_probe = efx_farch_rx_probe,

	.rx_init = efx_farch_rx_init,

	.rx_remove = efx_farch_rx_remove,

	.rx_write = efx_farch_rx_write,

	.rx_defer_refill = efx_farch_rx_defer_refill,

	.ev_probe = efx_farch_ev_probe,

	.ev_init = efx_farch_ev_init,

	.ev_fini = efx_farch_ev_fini,

	.ev_remove = efx_farch_ev_remove,

	.ev_process = efx_farch_ev_process,

	.ev_read_ack = efx_farch_ev_read_ack,

	.ev_test_generate = efx_farch_ev_test_generate,



	.revision = EFX_REV_FALCON_A1,

	.mem_map_size = 0x20000,
@@ -2414,6 +2436,28 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.resume_wol = efx_port_dummy_op_void,

	.test_chip = falcon_b0_test_chip,

	.test_nvram = falcon_test_nvram,

	.irq_enable_master = efx_farch_irq_enable_master,

	.irq_test_generate = efx_farch_irq_test_generate,

	.irq_disable_non_ev = efx_farch_irq_disable_master,

	.irq_handle_msi = efx_farch_msi_interrupt,

	.irq_handle_legacy = efx_farch_legacy_interrupt,

	.tx_probe = efx_farch_tx_probe,

	.tx_init = efx_farch_tx_init,

	.tx_remove = efx_farch_tx_remove,

	.tx_write = efx_farch_tx_write,

	.rx_push_indir_table = efx_farch_rx_push_indir_table,

	.rx_probe = efx_farch_rx_probe,

	.rx_init = efx_farch_rx_init,

	.rx_remove = efx_farch_rx_remove,

	.rx_write = efx_farch_rx_write,

	.rx_defer_refill = efx_farch_rx_defer_refill,

	.ev_probe = efx_farch_ev_probe,

	.ev_init = efx_farch_ev_init,

	.ev_fini = efx_farch_ev_fini,

	.ev_remove = efx_farch_ev_remove,

	.ev_process = efx_farch_ev_process,

	.ev_read_ack = efx_farch_ev_read_ack,

	.ev_test_generate = efx_farch_ev_test_generate,



	.revision = EFX_REV_FALCON_B0,

	/* Map everything up to and including the RSS indirection

drivers/net/ethernet/sfc/farch.c

0 → 100644
+1781 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/net_driver.h

+49 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static inline unsigned int efx_port_num(struct efx_nic *efx) 
 * @get_wol: Get WoL configuration from driver state

 * @set_wol: Push WoL configuration to the NIC

 * @resume_wol: Synchronise WoL state between driver and MC (e.g. after resume)

 * @test_chip: Test registers.  Should use efx_nic_test_registers(), and is

 * @test_chip: Test registers.  May use efx_farch_test_registers(), and is

 *	expected to reset the NIC.

 * @test_nvram: Test validity of NVRAM contents

 * @mcdi_request: Send an MCDI request with the given header and SDU.
@@ -985,6 +985,32 @@ static inline unsigned int efx_port_num(struct efx_nic *efx) 
 * @mcdi_poll_reboot: Test whether the MCDI has rebooted.  If so,

 *	return an appropriate error code for aborting any current

 *	request; otherwise return 0.

 * @irq_enable_master: Enable IRQs on the NIC.  Each event queue must

 *	be separately enabled after this.

 * @irq_test_generate: Generate a test IRQ

 * @irq_disable_non_ev: Disable non-event IRQs on the NIC.  Each event

 *	queue must be separately disabled before this.

 * @irq_handle_msi: Handle MSI for a channel.  The @dev_id argument is

 *	a pointer to the &struct efx_msi_context for the channel.

 * @irq_handle_legacy: Handle legacy interrupt.  The @dev_id argument

 *	is a pointer to the &struct efx_nic.

 * @tx_probe: Allocate resources for TX queue

 * @tx_init: Initialise TX queue on the NIC

 * @tx_remove: Free resources for TX queue

 * @tx_write: Write TX descriptors and doorbell

 * @rx_push_indir_table: Write RSS indirection table to the NIC

 * @rx_probe: Allocate resources for RX queue

 * @rx_init: Initialise RX queue on the NIC

 * @rx_remove: Free resources for RX queue

 * @rx_write: Write RX descriptors and doorbell

 * @rx_defer_refill: Generate a refill reminder event

 * @ev_probe: Allocate resources for event queue

 * @ev_init: Initialise event queue on the NIC

 * @ev_fini: Deinitialise event queue on the NIC

 * @ev_remove: Free resources for event queue

 * @ev_process: Process events for a queue, up to the given NAPI quota

 * @ev_read_ack: Acknowledge read events on a queue, rearming its IRQ

 * @ev_test_generate: Generate a test event

 * @revision: Hardware architecture revision

 * @mem_map_size: Memory BAR mapped size

 * @txd_ptr_tbl_base: TX descriptor ring base address
@@ -1041,6 +1067,28 @@ struct efx_nic_type { 
	void (*mcdi_read_response)(struct efx_nic *efx, efx_dword_t *pdu,

				   size_t pdu_offset, size_t pdu_len);

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

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

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

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

	irqreturn_t (*irq_handle_msi)(int irq, void *dev_id);

	irqreturn_t (*irq_handle_legacy)(int irq, void *dev_id);

	int (*tx_probe)(struct efx_tx_queue *tx_queue);

	void (*tx_init)(struct efx_tx_queue *tx_queue);

	void (*tx_remove)(struct efx_tx_queue *tx_queue);

	void (*tx_write)(struct efx_tx_queue *tx_queue);

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

	int (*rx_probe)(struct efx_rx_queue *rx_queue);

	void (*rx_init)(struct efx_rx_queue *rx_queue);

	void (*rx_remove)(struct efx_rx_queue *rx_queue);

	void (*rx_write)(struct efx_rx_queue *rx_queue);

	void (*rx_defer_refill)(struct efx_rx_queue *rx_queue);

	int (*ev_probe)(struct efx_channel *channel);

	void (*ev_init)(struct efx_channel *channel);

	void (*ev_fini)(struct efx_channel *channel);

	void (*ev_remove)(struct efx_channel *channel);

	int (*ev_process)(struct efx_channel *channel, int quota);

	void (*ev_read_ack)(struct efx_channel *channel);

	void (*ev_test_generate)(struct efx_channel *channel);



	int revision;

	unsigned int mem_map_size;