Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64633/?format=api
{ "id": 64633, "url": "http://patches.dpdk.org/api/patches/64633/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200114092622.13944-1-kirankumark@marvell.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": "<20200114092622.13944-1-kirankumark@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200114092622.13944-1-kirankumark@marvell.com", "date": "2020-01-14T09:26:22", "name": "[v3] net/octeontx2: fix PTP and HIGIG2 coexistence", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "609e1d6b7b2f7f8cc99027e33fb3fe9441b01a85", "submitter": { "id": 1260, "url": "http://patches.dpdk.org/api/people/1260/?format=api", "name": "Kiran Kumar Kokkilagadda", "email": "kirankumark@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200114092622.13944-1-kirankumark@marvell.com/mbox/", "series": [ { "id": 8108, "url": "http://patches.dpdk.org/api/series/8108/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8108", "date": "2020-01-14T09:26:22", "name": "[v3] net/octeontx2: fix PTP and HIGIG2 coexistence", "version": 3, "mbox": "http://patches.dpdk.org/series/8108/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64633/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/64633/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 D3A4FA04FD;\n\tTue, 14 Jan 2020 10:26:59 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AA7101C224;\n\tTue, 14 Jan 2020 10:26:58 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 70E561C223;\n Tue, 14 Jan 2020 10:26:57 +0100 (CET)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 00E9KRAh002199; Tue, 14 Jan 2020 01:26:56 -0800", "from sc-exch01.marvell.com ([199.233.58.181])\n by mx0a-0016f401.pphosted.com with ESMTP id 2xfckusfpf-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Tue, 14 Jan 2020 01:26:56 -0800", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH01.marvell.com\n (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 14 Jan\n 2020 01:26:55 -0800", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Tue, 14 Jan 2020 01:26:55 -0800", "from localhost.localdomain (unknown [10.28.34.15])\n by maili.marvell.com (Postfix) with ESMTP id 816903F703F;\n Tue, 14 Jan 2020 01:26:53 -0800 (PST)" ], "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-type; s=pfpt0818; bh=TOAwpstum2rGglYaFxVShxm9IXvtneUEp0XorIiou64=;\n b=uEFEW27MIIcSSu2Di+peJtUJvgmEEWQVznFSjzp/P5nm0gHOVrjgC9MFxj8C9EFVsXJH\n 22860jnnq3+YAPKvM+MD70wuBEvjVFYjBLxXuPDzYenQZwOcWKCC7SSM387ftrDrwfDa\n F0HHKLqv+oxtbx2G3g1/H/ZFlChmCnNEWAjc4sOfvcs0w/l3gX3bgtFroMcytu+xxELD\n onE4nP6TpPANTOZ868zr+hWORfxrn7mUVNN6qmBORlKqouLidKXnthIUx/ICfe5jAYbv\n 9ITCrW2AKNouDFUkWCm5Ugcb3/GwPjlWNReMmSnAv7GMjYm5LuXQBJkOJ9DCi7se9KjP VA==", "From": "<kirankumark@marvell.com>", "To": "Jerin Jacob <jerinj@marvell.com>, Nithin Dabilpuram\n <ndabilpuram@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>", "CC": "<dev@dpdk.org>, <stable@dpdk.org>", "Date": "Tue, 14 Jan 2020 14:56:22 +0530", "Message-ID": "<20200114092622.13944-1-kirankumark@marvell.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200114082854.13198-1-kirankumark@marvell.com>", "References": "<20200114082854.13198-1-kirankumark@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572\n definitions=2020-01-14_02:2020-01-13,\n 2020-01-14 signatures=0", "Subject": "[dpdk-dev] [PATCH v3] net/octeontx2: fix PTP and HIGIG2 coexistence", "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": "From: Kiran Kumar K <kirankumark@marvell.com>\n\nocteontx2 PMD does not support both PTP and HIGIG2 together.\nadded a check to enforce this and updated the Rx offload capabilities when\nHigig2 mode enabled\n\nfixes: 602009ee2dfb (net/octeontx2: support HIGIG2)\n\nSigned-off-by: Kiran Kumar K <kirankumark@marvell.com>\n---\nV3 Changes:\n* Fixed commit log\n\nV2 Chanhes:\n* Fixed error message\n\n drivers/net/octeontx2/otx2_ethdev.c | 9 ++++++++-\n drivers/net/octeontx2/otx2_ptp.c | 5 +++++\n 2 files changed, 13 insertions(+), 1 deletion(-)\n\n--\n2.17.1", "diff": "diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c\nindex ed329273d..2e91a5ab7 100644\n--- a/drivers/net/octeontx2/otx2_ethdev.c\n+++ b/drivers/net/octeontx2/otx2_ethdev.c\n@@ -18,7 +18,8 @@ nix_get_rx_offload_capa(struct otx2_eth_dev *dev)\n {\n \tuint64_t capa = NIX_RX_OFFLOAD_CAPA;\n\n-\tif (otx2_dev_is_vf(dev))\n+\tif (otx2_dev_is_vf(dev) ||\n+\t dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG)\n \t\tcapa &= ~DEV_RX_OFFLOAD_TIMESTAMP;\n\n \treturn capa;\n@@ -1641,6 +1642,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)\n \t\tgoto fail_offloads;\n \t}\n\n+\tif (dev->ptp_en &&\n+\t dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {\n+\t\totx2_err(\"Both PTP and switch header enabled\");\n+\t\tgoto free_nix_lf;\n+\t}\n+\n \trc = nix_lf_switch_header_type_enable(dev);\n \tif (rc) {\n \t\totx2_err(\"Failed to enable switch type nix_lf rc=%d\", rc);\ndiff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c\nindex f34b9339c..ae5a2b7cd 100644\n--- a/drivers/net/octeontx2/otx2_ptp.c\n+++ b/drivers/net/octeontx2/otx2_ptp.c\n@@ -221,6 +221,11 @@ otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)\n \t\treturn -EINVAL;\n \t}\n\n+\tif (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {\n+\t\totx2_err(\"Both PTP and switch header enabled\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/* Allocating a iova address for tx tstamp */\n \tconst struct rte_memzone *ts;\n \tts = rte_eth_dma_zone_reserve(eth_dev, \"otx2_ts\",\n", "prefixes": [ "v3" ] }