From patchwork Fri Oct 22 11:56:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 102660 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 769CFA0C43; Fri, 22 Oct 2021 13:57:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C9764114A; Fri, 22 Oct 2021 13:57:14 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 19DBA41149 for ; Fri, 22 Oct 2021 13:57:12 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19M9qaJd002743 for ; Fri, 22 Oct 2021 04:57:12 -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-transfer-encoding : content-type; s=pfpt0220; bh=X3JO1HS+MtQhmBXEu7hxB969G9Otn17KvugaGIP7ejg=; b=T3miKURZXKfC/y3BMrMCTzbzQkuJJe9GDxkocymjleHvC7nG8y8WyC3RT0PnAfPnDFWd QOeQsFwlTG4TIFVOJnALi3EDqAvYwDbfQdv9Xx8xFnlNsNAu8SzPT9L2BcXjBK9OsLjc SC0UJojH+we8Zr11a7OUU6tDgWehS/aFm+7UNNMqy82KD1Y/chyw50dshR7UAlrE0wX2 3zzTXYQwUCw18UrI1Elw/XpkWWCBnkC0iiaZvfLSRgQ81VjeZ86u01wfKamWwm5uMm1r ADNJD/iCoqLYFsQmPQDSlZ1MdRAbzYQiYNrPqxKeqSG+oACxPId3r+upKX0MvJ5kmTbn bQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 3buu218djt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 22 Oct 2021 04:57:12 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 22 Oct 2021 04:57:10 -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, 22 Oct 2021 04:57:10 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id 9D7C63F7040; Fri, 22 Oct 2021 04:57:07 -0700 (PDT) From: Tomasz Duszynski To: CC: , , Tomasz Duszynski , Nithin Dabilpuram , "Kiran Kumar K" , Sunil Kumar Kori , Satha Rao , Jakub Palider Date: Fri, 22 Oct 2021 13:56:25 +0200 Message-ID: <20211022115625.1956708-1-tduszynski@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211005074620.2224968-1-tduszynski@marvell.com> References: <20211005074620.2224968-1-tduszynski@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: zFrXvjATL0K8-Oey3p4lQvJeAIZ_6Ou9 X-Proofpoint-ORIG-GUID: zFrXvjATL0K8-Oey3p4lQvJeAIZ_6Ou9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-22_03,2021-10-21_02,2020-04-07_01 Subject: [dpdk-dev] [PATCH v2] common/cnxk: support BPHY telemetry 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" Add initial support for baseband telemetry. Signed-off-by: Tomasz Duszynski Acked-by: Jerin Jacob --- v2: - make bphy telemetry available only on platforms supporting baseband - use platform types where possible - remove unused header drivers/common/cnxk/cnxk_telemetry_bphy.c | 52 +++++++++++++++++++++++ drivers/common/cnxk/meson.build | 3 +- drivers/common/cnxk/roc_model.h | 5 +++ drivers/raw/cnxk_bphy/cnxk_bphy.c | 11 +++++ drivers/raw/cnxk_bphy/cnxk_bphy_irq.h | 1 + 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 drivers/common/cnxk/cnxk_telemetry_bphy.c -- 2.25.1 diff --git a/drivers/common/cnxk/cnxk_telemetry_bphy.c b/drivers/common/cnxk/cnxk_telemetry_bphy.c new file mode 100644 index 0000000000..95f84888b7 --- /dev/null +++ b/drivers/common/cnxk/cnxk_telemetry_bphy.c @@ -0,0 +1,52 @@ + +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2021 Marvell. + */ + +#include "cnxk_telemetry.h" +#include "roc_api.h" +#include "roc_priv.h" + +static int +cnxk_tel_bphy(struct plt_tel_data *d) +{ + struct idev_cfg *idev; + + idev = idev_get_cfg(); + if (!idev || !idev->bphy) + return -ENODEV; + + plt_tel_data_add_dict_int(d, "sso_pf_func", roc_bphy_sso_pf_func_get()); + plt_tel_data_add_dict_int(d, "npa_pf_func", roc_bphy_npa_pf_func_get()); + + return 0; +} + +static int +cnxk_bphy_tel_handle_info(const char *cmd __plt_unused, + const char *params __plt_unused, + struct plt_tel_data *d) +{ + plt_tel_data_start_dict(d); + + return cnxk_tel_bphy(d); +} + +static int +cnxk_bphy_telemetry_register(void) +{ + if (!(roc_model->flag & ROC_MODEL_CNF9K) && + !(roc_model->flag & ROC_MODEL_CNF10K)) + return 0; + + plt_telemetry_register_cmd( + "/cnxk/bphy/info", cnxk_bphy_tel_handle_info, + "Returns bphy information. Takes no parameters"); + + return 0; +} + +PLT_INIT(cnxk_telemetry_bphy_init) +{ + roc_plt_init_cb_register(cnxk_bphy_telemetry_register); +} diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build index d9871a6b45..aca99b84e7 100644 --- a/drivers/common/cnxk/meson.build +++ b/drivers/common/cnxk/meson.build @@ -74,7 +74,8 @@ includes += include_directories('../../../lib/ethdev') includes += include_directories('../../../lib/meter') # Telemetry common code -sources += files('cnxk_telemetry_npa.c', +sources += files('cnxk_telemetry_bphy.c', + 'cnxk_telemetry_npa.c', 'cnxk_telemetry_nix.c') deps += ['bus_pci', 'net', 'telemetry'] diff --git a/drivers/common/cnxk/roc_model.h b/drivers/common/cnxk/roc_model.h index 3779a88bca..cee06779bc 100644 --- a/drivers/common/cnxk/roc_model.h +++ b/drivers/common/cnxk/roc_model.h @@ -40,12 +40,17 @@ struct roc_model { ROC_MODEL_CNF95xx_B0 | ROC_MODEL_CNF95xxMM_A0 | \ ROC_MODEL_CNF95xxO_A0 | ROC_MODEL_CNF95xxN_A0 | ROC_MODEL_CN98xx_A0 | \ ROC_MODEL_CNF95xxN_A1) +#define ROC_MODEL_CNF9K \ + (ROC_MODEL_CNF95xx_A0 | ROC_MODEL_CNF95xx_B0 | \ + ROC_MODEL_CNF95xxMM_A0 | ROC_MODEL_CNF95xxO_A0 | \ + ROC_MODEL_CNF95xxN_A0 | ROC_MODEL_CNF95xxN_A1) #define ROC_MODEL_CN106xx (ROC_MODEL_CN106xx_A0) #define ROC_MODEL_CNF105xx (ROC_MODEL_CNF105xx_A0) #define ROC_MODEL_CNF105xxN (ROC_MODEL_CNF105xxN_A0) #define ROC_MODEL_CN10K \ (ROC_MODEL_CN106xx | ROC_MODEL_CNF105xx | ROC_MODEL_CNF105xxN) +#define ROC_MODEL_CNF10K (ROC_MODEL_CNF105xx | ROC_MODEL_CNF105xxN) /* Runtime variants */ static inline uint64_t diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c index 6bfda71761..558ebfa85e 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c @@ -341,6 +341,13 @@ bphy_rawdev_probe(struct rte_pci_driver *pci_drv, bphy_dev = (struct bphy_device *)bphy_rawdev->dev_private; bphy_dev->mem.res0 = pci_dev->mem_resource[0]; bphy_dev->mem.res2 = pci_dev->mem_resource[2]; + bphy_dev->bphy.pci_dev = pci_dev; + + ret = roc_bphy_dev_init(&bphy_dev->bphy); + if (ret) { + rte_rawdev_pmd_release(bphy_rawdev); + return ret; + } return 0; } @@ -349,6 +356,7 @@ static int bphy_rawdev_remove(struct rte_pci_device *pci_dev) { char name[RTE_RAWDEV_NAME_MAX_LEN]; + struct bphy_device *bphy_dev; struct rte_rawdev *rawdev; if (rte_eal_process_type() != RTE_PROC_PRIMARY) @@ -366,6 +374,9 @@ bphy_rawdev_remove(struct rte_pci_device *pci_dev) return -EINVAL; } + bphy_dev = (struct bphy_device *)rawdev->dev_private; + roc_bphy_dev_fini(&bphy_dev->bphy); + return rte_rawdev_pmd_release(rawdev); } diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h index f141677e2a..63d7285055 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h @@ -24,6 +24,7 @@ struct bphy_irq_queue { struct bphy_device { #define BPHY_QUEUE_CNT 1 + struct roc_bphy bphy; struct roc_bphy_irq_chip *irq_chip; struct bphy_mem mem; /* bphy irq interface supports single queue only */