Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127060/?format=api
{ "id": 127060, "url": "http://patches.dpdk.org/api/patches/127060/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230519025950.1642943-6-chaoyong.he@corigine.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": "<20230519025950.1642943-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230519025950.1642943-6-chaoyong.he@corigine.com", "date": "2023-05-19T02:59:47", "name": "[5/8] net/nfp: remove the custom round macro", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dbc792a4e01d0413f4b275854a2636450b23f953", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230519025950.1642943-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 28074, "url": "http://patches.dpdk.org/api/series/28074/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=28074", "date": "2023-05-19T02:59:42", "name": "make the logic conform the coding style of DPDK", "version": 1, "mbox": "http://patches.dpdk.org/series/28074/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/127060/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/127060/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 BE68A42B42;\n\tFri, 19 May 2023 05:00:49 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E78B742D4A;\n\tFri, 19 May 2023 05:00:24 +0200 (CEST)", "from NAM10-BN7-obe.outbound.protection.outlook.com\n (mail-bn7nam10on2118.outbound.protection.outlook.com [40.107.92.118])\n by mails.dpdk.org (Postfix) with ESMTP id 6E51842D4A\n for <dev@dpdk.org>; Fri, 19 May 2023 05:00:23 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SJ0PR13MB5769.namprd13.prod.outlook.com (2603:10b6:a03:40c::15)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Fri, 19 May\n 2023 03:00:21 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.017; Fri, 19 May 2023\n 03:00:21 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Hm6078yD4duj+aNSUQjacMBbXDzDjZv7k91EMSFVNkRmsc8JSANJK6IK8faeAOipARnTxetWC3x+29AxJP69XAyF+cZsIvkR+U8ULL63yXG+IAO/K3ilLwasw4huTWcteV/O0xXcB9OwQ+KPJdN3rKblA3vB8DqXaIyiNXcJSDkmkvo36s4ZuClyfbPlLGPCMIGvjWc+SRaGsfZVZuy2HKAjQv7LqDFmAWC5JI5vG8W7IIQOcY6+CF7BmxJLYyr2NCtLi662rIUg0JfvN7/d6iREG8Y/XYh7g4SNgCUCRHRKeajEeaXOW9hfWhmg/zo4tWEw7KXFkty4TFftkv3g3g==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=ToHuNOugHxj2ko1g8FeYGq0F4MlDT1IHCY7gTRkOwYU=;\n b=DLn2emaB2Ou9DhhiL3TQrPixYGuH+S1ajl3ND2EPstQW1LiD4hKlYDpuk87UMoHG876s42IwbqA4tOSyMCQ25zJ9ye9zY564GeGJAL80b0Zx4OkbxA6WBUGSkktkd09ZaSAF4Q7BtEVvjLWf8eqZbaCoeYBRn5q5lth/eigHS+eCnZGBtasJYlgJlTBiHnXlbgt+8WOZ3L7RV8COZOv1e0OqhRAUU+6S+ZqAMWjwG9tdt7UZCy7X/m71VB/6/fMbSoGug/bXNRkdJvbViMXncfX9aZbcSAQBgIdEi1Sig21G7sjZkutDwIwMR4EH1t/7QZpp0tL7IPIGLeNJiaJCNw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=ToHuNOugHxj2ko1g8FeYGq0F4MlDT1IHCY7gTRkOwYU=;\n b=ALtigWkQmB0Gyh55Pn+X63jIXyo+Lf1CJZ9pIkgXOF1mN0+ZLLRAMlCyiH1OJ0+ZsLrpMBucBYIONRafSyzsploWjKlC8UliMEOKFA6ZZ+zlPuR65bJLVmvZl+gi/1nikyMYqichnaFdJJRcJbKzfzaUOUkzVwOk+Iu3NA/xPCw=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH 5/8] net/nfp: remove the custom round macro", "Date": "Fri, 19 May 2023 10:59:47 +0800", "Message-Id": "<20230519025950.1642943-6-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230519025950.1642943-1-chaoyong.he@corigine.com>", "References": "<20230519025950.1642943-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0005.apcprd01.prod.exchangelabs.com\n (2603:1096:4:191::23) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|SJ0PR13MB5769:EE_", "X-MS-Office365-Filtering-Correlation-Id": "2d1584db-f823-4ccf-539b-08db58152f6a", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n ewT0OEw5d6OBTqpdn+NAlhRF0c9rzaOhcGqk6tBFTTgM5XLB9RIMCFL+5dkc41mCvOovlBecKOooMhj/583xv44NEs44hh80sVr1p6hfPSYXfJaPr/lg1rp9BRubXeseDgEaVOAJBpGMVFsGa3FgATyeWa/XPYQhy+mp9OTnZf3N1ecsIEo6nABQM/o0KOUm4wl/pVOAfVjVSmFQyyWxLA8LGCV2fUdTPKy3zGK1jxU/t/4CPxf240WT6DWGU1/ypaAE/7hisXTUGNDp8XplZIe2i3qwWDhqke49Iru2D/QU7HXr18mFpeQG+4IxcIzLmOKea+VoKR7aUGB6jOL2gUGTV9bSp3sLp9CihIa//LGQ3ykMUcZOgAarRnVH00Q4UwN1ZMMcKjCfi+gzG1hDMgFwQbttNrBuewayhY/boFd5DAdsLrsNx7CJQVbPGyijQiL2L5POZoJYS41BNRDrAzoSNcGCFFFyaHkja1lkPRwLFvuEfw76wR3EdKLb9RPGgkxdy6dgcbevC7J6ENMFQcz57av4yedqAa3BLSflKIxghWHMtdGcnwosh0pcW43kQj+j2jGVFYQqsPJNkmeOHTRCqvjVTGhny5Z7ykDNYEaj/BFpyxPTwpAnXjHDcO8U", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(39840400004)(396003)(451199021)(6916009)(66476007)(66574015)(2616005)(6666004)(6512007)(41300700001)(2906002)(6486002)(83380400001)(478600001)(66556008)(107886003)(52116002)(66946007)(26005)(6506007)(1076003)(186003)(5660300002)(4326008)(316002)(8676002)(8936002)(44832011)(86362001)(38100700002)(36756003)(38350700002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?WF8vqUQ1hUaylvVe7tkq9VtzBKvi?=\n\t=?utf-8?q?ZKMWYyJ3IiYVwERdf/virHa8Zgkh2QA756XdRtSxiKr8JNsz4a6BxLcj2BiVn7M1g?=\n\t=?utf-8?q?njWMhelSwAWi/wXXVv70YX5mbHaiVdpjWbGb+2P9+Ba0hd9Ez4Gu2zYomotuBom2r?=\n\t=?utf-8?q?IVNLyh4WZzz2IGY8lDx4w3Qniz9UDaGefXE2+aC5shuV1LfoeQe3WW4088wIS79NV?=\n\t=?utf-8?q?gdMi3TQiJNdVhJ3xmdBOT/ZBzX0lsE85ggTNfq9M0KpwxgnLcFc+0rsaXrAjni0A8?=\n\t=?utf-8?q?u2Isp+9fob7PA0Nv2oeDlrKXbm1NPf2Hthkyb9wQjoRKTRqrkOZb2MVI+/dL1aWW+?=\n\t=?utf-8?q?afwX4yp0aBz6ne8fy8MEyZeh8brdWyipQwbbfY8F+slydinbt2BfvIglzZI7BUmH8?=\n\t=?utf-8?q?6w2stD776JxYEX5HFNlkRZSEeOxB3a4vUVR12GQg5LAKBzKYel1el7m5lyWjWQJCi?=\n\t=?utf-8?q?4VZF93f0VPCfzB2Fi0QwYYfB467380jYlHdn3igew2PeVwSQe3TivT8HZpo+NgDq1?=\n\t=?utf-8?q?StLYXEaesT2eVnJTY9J4Ub3aaEFwaiNUFOPoRPqPd4NdgIc+iS1FqqGt9a9l4CB0h?=\n\t=?utf-8?q?GnemymO+unfjjRWzm+hq/AIRJYQR8k6F5yEcaV3XtBGzIg8KdhCpxH3c8HaNPjiye?=\n\t=?utf-8?q?qGoLRnUKFW4b5Gd2Mq5sdsZNBWRtNbmFDwNBwsysWo+0r/ETOue3Cf3rDxmyU+92I?=\n\t=?utf-8?q?0nisn9nmrm+8fGRy/ccKDjb3S01NcSD+vyupJelK67LUUsboZbQpg/wiUDKL+CuXB?=\n\t=?utf-8?q?w55sHzvxGVtnTgOyrhrE5BeiyBUcl/VoNQsC1uGR1LQYs4op4D9UuFyVK26wbOBAt?=\n\t=?utf-8?q?qMP7tSpPBqRyaZtnheZ+lGwndppJyoW11029Zgsix4tbqi4iOdI1152WP2YgaBx/L?=\n\t=?utf-8?q?SYz5MiaFK3yCcEMw8XjT9d+ASMw3J5HN93Gh2euk9qU2d9unCLNf0V6QEz1oupNey?=\n\t=?utf-8?q?3RCfphQYURfOd9mJnU5584s6DySgqkKl/8FfBE6J3iLRITxB8KK+4Y1MEgcbZ+Uc8?=\n\t=?utf-8?q?oQfa+t55YrmKdefFtqwH9KEHDPhwkayRRwJSYZiCTs70AW6BdEn1bVAVTlFot0ECn?=\n\t=?utf-8?q?nDyBWLvTEcwwCJnVTPXTn7/7xFaROfQ/5jDfaJqQFLHfYQ2IweN7CBo8EeMiTK+nD?=\n\t=?utf-8?q?mcIpcKuvW0nC6UzbocV1Xgv25FARljNOi7sv0qm06nqDjXuNwjsETDMaK6OmN3ARj?=\n\t=?utf-8?q?bptA/4Rbm4HbM4tGHvZZhpvMlTjUvgq6dTbsHz5tdGA9o55ohz6U/C96C1TD0Z1hK?=\n\t=?utf-8?q?G+8ThEHnpw/foUv+r1u5tQFrtWTry7VPQx/hVMY+ubC8j5gEc8ztGkCxjVTs3/LIo?=\n\t=?utf-8?q?Q2yt3q17VF145KQncBTXdj+qxFxesLB+nNph8uvLL3fEsuW7WLsnJaqClV2paKreo?=\n\t=?utf-8?q?q+b2ja+S33qagxJfYCGCfjEwCQTn3G429kW6Fj990aZjE/gl9ggnEYIB7fnH8kAcu?=\n\t=?utf-8?q?nYQDg8+1AQFc7CM3CAxu6JszXBDsgxsGXmr/NWg/a/jKJewBema+8fvA464+RmJFR?=\n\t=?utf-8?q?HtK2+gKNhhwlaq7/1ZaWOAcxB6hMAKrW1A=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 2d1584db-f823-4ccf-539b-08db58152f6a", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 May 2023 03:00:21.8383 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n UnTgeKj/8WU2ZXKyum9G+P+03VWTPraOkUTav+DZZv2KoFTiwOioDVb6Qog9bhvDlQvPojJuEW9MrhrOKTfLBPUPOOrLFC6ITUIyReljLrk=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SJ0PR13MB5769", "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": "Remove the custom round macro, use the macro provide by\nthe DPDK.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 9 +++++----\n drivers/net/nfp/nfpcore/nfp_rtsym.c | 4 ++--\n drivers/net/nfp/nfpcore/nfp_rtsym.h | 19 -------------------\n 3 files changed, 7 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex b35aa9a610..9b815800bb 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -70,8 +70,8 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,\n \t\tn_descs++;\n \n \t/* Don't count metadata descriptor, for the round down to work out */\n-\tif (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=\n-\t\t\tround_down(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT))\n+\tif (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=\n+\t\t\tRTE_ALIGN_FLOOR(txq->wr_p + n_descs, NFDK_TX_DESC_BLOCK_CNT))\n \t\tgoto close_block;\n \n \tif (txq->data_pending + pkt->pkt_len > NFDK_TX_MAX_DATA_PER_BLOCK)\n@@ -293,8 +293,9 @@ nfp_net_nfdk_xmit_pkts(void *tx_queue,\n \t\t}\n \n \t\tused_descs = ktxds - txq->ktxds - txq->wr_p;\n-\t\tif (round_down(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=\n-\t\t\t\tround_down(txq->wr_p + used_descs - 1, NFDK_TX_DESC_BLOCK_CNT)) {\n+\t\tif (RTE_ALIGN_FLOOR(txq->wr_p, NFDK_TX_DESC_BLOCK_CNT) !=\n+\t\t\t\tRTE_ALIGN_FLOOR(txq->wr_p + used_descs - 1,\n+\t\t\t\t\t\tNFDK_TX_DESC_BLOCK_CNT)) {\n \t\t\tPMD_TX_LOG(INFO, \"Used descs cross block boundary\");\n \t\t\tgoto xmit_end;\n \t\t}\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 850667adf8..9713605580 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -113,8 +113,8 @@ __nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip)\n \t\treturn NULL;\n \n \t/* Align to 64 bits */\n-\tsymtab_size = round_up(symtab_size, 8);\n-\tstrtab_size = round_up(strtab_size, 8);\n+\tsymtab_size = RTE_ALIGN_CEIL(symtab_size, 8);\n+\tstrtab_size = RTE_ALIGN_CEIL(strtab_size, 8);\n \n \trtsymtab = malloc(symtab_size);\n \tif (rtsymtab == NULL)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h\nindex d2856e19c3..8b494211bc 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h\n@@ -15,25 +15,6 @@\n #define NFP_RTSYM_TARGET_LMEM -1\n #define NFP_RTSYM_TARGET_EMU_CACHE -7\n \n-/*\n- * This looks more complex than it should be. But we need to get the type for\n- * the ~ right in round_down (it needs to be as wide as the result!), and we\n- * want to evaluate the macro arguments just once each.\n- */\n-#define __round_mask(x, y) ((__typeof__(x))((y) - 1))\n-\n-#define round_up(x, y) \\\n-\t(__extension__ ({ \\\n-\t\ttypeof(x) _x = (x); \\\n-\t\t((((_x) - 1) | __round_mask(_x, y)) + 1); \\\n-\t}))\n-\n-#define round_down(x, y) \\\n-\t(__extension__ ({ \\\n-\t\ttypeof(x) _x = (x); \\\n-\t\t((_x) & ~__round_mask(_x, y)); \\\n-\t}))\n-\n /*\n * Structure describing a run-time NFP symbol.\n *\n", "prefixes": [ "5/8" ] }