net/octeontx2: support SDP interface

System DPI Packet Interface Unit (SDP) is a co-processor
of OCTEON TX2 which provides PCIe endpoint support for a
remote host to DMA packets into and out of the OCTEON TX2 SoC.
SDP interface comes in to live only when it is connected in
EP mode. It exposes input and output queue pairs to remote host
for instruction input and packet output. It can be used as
a communication channel between remote host and OCTEON TX2.
Host machine needs to use corresponding user/kernel mode
driver to communicate with SDP interface on OCTEON TX2 SoC.

SDP interface support is limited to SDP PF device now.
No SDP VF support.

Signed-off-by: Subrahmanyam Nilla <snilla@marvell.com>
Signed-off-by: Venkateshwarlu Nalla <venkatn@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index eb7aaa468f68623ea3bd585e9854aa9a0999550b..da73b99df1eb9c2aa01151c1321600a335ceb4c4 100644 (file)
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -212,6 +212,10 @@ Multicast MAC filtering
 ``net_octeontx2`` pmd supports multicast mac filtering feature only on physical
 function devices.
 
+SDP interface support
+~~~~~~~~~~~~~~~~~~~~~
+OCTEON TX2 SDP interface support is limited to PF device, No VF support.
+
 Debugging Options
 -----------------
 

diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst
index 1c7d98f73f0f6af1d16e7b396a2417bc277988ec..15b1641cf2d6284fbb30f509b8a22432b04b1238 100644 (file)
--- a/doc/guides/platform/octeontx2.rst
+++ b/doc/guides/platform/octeontx2.rst
@@ -64,6 +64,8 @@ DPDK subsystem.
    +---+-----+--------------------------------------------------------------+
    | 8 | DPI | rte_rawdev                                                   |
    +---+-----+--------------------------------------------------------------+
+   | 9 | SDP | rte_ethdev                                                   |
+   +---+-----+--------------------------------------------------------------+
 
 PF0 is called the administrative / admin function (AF) and has exclusive
 privileges to provision RVU functional block's LFs to each of the PF/VF.
@@ -102,6 +104,25 @@ Typical application usage models are,
 #. Exception path to Linux kernel from DPDK application as SW ``KNI`` replacement.
 #. Communication between two different DPDK applications.
 
+SDP interface
+-------------
+
+System DPI Packet Interface unit(SDP) provides PCIe endpoint support for remote host
+to DMA packets into and out of OCTEON TX2 SoC. SDP interface comes in to live only when
+OCTEON TX2 SoC is connected in PCIe endpoint mode. It can be used to send/receive
+packets to/from remote host machine using input/output queue pairs exposed to it.
+SDP interface receives input packets from remote host from NIX-RX and sends packets
+to remote host using NIX-TX. Remote host machine need to use corresponding driver
+(kernel/user mode) to communicate with SDP interface on OCTEON TX2 SoC. SDP supports
+single PCIe SRIOV physical function(PF) and multiple virtual functions(VF's). Users
+can bind PF or VF to use SDP interface and it will be enumerated as ethdev ports.
+
+The primary use case for SDP is to enable the smart NIC use case. Typical usage models are,
+
+#. Communication channel between remote host and OCTEON TX2 SoC over PCIe.
+#. Transfer packets received from network interface to remote host over PCIe and
+   vice-versa.
+
 OCTEON TX2 packet flow
 ----------------------
 

diff --git a/drivers/common/octeontx2/otx2_common.h b/drivers/common/octeontx2/otx2_common.h
index 0d0b87ee630604ce256d1c622f9c128f37b547c8..f62c45debe262655bdf990b24b1c0a8bd6911f36 100644 (file)
--- a/drivers/common/octeontx2/otx2_common.h
+++ b/drivers/common/octeontx2/otx2_common.h
@@ -121,6 +121,8 @@ extern int otx2_logtype_dpi;
 #define PCI_DEVID_OCTEONTX2_RVU_CPT_VF         0xA0FE
 #define PCI_DEVID_OCTEONTX2_RVU_AF_VF          0xA0f8
 #define PCI_DEVID_OCTEONTX2_DPI_VF             0xA081
+#define PCI_DEVID_OCTEONTX2_RVU_SDP_PF         0xA0f6
+#define PCI_DEVID_OCTEONTX2_RVU_SDP_VF         0xA0f7
 
 /* Subsystem Device ID */
 #define PCI_SUBSYS_DEVID_96XX_95XX             0xB200

diff --git a/drivers/common/octeontx2/otx2_dev.c b/drivers/common/octeontx2/otx2_dev.c
index 910270975562aeecd4abf55cef2d98ca14da65e2..0fc799e4ab91d1a7bb3b3495faff3206df78f3a1 100644 (file)
--- a/drivers/common/octeontx2/otx2_dev.c
+++ b/drivers/common/octeontx2/otx2_dev.c
@@ -885,6 +885,7 @@ otx2_update_vf_hwcap(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
        case PCI_DEVID_OCTEONTX2_RVU_CPT_VF:
        case PCI_DEVID_OCTEONTX2_RVU_AF_VF:
        case PCI_DEVID_OCTEONTX2_RVU_VF:
+       case PCI_DEVID_OCTEONTX2_RVU_SDP_VF:
                dev->hwcap |= OTX2_HWCAP_F_VF;
                break;
        }

diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h
index 5fd05fa170f948b6f65498be46fdc7eae3443212..7d9839c33451871a40c9cdd551641dd06aeffe30 100644 (file)
--- a/drivers/common/octeontx2/otx2_dev.h
+++ b/drivers/common/octeontx2/otx2_dev.h
@@ -19,6 +19,10 @@
 #define otx2_dev_is_lbk(dev)   ((dev->hwcap & OTX2_HWCAP_F_VF) && \
                                 (dev->tx_chan_base < 0x700))
 #define otx2_dev_revid(dev)    (dev->hwcap & 0xFF)
