Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/70299/?format=api
{ "id": 70299, "url": "http://patches.dpdk.org/api/patches/70299/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200515050831.22834-13-hemant.agrawal@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200515050831.22834-13-hemant.agrawal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200515050831.22834-13-hemant.agrawal@nxp.com", "date": "2020-05-15T05:08:30", "name": "[v7,12/13] bus/fslmc: share mcp ptr as function across libs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3a968e2d40d1e404dcb2643d144d0b1e7a64040d", "submitter": { "id": 477, "url": "http://patches.dpdk.org/api/people/477/?format=api", "name": "Hemant Agrawal", "email": "hemant.agrawal@nxp.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200515050831.22834-13-hemant.agrawal@nxp.com/mbox/", "series": [ { "id": 10081, "url": "http://patches.dpdk.org/api/series/10081/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10081", "date": "2020-05-15T05:08:18", "name": "NXP DPAAx: move internal symbols to INTERNAL", "version": 7, "mbox": "http://patches.dpdk.org/series/10081/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/70299/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/70299/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D7523A00C3;\n\tFri, 15 May 2020 07:13:14 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 97C8E1DA36;\n\tFri, 15 May 2020 07:11:26 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n by dpdk.org (Postfix) with ESMTP id 14AF71D90A\n for <dev@dpdk.org>; Fri, 15 May 2020 07:11:08 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id EC26A200634;\n Fri, 15 May 2020 07:11:07 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n [165.114.16.14])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id BBB60200643;\n Fri, 15 May 2020 07:11:05 +0200 (CEST)", "from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net\n [10.232.133.63])\n by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 7DD9B4031D;\n Fri, 15 May 2020 13:11:02 +0800 (SGT)" ], "From": "Hemant Agrawal <hemant.agrawal@nxp.com>", "To": "dev@dpdk.org,\n\tdavid.marchand@redhat.com,\n\tmdr@ashroe.eu", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>", "Date": "Fri, 15 May 2020 10:38:30 +0530", "Message-Id": "<20200515050831.22834-13-hemant.agrawal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200515050831.22834-1-hemant.agrawal@nxp.com>", "References": "<20200514142951.31801-1-hemant.agrawal@nxp.com>\n <20200515050831.22834-1-hemant.agrawal@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v7 12/13] bus/fslmc: share mcp ptr as function\n\tacross libs", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Currently rte_mcp_ptr_list is being shared as a variable\nacross libs. This is only used in control path.\nThis patch change it to a exported function based access.\n\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/bus/fslmc/fslmc_vfio.c | 15 ++++++++++++---\n drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 2 +-\n drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 7 ++++---\n drivers/bus/fslmc/rte_bus_fslmc_version.map | 2 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-\n drivers/event/dpaa2/dpaa2_hw_dpcon.c | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-\n drivers/net/dpaa2/dpaa2_mux.c | 2 +-\n drivers/net/dpaa2/dpaa2_ptp.c | 2 +-\n drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 2 +-\n 12 files changed, 26 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 970969d2bf..efe2c43d37 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -51,6 +51,15 @@ static int fslmc_iommu_type;\n static uint32_t *msi_intr_vaddr;\n void *(*rte_mcp_ptr_list);\n \n+void *\n+dpaa2_get_mcp_ptr(int portal_idx)\n+{\n+\tif (rte_mcp_ptr_list)\n+\t\treturn rte_mcp_ptr_list[portal_idx];\n+\telse\n+\t\treturn NULL;\n+}\n+\n static struct rte_dpaa2_object_list dpaa2_obj_list =\n \tTAILQ_HEAD_INITIALIZER(dpaa2_obj_list);\n \n@@ -734,7 +743,7 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)\n \tstruct fsl_mc_io dpmng = {0};\n \tstruct mc_version mc_ver_info = {0};\n \n-\trte_mcp_ptr_list = malloc(sizeof(void *) * 1);\n+\trte_mcp_ptr_list = malloc(sizeof(void *) * (MC_PORTAL_INDEX + 1));\n \tif (!rte_mcp_ptr_list) {\n \t\tDPAA2_BUS_ERR(\"Unable to allocate MC portal memory\");\n \t\tret = -ENOMEM;\n@@ -762,7 +771,7 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)\n \t * required.\n \t */\n \tif (rte_eal_process_type() == RTE_PROC_SECONDARY) {\n-\t\trte_mcp_ptr_list[0] = (void *)v_addr;\n+\t\trte_mcp_ptr_list[MC_PORTAL_INDEX] = (void *)v_addr;\n \t\treturn 0;\n \t}\n \n@@ -782,7 +791,7 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev)\n \t\tret = -1;\n \t\tgoto cleanup;\n \t}\n-\trte_mcp_ptr_list[0] = (void *)v_addr;\n+\trte_mcp_ptr_list[MC_PORTAL_INDEX] = (void *)v_addr;\n \n \tfree(dev_name);\n \treturn 0;\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\nindex db49d637f5..79b148f20b 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c\n@@ -56,7 +56,7 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,\n \t}\n \n \t/* Open the dpbp object */\n-\tdpbp_node->dpbp.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpbp_node->dpbp.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dpbp_open(&dpbp_node->dpbp,\n \t\t\tCMD_PRI_LOW, dpbp_id, &dpbp_node->token);\n \tif (ret) {\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\nindex 5ad0374df9..d393ce6186 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpci.c\n@@ -50,7 +50,7 @@ rte_dpaa2_create_dpci_device(int vdev_fd __rte_unused,\n \t}\n \n \t/* Open the dpci object */\n-\tdpci_node->dpci.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpci_node->dpci.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dpci_open(&dpci_node->dpci,\n \t\t\tCMD_PRI_LOW, dpci_id, &dpci_node->token);\n \tif (ret) {\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\nindex 739ce434ba..21c535f2fb 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c\n@@ -416,7 +416,7 @@ dpaa2_create_dpio_device(int vdev_fd,\n \tdpio_dev->hw_id = object_id;\n \trte_atomic16_init(&dpio_dev->ref_count);\n \t/* Using single portal for all devices */\n-\tdpio_dev->mc_portal = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpio_dev->mc_portal = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \n \tif (!check_lcore_cpuset) {\n \t\tcheck_lcore_cpuset = 1;\ndiff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h\nindex 33b191f823..194b99c583 100644\n--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h\n+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h\n@@ -198,9 +198,6 @@ struct dpaa2_dpcon_dev {\n \tuint8_t channel_index;\n };\n \n-/*! Global MCP list */\n-extern void *(*rte_mcp_ptr_list);\n-\n /* Refer to Table 7-3 in SEC BG */\n struct qbman_fle {\n \tuint32_t addr_lo;\n@@ -441,4 +438,8 @@ struct dpaa2_dpci_dev *rte_dpaa2_alloc_dpci_dev(void);\n __rte_internal\n void rte_dpaa2_free_dpci_dev(struct dpaa2_dpci_dev *dpci);\n \n+/* Global MCP pointer */\n+__rte_internal\n+void *dpaa2_get_mcp_ptr(int portal_idx);\n+\n #endif\ndiff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/rte_bus_fslmc_version.map\nindex 1b7a5a45e9..80da19a277 100644\n--- a/drivers/bus/fslmc/rte_bus_fslmc_version.map\n+++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map\n@@ -21,6 +21,7 @@ INTERNAL {\n \tdpaa2_free_dpbp_dev;\n \tdpaa2_free_dq_storage;\n \tdpaa2_free_eq_descriptors;\n+\tdpaa2_get_mcp_ptr;\n \tdpaa2_io_portal;\n \tdpaa2_svr_family;\n \tdpaa2_virt_mode;\n@@ -111,5 +112,4 @@ INTERNAL {\n \trte_fslmc_get_device_count;\n \trte_fslmc_object_register;\n \trte_global_active_dqs_list;\n-\trte_mcp_ptr_list;\n };\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex fe34e644cc..5d63644934 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -3788,7 +3788,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\t\t\"Error in allocating the memory for dpsec object\");\n \t\treturn -ENOMEM;\n \t}\n-\tdpseci->regs = rte_mcp_ptr_list[0];\n+\tdpseci->regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \n \tretcode = dpseci_open(dpseci, CMD_PRI_LOW, hw_id, &token);\n \tif (retcode != 0) {\ndiff --git a/drivers/event/dpaa2/dpaa2_hw_dpcon.c b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\nindex d64e588aa8..200b71640b 100644\n--- a/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n+++ b/drivers/event/dpaa2/dpaa2_hw_dpcon.c\n@@ -48,7 +48,7 @@ rte_dpaa2_create_dpcon_device(int dev_fd __rte_unused,\n \t}\n \n \t/* Open the dpcon object */\n-\tdpcon_node->dpcon.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpcon_node->dpcon.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dpcon_open(&dpcon_node->dpcon,\n \t\t\t CMD_PRI_LOW, dpcon_id, &dpcon_node->token);\n \tif (ret) {\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 1bab3b064c..2f031ec5c1 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -2343,7 +2343,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)\n \t\tDPAA2_PMD_ERR(\"Memory allocation failed for dpni device\");\n \t\treturn -1;\n \t}\n-\tdpni_dev->regs = rte_mcp_ptr_list[0];\n+\tdpni_dev->regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \teth_dev->process_private = (void *)dpni_dev;\n \n \t/* For secondary processes, the primary has done all the work */\ndiff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c\nindex 9ac8806faf..f8366e839e 100644\n--- a/drivers/net/dpaa2/dpaa2_mux.c\n+++ b/drivers/net/dpaa2/dpaa2_mux.c\n@@ -224,7 +224,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused,\n \t}\n \n \t/* Open the dpdmux object */\n-\tdpdmux_dev->dpdmux.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpdmux_dev->dpdmux.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dpdmux_open(&dpdmux_dev->dpdmux, CMD_PRI_LOW, dpdmux_id,\n \t\t\t &dpdmux_dev->token);\n \tif (ret) {\ndiff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c\nindex 316912fe3e..f58eedb314 100644\n--- a/drivers/net/dpaa2/dpaa2_ptp.c\n+++ b/drivers/net/dpaa2/dpaa2_ptp.c\n@@ -147,7 +147,7 @@ dpaa2_create_dprtc_device(int vdev_fd __rte_unused,\n \t}\n \n \t/* Open the dprtc object */\n-\tdprtc_dev->dprtc.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdprtc_dev->dprtc.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dprtc_open(&dprtc_dev->dprtc, CMD_PRI_LOW, dprtc_id,\n \t\t\t &dprtc_dev->token);\n \tif (ret) {\ndiff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c\nindex d5202d6522..1be1b6ddf0 100644\n--- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c\n+++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c\n@@ -1315,7 +1315,7 @@ dpaa2_dpdmai_dev_init(struct rte_rawdev *rawdev, int dpdmai_id)\n \n \t/* Open DPDMAI device */\n \tdpdmai_dev->dpdmai_id = dpdmai_id;\n-\tdpdmai_dev->dpdmai.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tdpdmai_dev->dpdmai.regs = dpaa2_get_mcp_ptr(MC_PORTAL_INDEX);\n \tret = dpdmai_open(&dpdmai_dev->dpdmai, CMD_PRI_LOW,\n \t\t\t dpdmai_dev->dpdmai_id, &dpdmai_dev->token);\n \tif (ret) {\n", "prefixes": [ "v7", "12/13" ] }