@@ -200,6 +200,7 @@ Carolyn Wyborny <carolyn.wyborny@intel.com>
Chaeyong Chong <cychong@gmail.com>
Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
Chandubabu Namburu <chandu@amd.com>
+Chang Miao <chang.miao@corigine.com>
Changchun Ouyang <changchun.ouyang@intel.com>
Changpeng Liu <changpeng.liu@intel.com>
Changqing Wu <changqingx.wu@intel.com>
@@ -1265,6 +1266,7 @@ Shelton Chia <jiaxt@sinogrid.com>
Shepard Siegel <shepard.siegel@atomicrules.com>
Shesha Sreenivasamurthy <shesha@cisco.com>
Shibin Koikkara Reeny <shibin.koikkara.reeny@intel.com>
+Shihong Wang <shihong.wang@corigine.com>
Shijith Thotton <sthotton@marvell.com> <shijith.thotton@caviumnetworks.com>
Shiqi Liu <835703180@qq.com>
Shiri Kuzin <shirik@nvidia.com> <shirik@mellanox.com>
@@ -27,6 +27,7 @@ sources = files(
'nfpcore/nfp_target.c',
'nfpcore/nfp6000_pcie.c',
'nfp_common.c',
+ 'nfp_ctrl.c',
'nfp_rxtx.c',
'nfp_cpp_bridge.c',
'nfp_ethdev_vf.c',
@@ -64,6 +64,13 @@ enum nfp_net_meta_format {
NFP_NET_METAFORMAT_CHAINED,
};
+/* Parsed control BAR TLV capabilities */
+struct nfp_net_tlv_caps {
+ uint32_t mbox_off; /**< VNIC mailbox area offset */
+ uint32_t mbox_len; /**< VNIC mailbox area length */
+ uint32_t mbox_cmsg_types; /**< Cmsgs which can be passed through the mailbox */
+};
+
struct nfp_pf_dev {
/* Backpointer to associated pci device */
struct rte_pci_device *pci_dev;
@@ -163,6 +170,8 @@ struct nfp_net_hw {
uint8_t idx;
/* Internal port number as seen from NFP */
uint8_t nfp_idx;
+
+ struct nfp_net_tlv_caps tlv_caps;
};
struct nfp_net_adapter {
new file mode 100644
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Corigine Systems, Inc.
+ * All rights reserved.
+ */
+
+#include "nfp_ctrl.h"
+
+#include <ethdev_pci.h>
+
+#include "nfpcore/nfp_platform.h"
+
+#include "nfp_common.h"
+#include "nfp_logs.h"
+
+static void
+nfp_net_tlv_caps_reset(struct nfp_net_tlv_caps *caps)
+{
+ memset(caps, 0, sizeof(*caps));
+ caps->mbox_off = NFP_NET_CFG_MBOX_BASE;
+ caps->mbox_len = NFP_NET_CFG_MBOX_VAL_MAX_SZ;
+}
+
+int
+nfp_net_tlv_caps_parse(struct rte_eth_dev *dev)
+{
+ uint32_t hdr;
+ uint8_t *end;
+ uint8_t *data;
+ uint32_t length;
+ uint32_t offset;
+ uint32_t tlv_type;
+ struct nfp_net_hw *hw;
+ struct nfp_net_tlv_caps *caps;
+
+ hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ caps = &hw->tlv_caps;
+ nfp_net_tlv_caps_reset(caps);
+
+ data = hw->ctrl_bar + NFP_NET_CFG_TLV_BASE;
+ end = hw->ctrl_bar + NFP_NET_CFG_BAR_SZ;
+
+ hdr = rte_read32(data);
+ if (hdr == 0) {
+ PMD_DRV_LOG(INFO, "TLV is empty!");
+ return 0;
+ }
+
+ for (; ; data += length) {
+ offset = data - hw->ctrl_bar;
+
+ if (data + NFP_NET_CFG_TLV_VALUE > end) {
+ PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV");
+ return -EINVAL;
+ }
+
+ hdr = rte_read32(data);
+
+ length = FIELD_GET(NFP_NET_CFG_TLV_HEADER_LENGTH, hdr);
+ if ((length & (NFP_NET_CFG_TLV_LENGTH_INC - 1)) != 0) {
+ PMD_DRV_LOG(ERR, "TLV size not multiple of 4B len: %u", length);
+ return -EINVAL;
+ }
+
+ /* Advance past the header */
+ data += NFP_NET_CFG_TLV_VALUE;
+ if (data + length > end) {
+ PMD_DRV_LOG(ERR, "Oversized TLV offset: %u len: %u",
+ offset, length);
+ return -EINVAL;
+ }
+
+ tlv_type = FIELD_GET(NFP_NET_CFG_TLV_HEADER_TYPE, hdr);
+
+ switch (tlv_type) {
+ case NFP_NET_CFG_TLV_TYPE_UNKNOWN:
+ PMD_DRV_LOG(ERR, "Unknown TLV at offset: %u", offset);
+ return -EINVAL;
+ case NFP_NET_CFG_TLV_TYPE_RESERVED:
+ break;
+ case NFP_NET_CFG_TLV_TYPE_END:
+ if (length == 0)
+ return 0;
+
+ PMD_DRV_LOG(ERR, "END TLV should be empty, has len: %u", length);
+ return -EINVAL;
+ case NFP_NET_CFG_TLV_TYPE_MBOX:
+ caps->mbox_len = length;
+
+ if (length != 0)
+ caps->mbox_off = data - hw->ctrl_bar;
+ else
+ caps->mbox_off = 0;
+ break;
+ case NFP_NET_CFG_TLV_TYPE_MBOX_CMSG_TYPES:
+ if (length != 0)
+ caps->mbox_cmsg_types = rte_read32(data);
+ break;
+ default:
+ if (FIELD_GET(NFP_NET_CFG_TLV_HEADER_REQUIRED, hdr) == 0)
+ break;
+
+ PMD_DRV_LOG(ERR, "Unknown TLV type: %u offset: %u len: %u",
+ tlv_type, offset, length);
+ return -EINVAL;
+ }
+ }
+
+ PMD_DRV_LOG(ERR, "Reached end of BAR without END TLV");
+ return -EINVAL;
+}
@@ -8,6 +8,8 @@
#include <stdint.h>
+#include <ethdev_driver.h>
+
/*
* Configuration BAR size.
*
@@ -207,6 +209,9 @@ struct nfp_net_fw_ver {
#define NFP_NET_CFG_RX_OFFSET 0x0050
#define NFP_NET_CFG_RX_OFFSET_DYNAMIC 0 /* Prepend mode */
+/* Start anchor of the TLV area */
+#define NFP_NET_CFG_TLV_BASE 0x0058
+
/**
* Reuse spare address to contain the offset from the start of
* the host buffer where the first byte of the received frame
@@ -434,6 +439,115 @@ struct nfp_net_fw_ver {
#define NFP_PF_CSR_SLICE_SIZE (32 * 1024)
+/*
+ * General use mailbox area (0x1800 - 0x19ff)
+ * 4B used for update command and 4B return code followed by
+ * a max of 504B of variable length value.
+ */
+#define NFP_NET_CFG_MBOX_BASE 0x1800
+#define NFP_NET_CFG_MBOX_VAL 0x1808
+#define NFP_NET_CFG_MBOX_VAL_MAX_SZ 0x1F8
+
+/*
+ * TLV capabilities
+ * @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_VALUE: Offset of value with the TLV
+ * @NFP_NET_CFG_TLV_STATS_OFFSET: Length of TLV stats offset
+ *
+ * List of simple TLV structures, first one starts at @NFP_NET_CFG_TLV_BASE.
+ * Last structure must be of type @NFP_NET_CFG_TLV_TYPE_END. Presence of TLVs
+ * is indicated by @NFP_NET_CFG_TLV_BASE being non-zero. TLV structures may
+ * fill the entire remainder of the BAR or be shorter. FW must make sure TLVs
+ * don't conflict with other features which allocate space beyond
+ * @NFP_NET_CFG_TLV_BASE. @NFP_NET_CFG_TLV_TYPE_RESERVED should be used to wrap
+ * space used by such features.
+ *
+ * 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_LENGTH 0x02
+#define NFP_NET_CFG_TLV_LENGTH_INC 4
+#define NFP_NET_CFG_TLV_VALUE 0x04
+#define NFP_NET_CFG_TLV_STATS_OFFSET 0x08
+
+#define NFP_NET_CFG_TLV_HEADER_REQUIRED 0x80000000
+#define NFP_NET_CFG_TLV_HEADER_TYPE 0x7fff0000
+#define NFP_NET_CFG_TLV_HEADER_LENGTH 0x0000ffff
+
+/*
+ * Capability TLV types
+ *
+ * @NFP_NET_CFG_TLV_TYPE_UNKNOWN:
+ * Special TLV type to catch bugs, should never be encountered. Drivers should
+ * treat encountering this type as error and refuse to probe.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_RESERVED:
+ * Reserved space, may contain legacy fixed-offset fields, or be used for
+ * padding. The use of this type should be otherwise avoided.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_END:
+ * Empty, end of TLV list. Must be the last TLV. Drivers will stop processing
+ * further TLVs when encountered.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_ME_FREQ:
+ * Single word, ME frequency in MHz as used in calculation for
+ * @NFP_NET_CFG_RXR_IRQ_MOD and @NFP_NET_CFG_TXR_IRQ_MOD.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_MBOX:
+ * Variable, mailbox area. Overwrites the default location which is
+ * @NFP_NET_CFG_MBOX_BASE and length @NFP_NET_CFG_MBOX_VAL_MAX_SZ.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_EXPERIMENTAL0:
+ * @NFP_NET_CFG_TLV_TYPE_EXPERIMENTAL1:
+ * Variable, experimental IDs. IDs designated for internal development and
+ * experiments before a stable TLV ID has been allocated to a feature. Should
+ * never be present in production FW.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_REPR_CAP:
+ * Single word, equivalent of %NFP_NET_CFG_CAP for representors, features which
+ * can be used on representors.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_MBOX_CMSG_TYPES:
+ * Variable, bitmap of control message types supported by the mailbox handler.
+ * Bit 0 corresponds to message type 0, bit 1 to 1, etc. Control messages are
+ * encapsulated into simple TLVs, with an end TLV and written to the Mailbox.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_CRYPTO_OPS:
+ * 8 words, bitmaps of supported and enabled crypto operations.
+ * First 16B (4 words) contains a bitmap of supported crypto operations,
+ * and next 16B contain the enabled operations.
+ * This capability is obsoleted by ones with better sync methods.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_VNIC_STATS:
+ * Variable, per-vNIC statistics, data should be 8B aligned (FW should insert
+ * zero-length RESERVED TLV to pad).
+ * TLV data has two sections. First is an array of statistics' IDs (2B each).
+ * Second 8B statistics themselves. Statistics are 8B aligned, meaning there
+ * may be a padding between sections.
+ * Number of statistics can be determined as floor(tlv.length / (2 + 8)).
+ * This TLV overwrites %NFP_NET_CFG_STATS_* values (statistics in this TLV
+ * duplicate the old ones, so driver should be careful not to unnecessarily
+ * render both).
+ *
+ * @NFP_NET_CFG_TLV_TYPE_CRYPTO_OPS_RX_SCAN:
+ * Same as %NFP_NET_CFG_TLV_TYPE_CRYPTO_OPS, but crypto TLS does stream scan
+ * RX sync, rather than kernel-assisted sync.
+ *
+ * @NFP_NET_CFG_TLV_TYPE_CRYPTO_OPS_LENGTH:
+ * CRYPTO OPS TLV should be at least 32B.
+ */
+#define NFP_NET_CFG_TLV_TYPE_UNKNOWN 0
+#define NFP_NET_CFG_TLV_TYPE_RESERVED 1
+#define NFP_NET_CFG_TLV_TYPE_END 2
+#define NFP_NET_CFG_TLV_TYPE_MBOX 4
+#define NFP_NET_CFG_TLV_TYPE_MBOX_CMSG_TYPES 10
+
+int nfp_net_tlv_caps_parse(struct rte_eth_dev *dev);
+
/*
* nfp_net_cfg_ctrl_rss() - Get RSS flag based on firmware's capability
* @hw_cap: The firmware's capabilities
@@ -549,6 +549,12 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
if (err != 0)
return err;
+ err = nfp_net_tlv_caps_parse(eth_dev);
+ if (err != 0) {
+ PMD_INIT_LOG(ERR, "Failed to parser TLV caps");
+ return err;
+ }
+
nfp_net_ethdev_ops_mount(hw, eth_dev);
hw->eth_xstats_base = rte_malloc("rte_eth_xstat", sizeof(struct rte_eth_xstat) *