sfc_ef100: RX path for EF100 (8e57daf7) · Commits · 戴 / test

drivers/net/ethernet/sfc/ef100_nic.c

+23 −2

Original line number	Diff line number	Diff line
		@@ -260,6 +260,10 @@ static int ef100_ev_process(struct efx_channel *channel, int quota)
		ev_type = EFX_QWORD_FIELD(*p_event, ESF_GZ_E_TYPE);

		switch (ev_type) {
		case ESE_GZ_EF100_EV_RX_PKTS:
		efx_ef100_ev_rx(channel, p_event);
		++spent;
		break;
		case ESE_GZ_EF100_EV_MCDI:
		efx_mcdi_process_event(channel, p_event);
		break;
		@@ -482,9 +486,10 @@ static unsigned int ef100_check_caps(const struct efx_nic *efx,

		/* NIC level access functions
		*/
		#define EF100_OFFLOAD_FEATURES (NETIF_F_HW_CSUM \| \
		#define EF100_OFFLOAD_FEATURES (NETIF_F_HW_CSUM \| NETIF_F_RXCSUM \| \
		NETIF_F_HIGHDMA \| NETIF_F_SG \| NETIF_F_FRAGLIST \| \
		NETIF_F_TSO_ECN \| NETIF_F_TSO_MANGLEID \| NETIF_F_HW_VLAN_CTAG_TX)
		NETIF_F_RXHASH \| NETIF_F_RXFCS \| NETIF_F_TSO_ECN \| NETIF_F_RXALL \| \
		NETIF_F_TSO_MANGLEID \| NETIF_F_HW_VLAN_CTAG_TX)

		const struct efx_nic_type ef100_pf_nic_type = {
		.revision = EFX_REV_EF100,
		@@ -540,6 +545,16 @@ const struct efx_nic_type ef100_pf_nic_type = {

		.get_phys_port_id = efx_ef100_get_phys_port_id,

		.rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN,
		.rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,
		.rx_ts_offset = ESF_GZ_RX_PREFIX_PARTIAL_TSTAMP_LBN / 8,
		.rx_hash_key_size = 40,
		.rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,
		.rx_push_rss_config = efx_mcdi_pf_rx_push_rss_config,
		.rx_push_rss_context_config = efx_mcdi_rx_push_rss_context_config,
		.rx_pull_rss_context_config = efx_mcdi_rx_pull_rss_context_config,
		.rx_restore_rss_contexts = efx_mcdi_rx_restore_rss_contexts,

		.reconfigure_mac = ef100_reconfigure_mac,

		/* Per-type bar/size configuration not used on ef100. Location of
		@@ -903,6 +918,12 @@ static int ef100_probe_main(struct efx_nic *efx)
		if (rc)
		goto fail;

		netdev_rss_key_fill(efx->rss_context.rx_hash_key,
		sizeof(efx->rss_context.rx_hash_key));

		/* Don't fail init if RSS setup doesn't work. */
		efx_mcdi_push_default_indir_table(efx, efx->n_rx_channels);

		rc = ef100_register_netdev(efx);
		if (rc)
		goto fail;

drivers/net/ethernet/sfc/ef100_rx.c

+143 −7

Original line number	Diff line number	Diff line
		@@ -12,20 +12,156 @@
		#include "ef100_rx.h"
		#include "rx_common.h"
		#include "efx.h"
		#include "nic_common.h"
		#include "mcdi_functions.h"
		#include "ef100_regs.h"
		#include "ef100_nic.h"
		#include "io.h"

		/* RX stubs */
		/* Get the value of a field in the RX prefix */
		#define PREFIX_OFFSET_W(_f) (ESF_GZ_RX_PREFIX_ ## _f ## _LBN / 32)
		#define PREFIX_OFFSET_B(_f) (ESF_GZ_RX_PREFIX_ ## _f ## _LBN % 32)
		#define PREFIX_WIDTH_MASK(_f) ((1UL << ESF_GZ_RX_PREFIX_ ## _f ## _WIDTH) - 1)
		#define PREFIX_WORD(_p, _f) le32_to_cpu((__force __le32)(_p)[PREFIX_OFFSET_W(_f)])
		#define PREFIX_FIELD(_p, _f) ((PREFIX_WORD(_p, _f) >> PREFIX_OFFSET_B(_f)) & \
		PREFIX_WIDTH_MASK(_f))

		void ef100_rx_write(struct efx_rx_queue *rx_queue)
		#define ESF_GZ_RX_PREFIX_NT_OR_INNER_L3_CLASS_LBN \
		(ESF_GZ_RX_PREFIX_CLASS_LBN + ESF_GZ_RX_PREFIX_HCLASS_NT_OR_INNER_L3_CLASS_LBN)
		#define ESF_GZ_RX_PREFIX_NT_OR_INNER_L3_CLASS_WIDTH \
		ESF_GZ_RX_PREFIX_HCLASS_NT_OR_INNER_L3_CLASS_WIDTH

		static bool check_fcs(struct efx_channel channel, u32 prefix)
		{
		u16 rxclass;
		u8 l2status;

		rxclass = le16_to_cpu((__force __le16)PREFIX_FIELD(prefix, CLASS));
		l2status = PREFIX_FIELD(&rxclass, HCLASS_L2_STATUS);

		if (likely(l2status == ESE_GZ_RH_HCLASS_L2_STATUS_OK))
		/* Everything is ok */
		return 0;

		if (l2status == ESE_GZ_RH_HCLASS_L2_STATUS_FCS_ERR)
		channel->n_rx_eth_crc_err++;
		return 1;
		}

		void __ef100_rx_packet(struct efx_channel *channel)
		{
		/* Stub. No RX path yet. Discard the buffer. */
		struct efx_rx_buffer *rx_buf = efx_rx_buffer(&channel->rx_queue,
		channel->rx_pkt_index);
		struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
		struct efx_rx_buffer *rx_buf = efx_rx_buffer(&channel->rx_queue, channel->rx_pkt_index);
		struct efx_nic *efx = channel->efx;
		u8 *eh = efx_rx_buf_va(rx_buf);
		__wsum csum = 0;
		u32 *prefix;

		prefix = (u32 *)(eh - ESE_GZ_RX_PKT_PREFIX_LEN);

		if (check_fcs(channel, prefix) &&
		unlikely(!(efx->net_dev->features & NETIF_F_RXALL)))
		goto out;

		rx_buf->len = le16_to_cpu((__force __le16)PREFIX_FIELD(prefix, LENGTH));
		if (rx_buf->len <= sizeof(struct ethhdr)) {
		if (net_ratelimit())
		netif_err(channel->efx, rx_err, channel->efx->net_dev,
		"RX packet too small (%d)\n", rx_buf->len);
		++channel->n_rx_frm_trunc;
		goto out;
		}

		if (likely(efx->net_dev->features & NETIF_F_RXCSUM)) {
		if (PREFIX_FIELD(prefix, NT_OR_INNER_L3_CLASS) == 1) {
		++channel->n_rx_ip_hdr_chksum_err;
		} else {
		u16 sum = be16_to_cpu((__force __be16)PREFIX_FIELD(prefix, CSUM_FRAME));

		csum = (__force __wsum) sum;
		}
		}

		if (channel->type->receive_skb) {
		struct efx_rx_queue *rx_queue =
		efx_channel_get_rx_queue(channel);

		/* no support for special channels yet, so just discard */
		WARN_ON_ONCE(1);
		efx_free_rx_buffers(rx_queue, rx_buf, 1);
		goto out;
		}

		efx_rx_packet_gro(channel, rx_buf, channel->rx_pkt_n_frags, eh, csum);

		out:
		channel->rx_pkt_n_frags = 0;
		}

		static void ef100_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index)
		{
		struct efx_rx_buffer *rx_buf = efx_rx_buffer(rx_queue, index);
		struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
		struct efx_nic *efx = rx_queue->efx;

		++rx_queue->rx_packets;

		netif_vdbg(efx, rx_status, efx->net_dev,
		"RX queue %d received id %x\n",
		efx_rx_queue_index(rx_queue), index);

		efx_sync_rx_buffer(efx, rx_buf, efx->rx_dma_len);

		prefetch(efx_rx_buf_va(rx_buf));

		rx_buf->page_offset += efx->rx_prefix_size;

		efx_recycle_rx_pages(channel, rx_buf, 1);

		efx_rx_flush_packet(channel);
		channel->rx_pkt_n_frags = 1;
		channel->rx_pkt_index = index;
		}

		void efx_ef100_ev_rx(struct efx_channel channel, const efx_qword_t p_event)
		{
		struct efx_rx_queue *rx_queue = efx_channel_get_rx_queue(channel);
		unsigned int n_packets =
		EFX_QWORD_FIELD(*p_event, ESF_GZ_EV_RXPKTS_NUM_PKT);
		int i;

		WARN_ON_ONCE(!n_packets);
		if (n_packets > 1)
		++channel->n_rx_merge_events;

		channel->irq_mod_score += 2 * n_packets;

		for (i = 0; i < n_packets; ++i) {
		ef100_rx_packet(rx_queue,
		rx_queue->removed_count & rx_queue->ptr_mask);
		++rx_queue->removed_count;
		}
		}

		void ef100_rx_write(struct efx_rx_queue *rx_queue)
		{
		struct efx_rx_buffer *rx_buf;
		unsigned int idx;
		efx_qword_t *rxd;
		efx_dword_t rxdb;

		while (rx_queue->notified_count != rx_queue->added_count) {
		idx = rx_queue->notified_count & rx_queue->ptr_mask;
		rx_buf = efx_rx_buffer(rx_queue, idx);
		rxd = efx_rx_desc(rx_queue, idx);

		EFX_POPULATE_QWORD_1(*rxd, ESF_GZ_RX_BUF_ADDR, rx_buf->dma_addr);

		++rx_queue->notified_count;
		}

		wmb();
		EFX_POPULATE_DWORD_1(rxdb, ERF_GZ_RX_RING_PIDX,
		rx_queue->added_count & rx_queue->ptr_mask);
		efx_writed_page(rx_queue->efx, &rxdb,
		ER_GZ_RX_RING_DOORBELL, efx_rx_queue_index(rx_queue));
		}

drivers/net/ethernet/sfc/ef100_rx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include "net_driver.h"

		void efx_ef100_ev_rx(struct efx_channel channel, const efx_qword_t p_event);
		void ef100_rx_write(struct efx_rx_queue *rx_queue);
		void __ef100_rx_packet(struct efx_channel *channel);

Admin message