Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131676/?format=api
{ "id": 131676, "url": "https://patches.dpdk.org/api/patches/131676/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230920072528.14185-3-syalavarthi@marvell.com/", "project": { "id": 1, "url": "https://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": "<20230920072528.14185-3-syalavarthi@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230920072528.14185-3-syalavarthi@marvell.com", "date": "2023-09-20T07:24:53", "name": "[v2,02/34] ml/cnxk: drop use of RTE API for firmware read", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "0890cd71a4f923f9931ea39ef949be96b63cd1e2", "submitter": { "id": 2480, "url": "https://patches.dpdk.org/api/people/2480/?format=api", "name": "Srikanth Yalavarthi", "email": "syalavarthi@marvell.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230920072528.14185-3-syalavarthi@marvell.com/mbox/", "series": [ { "id": 29567, "url": "https://patches.dpdk.org/api/series/29567/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=29567", "date": "2023-09-20T07:24:51", "name": "Implemenation of revised ml/cnxk driver", "version": 2, "mbox": "https://patches.dpdk.org/series/29567/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/131676/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/131676/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4F0CB425E4;\n\tWed, 20 Sep 2023 09:25:47 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 47114406B8;\n\tWed, 20 Sep 2023 09:25:38 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id A531B40E0F\n for <dev@dpdk.org>; Wed, 20 Sep 2023 09:25:35 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 38K633lY002294 for <dev@dpdk.org>; Wed, 20 Sep 2023 00:25:34 -0700", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3t7u4d89j8-2\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Wed, 20 Sep 2023 00:25:34 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48;\n Wed, 20 Sep 2023 00:25:32 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend\n Transport; Wed, 20 Sep 2023 00:25:32 -0700", "from ml-host-33.caveonetworks.com (unknown [10.110.143.233])\n by maili.marvell.com (Postfix) with ESMTP id 90D075B6929;\n Wed, 20 Sep 2023 00:25:32 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=y+oFCWluDAtiD+0vidYLCHyysCokhjEQOgPx/VWxXH0=;\n b=G1VfmWKjKu6RkDIBKqMmuPeI3QvqxSJOU/xJ2kMOEhR5naOd39vjZs7yW1phzr+rz3mK\n xEQS5Glx3cm9gY63WuiYcqNx00zbAwiiLcHTkVeISXx2PTihOcWmQAY/0hsfUnFVd6oD\n r8vp9oi/knIq6RNWuTd+CXw2hgHpGLBt2jnHXK513WpRRWtixsB3ukdpojl0eT10lfLb\n IrF8zLszmMp727ZBeyH/AHnUlGlKhSKLE4UVECrXxaWpMjXYWQ89BvLDO7z7u6bXtwR/\n vEu4F7QqkknsNDsadZo5HK2fbTGeELQiSRwiso7wB8kfCZi/Qq8QTC8sFvpZv3AS9AnA pA==", "From": "Srikanth Yalavarthi <syalavarthi@marvell.com>", "To": "Srikanth Yalavarthi <syalavarthi@marvell.com>, Prince Takkar\n <ptakkar@marvell.com>", "CC": "<dev@dpdk.org>, <sshankarnara@marvell.com>, <aprabhu@marvell.com>", "Subject": "[PATCH v2 02/34] ml/cnxk: drop use of RTE API for firmware read", "Date": "Wed, 20 Sep 2023 00:24:53 -0700", "Message-ID": "<20230920072528.14185-3-syalavarthi@marvell.com>", "X-Mailer": "git-send-email 2.41.0", "In-Reply-To": "<20230920072528.14185-1-syalavarthi@marvell.com>", "References": "<20230830155927.3566-1-syalavarthi@marvell.com>\n <20230920072528.14185-1-syalavarthi@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "EPMtn8JoyYQ7EBat5Da2ubFcSwAikiSQ", "X-Proofpoint-GUID": "EPMtn8JoyYQ7EBat5Da2ubFcSwAikiSQ", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26\n definitions=2023-09-20_02,2023-09-19_01,2023-05-22_02", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Dropped use of rte_firmware_read API to read ML firmware\nbinary. When DPDK is built with libarchive aaupport, the\nthe RTE API assumes the binary file as a compressed\narchive. This causes the ML firmware binary to be parsed\nincorrectly.\n\nFixes: c29da752ffa8 (\"ml/cnxk: support firmware load and device reset\")\nCc: syalavarthi@marvell.com\n\nSigned-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>\n---\n drivers/ml/cnxk/cn10k_ml_dev.c | 64 +++++++++++++++++++++++++++++++---\n 1 file changed, 60 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/ml/cnxk/cn10k_ml_dev.c b/drivers/ml/cnxk/cn10k_ml_dev.c\nindex e3c2badcef..b7e6ed9a00 100644\n--- a/drivers/ml/cnxk/cn10k_ml_dev.c\n+++ b/drivers/ml/cnxk/cn10k_ml_dev.c\n@@ -2,6 +2,11 @@\n * Copyright (c) 2022 Marvell.\n */\n \n+#include <fcntl.h>\n+#include <sys/mman.h>\n+#include <sys/stat.h>\n+#include <unistd.h>\n+\n #include <rte_common.h>\n #include <rte_dev.h>\n #include <rte_devargs.h>\n@@ -61,6 +66,57 @@ static const int valid_ocm_page_size[] = {1024, 2048, 4096, 8192, 16384};\n /* Dummy operations for ML device */\n struct rte_ml_dev_ops ml_dev_dummy_ops = {0};\n \n+static int\n+ml_read_file(const char *file, size_t *size, char **buffer)\n+{\n+\tchar *file_buffer = NULL;\n+\tstruct stat file_stat;\n+\tchar *file_map;\n+\tint ret;\n+\tint fd;\n+\n+\tfd = open(file, O_RDONLY);\n+\tif (fd == -1) {\n+\t\tplt_err(\"Failed to open file: %s\\n\", file);\n+\t\treturn -errno;\n+\t}\n+\n+\tif (fstat(fd, &file_stat) != 0) {\n+\t\tplt_err(\"fstat failed for file: %s\\n\", file);\n+\t\tclose(fd);\n+\t\treturn -errno;\n+\t}\n+\n+\tfile_buffer = rte_malloc(\"ml_firmware\", file_stat.st_size, PLT_CACHE_LINE_SIZE);\n+\tif (file_buffer == NULL) {\n+\t\tplt_err(\"Failed to allocate memory: %s\\n\", file);\n+\t\tret = -ENOMEM;\n+\t\tgoto error;\n+\t}\n+\n+\tfile_map = mmap(0, file_stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);\n+\tif (file_map == MAP_FAILED) {\n+\t\tplt_err(\"Failed to map file: %s\\n\", file);\n+\t\tret = -errno;\n+\t\tgoto error;\n+\t}\n+\n+\trte_memcpy(file_buffer, file_map, file_stat.st_size);\n+\tmunmap(file_map, file_stat.st_size);\n+\tclose(fd);\n+\n+\t*size = file_stat.st_size;\n+\t*buffer = file_buffer;\n+\n+\treturn 0;\n+\n+error:\n+\tfree(file_buffer);\n+\tclose(fd);\n+\n+\treturn ret;\n+}\n+\n static int\n parse_string_arg(const char *key __rte_unused, const char *value, void *extra_args)\n {\n@@ -736,7 +792,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)\n {\n \tconst struct plt_memzone *mz;\n \tstruct cn10k_ml_fw *fw;\n-\tvoid *fw_buffer = NULL;\n+\tchar *fw_buffer = NULL;\n \tuint64_t mz_size = 0;\n \tuint64_t fw_size = 0;\n \tint ret = 0;\n@@ -746,7 +802,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)\n \n \tif (roc_env_is_emulator() || roc_env_is_hw()) {\n \t\t/* Read firmware image to a buffer */\n-\t\tret = rte_firmware_read(fw->path, &fw_buffer, &fw_size);\n+\t\tret = ml_read_file(fw->path, &fw_size, &fw_buffer);\n \t\tif ((ret < 0) || (fw_buffer == NULL)) {\n \t\t\tplt_err(\"Unable to read firmware data: %s\\n\", fw->path);\n \t\t\treturn ret;\n@@ -763,7 +819,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)\n \tmz = plt_memzone_reserve_aligned(FW_MEMZONE_NAME, mz_size, 0, ML_CN10K_ALIGN_SIZE);\n \tif (mz == NULL) {\n \t\tplt_err(\"plt_memzone_reserve failed : %s\", FW_MEMZONE_NAME);\n-\t\tfree(fw_buffer);\n+\t\trte_free(fw_buffer);\n \t\treturn -ENOMEM;\n \t}\n \tfw->req = mz->addr;\n@@ -780,7 +836,7 @@ cn10k_ml_fw_load(struct cn10k_ml_dev *mldev)\n \tif (roc_env_is_emulator() || roc_env_is_hw()) {\n \t\tfw->data = PLT_PTR_ADD(mz->addr, sizeof(struct cn10k_ml_req));\n \t\tret = cn10k_ml_fw_load_cn10ka(fw, fw_buffer, fw_size);\n-\t\tfree(fw_buffer);\n+\t\trte_free(fw_buffer);\n \t} else if (roc_env_is_asim()) {\n \t\tfw->data = NULL;\n \t\tret = cn10k_ml_fw_load_asim(fw);\n", "prefixes": [ "v2", "02/34" ] }