Merge branch 'nfp-whitespace-sync-and-flower-TCP-flags'
Jakub Kicinski says: ==================== nfp: whitespace sync and flower TCP flags Whitespace cleanup from Michael and flower offload support for matching on TCP flags from Pieter. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
a73d65b5cd
@ -61,6 +61,13 @@
|
||||
#define NFP_FLOWER_MASK_MPLS_BOS BIT(8)
|
||||
#define NFP_FLOWER_MASK_MPLS_Q BIT(0)
|
||||
|
||||
/* Compressed HW representation of TCP Flags */
|
||||
#define NFP_FL_TCP_FLAG_URG BIT(4)
|
||||
#define NFP_FL_TCP_FLAG_PSH BIT(3)
|
||||
#define NFP_FL_TCP_FLAG_RST BIT(2)
|
||||
#define NFP_FL_TCP_FLAG_SYN BIT(1)
|
||||
#define NFP_FL_TCP_FLAG_FIN BIT(0)
|
||||
|
||||
#define NFP_FL_SC_ACT_DROP 0x80000000
|
||||
#define NFP_FL_SC_ACT_USER 0x7D000000
|
||||
#define NFP_FL_SC_ACT_POPV 0x6A000000
|
||||
@ -257,7 +264,7 @@ struct nfp_flower_tp_ports {
|
||||
* 3 2 1
|
||||
* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | DSCP |ECN| protocol | reserved |
|
||||
* | DSCP |ECN| protocol | ttl | flags |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* | ipv4_addr_src |
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
@ -268,7 +275,7 @@ struct nfp_flower_ipv4 {
|
||||
u8 tos;
|
||||
u8 proto;
|
||||
u8 ttl;
|
||||
u8 reserved;
|
||||
u8 flags;
|
||||
__be32 ipv4_src;
|
||||
__be32 ipv4_dst;
|
||||
};
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
#include <linux/time64.h>
|
||||
#include <linux/types.h>
|
||||
#include <net/pkt_cls.h>
|
||||
#include <net/tcp.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
struct net_device;
|
||||
|
||||
@ -181,6 +181,26 @@ nfp_flower_compile_ipv4(struct nfp_flower_ipv4 *frame,
|
||||
frame->tos = flow_ip->tos;
|
||||
frame->ttl = flow_ip->ttl;
|
||||
}
|
||||
|
||||
if (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_TCP)) {
|
||||
struct flow_dissector_key_tcp *tcp;
|
||||
u32 tcp_flags;
|
||||
|
||||
tcp = skb_flow_dissector_target(flow->dissector,
|
||||
FLOW_DISSECTOR_KEY_TCP, target);
|
||||
tcp_flags = be16_to_cpu(tcp->flags);
|
||||
|
||||
if (tcp_flags & TCPHDR_FIN)
|
||||
frame->flags |= NFP_FL_TCP_FLAG_FIN;
|
||||
if (tcp_flags & TCPHDR_SYN)
|
||||
frame->flags |= NFP_FL_TCP_FLAG_SYN;
|
||||
if (tcp_flags & TCPHDR_RST)
|
||||
frame->flags |= NFP_FL_TCP_FLAG_RST;
|
||||
if (tcp_flags & TCPHDR_PSH)
|
||||
frame->flags |= NFP_FL_TCP_FLAG_PSH;
|
||||
if (tcp_flags & TCPHDR_URG)
|
||||
frame->flags |= NFP_FL_TCP_FLAG_URG;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -44,11 +44,16 @@
|
||||
#include "../nfp_net.h"
|
||||
#include "../nfp_port.h"
|
||||
|
||||
#define NFP_FLOWER_SUPPORTED_TCPFLAGS \
|
||||
(TCPHDR_FIN | TCPHDR_SYN | TCPHDR_RST | \
|
||||
TCPHDR_PSH | TCPHDR_URG)
|
||||
|
||||
#define NFP_FLOWER_WHITELIST_DISSECTOR \
|
||||
(BIT(FLOW_DISSECTOR_KEY_CONTROL) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_BASIC) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_TCP) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_PORTS) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) | \
|
||||
BIT(FLOW_DISSECTOR_KEY_VLAN) | \
|
||||
@ -288,6 +293,35 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
|
||||
}
|
||||
}
|
||||
|
||||
if (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_TCP)) {
|
||||
struct flow_dissector_key_tcp *tcp;
|
||||
u32 tcp_flags;
|
||||
|
||||
tcp = skb_flow_dissector_target(flow->dissector,
|
||||
FLOW_DISSECTOR_KEY_TCP,
|
||||
flow->key);
|
||||
tcp_flags = be16_to_cpu(tcp->flags);
|
||||
|
||||
if (tcp_flags & ~NFP_FLOWER_SUPPORTED_TCPFLAGS)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
/* We only support PSH and URG flags when either
|
||||
* FIN, SYN or RST is present as well.
|
||||
*/
|
||||
if ((tcp_flags & (TCPHDR_PSH | TCPHDR_URG)) &&
|
||||
!(tcp_flags & (TCPHDR_FIN | TCPHDR_SYN | TCPHDR_RST)))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
/* We need to store TCP flags in the IPv4 key space, thus
|
||||
* we need to ensure we include a IPv4 key layer if we have
|
||||
* not done so already.
|
||||
*/
|
||||
if (!(key_layer & NFP_FLOWER_LAYER_IPV4)) {
|
||||
key_layer |= NFP_FLOWER_LAYER_IPV4;
|
||||
key_size += sizeof(struct nfp_flower_ipv4);
|
||||
}
|
||||
}
|
||||
|
||||
ret_key_ls->key_layer = key_layer;
|
||||
ret_key_ls->key_layer_two = key_layer_two;
|
||||
ret_key_ls->key_size = key_size;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2015-2017 Netronome Systems, Inc.
|
||||
* Copyright (C) 2015-2018 Netronome Systems, Inc.
|
||||
*
|
||||
* This software is dual licensed under the GNU General License Version 2,
|
||||
* June 1991 as shown in the file COPYING in the top-level directory of this
|
||||
@ -51,12 +51,12 @@
|
||||
* The configuration BAR is 8K in size, but due to
|
||||
* THB-350, 32k needs to be reserved.
|
||||
*/
|
||||
#define NFP_NET_CFG_BAR_SZ (32 * 1024)
|
||||
#define NFP_NET_CFG_BAR_SZ (32 * 1024)
|
||||
|
||||
/**
|
||||
* Offset in Freelist buffer where packet starts on RX
|
||||
*/
|
||||
#define NFP_NET_RX_OFFSET 32
|
||||
#define NFP_NET_RX_OFFSET 32
|
||||
|
||||
/**
|
||||
* LSO parameters
|
||||
@ -75,65 +75,65 @@
|
||||
#define NFP_NET_META_PORTID 5
|
||||
#define NFP_NET_META_CSUM 6 /* checksum complete type */
|
||||
|
||||
#define NFP_META_PORT_ID_CTRL ~0U
|
||||
#define NFP_META_PORT_ID_CTRL ~0U
|
||||
|
||||
/**
|
||||
* Hash type pre-pended when a RSS hash was computed
|
||||
*/
|
||||
#define NFP_NET_RSS_NONE 0
|
||||
#define NFP_NET_RSS_IPV4 1
|
||||
#define NFP_NET_RSS_IPV6 2
|
||||
#define NFP_NET_RSS_IPV6_EX 3
|
||||
#define NFP_NET_RSS_IPV4_TCP 4
|
||||
#define NFP_NET_RSS_IPV6_TCP 5
|
||||
#define NFP_NET_RSS_IPV6_EX_TCP 6
|
||||
#define NFP_NET_RSS_IPV4_UDP 7
|
||||
#define NFP_NET_RSS_IPV6_UDP 8
|
||||
#define NFP_NET_RSS_IPV6_EX_UDP 9
|
||||
#define NFP_NET_RSS_NONE 0
|
||||
#define NFP_NET_RSS_IPV4 1
|
||||
#define NFP_NET_RSS_IPV6 2
|
||||
#define NFP_NET_RSS_IPV6_EX 3
|
||||
#define NFP_NET_RSS_IPV4_TCP 4
|
||||
#define NFP_NET_RSS_IPV6_TCP 5
|
||||
#define NFP_NET_RSS_IPV6_EX_TCP 6
|
||||
#define NFP_NET_RSS_IPV4_UDP 7
|
||||
#define NFP_NET_RSS_IPV6_UDP 8
|
||||
#define NFP_NET_RSS_IPV6_EX_UDP 9
|
||||
|
||||
/**
|
||||
* Ring counts
|
||||
* %NFP_NET_TXR_MAX: Maximum number of TX rings
|
||||
* %NFP_NET_RXR_MAX: Maximum number of RX rings
|
||||
* %NFP_NET_TXR_MAX: Maximum number of TX rings
|
||||
* %NFP_NET_RXR_MAX: Maximum number of RX rings
|
||||
*/
|
||||
#define NFP_NET_TXR_MAX 64
|
||||
#define NFP_NET_RXR_MAX 64
|
||||
#define NFP_NET_TXR_MAX 64
|
||||
#define NFP_NET_RXR_MAX 64
|
||||
|
||||
/**
|
||||
* Read/Write config words (0x0000 - 0x002c)
|
||||
* %NFP_NET_CFG_CTRL: Global control
|
||||
* %NFP_NET_CFG_CTRL: Global control
|
||||
* %NFP_NET_CFG_UPDATE: Indicate which fields are updated
|
||||
* %NFP_NET_CFG_TXRS_ENABLE: Bitmask of enabled TX rings
|
||||
* %NFP_NET_CFG_RXRS_ENABLE: Bitmask of enabled RX rings
|
||||
* %NFP_NET_CFG_MTU: Set MTU size
|
||||
* %NFP_NET_CFG_MTU: Set MTU size
|
||||
* %NFP_NET_CFG_FLBUFSZ: Set freelist buffer size (must be larger than MTU)
|
||||
* %NFP_NET_CFG_EXN: MSI-X table entry for exceptions
|
||||
* %NFP_NET_CFG_LSC: MSI-X table entry for link state changes
|
||||
* %NFP_NET_CFG_EXN: MSI-X table entry for exceptions
|
||||
* %NFP_NET_CFG_LSC: MSI-X table entry for link state changes
|
||||
* %NFP_NET_CFG_MACADDR: MAC address
|
||||
*
|
||||
* TODO:
|
||||
* - define Error details in UPDATE
|
||||
*/
|
||||
#define NFP_NET_CFG_CTRL 0x0000
|
||||
#define NFP_NET_CFG_CTRL_ENABLE (0x1 << 0) /* Global enable */
|
||||
#define NFP_NET_CFG_CTRL_PROMISC (0x1 << 1) /* Enable Promisc mode */
|
||||
#define NFP_NET_CFG_CTRL_L2BC (0x1 << 2) /* Allow L2 Broadcast */
|
||||
#define NFP_NET_CFG_CTRL_L2MC (0x1 << 3) /* Allow L2 Multicast */
|
||||
#define NFP_NET_CFG_CTRL_RXCSUM (0x1 << 4) /* Enable RX Checksum */
|
||||
#define NFP_NET_CFG_CTRL_TXCSUM (0x1 << 5) /* Enable TX Checksum */
|
||||
#define NFP_NET_CFG_CTRL_RXVLAN (0x1 << 6) /* Enable VLAN strip */
|
||||
#define NFP_NET_CFG_CTRL_TXVLAN (0x1 << 7) /* Enable VLAN insert */
|
||||
#define NFP_NET_CFG_CTRL_SCATTER (0x1 << 8) /* Scatter DMA */
|
||||
#define NFP_NET_CFG_CTRL_GATHER (0x1 << 9) /* Gather DMA */
|
||||
#define NFP_NET_CFG_CTRL_LSO (0x1 << 10) /* LSO/TSO (version 1) */
|
||||
#define NFP_NET_CFG_CTRL 0x0000
|
||||
#define NFP_NET_CFG_CTRL_ENABLE (0x1 << 0) /* Global enable */
|
||||
#define NFP_NET_CFG_CTRL_PROMISC (0x1 << 1) /* Enable Promisc mode */
|
||||
#define NFP_NET_CFG_CTRL_L2BC (0x1 << 2) /* Allow L2 Broadcast */
|
||||
#define NFP_NET_CFG_CTRL_L2MC (0x1 << 3) /* Allow L2 Multicast */
|
||||
#define NFP_NET_CFG_CTRL_RXCSUM (0x1 << 4) /* Enable RX Checksum */
|
||||
#define NFP_NET_CFG_CTRL_TXCSUM (0x1 << 5) /* Enable TX Checksum */
|
||||
#define NFP_NET_CFG_CTRL_RXVLAN (0x1 << 6) /* Enable VLAN strip */
|
||||
#define NFP_NET_CFG_CTRL_TXVLAN (0x1 << 7) /* Enable VLAN insert */
|
||||
#define NFP_NET_CFG_CTRL_SCATTER (0x1 << 8) /* Scatter DMA */
|
||||
#define NFP_NET_CFG_CTRL_GATHER (0x1 << 9) /* Gather DMA */
|
||||
#define NFP_NET_CFG_CTRL_LSO (0x1 << 10) /* LSO/TSO (version 1) */
|
||||
#define NFP_NET_CFG_CTRL_CTAG_FILTER (0x1 << 11) /* VLAN CTAG filtering */
|
||||
#define NFP_NET_CFG_CTRL_RINGCFG (0x1 << 16) /* Ring runtime changes */
|
||||
#define NFP_NET_CFG_CTRL_RINGCFG (0x1 << 16) /* Ring runtime changes */
|
||||
#define NFP_NET_CFG_CTRL_RSS (0x1 << 17) /* RSS (version 1) */
|
||||
#define NFP_NET_CFG_CTRL_IRQMOD (0x1 << 18) /* Interrupt moderation */
|
||||
#define NFP_NET_CFG_CTRL_RINGPRIO (0x1 << 19) /* Ring priorities */
|
||||
#define NFP_NET_CFG_CTRL_MSIXAUTO (0x1 << 20) /* MSI-X auto-masking */
|
||||
#define NFP_NET_CFG_CTRL_TXRWB (0x1 << 21) /* Write-back of TX ring*/
|
||||
#define NFP_NET_CFG_CTRL_L2SWITCH (0x1 << 22) /* L2 Switch */
|
||||
#define NFP_NET_CFG_CTRL_IRQMOD (0x1 << 18) /* Interrupt moderation */
|
||||
#define NFP_NET_CFG_CTRL_RINGPRIO (0x1 << 19) /* Ring priorities */
|
||||
#define NFP_NET_CFG_CTRL_MSIXAUTO (0x1 << 20) /* MSI-X auto-masking */
|
||||
#define NFP_NET_CFG_CTRL_TXRWB (0x1 << 21) /* Write-back of TX ring*/
|
||||
#define NFP_NET_CFG_CTRL_L2SWITCH (0x1 << 22) /* L2 Switch */
|
||||
#define NFP_NET_CFG_CTRL_L2SWITCH_LOCAL (0x1 << 23) /* Switch to local */
|
||||
#define NFP_NET_CFG_CTRL_VXLAN (0x1 << 24) /* VXLAN tunnel support */
|
||||
#define NFP_NET_CFG_CTRL_NVGRE (0x1 << 25) /* NVGRE tunnel support */
|
||||
@ -152,35 +152,35 @@
|
||||
#define NFP_NET_CFG_CTRL_CHAIN_META (NFP_NET_CFG_CTRL_RSS2 | \
|
||||
NFP_NET_CFG_CTRL_CSUM_COMPLETE)
|
||||
|
||||
#define NFP_NET_CFG_UPDATE 0x0004
|
||||
#define NFP_NET_CFG_UPDATE_GEN (0x1 << 0) /* General update */
|
||||
#define NFP_NET_CFG_UPDATE_RING (0x1 << 1) /* Ring config change */
|
||||
#define NFP_NET_CFG_UPDATE_RSS (0x1 << 2) /* RSS config change */
|
||||
#define NFP_NET_CFG_UPDATE_TXRPRIO (0x1 << 3) /* TX Ring prio change */
|
||||
#define NFP_NET_CFG_UPDATE_RXRPRIO (0x1 << 4) /* RX Ring prio change */
|
||||
#define NFP_NET_CFG_UPDATE_MSIX (0x1 << 5) /* MSI-X change */
|
||||
#define NFP_NET_CFG_UPDATE_L2SWITCH (0x1 << 6) /* Switch changes */
|
||||
#define NFP_NET_CFG_UPDATE_RESET (0x1 << 7) /* Update due to FLR */
|
||||
#define NFP_NET_CFG_UPDATE_IRQMOD (0x1 << 8) /* IRQ mod change */
|
||||
#define NFP_NET_CFG_UPDATE 0x0004
|
||||
#define NFP_NET_CFG_UPDATE_GEN (0x1 << 0) /* General update */
|
||||
#define NFP_NET_CFG_UPDATE_RING (0x1 << 1) /* Ring config change */
|
||||
#define NFP_NET_CFG_UPDATE_RSS (0x1 << 2) /* RSS config change */
|
||||
#define NFP_NET_CFG_UPDATE_TXRPRIO (0x1 << 3) /* TX Ring prio change */
|
||||
#define NFP_NET_CFG_UPDATE_RXRPRIO (0x1 << 4) /* RX Ring prio change */
|
||||
#define NFP_NET_CFG_UPDATE_MSIX (0x1 << 5) /* MSI-X change */
|
||||
#define NFP_NET_CFG_UPDATE_L2SWITCH (0x1 << 6) /* Switch changes */
|
||||
#define NFP_NET_CFG_UPDATE_RESET (0x1 << 7) /* Update due to FLR */
|
||||
#define NFP_NET_CFG_UPDATE_IRQMOD (0x1 << 8) /* IRQ mod change */
|
||||
#define NFP_NET_CFG_UPDATE_VXLAN (0x1 << 9) /* VXLAN port change */
|
||||
#define NFP_NET_CFG_UPDATE_BPF (0x1 << 10) /* BPF program load */
|
||||
#define NFP_NET_CFG_UPDATE_MACADDR (0x1 << 11) /* MAC address change */
|
||||
#define NFP_NET_CFG_UPDATE_MBOX (0x1 << 12) /* Mailbox update */
|
||||
#define NFP_NET_CFG_UPDATE_VF (0x1 << 13) /* VF settings change */
|
||||
#define NFP_NET_CFG_UPDATE_ERR (0x1 << 31) /* A error occurred */
|
||||
#define NFP_NET_CFG_TXRS_ENABLE 0x0008
|
||||
#define NFP_NET_CFG_RXRS_ENABLE 0x0010
|
||||
#define NFP_NET_CFG_MTU 0x0018
|
||||
#define NFP_NET_CFG_FLBUFSZ 0x001c
|
||||
#define NFP_NET_CFG_EXN 0x001f
|
||||
#define NFP_NET_CFG_LSC 0x0020
|
||||
#define NFP_NET_CFG_MACADDR 0x0024
|
||||
#define NFP_NET_CFG_UPDATE_ERR (0x1 << 31) /* A error occurred */
|
||||
#define NFP_NET_CFG_TXRS_ENABLE 0x0008
|
||||
#define NFP_NET_CFG_RXRS_ENABLE 0x0010
|
||||
#define NFP_NET_CFG_MTU 0x0018
|
||||
#define NFP_NET_CFG_FLBUFSZ 0x001c
|
||||
#define NFP_NET_CFG_EXN 0x001f
|
||||
#define NFP_NET_CFG_LSC 0x0020
|
||||
#define NFP_NET_CFG_MACADDR 0x0024
|
||||
|
||||
/**
|
||||
* Read-only words (0x0030 - 0x0050):
|
||||
* %NFP_NET_CFG_VERSION: Firmware version number
|
||||
* %NFP_NET_CFG_STS: Status
|
||||
* %NFP_NET_CFG_CAP: Capabilities (same bits as %NFP_NET_CFG_CTRL)
|
||||
* %NFP_NET_CFG_STS: Status
|
||||
* %NFP_NET_CFG_CAP: Capabilities (same bits as %NFP_NET_CFG_CTRL)
|
||||
* %NFP_NET_CFG_MAX_TXRINGS: Maximum number of TX rings
|
||||
* %NFP_NET_CFG_MAX_RXRINGS: Maximum number of RX rings
|
||||
* %NFP_NET_CFG_MAX_MTU: Maximum support MTU
|
||||
@ -190,37 +190,37 @@
|
||||
* TODO:
|
||||
* - define more STS bits
|
||||
*/
|
||||
#define NFP_NET_CFG_VERSION 0x0030
|
||||
#define NFP_NET_CFG_VERSION 0x0030
|
||||
#define NFP_NET_CFG_VERSION_RESERVED_MASK (0xff << 24)
|
||||
#define NFP_NET_CFG_VERSION_CLASS_MASK (0xff << 16)
|
||||
#define NFP_NET_CFG_VERSION_CLASS(x) (((x) & 0xff) << 16)
|
||||
#define NFP_NET_CFG_VERSION_CLASS(x) (((x) & 0xff) << 16)
|
||||
#define NFP_NET_CFG_VERSION_CLASS_GENERIC 0
|
||||
#define NFP_NET_CFG_VERSION_MAJOR_MASK (0xff << 8)
|
||||
#define NFP_NET_CFG_VERSION_MAJOR(x) (((x) & 0xff) << 8)
|
||||
#define NFP_NET_CFG_VERSION_MAJOR(x) (((x) & 0xff) << 8)
|
||||
#define NFP_NET_CFG_VERSION_MINOR_MASK (0xff << 0)
|
||||
#define NFP_NET_CFG_VERSION_MINOR(x) (((x) & 0xff) << 0)
|
||||
#define NFP_NET_CFG_STS 0x0034
|
||||
#define NFP_NET_CFG_STS_LINK (0x1 << 0) /* Link up or down */
|
||||
#define NFP_NET_CFG_VERSION_MINOR(x) (((x) & 0xff) << 0)
|
||||
#define NFP_NET_CFG_STS 0x0034
|
||||
#define NFP_NET_CFG_STS_LINK (0x1 << 0) /* Link up or down */
|
||||
/* Link rate */
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_SHIFT 1
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_MASK 0xF
|
||||
#define NFP_NET_CFG_STS_LINK_RATE \
|
||||
#define NFP_NET_CFG_STS_LINK_RATE \
|
||||
(NFP_NET_CFG_STS_LINK_RATE_MASK << NFP_NET_CFG_STS_LINK_RATE_SHIFT)
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED 0
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_UNKNOWN 1
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_1G 2
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_10G 3
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_25G 4
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_40G 5
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_50G 6
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_100G 7
|
||||
#define NFP_NET_CFG_CAP 0x0038
|
||||
#define NFP_NET_CFG_MAX_TXRINGS 0x003c
|
||||
#define NFP_NET_CFG_MAX_RXRINGS 0x0040
|
||||
#define NFP_NET_CFG_MAX_MTU 0x0044
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_UNKNOWN 1
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_1G 2
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_10G 3
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_25G 4
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_40G 5
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_50G 6
|
||||
#define NFP_NET_CFG_STS_LINK_RATE_100G 7
|
||||
#define NFP_NET_CFG_CAP 0x0038
|
||||
#define NFP_NET_CFG_MAX_TXRINGS 0x003c
|
||||
#define NFP_NET_CFG_MAX_RXRINGS 0x0040
|
||||
#define NFP_NET_CFG_MAX_MTU 0x0044
|
||||
/* Next two words are being used by VFs for solving THB350 issue */
|
||||
#define NFP_NET_CFG_START_TXQ 0x0048
|
||||
#define NFP_NET_CFG_START_RXQ 0x004c
|
||||
#define NFP_NET_CFG_START_TXQ 0x0048
|
||||
#define NFP_NET_CFG_START_RXQ 0x004c
|
||||
|
||||
/**
|
||||
* Prepend configuration
|
||||
@ -280,8 +280,8 @@
|
||||
/**
|
||||
* 40B reserved for future use (0x0098 - 0x00c0)
|
||||
*/
|
||||
#define NFP_NET_CFG_RESERVED 0x0098
|
||||
#define NFP_NET_CFG_RESERVED_SZ 0x0028
|
||||
#define NFP_NET_CFG_RESERVED 0x0098
|
||||
#define NFP_NET_CFG_RESERVED_SZ 0x0028
|
||||
|
||||
/**
|
||||
* RSS configuration (0x0100 - 0x01ac):
|
||||
@ -290,26 +290,26 @@
|
||||
* %NFP_NET_CFG_RSS_KEY: RSS "secret" key
|
||||
* %NFP_NET_CFG_RSS_ITBL: RSS indirection table
|
||||
*/
|
||||
#define NFP_NET_CFG_RSS_BASE 0x0100
|
||||
#define NFP_NET_CFG_RSS_CTRL NFP_NET_CFG_RSS_BASE
|
||||
#define NFP_NET_CFG_RSS_MASK (0x7f)
|
||||
#define NFP_NET_CFG_RSS_MASK_of(_x) ((_x) & 0x7f)
|
||||
#define NFP_NET_CFG_RSS_IPV4 (1 << 8) /* RSS for IPv4 */
|
||||
#define NFP_NET_CFG_RSS_IPV6 (1 << 9) /* RSS for IPv6 */
|
||||
#define NFP_NET_CFG_RSS_IPV4_TCP (1 << 10) /* RSS for IPv4/TCP */
|
||||
#define NFP_NET_CFG_RSS_IPV4_UDP (1 << 11) /* RSS for IPv4/UDP */
|
||||
#define NFP_NET_CFG_RSS_IPV6_TCP (1 << 12) /* RSS for IPv6/TCP */
|
||||
#define NFP_NET_CFG_RSS_IPV6_UDP (1 << 13) /* RSS for IPv6/UDP */
|
||||
#define NFP_NET_CFG_RSS_BASE 0x0100
|
||||
#define NFP_NET_CFG_RSS_CTRL NFP_NET_CFG_RSS_BASE
|
||||
#define NFP_NET_CFG_RSS_MASK (0x7f)
|
||||
#define NFP_NET_CFG_RSS_MASK_of(_x) ((_x) & 0x7f)
|
||||
#define NFP_NET_CFG_RSS_IPV4 (1 << 8) /* RSS for IPv4 */
|
||||
#define NFP_NET_CFG_RSS_IPV6 (1 << 9) /* RSS for IPv6 */
|
||||
#define NFP_NET_CFG_RSS_IPV4_TCP (1 << 10) /* RSS for IPv4/TCP */
|
||||
#define NFP_NET_CFG_RSS_IPV4_UDP (1 << 11) /* RSS for IPv4/UDP */
|
||||
#define NFP_NET_CFG_RSS_IPV6_TCP (1 << 12) /* RSS for IPv6/TCP */
|
||||
#define NFP_NET_CFG_RSS_IPV6_UDP (1 << 13) /* RSS for IPv6/UDP */
|
||||
#define NFP_NET_CFG_RSS_HFUNC 0xff000000
|
||||
#define NFP_NET_CFG_RSS_TOEPLITZ (1 << 24) /* Use Toeplitz hash */
|
||||
#define NFP_NET_CFG_RSS_TOEPLITZ (1 << 24) /* Use Toeplitz hash */
|
||||
#define NFP_NET_CFG_RSS_XOR (1 << 25) /* Use XOR as hash */
|
||||
#define NFP_NET_CFG_RSS_CRC32 (1 << 26) /* Use CRC32 as hash */
|
||||
#define NFP_NET_CFG_RSS_HFUNCS 3
|
||||
#define NFP_NET_CFG_RSS_KEY (NFP_NET_CFG_RSS_BASE + 0x4)
|
||||
#define NFP_NET_CFG_RSS_KEY_SZ 0x28
|
||||
#define NFP_NET_CFG_RSS_ITBL (NFP_NET_CFG_RSS_BASE + 0x4 + \
|
||||
#define NFP_NET_CFG_RSS_KEY (NFP_NET_CFG_RSS_BASE + 0x4)
|
||||
#define NFP_NET_CFG_RSS_KEY_SZ 0x28
|
||||
#define NFP_NET_CFG_RSS_ITBL (NFP_NET_CFG_RSS_BASE + 0x4 + \
|
||||
NFP_NET_CFG_RSS_KEY_SZ)
|
||||
#define NFP_NET_CFG_RSS_ITBL_SZ 0x80
|
||||
#define NFP_NET_CFG_RSS_ITBL_SZ 0x80
|
||||
|
||||
/**
|
||||
* TX ring configuration (0x200 - 0x800)
|
||||
@ -321,13 +321,13 @@
|
||||
* %NFP_NET_CFG_TXR_PRIO: Per TX ring priority (1B entries)
|
||||
* %NFP_NET_CFG_TXR_IRQ_MOD: Per TX ring interrupt moderation packet
|
||||
*/
|
||||
#define NFP_NET_CFG_TXR_BASE 0x0200
|
||||
#define NFP_NET_CFG_TXR_ADDR(_x) (NFP_NET_CFG_TXR_BASE + ((_x) * 0x8))
|
||||
#define NFP_NET_CFG_TXR_WB_ADDR(_x) (NFP_NET_CFG_TXR_BASE + 0x200 + \
|
||||
#define NFP_NET_CFG_TXR_BASE 0x0200
|
||||
#define NFP_NET_CFG_TXR_ADDR(_x) (NFP_NET_CFG_TXR_BASE + ((_x) * 0x8))
|
||||
#define NFP_NET_CFG_TXR_WB_ADDR(_x) (NFP_NET_CFG_TXR_BASE + 0x200 + \
|
||||
((_x) * 0x8))
|
||||
#define NFP_NET_CFG_TXR_SZ(_x) (NFP_NET_CFG_TXR_BASE + 0x400 + (_x))
|
||||
#define NFP_NET_CFG_TXR_VEC(_x) (NFP_NET_CFG_TXR_BASE + 0x440 + (_x))
|
||||
#define NFP_NET_CFG_TXR_PRIO(_x) (NFP_NET_CFG_TXR_BASE + 0x480 + (_x))
|
||||
#define NFP_NET_CFG_TXR_SZ(_x) (NFP_NET_CFG_TXR_BASE + 0x400 + (_x))
|
||||
#define NFP_NET_CFG_TXR_VEC(_x) (NFP_NET_CFG_TXR_BASE + 0x440 + (_x))
|
||||
#define NFP_NET_CFG_TXR_PRIO(_x) (NFP_NET_CFG_TXR_BASE + 0x480 + (_x))
|
||||
#define NFP_NET_CFG_TXR_IRQ_MOD(_x) (NFP_NET_CFG_TXR_BASE + 0x500 + \
|
||||
((_x) * 0x4))
|
||||
|
||||
@ -340,11 +340,11 @@
|
||||
* %NFP_NET_CFG_RXR_PRIO: Per RX ring priority (1B entries)
|
||||
* %NFP_NET_CFG_RXR_IRQ_MOD: Per RX ring interrupt moderation (4B entries)
|
||||
*/
|
||||
#define NFP_NET_CFG_RXR_BASE 0x0800
|
||||
#define NFP_NET_CFG_RXR_ADDR(_x) (NFP_NET_CFG_RXR_BASE + ((_x) * 0x8))
|
||||
#define NFP_NET_CFG_RXR_SZ(_x) (NFP_NET_CFG_RXR_BASE + 0x200 + (_x))
|
||||
#define NFP_NET_CFG_RXR_VEC(_x) (NFP_NET_CFG_RXR_BASE + 0x240 + (_x))
|
||||
#define NFP_NET_CFG_RXR_PRIO(_x) (NFP_NET_CFG_RXR_BASE + 0x280 + (_x))
|
||||
#define NFP_NET_CFG_RXR_BASE 0x0800
|
||||
#define NFP_NET_CFG_RXR_ADDR(_x) (NFP_NET_CFG_RXR_BASE + ((_x) * 0x8))
|
||||
#define NFP_NET_CFG_RXR_SZ(_x) (NFP_NET_CFG_RXR_BASE + 0x200 + (_x))
|
||||
#define NFP_NET_CFG_RXR_VEC(_x) (NFP_NET_CFG_RXR_BASE + 0x240 + (_x))
|
||||
#define NFP_NET_CFG_RXR_PRIO(_x) (NFP_NET_CFG_RXR_BASE + 0x280 + (_x))
|
||||
#define NFP_NET_CFG_RXR_IRQ_MOD(_x) (NFP_NET_CFG_RXR_BASE + 0x300 + \
|
||||
((_x) * 0x4))
|
||||
|
||||
@ -358,36 +358,36 @@
|
||||
* the MSI-X entry and the host driver must clear the register to
|
||||
* re-enable the interrupt.
|
||||
*/
|
||||
#define NFP_NET_CFG_ICR_BASE 0x0c00
|
||||
#define NFP_NET_CFG_ICR(_x) (NFP_NET_CFG_ICR_BASE + (_x))
|
||||
#define NFP_NET_CFG_ICR_UNMASKED 0x0
|
||||
#define NFP_NET_CFG_ICR_RXTX 0x1
|
||||
#define NFP_NET_CFG_ICR_LSC 0x2
|
||||
#define NFP_NET_CFG_ICR_BASE 0x0c00
|
||||
#define NFP_NET_CFG_ICR(_x) (NFP_NET_CFG_ICR_BASE + (_x))
|
||||
#define NFP_NET_CFG_ICR_UNMASKED 0x0
|
||||
#define NFP_NET_CFG_ICR_RXTX 0x1
|
||||
#define NFP_NET_CFG_ICR_LSC 0x2
|
||||
|
||||
/**
|
||||
* General device stats (0x0d00 - 0x0d90)
|
||||
* all counters are 64bit.
|
||||
*/
|
||||
#define NFP_NET_CFG_STATS_BASE 0x0d00
|
||||
#define NFP_NET_CFG_STATS_RX_DISCARDS (NFP_NET_CFG_STATS_BASE + 0x00)
|
||||
#define NFP_NET_CFG_STATS_RX_ERRORS (NFP_NET_CFG_STATS_BASE + 0x08)
|
||||
#define NFP_NET_CFG_STATS_RX_OCTETS (NFP_NET_CFG_STATS_BASE + 0x10)
|
||||
#define NFP_NET_CFG_STATS_RX_UC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x18)
|
||||
#define NFP_NET_CFG_STATS_RX_MC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x20)
|
||||
#define NFP_NET_CFG_STATS_RX_BC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x28)
|
||||
#define NFP_NET_CFG_STATS_RX_FRAMES (NFP_NET_CFG_STATS_BASE + 0x30)
|
||||
#define NFP_NET_CFG_STATS_RX_MC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x38)
|
||||
#define NFP_NET_CFG_STATS_RX_BC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x40)
|
||||
#define NFP_NET_CFG_STATS_BASE 0x0d00
|
||||
#define NFP_NET_CFG_STATS_RX_DISCARDS (NFP_NET_CFG_STATS_BASE + 0x00)
|
||||
#define NFP_NET_CFG_STATS_RX_ERRORS (NFP_NET_CFG_STATS_BASE + 0x08)
|
||||
#define NFP_NET_CFG_STATS_RX_OCTETS (NFP_NET_CFG_STATS_BASE + 0x10)
|
||||
#define NFP_NET_CFG_STATS_RX_UC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x18)
|
||||
#define NFP_NET_CFG_STATS_RX_MC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x20)
|
||||
#define NFP_NET_CFG_STATS_RX_BC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x28)
|
||||
#define NFP_NET_CFG_STATS_RX_FRAMES (NFP_NET_CFG_STATS_BASE + 0x30)
|
||||
#define NFP_NET_CFG_STATS_RX_MC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x38)
|
||||
#define NFP_NET_CFG_STATS_RX_BC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x40)
|
||||
|
||||
#define NFP_NET_CFG_STATS_TX_DISCARDS (NFP_NET_CFG_STATS_BASE + 0x48)
|
||||
#define NFP_NET_CFG_STATS_TX_ERRORS (NFP_NET_CFG_STATS_BASE + 0x50)
|
||||
#define NFP_NET_CFG_STATS_TX_OCTETS (NFP_NET_CFG_STATS_BASE + 0x58)
|
||||
#define NFP_NET_CFG_STATS_TX_UC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x60)
|
||||
#define NFP_NET_CFG_STATS_TX_MC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x68)
|
||||
#define NFP_NET_CFG_STATS_TX_BC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x70)
|
||||
#define NFP_NET_CFG_STATS_TX_FRAMES (NFP_NET_CFG_STATS_BASE + 0x78)
|
||||
#define NFP_NET_CFG_STATS_TX_MC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x80)
|
||||
#define NFP_NET_CFG_STATS_TX_BC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x88)
|
||||
#define NFP_NET_CFG_STATS_TX_DISCARDS (NFP_NET_CFG_STATS_BASE + 0x48)
|
||||
#define NFP_NET_CFG_STATS_TX_ERRORS (NFP_NET_CFG_STATS_BASE + 0x50)
|
||||
#define NFP_NET_CFG_STATS_TX_OCTETS (NFP_NET_CFG_STATS_BASE + 0x58)
|
||||
#define NFP_NET_CFG_STATS_TX_UC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x60)
|
||||
#define NFP_NET_CFG_STATS_TX_MC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x68)
|
||||
#define NFP_NET_CFG_STATS_TX_BC_OCTETS (NFP_NET_CFG_STATS_BASE + 0x70)
|
||||
#define NFP_NET_CFG_STATS_TX_FRAMES (NFP_NET_CFG_STATS_BASE + 0x78)
|
||||
#define NFP_NET_CFG_STATS_TX_MC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x80)
|
||||
#define NFP_NET_CFG_STATS_TX_BC_FRAMES (NFP_NET_CFG_STATS_BASE + 0x88)
|
||||
|
||||
#define NFP_NET_CFG_STATS_APP0_FRAMES (NFP_NET_CFG_STATS_BASE + 0x90)
|
||||
#define NFP_NET_CFG_STATS_APP0_BYTES (NFP_NET_CFG_STATS_BASE + 0x98)
|
||||
@ -404,11 +404,11 @@
|
||||
* %NFP_NET_CFG_TXR_STATS: TX ring statistics (Packet and Byte count)
|
||||
* %NFP_NET_CFG_RXR_STATS: RX ring statistics (Packet and Byte count)
|
||||
*/
|
||||
#define NFP_NET_CFG_TXR_STATS_BASE 0x1000
|
||||
#define NFP_NET_CFG_TXR_STATS(_x) (NFP_NET_CFG_TXR_STATS_BASE + \
|
||||
#define NFP_NET_CFG_TXR_STATS_BASE 0x1000
|
||||
#define NFP_NET_CFG_TXR_STATS(_x) (NFP_NET_CFG_TXR_STATS_BASE + \
|
||||
((_x) * 0x10))
|
||||
#define NFP_NET_CFG_RXR_STATS_BASE 0x1400
|
||||
#define NFP_NET_CFG_RXR_STATS(_x) (NFP_NET_CFG_RXR_STATS_BASE + \
|
||||
#define NFP_NET_CFG_RXR_STATS_BASE 0x1400
|
||||
#define NFP_NET_CFG_RXR_STATS(_x) (NFP_NET_CFG_RXR_STATS_BASE + \
|
||||
((_x) * 0x10))
|
||||
|
||||
/**
|
||||
@ -444,7 +444,7 @@
|
||||
* %NFP_NET_CFG_TLV_TYPE: Offset of type within the TLV
|
||||
* %NFP_NET_CFG_TLV_TYPE_REQUIRED: Driver must be able to parse the TLV
|
||||
* %NFP_NET_CFG_TLV_LENGTH: Offset of length within the TLV
|
||||
* %NFP_NET_CFG_TLV_LENGTH_INC: TLV length increments
|
||||
* %NFP_NET_CFG_TLV_LENGTH_INC: TLV length increments
|
||||
* %NFP_NET_CFG_TLV_VALUE: Offset of value with the TLV
|
||||
*
|
||||
* List of simple TLV structures, first one starts at %NFP_NET_CFG_TLV_BASE.
|
||||
@ -457,12 +457,12 @@
|
||||
* Note that the 4 byte TLV header is not counted in %NFP_NET_CFG_TLV_LENGTH.
|
||||
*/
|
||||
#define NFP_NET_CFG_TLV_TYPE 0x00
|
||||
#define NFP_NET_CFG_TLV_TYPE_REQUIRED 0x8000
|
||||
#define NFP_NET_CFG_TLV_TYPE_REQUIRED 0x8000
|
||||
#define NFP_NET_CFG_TLV_LENGTH 0x02
|
||||
#define NFP_NET_CFG_TLV_LENGTH_INC 4
|
||||
#define NFP_NET_CFG_TLV_VALUE 0x04
|
||||
|
||||
#define NFP_NET_CFG_TLV_HEADER_REQUIRED 0x80000000
|
||||
#define NFP_NET_CFG_TLV_HEADER_REQUIRED 0x80000000
|
||||
#define NFP_NET_CFG_TLV_HEADER_TYPE 0x7fff0000
|
||||
#define NFP_NET_CFG_TLV_HEADER_LENGTH 0x0000ffff
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user