Commit 956f2d86 authored by Martin Habets's avatar Martin Habets Committed by Jakub Kicinski
Browse files

sfc/siena: Remove build references to missing functionality 



Functionality not supported or needed on Siena includes:
- Anything for EF100
- EF10 specifics such as register access, PIO and TSO offload.
Also only bind to Siena NICs.

Remove EF10 specifics from nic.h.
The functions that start with efx_farch_ will be removed from sfc.ko
with a subsequent patch.
Add the efx_ prefix to siena_prepare_flush() to make it consistent
with the other APIs.

Signed-off-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d48523cb

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

+4 −24
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "efx.h"

#include "efx_common.h"

#include "efx_channels.h"

#include "ef100.h"

#include "rx_common.h"

#include "tx_common.h"

#include "nic.h"
@@ -795,22 +794,10 @@ static void efx_unregister_netdev(struct efx_nic *efx) 


/* PCI device ID table */

static const struct pci_device_id efx_pci_table[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0903),  /* SFC9120 PF */

	 .driver_data = (unsigned long) &efx_hunt_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1903),  /* SFC9120 VF */

	 .driver_data = (unsigned long) &efx_hunt_a0_vf_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0923),  /* SFC9140 PF */

	 .driver_data = (unsigned long) &efx_hunt_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1923),  /* SFC9140 VF */

	 .driver_data = (unsigned long) &efx_hunt_a0_vf_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0a03),  /* SFC9220 PF */

	 .driver_data = (unsigned long) &efx_hunt_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1a03),  /* SFC9220 VF */

	 .driver_data = (unsigned long) &efx_hunt_a0_vf_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0b03),  /* SFC9250 PF */

	 .driver_data = (unsigned long) &efx_hunt_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1b03),  /* SFC9250 VF */

	 .driver_data = (unsigned long) &efx_hunt_a0_vf_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803),	/* SFC9020 */

	 .driver_data = (unsigned long)&siena_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),	/* SFL9021 */

	 .driver_data = (unsigned long)&siena_a0_nic_type},

	{0}			/* end of list */

};
@@ -1298,14 +1285,8 @@ static int __init efx_init_module(void) 
	if (rc < 0)

		goto err_pci;



	rc = pci_register_driver(&ef100_pci_driver);

	if (rc < 0)

		goto err_pci_ef100;



	return 0;



 err_pci_ef100:

	pci_unregister_driver(&efx_pci_driver);

 err_pci:

	efx_destroy_reset_workqueue();

 err_reset:
@@ -1318,7 +1299,6 @@ static void __exit efx_exit_module(void) 
{

	printk(KERN_INFO "Solarflare NET driver unloading\n");



	pci_unregister_driver(&ef100_pci_driver);

	pci_unregister_driver(&efx_pci_driver);

	efx_destroy_reset_workqueue();

	unregister_netdevice_notifier(&efx_netdev_notifier);

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

+3 −12
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


#include <linux/indirect_call_wrapper.h>

#include "net_driver.h"

#include "ef100_rx.h"

#include "ef100_tx.h"

#include "filter.h"



int efx_net_open(struct net_device *net_dev);
@@ -24,9 +22,8 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb, 
netdev_tx_t __efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb);

static inline netdev_tx_t efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb)

{

	return INDIRECT_CALL_2(tx_queue->efx->type->tx_enqueue,

			       ef100_enqueue_skb, __efx_enqueue_skb,

			       tx_queue, skb);

	return INDIRECT_CALL_1(tx_queue->efx->type->tx_enqueue,

			       __efx_enqueue_skb, tx_queue, skb);

}

void efx_xmit_done_single(struct efx_tx_queue *tx_queue);

int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
@@ -40,16 +37,10 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index, 
static inline void efx_rx_flush_packet(struct efx_channel *channel)

{

	if (channel->rx_pkt_n_frags)

		INDIRECT_CALL_2(channel->efx->type->rx_packet,

				__ef100_rx_packet, __efx_rx_packet,

				channel);

		__efx_rx_packet(channel);

}

static inline bool efx_rx_buf_hash_valid(struct efx_nic *efx, const u8 *prefix)

{

	if (efx->type->rx_buf_hash_valid)

		return INDIRECT_CALL_1(efx->type->rx_buf_hash_valid,

				       ef100_rx_buf_hash_valid,

				       prefix);

	return true;

}

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

+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "bitfield.h"

