From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E1F2B45A67; Mon, 30 Sep 2024 12:31:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B21394066E; Mon, 30 Sep 2024 12:30:27 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2084.outbound.protection.outlook.com [40.107.22.84]) by mails.dpdk.org (Postfix) with ESMTP id 98C8340609 for ; Mon, 30 Sep 2024 12:30:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N6fniovwzotTE84qLhQefh5OUOkR4V6xLDuCXJ82WTAjisweKyr1MLuredUgbs2PZD4pQuQdCNhU217RgA0lbTnXfO3QS6Au5niYrC1dUpqkVNu/decQV4KqffIj7C7KZVCDrfKsT1MrrXrYng3f1Hhc9QFe1MJjElMGuuW3mMex/r0byzNkLUXtQQt8axA4E1mi4pgwP6gSTaSp76YQPs+zPwukgVaXW1+K8NslN8B/1nPTAWqC/5V4LDpLKIWOIarZv3Qpb/bW21/MtVLoJRr9xKVsmG/d0NIpLY8rpdFClDiK4C+H27UywY1ouk3kjgGz8dhFAZXA9Iq6V7pVjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=K+Bqv9MhADY+cMWEDD7h5Uu2kGHmnDaPxL2F5o8W4OI=; b=nRMmM8ImGiRnd0dOlEss20BpUPvbO1U67UN5vUhVu1Kr8WeKNirEupSyHjqP4nmF4m1IbBFu2vjbLShha5YaCHm2nWOyDZua8vaIeEhq5JRKjQM/zC93zT0yKGiuDDm3Afu3Oim1PKq/QLf67N4M/LrsTzfJtlHl3sQvO3zAhkFP2h0Qn2qydaows/h/BIZ+bKYEhdPVyvoB2lEizoNqYldX/pTI2flbjs/5C7pIIOWLeYzXOwR5F+0n1XjbgXB6pla5JGnXJARlRipAqk0aMfilxvCLfMfYdhkr45i6itIYW2aWVzRif4h5MRGnJ7tlURl3cQqif27hKi7gk35WDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K+Bqv9MhADY+cMWEDD7h5Uu2kGHmnDaPxL2F5o8W4OI=; b=aB4CyxXf26jVqda8Gb+oGeLM06ijqeVzFgDDsNqZ2b68j6xnqofgnzdqGnzygb7R39F+17RP5r3IkUCXz2VxOBJBRv7feQF6Tq4Lr9z2grIUINuUjxTXOJUthI/rnRMf0T0JqF2IoybLaoX3XRzfWMXAfvhaqrj2Hj2DvEI1tSIPueoeqc2iUxkGRuNtYHGiOs9ZUXpXm1Jgx36C4zJk3hXNEQlHI3u8wsSon8p4PWLGC96bkUIdflzznRt2RmzKMHB5VbyhXYMil1tjqtamVCFnPhmps0MC6AwjFBpxdcjffXv+dMZGV+fQlFxUz65F5JLitXDTPCpfbjSL2s+veg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) by VI0PR04MB10161.eurprd04.prod.outlook.com (2603:10a6:800:242::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 10:30:16 +0000 Received: from PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87]) by PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87%3]) with mapi id 15.20.8005.026; Mon, 30 Sep 2024 10:30:16 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@amd.com, Vanshika Shukla Subject: [PATCH v3 09/18] net/dpaa: support Rx/Tx timestamp read Date: Mon, 30 Sep 2024 15:59:37 +0530 Message-Id: <20240930102946.3236998-10-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240930102946.3236998-1-hemant.agrawal@nxp.com> References: <20240823073240.3708320-1-hemant.agrawal@nxp.com> <20240930102946.3236998-1-hemant.agrawal@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2P153CA0027.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::14) To PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9328:EE_|VI0PR04MB10161:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c84b1ed-c60b-4136-851d-08dce13adfc4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?26MN8Qce3F4KiUd/PFMxgrx5tNvUGMdVBVK94b34w+2d4NA1opKDmCybkyCV?= =?us-ascii?Q?K1R9gEavXd4CGruhEwIxljxJrOv38HwaitdC7ismp7242lWXsoRHwBacFqyi?= =?us-ascii?Q?gq46RGbiY1tqFVh1twI3q+ifMZfK9Qn2KwJ/Yi5d2tGU2mVANis3Rw8KkUgk?= =?us-ascii?Q?wkpbDWuywEADO19s7VlMhxVT2PR4m4NCU5KTT/TGz6nnyy8DUwFRMugzx9gj?= =?us-ascii?Q?pH6TlPyg5SN5RlRnjuLf43T6r5sPZUa+wFHBF9IZK/Xr8/6o3nBPGf0Pf/Eh?= =?us-ascii?Q?ox0/Jvk9WqEYdXkfpPCQqDtmmU9RcdSz8jmpGGhm+/7j/i/uPQvF3/rfDSYp?= =?us-ascii?Q?fqZM/THfF4SJguIWnOznoT9YyKqYKw4dfnOmapCV0ZLH27pDgRE0+CQVrsIN?= =?us-ascii?Q?0vkbZ2zJ/X62P6lpXrSHz9KVPNY3NLYbIZIl/DrLKh4q9sZ9ZatkmfumgN4i?= =?us-ascii?Q?omENZS+leANJvUiB4sixn3W1zs669jNQMRwf4WD5HYce07PaaZTKjdGTvcoG?= =?us-ascii?Q?iXycYwRhI8HZEDsXlpFahHbB+y9KxAjnAkTbmh5VCNdgiIYjbfGh0VDyhQt3?= =?us-ascii?Q?AONxtkOIYq91KSLmjbDQ9YeTNNbECflXUEX1wJNA/peHDMnsIshmpD8V6oKp?= =?us-ascii?Q?t1zDhVnNgKHUb8gZTrQrF01NCMtTUiYipt7/+aus5MWA1agHIJ+1gW3JT5il?= =?us-ascii?Q?mE/pE5QAXjklVQY0NRT16Pwy4fNXpmDXb/OHzg22e5hqeRa880zIkAb+OlMc?= =?us-ascii?Q?bBs8mSIqFdPiS86uMnY3YqCfAwJ8WfGaohNoU4R1oRasJW9ylk35Xu8weOKf?= =?us-ascii?Q?BrxRJrs5khZ15n9jgrXGtLUGyYQnFUlRBt07j0Fc6zROxW/UIaRczRPP0WlT?= =?us-ascii?Q?LbTF4RLQQHHMrwnleTKRtWwpqja7SnU1t/cfy+fZanLE/Dx5+wJTmG2sViIn?= =?us-ascii?Q?2FuET6USOnouILXpxh6uMwN0WmykLj0EJAc2S8PC9h3HxuWq9ay2P/yY3AUx?= =?us-ascii?Q?S+klANGCzQLAjc4OgcNYrMVkZRzAqJH4JfvwfkdognaeEGbISvoTkBfL66w+?= =?us-ascii?Q?6vOFJZE/7VJ/mWKG3g4uDmb0nF55iIDuJVr9kBkEFosjc38IPEGcPNX7zk3i?= =?us-ascii?Q?H8ywiFfZLRsG03vamzE7UQVepWSFBO9tOhhQfuStkb+DoqamucTeJyT/FLfq?= =?us-ascii?Q?5ZgFj5AGmLAMraAyuYryam4iuOvoGnqC1WoP2P8tlX9wEEIW0zw2Uj4KeBpd?= =?us-ascii?Q?ltJ7tF8H0kHqLflJfzo3gX7dM6fyEWhgJQ+XcPP+YaVycX6r/6woxvwQMZlS?= =?us-ascii?Q?D4YEfsXfN/R0m2g315/IDp9LQjNtcawlSUHqvLXB9IXNIQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9328.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?misHh/cjq3ZIa/YR6euzeJz6bvCXQPWv8073jl1wDmzS9q3PTT5EB61H87u3?= =?us-ascii?Q?K0YRxbSAyFu93bEuTZAbJV1cJwFnJuPb9ny1mlorbdN2QnOA5tKbrdb1hvbP?= =?us-ascii?Q?j0nbh6RYJ7DvTvFDYR8rO5mxLKkaZhNqHApfq10XZQYmJFIU+8zIfKsqdmwc?= =?us-ascii?Q?52UzLvQ5ug+XobdXntEbniFpxpk5KLv3RxeJDOvb3jmAEcmyWZUiGRdcGdTw?= =?us-ascii?Q?7ktr0VJoJ/46HXAf9LjIp2XMoLaXUOCgrnp5W/85rZZvnTFyTL0PgKPkQ1NW?= =?us-ascii?Q?i6GF8GJ8NrSZL/8/xI3RT51g25NJAPqHm9qTFrj1prD4wBQjCfd4ht2szC+G?= =?us-ascii?Q?gS5qjfeUQekRra/Q7ylHL18aikIWK0CxBYnlO2Wj1NhCEpiuf3x1RzkOyMtt?= =?us-ascii?Q?UeMTTVSvf2DsYp6P1k/i0TKTwSINO6b/8Ezv0dF1DAqSO9Ak8BHplvmEDyjP?= =?us-ascii?Q?iukBg1MGziVSp5fwQE4rEZanFH1V/88vwoGAWTV/ORxjYd4YuIOgAz/ZEh3H?= =?us-ascii?Q?b77ovpqnI6ccbi9rf8M7MA2nPQy177nnLtFcX8b7RjFfrX++EUOl/lyapXCG?= =?us-ascii?Q?daeWCSd8Dlvp4/miWP152RbI/W/SSOC1trFM2WrMEXBi5wCRW6teePwtZES6?= =?us-ascii?Q?pe0HeeZwal/GzkD88UO/ixzo7p09W3YRf987vvM2HICGHlaTHHAKMeGgOF27?= =?us-ascii?Q?Qhuq1+gswHdvNFThxdYBgpeR+R9CKrC/7nZeyyViCmUDqjFnSEcmCcDVErF/?= =?us-ascii?Q?Z1P/gCIEdOy6UGp5tSFLLKXi0KcAzxaRe0RX/1/jWW6vqHXfRtDFc88t/sMb?= =?us-ascii?Q?quO+9kpr40tHh5pnJH+pGPYUW9qcXs38ShWff3pcwJJ9lnE8Xvlucw5XNjFv?= =?us-ascii?Q?a67uxDpIsKc0tj2+f1yVhWVMxSpjIbqnmsErHLmfcTPf5cVh9RafwwbNVlPy?= =?us-ascii?Q?17LLgzQzgoTdIeVes7X8S2yAw8DiE9MfvUI6TmVcHyh1bdCBnqcOB0QKcCS2?= =?us-ascii?Q?aJJz7WNDjG/EYhp/9jdtW/zB8sGDf15w9hsN0jt1grHUMorCI3WfUBt6RSHg?= =?us-ascii?Q?ZMaEumtGjKOLIED1Cn8Hygviea/fZzR5yy798uAkmLCr0Np43b86UJptMYKN?= =?us-ascii?Q?NFedaN59qE7ihaCvxRG/E3VDR53qU+SCf1uGaxwoXiGAiVtCN2q5IjCGOjtS?= =?us-ascii?Q?vFEuPvs6YkqZXIOHwyAEzQQ3glFPQLPjAcQL63Hha3bNSrsHNFhVFXj+RWe0?= =?us-ascii?Q?bCXUwYXiijXbZbqbmkGOQoLAH3OB7SRBQzL0iBdmszF6kfZJkQP6JhJtw0ga?= =?us-ascii?Q?OWy/ON4hTUrsuN3mlAcXiwjyyVuFO8cSLfNCTVDc2g6HTw1CDwaexNX0yQ7C?= =?us-ascii?Q?NF7a0FLvEwL5l4acnLh3bS0Xr1lh0P3mBY4WUUAeP479fwo6hsORgby7nejJ?= =?us-ascii?Q?bBr7TL683XVLfcjsUMnh972loJx6NyqfejjcfQA5AgJUeo5JTkU2+XOI00k3?= =?us-ascii?Q?tuc7AqATsUaDXShtj9QCNJalmKLKGh2DBgsKJqFXpQdZiKBhwrMc/suTngZm?= =?us-ascii?Q?BjhKdOmV4Crs8gHyfg/SvK2X0lypKSNECDRAchPhahIaU8sluak2JnLVeVx1?= =?us-ascii?Q?RQ=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c84b1ed-c60b-4136-851d-08dce13adfc4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9328.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 10:30:16.1166 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dtQs7NEXpn96Zc7vo5sG5cwmWtOpEjoYb2zxjEsvK4aKXYAcVcnnEVu5dN8b3gPw5igDgRcBux0S8UQ5DM22KQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10161 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 From: Vanshika Shukla This patch implements Rx/Tx timestamp read operations for DPAA1 platform. Signed-off-by: Vanshika Shukla --- doc/guides/nics/features/dpaa.ini | 1 + drivers/bus/dpaa/base/fman/fman.c | 21 +++++++- drivers/bus/dpaa/base/fman/fman_hw.c | 6 ++- drivers/bus/dpaa/include/fman.h | 18 ++++++- drivers/net/dpaa/dpaa_ethdev.c | 2 + drivers/net/dpaa/dpaa_ethdev.h | 17 +++++++ drivers/net/dpaa/dpaa_ptp.c | 42 ++++++++++++++++ drivers/net/dpaa/dpaa_rxtx.c | 71 ++++++++++++++++++++++++---- drivers/net/dpaa/dpaa_rxtx.h | 4 +- drivers/net/dpaa/meson.build | 1 + 10 files changed, 168 insertions(+), 15 deletions(-) create mode 100644 drivers/net/dpaa/dpaa_ptp.c diff --git a/doc/guides/nics/features/dpaa.ini b/doc/guides/nics/features/dpaa.ini index b136ed191a..4196dd800c 100644 --- a/doc/guides/nics/features/dpaa.ini +++ b/doc/guides/nics/features/dpaa.ini @@ -19,6 +19,7 @@ Flow control = Y L3 checksum offload = Y L4 checksum offload = Y Packet type parsing = Y +Timestamp offload = Y Basic stats = Y Extended stats = Y FW version = Y diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index beeb03dbf2..e39bc8c252 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2010-2016 Freescale Semiconductor Inc. - * Copyright 2017-2020 NXP + * Copyright 2017-2024 NXP * */ @@ -520,6 +520,25 @@ fman_if_init(const struct device_node *dpa_node) goto err; } + regs_addr = of_get_address(tx_node, 0, &__if->regs_size, NULL); + if (!regs_addr) { + FMAN_ERR(-EINVAL, "of_get_address(%s)\n", mname); + goto err; + } + phys_addr = of_translate_address(tx_node, regs_addr); + if (!phys_addr) { + FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n", + mname, regs_addr); + goto err; + } + __if->tx_bmi_map = mmap(NULL, __if->regs_size, + PROT_READ | PROT_WRITE, MAP_SHARED, + fman_ccsr_map_fd, phys_addr); + if (__if->tx_bmi_map == MAP_FAILED) { + FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr); + goto err; + } + /* No channel ID for MAC-less */ assert(lenp == sizeof(*tx_channel_id)); na = of_n_addr_cells(mac_node); diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 124c69edb4..4fc41c1ae9 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright 2017,2020 NXP + * Copyright 2017,2020,2022 NXP * */ @@ -565,6 +565,10 @@ fman_if_set_ic_params(struct fman_if *fm_if, &((struct rx_bmi_regs *)__if->bmi_map)->fmbm_ricp; out_be32(fmbm_ricp, val); + unsigned int *fmbm_ticp = + &((struct tx_bmi_regs *)__if->tx_bmi_map)->fmbm_ticp; + out_be32(fmbm_ticp, val); + return 0; } diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h index 6b2a1893f9..09d1ddb897 100644 --- a/drivers/bus/dpaa/include/fman.h +++ b/drivers/bus/dpaa/include/fman.h @@ -2,7 +2,7 @@ * * Copyright 2010-2012 Freescale Semiconductor, Inc. * All rights reserved. - * Copyright 2019-2021 NXP + * Copyright 2019-2022 NXP * */ @@ -292,6 +292,21 @@ struct rx_bmi_regs { uint32_t fmbm_rdbg; /**< Rx Debug-*/ }; +struct tx_bmi_regs { + uint32_t fmbm_tcfg; /**< Tx Configuration*/ + uint32_t fmbm_tst; /**< Tx Status*/ + uint32_t fmbm_tda; /**< Tx DMA attributes*/ + uint32_t fmbm_tfp; /**< Tx FIFO Parameters*/ + uint32_t fmbm_tfed; /**< Tx Frame End Data*/ + uint32_t fmbm_ticp; /**< Tx Internal Context Parameters*/ + uint32_t fmbm_tfdne; /**< Tx Frame Dequeue Next Engine*/ + uint32_t fmbm_tfca; /**< Tx Frame Attributes*/ + uint32_t fmbm_tcfqid; /**< Tx Confirmation Frame Queue ID*/ + uint32_t fmbm_tefqid; /**< Tx Error Frame Queue ID*/ + uint32_t fmbm_tfene; /**< Tx Frame Enqueue Next Engine*/ + uint32_t fmbm_trlmts; /**< Tx Rate Limiter Scale*/ + uint32_t fmbm_trlmt; /**< Tx Rate Limiter*/ +}; struct fman_port_qmi_regs { uint32_t fmqm_pnc; /**< PortID n Configuration Register */ uint32_t fmqm_pns; /**< PortID n Status Register */ @@ -380,6 +395,7 @@ struct __fman_if { uint64_t regs_size; void *ccsr_map; void *bmi_map; + void *tx_bmi_map; void *qmi_map; struct list_head node; }; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index bf14d73433..682cb1c77e 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1673,6 +1673,8 @@ static struct eth_dev_ops dpaa_devops = { .rx_queue_intr_disable = dpaa_dev_queue_intr_disable, .rss_hash_update = dpaa_dev_rss_hash_update, .rss_hash_conf_get = dpaa_dev_rss_hash_conf_get, + .timesync_read_rx_timestamp = dpaa_timesync_read_rx_timestamp, + .timesync_read_tx_timestamp = dpaa_timesync_read_tx_timestamp, }; static bool diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 0a1ceb376a..bbdb0936c0 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -151,6 +151,14 @@ struct dpaa_if { void *netenv_handle; void *scheme_handle[2]; uint32_t scheme_count; + /*stores timestamp of last received packet on dev*/ + uint64_t rx_timestamp; + /*stores timestamp of last received tx confirmation packet on dev*/ + uint64_t tx_timestamp; + /* stores pointer to next tx_conf queue that should be processed, + * it corresponds to last packet transmitted + */ + struct qman_fq *next_tx_conf_queue; void *vsp_handle[DPAA_VSP_PROFILE_MAX_NUM]; uint32_t vsp_bpid[DPAA_VSP_PROFILE_MAX_NUM]; @@ -233,6 +241,15 @@ struct dpaa_if_rx_bmi_stats { uint32_t fmbm_rbdc; /**< Rx Buffers Deallocate Counter*/ }; +int +dpaa_timesync_read_tx_timestamp(struct rte_eth_dev *dev, + struct timespec *timestamp); + +int +dpaa_timesync_read_rx_timestamp(struct rte_eth_dev *dev, + struct timespec *timestamp, + uint32_t flags __rte_unused); + /* PMD related logs */ extern int dpaa_logtype_pmd; #define RTE_LOGTYPE_DPAA_PMD dpaa_logtype_pmd diff --git a/drivers/net/dpaa/dpaa_ptp.c b/drivers/net/dpaa/dpaa_ptp.c new file mode 100644 index 0000000000..2ecdda6db0 --- /dev/null +++ b/drivers/net/dpaa/dpaa_ptp.c @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2022-2024 NXP + */ + +/* System headers */ +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +int dpaa_timesync_read_tx_timestamp(struct rte_eth_dev *dev, + struct timespec *timestamp) +{ + struct dpaa_if *dpaa_intf = dev->data->dev_private; + + if (dpaa_intf->next_tx_conf_queue) { + while (!dpaa_intf->tx_timestamp) + dpaa_eth_tx_conf(dpaa_intf->next_tx_conf_queue); + } else { + return -1; + } + *timestamp = rte_ns_to_timespec(dpaa_intf->tx_timestamp); + + return 0; +} + +int dpaa_timesync_read_rx_timestamp(struct rte_eth_dev *dev, + struct timespec *timestamp, + uint32_t flags __rte_unused) +{ + struct dpaa_if *dpaa_intf = dev->data->dev_private; + *timestamp = rte_ns_to_timespec(dpaa_intf->rx_timestamp); + return 0; +} diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index d1338d1654..e3b4bb14ab 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2017,2019-2021 NXP + * Copyright 2017,2019-2024 NXP * */ @@ -49,7 +49,6 @@ #define DPAA_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) \ do { \ - (_fd)->cmd = 0; \ (_fd)->opaque_addr = 0; \ (_fd)->opaque = QM_FD_CONTIG << DPAA_FD_FORMAT_SHIFT; \ (_fd)->opaque |= ((_mbuf)->data_off) << DPAA_FD_OFFSET_SHIFT; \ @@ -122,6 +121,8 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr) { struct annotations_t *annot = GET_ANNOTATIONS(fd_virt_addr); uint64_t prs = *((uintptr_t *)(&annot->parse)) & DPAA_PARSE_MASK; + struct rte_ether_hdr *eth_hdr = + rte_pktmbuf_mtod(m, struct rte_ether_hdr *); DPAA_DP_LOG(DEBUG, " Parsing mbuf: %p with annotations: %p", m, annot); @@ -241,6 +242,11 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr) if (prs & DPAA_PARSE_VLAN_MASK) m->ol_flags |= RTE_MBUF_F_RX_VLAN; /* Packet received without stripping the vlan */ + + if (eth_hdr->ether_type == htons(RTE_ETHER_TYPE_1588)) { + m->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP; + m->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST; + } } static inline void dpaa_checksum(struct rte_mbuf *mbuf) @@ -317,7 +323,7 @@ static inline void dpaa_checksum_offload(struct rte_mbuf *mbuf, prs->ip_off[0] = mbuf->l2_len; prs->l4_off = mbuf->l3_len + mbuf->l2_len; /* Enable L3 (and L4, if TCP or UDP) HW checksum*/ - fd->cmd = DPAA_FD_CMD_RPD | DPAA_FD_CMD_DTC; + fd->cmd |= DPAA_FD_CMD_RPD | DPAA_FD_CMD_DTC; } static inline void @@ -513,6 +519,7 @@ dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, uint16_t offset, i; uint32_t length; uint8_t format; + struct annotations_t *annot; bp_info = DPAA_BPID_TO_POOL_INFO(dqrr[0]->fd.bpid); ptr = rte_dpaa_mem_ptov(qm_fd_addr(&dqrr[0]->fd)); @@ -554,6 +561,11 @@ dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, rte_mbuf_refcnt_set(mbuf, 1); dpaa_eth_packet_info(mbuf, mbuf->buf_addr); dpaa_display_frame_info(fd, fq[0]->fqid, true); + if (dpaa_ieee_1588) { + annot = GET_ANNOTATIONS(mbuf->buf_addr); + dpaa_intf->rx_timestamp = + rte_cpu_to_be_64(annot->timestamp); + } } } @@ -567,6 +579,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, uint16_t offset, i; uint32_t length; uint8_t format; + struct annotations_t *annot; for (i = 0; i < num_bufs; i++) { fd = &dqrr[i]->fd; @@ -594,6 +607,11 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, rte_mbuf_refcnt_set(mbuf, 1); dpaa_eth_packet_info(mbuf, mbuf->buf_addr); dpaa_display_frame_info(fd, fq[0]->fqid, true); + if (dpaa_ieee_1588) { + annot = GET_ANNOTATIONS(mbuf->buf_addr); + dpaa_intf->rx_timestamp = + rte_cpu_to_be_64(annot->timestamp); + } } } @@ -758,6 +776,8 @@ uint16_t dpaa_eth_queue_rx(void *q, uint32_t num_rx = 0, ifid = ((struct dpaa_if *)fq->dpaa_intf)->ifid; int num_rx_bufs, ret; uint32_t vdqcr_flags = 0; + struct annotations_t *annot; + struct dpaa_if *dpaa_intf = fq->dpaa_intf; if (unlikely(rte_dpaa_bpid_info == NULL && rte_eal_process_type() == RTE_PROC_SECONDARY)) @@ -800,6 +820,10 @@ uint16_t dpaa_eth_queue_rx(void *q, continue; bufs[num_rx++] = dpaa_eth_fd_to_mbuf(&dq->fd, ifid); dpaa_display_frame_info(&dq->fd, fq->fqid, true); + if (dpaa_ieee_1588) { + annot = GET_ANNOTATIONS(bufs[num_rx - 1]->buf_addr); + dpaa_intf->rx_timestamp = rte_cpu_to_be_64(annot->timestamp); + } qman_dqrr_consume(fq, dq); } while (fq->flags & QMAN_FQ_STATE_VDQCR); @@ -1095,6 +1119,7 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) struct dpaa_sw_buf_free buf_to_free[DPAA_MAX_SGS * DPAA_MAX_DEQUEUE_NUM_FRAMES]; uint32_t free_count = 0; struct qman_fq *fq = q; + struct dpaa_if *dpaa_intf = fq->dpaa_intf; struct qman_fq *fq_txconf = fq->tx_conf_queue; if (unlikely(!DPAA_PER_LCORE_PORTAL)) { @@ -1107,6 +1132,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) DPAA_DP_LOG(DEBUG, "Transmitting %d buffers on queue: %p", nb_bufs, q); + if (dpaa_ieee_1588) { + dpaa_intf->next_tx_conf_queue = fq_txconf; + dpaa_eth_tx_conf(fq_txconf); + dpaa_intf->tx_timestamp = 0; + } + while (nb_bufs) { frames_to_send = (nb_bufs > DPAA_TX_BURST_SIZE) ? DPAA_TX_BURST_SIZE : nb_bufs; @@ -1119,6 +1150,14 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) if (dpaa_svr_family == SVR_LS1043A_FAMILY && (mbuf->data_off & 0x7F) != 0x0) realloc_mbuf = 1; + + fd_arr[loop].cmd = 0; + if (dpaa_ieee_1588) { + fd_arr[loop].cmd |= DPAA_FD_CMD_FCO | + qman_fq_fqid(fq_txconf); + fd_arr[loop].cmd |= DPAA_FD_CMD_RPD | + DPAA_FD_CMD_UPD; + } seqn = *dpaa_seqn(mbuf); if (seqn != DPAA_INVALID_MBUF_SEQN) { index = seqn - 1; @@ -1176,10 +1215,6 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) mbuf = temp_mbuf; realloc_mbuf = 0; } - - if (dpaa_ieee_1588) - fd_arr[loop].cmd |= DPAA_FD_CMD_FCO | qman_fq_fqid(fq_txconf); - indirect_buf: state = tx_on_dpaa_pool(mbuf, bp_info, &fd_arr[loop], @@ -1208,9 +1243,6 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) sent += frames_to_send; } - if (dpaa_ieee_1588) - dpaa_eth_tx_conf(fq_txconf); - DPAA_DP_LOG(DEBUG, "Transmitted %d buffers on queue: %p", sent, q); for (loop = 0; loop < free_count; loop++) { @@ -1228,6 +1260,12 @@ dpaa_eth_tx_conf(void *q) struct qm_dqrr_entry *dq; int num_tx_conf, ret, dq_num; uint32_t vdqcr_flags = 0; + struct dpaa_if *dpaa_intf = fq->dpaa_intf; + struct qm_dqrr_entry *dqrr; + struct dpaa_bp_info *bp_info; + struct rte_mbuf *mbuf; + void *ptr; + struct annotations_t *annot; if (unlikely(rte_dpaa_bpid_info == NULL && rte_eal_process_type() == RTE_PROC_SECONDARY)) @@ -1252,7 +1290,20 @@ dpaa_eth_tx_conf(void *q) dq = qman_dequeue(fq); if (!dq) continue; + dqrr = dq; dq_num++; + bp_info = DPAA_BPID_TO_POOL_INFO(dqrr->fd.bpid); + ptr = rte_dpaa_mem_ptov(qm_fd_addr(&dqrr->fd)); + rte_prefetch0((void *)((uint8_t *)ptr + + DEFAULT_RX_ICEOF)); + mbuf = (struct rte_mbuf *) + ((char *)ptr - bp_info->meta_data_size); + + if (mbuf->ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST) { + annot = GET_ANNOTATIONS(mbuf->buf_addr); + dpaa_intf->tx_timestamp = + rte_cpu_to_be_64(annot->timestamp); + } dpaa_display_frame_info(&dq->fd, fq->fqid, true); qman_dqrr_consume(fq, dq); dpaa_free_mbuf(&dq->fd); diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h index 042602e087..1048e86d41 100644 --- a/drivers/net/dpaa/dpaa_rxtx.h +++ b/drivers/net/dpaa/dpaa_rxtx.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2017,2020-2021 NXP + * Copyright 2017,2020-2022 NXP * */ @@ -260,7 +260,7 @@ struct dpaa_eth_parse_results_t { struct annotations_t { uint8_t reserved[DEFAULT_RX_ICEOF]; struct dpaa_eth_parse_results_t parse; /**< Pointer to Parsed result*/ - uint64_t reserved1; + uint64_t timestamp; uint64_t hash; /**< Hash Result */ }; diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build index 42e1f8c2e2..239858adda 100644 --- a/drivers/net/dpaa/meson.build +++ b/drivers/net/dpaa/meson.build @@ -14,6 +14,7 @@ sources = files( 'dpaa_flow.c', 'dpaa_rxtx.c', 'dpaa_fmc.c', + 'dpaa_ptp.c', ) if cc.has_argument('-Wno-pointer-arith') -- 2.25.1