+#define otx2_dev_is_sdp(dev)   (dev->sdp_link)
+
+#define otx2_dev_is_vf_or_sdp(dev)                             \
+       (otx2_dev_is_vf(dev) || otx2_dev_is_sdp(dev))
 
 #define otx2_dev_is_A0(dev)                                    \
        ((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&     \

diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
index dfa8cd205c6f2d9cc697d89e23d606e396605f3b..aab34dbcfbc5ded2565b1fa9214a25d9671e94e4 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -144,7 +144,7 @@ otx2_cgx_rxtx_start(struct otx2_eth_dev *dev)
 {
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_start_rxtx(mbox);
@@ -157,7 +157,7 @@ otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev)
 {
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_stop_rxtx(mbox);
@@ -190,7 +190,7 @@ nix_cgx_start_link_event(struct otx2_eth_dev *dev)
 {
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_start_linkevents(mbox);
@@ -203,7 +203,7 @@ cgx_intlbk_enable(struct otx2_eth_dev *dev, bool en)
 {
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        if (en)
@@ -219,7 +219,7 @@ nix_cgx_stop_link_event(struct otx2_eth_dev *dev)
 {
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_stop_linkevents(mbox);
@@ -2086,6 +2086,15 @@ otx2_eth_dev_lf_detach(struct otx2_mbox *mbox)
        return otx2_mbox_process(mbox);
 }
 
+static bool
+otx2_eth_dev_is_sdp(struct rte_pci_device *pci_dev)
+{
+       if (pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_SDP_PF ||
+           pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_SDP_VF)
+               return true;
+       return false;
+}
+
 static int
 otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
 {
@@ -2129,6 +2138,10 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
                        goto error;
                }
        }
+       if (otx2_eth_dev_is_sdp(pci_dev))
+               dev->sdp_link = true;
+       else
+               dev->sdp_link = false;
        /* Device generic callbacks */
        dev->ops = &otx2_dev_ops;
        dev->eth_dev = eth_dev;
@@ -2416,6 +2429,14 @@ static const struct rte_pci_id pci_nix_map[] = {
                RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
                               PCI_DEVID_OCTEONTX2_RVU_AF_VF)
        },
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
+                              PCI_DEVID_OCTEONTX2_RVU_SDP_PF)
+       },
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
+                              PCI_DEVID_OCTEONTX2_RVU_SDP_VF)
+       },
        {
                .vendor_id = 0,
        },

diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
index 4d9ed487043e74f38eb09244e7706c0400a202dd..b49e309fd04272ad9fdf67cc6e0dd823d5da7ae2 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -321,6 +321,7 @@ struct otx2_eth_dev {
        uint64_t clk_delta;
        bool mc_tbl_set;
        struct otx2_nix_mc_filter_tbl mc_fltr_tbl;
+       bool sdp_link; /* SDP flag */
 } __rte_cache_aligned;
 
 struct otx2_eth_txq {

diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
index fc0fbd9f2489fc94f70995ac34392b54e9954300..d1e77c324450cfb2479a963b712d684abf9f4f78 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -36,6 +36,8 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
 
        req = otx2_mbox_alloc_msg_nix_set_hw_frs(mbox);
        req->update_smq = true;
+       if (otx2_dev_is_sdp(dev))
+               req->sdp_link = true;
        /* FRS HW config should exclude FCS but include NPC VTAG insert size */
        req->maxlen = frame_size - RTE_ETHER_CRC_LEN + NIX_MAX_VTAG_ACT_SIZE;
 
@@ -46,6 +48,8 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        /* Now just update Rx MAXLEN */
        req = otx2_mbox_alloc_msg_nix_set_hw_frs(mbox);
        req->maxlen = frame_size - RTE_ETHER_CRC_LEN;
+       if (otx2_dev_is_sdp(dev))
+               req->sdp_link = true;
 
        rc = otx2_mbox_process(mbox);
        if (rc)
@@ -98,7 +102,7 @@ nix_cgx_promisc_config(struct rte_eth_dev *eth_dev, int en)
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        struct otx2_mbox *mbox = dev->mbox;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return;
 
        if (en)

diff --git a/drivers/net/octeontx2/otx2_flow_ctrl.c b/drivers/net/octeontx2/otx2_flow_ctrl.c
index 1b84998c62c15cc55595b6274aa9d9558748221a..c6d7b1971ae7f4dbd3db943fb9d35e63f63f4bc9 100644 (file)
--- a/drivers/net/octeontx2/otx2_flow_ctrl.c
+++ b/drivers/net/octeontx2/otx2_flow_ctrl.c
@@ -14,6 +14,9 @@ otx2_nix_rxchan_bpid_cfg(struct rte_eth_dev *eth_dev, bool enb)
        struct nix_bp_cfg_rsp *rsp;
        int rc;
 
+       if (otx2_dev_is_sdp(dev))
+               return 0;
+
        if (enb) {
                req = otx2_mbox_alloc_msg_nix_bp_enable(mbox);
                req->chan_base = 0;
@@ -199,7 +202,7 @@ otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        struct rte_eth_fc_conf fc_conf;
 
-       if (otx2_dev_is_lbk(dev))
+       if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
                return 0;
 
        memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));

diff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c
index 725b793d4dcbc5dcc2ed9752120a9da404baf166..f5679b06e765efbcf890a25842adf08896021fa3 100644 (file)
--- a/drivers/net/octeontx2/otx2_link.c
+++ b/drivers/net/octeontx2/otx2_link.c
@@ -93,7 +93,7 @@ otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
 
        RTE_SET_USED(wait_to_complete);
 
-       if (otx2_dev_is_lbk(dev))
+       if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_get_linkinfo(mbox);
@@ -129,7 +129,7 @@ otx2_nix_dev_set_link_up(struct rte_eth_dev *eth_dev)
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        int rc, i;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -ENOTSUP;
 
        rc = nix_dev_set_link_state(eth_dev, 1);
@@ -150,7 +150,7 @@ otx2_nix_dev_set_link_down(struct rte_eth_dev *eth_dev)
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        int i;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -ENOTSUP;
 
        /* Stop tx queues  */

diff --git a/drivers/net/octeontx2/otx2_mac.c b/drivers/net/octeontx2/otx2_mac.c
index b4bcc61f87decf4ca8d5bbb16f142a276b722e00..262d185e5454ed11752011d11f376bd1cc1be986 100644 (file)
--- a/drivers/net/octeontx2/otx2_mac.c
+++ b/drivers/net/octeontx2/otx2_mac.c
@@ -15,7 +15,7 @@ otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr)
        struct otx2_mbox *mbox = dev->mbox;
        int rc;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -ENOTSUP;
 
        if (otx2_dev_active_vfs(dev))