#include "efx.h"

#include "nic.h"

#include "ef10_regs.h"

#include "farch_regs.h"

#include "io.h"

#include "workarounds.h"
@@ -195,7 +194,6 @@ struct efx_nic_reg { 
#define REGISTER_BB(name) REGISTER(name, F, B, B)

#define REGISTER_BZ(name) REGISTER(name, F, B, Z)

#define REGISTER_CZ(name) REGISTER(name, F, C, Z)

#define REGISTER_DZ(name) REGISTER(name, E, D, Z)



static const struct efx_nic_reg efx_nic_regs[] = {

	REGISTER_AZ(ADR_REGION),
@@ -302,9 +300,6 @@ static const struct efx_nic_reg efx_nic_regs[] = { 
	REGISTER_AB(XX_TXDRV_CTL),

	/* XX_PRBS_CTL, XX_PRBS_CHK and XX_PRBS_ERR are not used */

	/* XX_CORE_STAT is partly RC */

	REGISTER_DZ(BIU_HW_REV_ID),

	REGISTER_DZ(MC_DB_LWRD),

	REGISTER_DZ(MC_DB_HWRD),

};



struct efx_nic_reg_table {
@@ -337,7 +332,6 @@ struct efx_nic_reg_table { 
				  FR_BZ_ ## name ## _STEP,		\

				  FR_CZ_ ## name ## _ROWS)

#define REGISTER_TABLE_CZ(name) REGISTER_TABLE(name, F, C, Z)

#define REGISTER_TABLE_DZ(name) REGISTER_TABLE(name, E, D, Z)



static const struct efx_nic_reg_table efx_nic_reg_tables[] = {

	/* DRIVER is not used */
@@ -368,7 +362,6 @@ static const struct efx_nic_reg_table efx_nic_reg_tables[] = { 
	/* MSIX_PBA_TABLE is not mapped */

	/* SRM_DBG is not mapped (and is redundant with BUF_FLL_TBL) */

	REGISTER_TABLE_BZ(RX_FILTER_TBL0),

	REGISTER_TABLE_DZ(BIU_MC_SFT_STATUS),

};



size_t efx_nic_get_regs_len(struct efx_nic *efx)

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

+2 −188
Original line number Diff line number Diff line
@@ -116,193 +116,7 @@ struct siena_nic_data { 
#endif

};



enum {

	EF10_STAT_port_tx_bytes = GENERIC_STAT_COUNT,

	EF10_STAT_port_tx_packets,

	EF10_STAT_port_tx_pause,

	EF10_STAT_port_tx_control,

	EF10_STAT_port_tx_unicast,

	EF10_STAT_port_tx_multicast,

	EF10_STAT_port_tx_broadcast,

	EF10_STAT_port_tx_lt64,

	EF10_STAT_port_tx_64,

	EF10_STAT_port_tx_65_to_127,

	EF10_STAT_port_tx_128_to_255,

	EF10_STAT_port_tx_256_to_511,

	EF10_STAT_port_tx_512_to_1023,

	EF10_STAT_port_tx_1024_to_15xx,

	EF10_STAT_port_tx_15xx_to_jumbo,

	EF10_STAT_port_rx_bytes,

	EF10_STAT_port_rx_bytes_minus_good_bytes,

	EF10_STAT_port_rx_good_bytes,

	EF10_STAT_port_rx_bad_bytes,

	EF10_STAT_port_rx_packets,

	EF10_STAT_port_rx_good,

	EF10_STAT_port_rx_bad,

	EF10_STAT_port_rx_pause,

	EF10_STAT_port_rx_control,

	EF10_STAT_port_rx_unicast,

	EF10_STAT_port_rx_multicast,

	EF10_STAT_port_rx_broadcast,

	EF10_STAT_port_rx_lt64,

	EF10_STAT_port_rx_64,

	EF10_STAT_port_rx_65_to_127,

	EF10_STAT_port_rx_128_to_255,

	EF10_STAT_port_rx_256_to_511,

	EF10_STAT_port_rx_512_to_1023,

	EF10_STAT_port_rx_1024_to_15xx,

	EF10_STAT_port_rx_15xx_to_jumbo,

	EF10_STAT_port_rx_gtjumbo,

	EF10_STAT_port_rx_bad_gtjumbo,

	EF10_STAT_port_rx_overflow,

	EF10_STAT_port_rx_align_error,

	EF10_STAT_port_rx_length_error,

	EF10_STAT_port_rx_nodesc_drops,

	EF10_STAT_port_rx_pm_trunc_bb_overflow,

	EF10_STAT_port_rx_pm_discard_bb_overflow,

	EF10_STAT_port_rx_pm_trunc_vfifo_full,

	EF10_STAT_port_rx_pm_discard_vfifo_full,

	EF10_STAT_port_rx_pm_trunc_qbb,

	EF10_STAT_port_rx_pm_discard_qbb,

	EF10_STAT_port_rx_pm_discard_mapping,

	EF10_STAT_port_rx_dp_q_disabled_packets,

	EF10_STAT_port_rx_dp_di_dropped_packets,

	EF10_STAT_port_rx_dp_streaming_packets,

	EF10_STAT_port_rx_dp_hlb_fetch,

	EF10_STAT_port_rx_dp_hlb_wait,

	EF10_STAT_rx_unicast,

	EF10_STAT_rx_unicast_bytes,

	EF10_STAT_rx_multicast,

	EF10_STAT_rx_multicast_bytes,

	EF10_STAT_rx_broadcast,

	EF10_STAT_rx_broadcast_bytes,

	EF10_STAT_rx_bad,

	EF10_STAT_rx_bad_bytes,

	EF10_STAT_rx_overflow,

	EF10_STAT_tx_unicast,

	EF10_STAT_tx_unicast_bytes,

	EF10_STAT_tx_multicast,

	EF10_STAT_tx_multicast_bytes,

	EF10_STAT_tx_broadcast,

	EF10_STAT_tx_broadcast_bytes,

	EF10_STAT_tx_bad,

	EF10_STAT_tx_bad_bytes,

	EF10_STAT_tx_overflow,

	EF10_STAT_V1_COUNT,

	EF10_STAT_fec_uncorrected_errors = EF10_STAT_V1_COUNT,

	EF10_STAT_fec_corrected_errors,

	EF10_STAT_fec_corrected_symbols_lane0,

	EF10_STAT_fec_corrected_symbols_lane1,

	EF10_STAT_fec_corrected_symbols_lane2,

	EF10_STAT_fec_corrected_symbols_lane3,

	EF10_STAT_ctpio_vi_busy_fallback,

	EF10_STAT_ctpio_long_write_success,

	EF10_STAT_ctpio_missing_dbell_fail,

	EF10_STAT_ctpio_overflow_fail,

	EF10_STAT_ctpio_underflow_fail,

	EF10_STAT_ctpio_timeout_fail,

	EF10_STAT_ctpio_noncontig_wr_fail,

	EF10_STAT_ctpio_frm_clobber_fail,

	EF10_STAT_ctpio_invalid_wr_fail,

	EF10_STAT_ctpio_vi_clobber_fallback,

	EF10_STAT_ctpio_unqualified_fallback,

	EF10_STAT_ctpio_runt_fallback,

	EF10_STAT_ctpio_success,

	EF10_STAT_ctpio_fallback,

	EF10_STAT_ctpio_poison,

	EF10_STAT_ctpio_erase,

	EF10_STAT_COUNT

};



/* Maximum number of TX PIO buffers we may allocate to a function.

 * This matches the total number of buffers on each SFC9100-family

 * controller.

 */

#define EF10_TX_PIOBUF_COUNT 16



/**

 * struct efx_ef10_nic_data - EF10 architecture NIC state

 * @mcdi_buf: DMA buffer for MCDI

 * @warm_boot_count: Last seen MC warm boot count

 * @vi_base: Absolute index of first VI in this function

 * @n_allocated_vis: Number of VIs allocated to this function

 * @n_piobufs: Number of PIO buffers allocated to this function

 * @wc_membase: Base address of write-combining mapping of the memory BAR

 * @pio_write_base: Base address for writing PIO buffers

 * @pio_write_vi_base: Relative VI number for @pio_write_base

 * @piobuf_handle: Handle of each PIO buffer allocated

 * @piobuf_size: size of a single PIO buffer

 * @must_restore_piobufs: Flag: PIO buffers have yet to be restored after MC

 *	reboot

 * @mc_stats: Scratch buffer for converting statistics to the kernel's format

 * @stats: Hardware statistics

 * @workaround_35388: Flag: firmware supports workaround for bug 35388

 * @workaround_26807: Flag: firmware supports workaround for bug 26807

 * @workaround_61265: Flag: firmware supports workaround for bug 61265

 * @must_check_datapath_caps: Flag: @datapath_caps needs to be revalidated

 *	after MC reboot

 * @datapath_caps: Capabilities of datapath firmware (FLAGS1 field of

 *	%MC_CMD_GET_CAPABILITIES response)

 * @datapath_caps2: Further Capabilities of datapath firmware (FLAGS2 field of

 * %MC_CMD_GET_CAPABILITIES response)

 * @rx_dpcpu_fw_id: Firmware ID of the RxDPCPU

 * @tx_dpcpu_fw_id: Firmware ID of the TxDPCPU

 * @must_probe_vswitching: Flag: vswitching has yet to be setup after MC reboot

 * @pf_index: The number for this PF, or the parent PF if this is a VF

#ifdef CONFIG_SFC_SRIOV

 * @vf: Pointer to VF data structure

#endif

 * @vport_mac: The MAC address on the vport, only for PFs; VFs will be zero

 * @vlan_list: List of VLANs added over the interface. Serialised by vlan_lock.

 * @vlan_lock: Lock to serialize access to vlan_list.

 * @udp_tunnels: UDP tunnel port numbers and types.

 * @udp_tunnels_dirty: flag indicating a reboot occurred while pushing

 *	@udp_tunnels to hardware and thus the push must be re-done.

 * @udp_tunnels_lock: Serialises writes to @udp_tunnels and @udp_tunnels_dirty.

 */

struct efx_ef10_nic_data {

	struct efx_buffer mcdi_buf;

	u16 warm_boot_count;

	unsigned int vi_base;

	unsigned int n_allocated_vis;

	unsigned int n_piobufs;

	void __iomem *wc_membase, *pio_write_base;

	unsigned int pio_write_vi_base;

	unsigned int piobuf_handle[EF10_TX_PIOBUF_COUNT];

	u16 piobuf_size;

	bool must_restore_piobufs;

	__le64 *mc_stats;

	u64 stats[EF10_STAT_COUNT];

	bool workaround_35388;

	bool workaround_26807;

	bool workaround_61265;

	bool must_check_datapath_caps;

	u32 datapath_caps;

	u32 datapath_caps2;

	unsigned int rx_dpcpu_fw_id;

	unsigned int tx_dpcpu_fw_id;

	bool must_probe_vswitching;

	unsigned int pf_index;

	u8 port_id[ETH_ALEN];

#ifdef CONFIG_SFC_SRIOV

	unsigned int vf_index;

	struct ef10_vf *vf;

#endif

	u8 vport_mac[ETH_ALEN];

	struct list_head vlan_list;

	struct mutex vlan_lock;

	struct efx_udp_tunnel udp_tunnels[16];

	bool udp_tunnels_dirty;

	struct mutex udp_tunnels_lock;

	u64 licensed_features;

};



/* TSOv2 */

int efx_ef10_tx_tso_desc(struct efx_tx_queue *tx_queue, struct sk_buff *skb,

			 bool *data_mapped);



extern const struct efx_nic_type efx_hunt_a0_nic_type;

extern const struct efx_nic_type efx_hunt_a0_vf_nic_type;

extern const struct efx_nic_type siena_a0_nic_type;



int falcon_probe_board(struct efx_nic *efx, u16 revision_info);
@@ -364,7 +178,7 @@ irqreturn_t efx_farch_legacy_interrupt(int irq, void *dev_id); 
irqreturn_t efx_farch_fatal_interrupt(struct efx_nic *efx);



/* Global Resources */

void siena_prepare_flush(struct efx_nic *efx);

void efx_siena_prepare_flush(struct efx_nic *efx);

int efx_farch_fini_dmaq(struct efx_nic *efx);

void efx_farch_finish_flr(struct efx_nic *efx);

void siena_finish_flush(struct efx_nic *efx);

drivers/net/ethernet/sfc/siena/nic_common.h

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ static inline bool efx_nic_tx_is_empty(struct efx_tx_queue *tx_queue, unsigned i 
	return ((empty_read_count ^ write_count) & ~EFX_EMPTY_COUNT_VALID) == 0;

}



int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue, struct sk_buff *skb,

			bool *data_mapped);



/* Decide whether to push a TX descriptor to the NIC vs merely writing

 * the doorbell.  This can reduce latency when we are adding a single

 * descriptor to an empty queue, but is otherwise pointless.  Further,