From patchwork Fri Jul 30 16:08:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 96471 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2496A0C40; Fri, 30 Jul 2021 18:08:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8478C40141; Fri, 30 Jul 2021 18:08:51 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 6C48340141 for ; Fri, 30 Jul 2021 18:08:49 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16UG6GPM002370; Fri, 30 Jul 2021 09:08:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=c/xgzVZRxuM/iKTrW9/VuR6qmVwMBxgWA7g8IBSDRuo=; b=bEj68Fcg6o8sxrt78G09AEQ3unnPDrCCo11wf1xj3BA6VRv+Ct5Jb7XMASu/sr6hJMZb PwJCkutTBtR6Rk9+P8vdGcOHQhA0U3FbeUG9MMq/RC3q8p/SUHEBYcmIy7cllqGXgsTb lVmZxws907XOro4a60TBrP5d50SPTP7t7OxT1SngnqEW53Y9HJmf5ZsgTXYJp0P+Boip YP0MKNybMF0ZJD05xPjNuzfb+c/w/8aRtz+dM3Q/3kNLS63oVsvpRX+KS0ZvIWv4NAE9 OjtqNNUBnFhqdN251++fgyM4BO+Ham/GvVtINVxytOSK17XOoT1oSjJtsWxhJVWySEKQ ng== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com with ESMTP id 3a4866trxw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 09:08:46 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 30 Jul 2021 09:08:44 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Fri, 30 Jul 2021 09:08:44 -0700 Received: from localhost.localdomain (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id AEB213F705F; Fri, 30 Jul 2021 09:08:42 -0700 (PDT) From: Harman Kalra To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Ray Kinsella CC: , Harman Kalra Date: Fri, 30 Jul 2021 21:38:28 +0530 Message-ID: <20210730160829.13597-1-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-Proofpoint-GUID: cYuZTsE0NniBA9O1ktY1Nay3CcNBzoZq X-Proofpoint-ORIG-GUID: cYuZTsE0NniBA9O1ktY1Nay3CcNBzoZq X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-30_11:2021-07-30, 2021-07-30 signatures=0 Subject: [dpdk-dev] [PATCH 1/2] common/cnxk: send link event to VF X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently link event is only sent to the PF by AF as soon as it comes up, or in case of any physical change in link. PF will broadcast these link events to all its VFs as soon as it receives it. But no event is sent when a new VF comes up, hence it will not have the link status. Adding support for sending link status to the VF once it comes up successfully. Signed-off-by: Harman Kalra Acked-by: Ray Kinsella --- drivers/common/cnxk/roc_dev.c | 33 ++++++++++++++++++++++++++++++ drivers/common/cnxk/roc_dev_priv.h | 5 +++++ drivers/common/cnxk/roc_nix.h | 7 +++++++ drivers/common/cnxk/roc_nix_mac.c | 23 +++++++++++++++++++++ drivers/common/cnxk/version.map | 2 ++ 5 files changed, 70 insertions(+) diff --git a/drivers/common/cnxk/roc_dev.c b/drivers/common/cnxk/roc_dev.c index c14f189f9b..4e204373dc 100644 --- a/drivers/common/cnxk/roc_dev.c +++ b/drivers/common/cnxk/roc_dev.c @@ -163,6 +163,39 @@ af_pf_wait_msg(struct dev *dev, uint16_t vf, int num_msg) rsp->rc = msg->rc; rsp->pcifunc = msg->pcifunc; + /* Whenever a PF comes up, AF sends the link status to it but + * when VF comes up no such event is sent to respective VF. + * Using MBOX_MSG_NIX_LF_START_RX response from AF for the + * purpose and send the link status of PF to VF. + */ + if (msg->id == MBOX_MSG_NIX_LF_START_RX) { + /* Send link status to VF */ + struct cgx_link_user_info linfo; + struct mbox_msghdr *vf_msg; + size_t sz; + + /* Get the link status */ + memset(&linfo, 0, sizeof(struct cgx_link_user_info)); + if (dev->ops && dev->ops->link_status_get) + dev->ops->link_status_get(dev->roc_nix, &linfo); + + sz = PLT_ALIGN(mbox_id2size(MBOX_MSG_CGX_LINK_EVENT), + MBOX_MSG_ALIGN); + /* Prepare the message to be sent */ + vf_msg = mbox_alloc_msg(&dev->mbox_vfpf_up, vf, sz); + if (vf_msg) { + mbox_req_init(MBOX_MSG_CGX_LINK_EVENT, vf_msg); + memcpy((uint8_t *)vf_msg + + sizeof(struct mbox_msghdr), &linfo, + sizeof(struct cgx_link_user_info)); + + vf_msg->rc = msg->rc; + vf_msg->pcifunc = msg->pcifunc; + /* Send to VF */ + mbox_msg_send(&dev->mbox_vfpf_up, vf); + } + } + offset = mbox->rx_start + msg->next_msgoff; } plt_spinlock_unlock(&mdev->mbox_lock); diff --git a/drivers/common/cnxk/roc_dev_priv.h b/drivers/common/cnxk/roc_dev_priv.h index 9488db3c41..302dc0feb0 100644 --- a/drivers/common/cnxk/roc_dev_priv.h +++ b/drivers/common/cnxk/roc_dev_priv.h @@ -30,9 +30,14 @@ typedef void (*link_info_t)(void *roc_nix, /* PTP info callback */ typedef int (*ptp_info_t)(void *roc_nix, bool enable); +/* Link status get callback */ +typedef void (*link_status_get_t)(void *roc_nix, + struct cgx_link_user_info *link); + struct dev_ops { link_info_t link_status_update; ptp_info_t ptp_info_update; + link_status_get_t link_status_get; }; #define dev_is_vf(dev) ((dev)->hwcap & DEV_HWCAP_F_VF) diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h index bb69027956..d7ab3c674e 100644 --- a/drivers/common/cnxk/roc_nix.h +++ b/drivers/common/cnxk/roc_nix.h @@ -243,6 +243,10 @@ typedef void (*link_status_t)(struct roc_nix *roc_nix, /* PTP info update callback */ typedef int (*ptp_info_update_t)(struct roc_nix *roc_nix, bool enable); +/* Link status get callback */ +typedef void (*link_info_get_t)(struct roc_nix *roc_nix, + struct roc_nix_link_info *link); + struct roc_nix { /* Input parameters */ struct plt_pci_device *pci_dev; @@ -487,6 +491,9 @@ int __roc_api roc_nix_mac_max_rx_len_set(struct roc_nix *roc_nix, int __roc_api roc_nix_mac_link_cb_register(struct roc_nix *roc_nix, link_status_t link_update); void __roc_api roc_nix_mac_link_cb_unregister(struct roc_nix *roc_nix); +int __roc_api roc_nix_mac_link_info_get_cb_register( + struct roc_nix *roc_nix, link_info_get_t link_info_get); +void __roc_api roc_nix_mac_link_info_get_cb_unregister(struct roc_nix *roc_nix); /* Ops */ int __roc_api roc_nix_switch_hdr_set(struct roc_nix *roc_nix, diff --git a/drivers/common/cnxk/roc_nix_mac.c b/drivers/common/cnxk/roc_nix_mac.c index 682d5a7295..36259941c9 100644 --- a/drivers/common/cnxk/roc_nix_mac.c +++ b/drivers/common/cnxk/roc_nix_mac.c @@ -296,3 +296,26 @@ roc_nix_mac_link_cb_unregister(struct roc_nix *roc_nix) dev->ops->link_status_update = NULL; } + +int +roc_nix_mac_link_info_get_cb_register(struct roc_nix *roc_nix, + link_info_get_t link_info_get) +{ + struct nix *nix = roc_nix_to_nix_priv(roc_nix); + struct dev *dev = &nix->dev; + + if (link_info_get == NULL) + return NIX_ERR_PARAM; + + dev->ops->link_status_get = (link_info_t)link_info_get; + return 0; +} + +void +roc_nix_mac_link_info_get_cb_unregister(struct roc_nix *roc_nix) +{ + struct nix *nix = roc_nix_to_nix_priv(roc_nix); + struct dev *dev = &nix->dev; + + dev->ops->link_status_get = NULL; +} diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index e3af48c02e..4cc2c9652c 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -105,6 +105,8 @@ INTERNAL { roc_nix_mac_addr_set; roc_nix_mac_link_cb_register; roc_nix_mac_link_cb_unregister; + roc_nix_mac_link_info_get_cb_register; + roc_nix_mac_link_info_get_cb_unregister; roc_nix_mac_link_event_start_stop; roc_nix_mac_link_info_get; roc_nix_mac_link_info_set; From patchwork Fri Jul 30 16:08:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 96472 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03FCAA0C40; Fri, 30 Jul 2021 18:08:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B54E2410DA; Fri, 30 Jul 2021 18:08:54 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 16BEF410DA for ; Fri, 30 Jul 2021 18:08:52 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16UG6GLO002356 for ; Fri, 30 Jul 2021 09:08:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=Xeh8kHEoErUNt0hen2pNPnAx/nE1yJzxRaW2bhHa+DM=; b=gGo7pYZEQVTQfolG8ZDl9jL+xA61RJHis6X1seqEQt1QkFXydBb8y3InHVOMt7X9+Sle 9DtdFmPIbW+xk03pHAXENkwoHH8Nlgn7YehvyRieM3uS44FcBzSKehYV1ZnXNtlcJFOv AYJu5ymEOI2mIlOIlVDHvSLETWTLWu8+QcyjhVQ1/+c5+TPX/yNt8nUoVUCgr4VCxFK5 39gIOcTNCb24GisgkcYBRsAo2lzFit8IZ/M/ikSVvn8zX+r9sgxWnjqZ6mPtIt6wpp7m +oOAzXqkljuZIAZzEHu2/22o11Sh9pFi1xlYYCCC4lrDYVsFuGbp1dq3YA2j48bZOs5b Dw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com with ESMTP id 3a4866try5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 30 Jul 2021 09:08:52 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 30 Jul 2021 09:08:50 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Fri, 30 Jul 2021 09:08:50 -0700 Received: from localhost.localdomain (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id EAF843F705F; Fri, 30 Jul 2021 09:08:48 -0700 (PDT) From: Harman Kalra To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Harman Kalra Date: Fri, 30 Jul 2021 21:38:29 +0530 Message-ID: <20210730160829.13597-2-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210730160829.13597-1-hkalra@marvell.com> References: <20210730160829.13597-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: n1zHwxChvAA0gauPDgTsWFS-QNJ2G-FR X-Proofpoint-ORIG-GUID: n1zHwxChvAA0gauPDgTsWFS-QNJ2G-FR X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-30_11:2021-07-30, 2021-07-30 signatures=0 Subject: [dpdk-dev] [PATCH 2/2] net/cnxk: callback for getting link status X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Adding a new callback for reading the link status. PF can read it's link status and can forward the same to VF once it comes up. Signed-off-by: Harman Kalra Acked-by: Nithin Dabilpuram --- drivers/net/cnxk/cnxk_ethdev.c | 9 +++++++++ drivers/net/cnxk/cnxk_ethdev.h | 2 ++ drivers/net/cnxk/cnxk_link.c | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c index 0e3652ed51..7152dcd002 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -1314,6 +1314,10 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev) /* Register up msg callbacks */ roc_nix_mac_link_cb_register(nix, cnxk_eth_dev_link_status_cb); + /* Register up msg callbacks */ + roc_nix_mac_link_info_get_cb_register(nix, + cnxk_eth_dev_link_status_get_cb); + dev->eth_dev = eth_dev; dev->configured = 0; dev->ptype_disable = 0; @@ -1415,6 +1419,11 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset) /* Disable link status events */ roc_nix_mac_link_event_start_stop(nix, false); + /* Unregister the link update op, this is required to stop VFs from + * receiving link status updates on exit path. + */ + roc_nix_mac_link_cb_unregister(nix); + /* Free up SQs */ for (i = 0; i < eth_dev->data->nb_tx_queues; i++) { dev_ops->tx_queue_release(eth_dev->data->tx_queues[i]); diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h index 4eead03905..4caf26303f 100644 --- a/drivers/net/cnxk/cnxk_ethdev.h +++ b/drivers/net/cnxk/cnxk_ethdev.h @@ -349,6 +349,8 @@ int cnxk_nix_rss_hash_conf_get(struct rte_eth_dev *eth_dev, void cnxk_nix_toggle_flag_link_cfg(struct cnxk_eth_dev *dev, bool set); void cnxk_eth_dev_link_status_cb(struct roc_nix *nix, struct roc_nix_link_info *link); +void cnxk_eth_dev_link_status_get_cb(struct roc_nix *nix, + struct roc_nix_link_info *link); int cnxk_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete); int cnxk_nix_queue_stats_mapping(struct rte_eth_dev *dev, uint16_t queue_id, uint8_t stat_idx, uint8_t is_rx); diff --git a/drivers/net/cnxk/cnxk_link.c b/drivers/net/cnxk/cnxk_link.c index 3fdbdba495..6a70801675 100644 --- a/drivers/net/cnxk/cnxk_link.c +++ b/drivers/net/cnxk/cnxk_link.c @@ -45,6 +45,29 @@ nix_link_status_print(struct rte_eth_dev *eth_dev, struct rte_eth_link *link) plt_info("Port %d: Link Down", (int)(eth_dev->data->port_id)); } +void +cnxk_eth_dev_link_status_get_cb(struct roc_nix *nix, + struct roc_nix_link_info *link) +{ + struct cnxk_eth_dev *dev = (struct cnxk_eth_dev *)nix; + struct rte_eth_link eth_link; + struct rte_eth_dev *eth_dev; + + if (!link || !nix) + return; + + eth_dev = dev->eth_dev; + if (!eth_dev) + return; + + rte_eth_linkstatus_get(eth_dev, ð_link); + + link->status = eth_link.link_status; + link->speed = eth_link.link_speed; + link->autoneg = eth_link.link_autoneg; + link->full_duplex = eth_link.link_duplex; +} + void cnxk_eth_dev_link_status_cb(struct roc_nix *nix, struct roc_nix_link_info *link) {