@@ -38,7 +38,7 @@ otx2_cgx_mac_max_entries_get(struct otx2_eth_dev *dev)
        struct otx2_mbox *mbox = dev->mbox;
        int rc;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return 0;
 
        otx2_mbox_alloc_msg_cgx_mac_max_entries_get(mbox);
@@ -59,7 +59,7 @@ otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr,
        struct cgx_mac_addr_add_rsp *rsp;
        int rc;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -ENOTSUP;
 
        if (otx2_dev_active_vfs(dev))
@@ -89,7 +89,7 @@ otx2_nix_mac_addr_del(struct rte_eth_dev *eth_dev, uint32_t index)
        struct cgx_mac_addr_del_req *req;
        int rc;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return;
 
        req = otx2_mbox_alloc_msg_cgx_mac_addr_del(mbox);

diff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c
index 160d7c9abad34d373b51171c739c064482226333..f13f0408a9a481a479a829575345219402ce3f01 100644 (file)
--- a/drivers/net/octeontx2/otx2_ptp.c
+++ b/drivers/net/octeontx2/otx2_ptp.c
@@ -104,7 +104,7 @@ nix_ptp_config(struct rte_eth_dev *eth_dev, int en)
        struct otx2_mbox *mbox = dev->mbox;
        uint8_t rc = -EINVAL;
 
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return rc;
 
        if (en) {
@@ -168,7 +168,7 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)
        }
 
        /* If we are VF, no further action can be taken */
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -EINVAL;
 
        if (!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)) {
@@ -222,7 +222,7 @@ otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev)
        }
 
        /* If we are VF, nothing else can be done */
-       if (otx2_dev_is_vf(dev))
+       if (otx2_dev_is_vf_or_sdp(dev))
                return -EINVAL;
 
        dev->rx_offloads &= ~DEV_RX_OFFLOAD_TIMESTAMP;

diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index 12903ec1b8dcef8530355b70721371f56333395e..ba615cebc2fbae8931a655812701746b8ed7307d 100644 (file)
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -410,6 +410,12 @@ populate_tm_registers(struct otx2_eth_dev *dev,
                        *regval++ = shaper2regval(&cir) | 1;
                        req->num_regs++;
                }
+               /* Configure TL4 to send to SDP channel instead of CGX/LBK */
+               if (otx2_dev_is_sdp(dev)) {
+                       *reg++ = NIX_AF_TL4X_SDP_LINK_CFG(schq);
+                       *regval++ = BIT_ULL(12);
+                       req->num_regs++;
+               }
 
                rc = send_tm_reqval(mbox, req);
                if (rc)
@@ -465,9 +471,12 @@ populate_tm_registers(struct otx2_eth_dev *dev,
                else
                        *regval++ = (strict_schedul_prio << 24) | rr_quantum;
                req->num_regs++;
-               *reg++ = NIX_AF_TL3_TL2X_LINKX_CFG(schq, nix_get_link(dev));
-               *regval++ = BIT_ULL(12) | nix_get_relchan(dev);
-               req->num_regs++;
+               if (!otx2_dev_is_sdp(dev)) {
+                       *reg++ = NIX_AF_TL3_TL2X_LINKX_CFG(schq,
+                                               nix_get_link(dev));
+                       *regval++ = BIT_ULL(12) | nix_get_relchan(dev);
+                       req->num_regs++;
+               }
                if (pir.rate && pir.burst) {
                        *reg++ = NIX_AF_TL2X_PIR(schq);
                        *regval++ = shaper2regval(&pir) | 1;
@@ -522,9 +531,6 @@ nix_tm_txsch_reg_config(struct otx2_eth_dev *dev)
        uint32_t lvl;
        int rc = 0;
 
-       if (nix_get_link(dev) == 13)
-               return -EPERM;
-
        for (lvl = 0; lvl < (uint32_t)dev->otx2_tm_root_lvl + 1; lvl++) {
                TAILQ_FOREACH(tm_node, &dev->node_list, node) {
                        if (tm_node->hw_lvl_id == lvl) {