From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0044.outbound.protection.outlook.com [104.47.34.44]) by dpdk.org (Postfix) with ESMTP id C5A681B416 for ; Thu, 8 Feb 2018 09:26:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=RJ4r/AFAIZ6WRq3nll7rYbCpmVpDug9EZ5afrCMe9wo=; b=bPgLBTgl+HFnUO/56AwzGeNVFZI4CtaJ01C7mi8pFGbPOF1zGaQ9PKUZGhV8MELdDGGYFaA8rd+uJUd7A15MmJ2cyVSU/2tBviicvDpchX8Tz6H7YuLthMwJOvkMl6wrMPSlj8RaRMiicxiBR3HcCVNlAUlZD+01YLf0x4/hyek= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (111.93.218.67) by DM5PR07MB3466.namprd07.prod.outlook.com (10.164.153.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Thu, 8 Feb 2018 08:26:35 +0000 From: Pavan Nikhilesh To: jerin.jacob@caviumnetworks.com, santosh.shukla@caviumnetworks.com, yliu@fridaylinux.org Cc: stable@dpdk.org, Pavan Nikhilesh Date: Thu, 8 Feb 2018 13:56:03 +0530 Message-Id: <20180208082603.2069-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180208082603.2069-1-pbhagavatula@caviumnetworks.com> References: <20180208082603.2069-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SG2PR0401CA0010.apcprd04.prod.outlook.com (10.170.128.148) To DM5PR07MB3466.namprd07.prod.outlook.com (10.164.153.21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 260190e1-46fd-4605-8ece-08d56ecdabec X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR07MB3466; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3466; 3:d5mwy5DnSG9rn3mc5Dh8dfepUG9Oio9KF6/6SJAvHVqlzFPmR5IF6EQ2Jc1vfhhuoStEcoUK9HNsZTSqR2rGk1qmVagcPiMZh+NV57UVQPPmkT7yMcuSujyU2R+BNx2inOAbtDkv/q5jcW+b28dL7n/XgGsivJMsQ9aCTsX3S4lILJwpHAy8NZSGozEaMhMARrG0Dp2jno7MNS45eioyMMh/tH/pKEN3uiSll0d1y4R2B3zonaBbUjFYAXFTRoyJ; 25:XXXe9a9i3v9xZnBSxwXMfS4EYrNDUaNEgYDDOLEEvr7rKbN+Ul7Sj00qZHv4rU79Dq8f4wl7wsQ7ZdtuJrf/r6qedy7nbDupNoKBzDr27efpMAPYVldHPck3gmN2+u/rILA24/397IIFVKplgrDv9tuCf9jubAWSuOyYEdfLTWKGJAQjZiqNFP2cnURsxKD9ptxrGfl/nEIbp2Vfex9H5bp/ZejU/cOvuzE/dX1coaVrHd3jALJ5ixshXpN33otCZzFmqalvXYG5yCxrw8JlsNBvtXowpZsuN/5dcb9AZQmUsmUi3CRKC4KVqzHCk7PGWGhGv2hr7OhXZ2hMQtMt7g==; 31:H46CrJvQLxfZB3yrmapqaQ/JWUTXPIju3g7PUc50vJNFpaYh3LIkZ9SEy2tT7X3JnD/n3OH+YUYVjD01Bc2ery/jHPmqOpTw6MiEEOmzJ0ut5T6hnK0A0wtl28r8e7N4jXeEmKdHPj2gcQkQ0+INNnKYxGEZPgSlqY1gUIcg+vE8XIMQmzt8m5V81VO8lvnCDBy3v3tOn9dkBkwCJjeRiVbl871snusTd18Q6v/ZvhM= X-MS-TrafficTypeDiagnostic: DM5PR07MB3466: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3466; 20:MSWEFEfh1Q11avnyOLM351hIq791clMsyvvFzwdxOAD5d2pw+afN3U5YR5ksR/QyLCxmNRiuBAlFXzfYbNUxAGsGJt8zR9al3V7Q4AYYl8otPBCsq/jVzBVZvQTYweg+7OwChVhSb1yc6LL4t9aOZpN0paDwLdBAF1l4xsk3VfKjzmet6r526mTcUdWM+8w+UgnvMv63vEypMLueCljErRWnA1U7/vBY90XKUyIiqn6etfmGGL1RtfWy7gG9NUrirxruWFuswn3FjdPJP6gJmDzPVJ/9Na67RR9uUjYIERJYvAzUHZwxCHSKd0bYR5cOGSuUklOh6um/0atgxTAcQW1+Y/SNL1Cjc3k+mu1lcZpI6AEGLmhBW4r3Q1uzPZzYVbopxm8etdb/A/i4RUk+AGUQSoQIPRGNuhhgLpi6O/TqEWinrM6ypp8PxWOJ5D+AGId6x6giP6cgdSY/B+hVLyfSD/eOsZa6smQpcBlifsOeHAo5VEoT3PMKa3YbLZgzm6yr+vn6Y8WAxux5S2Z2K/9eDDualSG32Pqfi5njCGXpI8cp4YWo3HXLd78fHCaI01vL2HPgigM7DrWtTgggC0iemgRtJMxj7XGx9fp7kX8=; 4:ed2cJspQ77vUjQc0aAAaqgRsdwhxzlDwbf1Hhyt4VhrXXsLTJ/jxhR3SLrjoM/S1YcovFU6yGA2vqRzNAMKwNMz3FevbfkcFQUEz5Hz/8fhhrKgd/n/Rd5BGDBMhsqLM0Da2/8ypDdzpgOTVq30SOOxuee3d2A0tQb/rf7Kft0mEkrnBy0XRbyVxqaoUzWaFmLp6XVW2yB2VrBuiBEnqsHkK6AzL5DTk2cV5CklupaPDgsrjLRq8AXxVBqJ6SWQq+tR/4rbTH9MBRBlR1UuNvg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(3231101)(2400082)(944501161)(10201501046)(6041288)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR07MB3466; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3466; X-Forefront-PRVS: 0577AD41D6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(39380400002)(376002)(396003)(366004)(39860400002)(189003)(199004)(5660300001)(68736007)(25786009)(107886003)(5009440100003)(4326008)(305945005)(97736004)(6116002)(3846002)(1076002)(2906002)(7736002)(47776003)(66066001)(1857600001)(105586002)(36756003)(48376002)(50466002)(106356001)(52116002)(316002)(16586007)(2950100002)(42882006)(6666003)(8936002)(50226002)(51416003)(81156014)(72206003)(8676002)(81166006)(6512007)(478600001)(53936002)(76176011)(386003)(26005)(6506007)(6486002)(16526019)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3466; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3466; 23:eEUXeW+hLXOoVlMfWDzjbqo/qhsZ5CEQYSjMhQVcO?= =?us-ascii?Q?XJuc16kmNQlH4prGQ4EtY3r+GOpL54pK65p3LF4tGFsjamWgAJ4uBwP+2gha?= =?us-ascii?Q?6IYlJx/UHsui1PTYbGFWf3dm3yxqJrzwBXJVj8te/Ow86rCiHQUWPDHy6hDQ?= =?us-ascii?Q?oz8R7tdAhYPGAHkKaWdQbDCNTDD6tBM/gH40lvm9G3gMs0uGPcJpKOGW372n?= =?us-ascii?Q?Qplav70M1VLnRPZMkhiwZSiI8xAQplZLyBfPe7x1wAPtWSd4ry/d3SYkte/I?= =?us-ascii?Q?YQ0Z8ZSKb1+NRRgFcWY2UuCaQw1D2kqzmFMh1r/KaMrOOZWKdxZn8bYQ2KQf?= =?us-ascii?Q?EkzZfH+mIgwbIWCQocdz8xuRKGwltI8DWugc1ibQ+3oR9IYRa2wn2e1SkgjT?= =?us-ascii?Q?vBtTN5Lr2IqPXCjwQfaJpTqHKZZCPLS6f1GzyIdlUTqaSxp6wtH5DYXfn6ob?= =?us-ascii?Q?aIsbTNZlBtV7v41uRLSBVM2u+IrnXfQTxS5h0lx4Gajp066FRR0ubc+N0hEB?= =?us-ascii?Q?gfnv07oZ/oIyOJa6xYeUdn3ck9eUIJ7t/f8ZsrPFsdC39pQubRNuSENVNlU9?= =?us-ascii?Q?D7P6DAB5z9/hXUQSw/YFdx4zZ0UfjTQCXmjJNzl6ac4oDI9jw9cM4yPyRbxX?= =?us-ascii?Q?oOr4jMK6pMjx6fq2Pls5rGCvikCKiFDojuwoEoFj7NAnrb5ob2wThxEmnyiJ?= =?us-ascii?Q?44kfVFwnZG0zUiV1+7w+g64vk4bQCFPAbWdcoxJU5DaH051altQd69rVcfoU?= =?us-ascii?Q?rFtu8r9GX/A+rs0uhOXQXnCUzGoElupNAT/F7oHDZiZxPfm0P5wJQForlyFN?= =?us-ascii?Q?TWLY04qaSyyjk4eXiekgL3EZaTjcnoODk8gLHdBImY1k7V+7UQBTuWhUPia9?= =?us-ascii?Q?kLj4gDKT5AnwasiD7xPUCR3gB8xlK9Qn6NP9C1d0h1S0C/UdOWD53K7DNCoq?= =?us-ascii?Q?ioU7N2a3NqMojHJmoX+JD5Tx2WianjTlgWufTbrIO2VoL8ZGLy0O0GE3D0+U?= =?us-ascii?Q?XkiWsfQBJXcA5qvs0a6GaAwVvY7pByXPkdg4sgqVLOm+aFNRr/LFTTI3wWHg?= =?us-ascii?Q?XEmkolCz9GlDKliPbrm3iX+CctMSJpys+E/jlycbeAO0yuzpAj/NPhEOp9jM?= =?us-ascii?Q?9NQLBfUEklM50EDWjAbgAik921K/TZhaf5USNHUyIziF896DUCyF2jA4ImJW?= =?us-ascii?Q?p9hk0etEesOhMrxSRDdn6smui5LxFLzhynreO22l8FwJrW504TFVgdyJQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3466; 6:HS/PrBJ0rtQWdCdyZlsuyFpNfJ1ZZ29m9j8HMtjRSjODJfXUnVXGk85mxKv35ZnnpeiaIgX/3jSY3TRZrrSsGlrMMx+lvsstEHio3d+0EB7JIM+7/h6Rw5eOC2PyxThxjkpbPy+rNSRA6A+d0KO4jpQSGc7gctIAeXeVZFIuJ4FRAaI+OUbJmq38T8R82ULKzy3Kq0WR3U+iWwX9bhOG15SM0DE24FT/XHyhRLxw8D+48nK81vHe7Tply7TeMwK/f4YIH7k6PmR23XcsPJIFtIn7cwCjtjrF1yA7DPRaGfZJSP0jLkFD6cs/aMPDgWwsakX3o3oS+/KsWfd079SMbwx44jvvPEIj+2w6Ig1Wwjs=; 5:A7jKT7rb4dcufDlXztS9ci1xR2K8pfXi/v2gioZwXFM2TICAfGaKhhACH5V6Cg/+c+9ucqeXGMcaARuLxDCafeaLhuoz5gifYK8o2/Iq9TFdlz9ivL5FMsBwBp5rBWVBD4UgkU7DpvM989XeWUFpn3kh7vi5fJ1n/gsLnUBwokg=; 24:g7Z3fxbitASYpaTLZzWxBiPpbuSS2pRKVU5N62SNo3Mc6t5KDPLvYBTYfeOuwz98iWmMMs5PNICa5M+dCKuvcZkebZ4m3VqbJgozfabSCGM=; 7:xssEDJwzbmF6R54TJdCTjE6XLfgz3sjwxe0W4qZV2BWDK0aU0ECq8REFdtCls3HwqQlenfECc8844I4HN5VSmM5IHTCza4oCx+nVP/u3v8pcxd7MSjuV81HOYVStV7CU4QFLzFaDnKpSCUFWmChOu+DikB+8j9Ze44yzRJOzyQ4rvNN9oT0y8TTQ4kMfDIpJHncA0ya5Wx6d7DsdeN5BkcZWbp6Y7Sby8VBZt+RxK/0ozMfqNoG2tUhpFlmJ8w+4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2018 08:26:35.3457 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 260190e1-46fd-4605-8ece-08d56ecdabec X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3466 X-Mailman-Approved-At: Thu, 08 Feb 2018 19:10:33 +0100 Subject: [dpdk-stable] [PATCH 2/2] event/octeontx: fix Rx adapter port id mapping X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 08:26:39 -0000 When octeontx event dev receives a packet for the event Rx adapter, the mbuf port id should contain the appropriate ethdev id instead of internal channel info. [ backported from upstream commit 9b4298339652 ] Fixes: 45a914c5bd71 ("event/octeontx: support event Rx adapter") Signed-off-by: Pavan Nikhilesh Acked-by: Santosh Shukla --- drivers/event/octeontx/Makefile | 2 +- drivers/event/octeontx/ssovf_worker.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile index fdf1b7385..260441281 100644 --- a/drivers/event/octeontx/Makefile +++ b/drivers/event/octeontx/Makefile @@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/ CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/ -LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx +LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx -lrte_pmd_octeontx LDLIBS += -lrte_bus_pci LDLIBS += -lrte_bus_vdev diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h index bf76ac880..4c9a4c471 100644 --- a/drivers/event/octeontx/ssovf_worker.h +++ b/drivers/event/octeontx/ssovf_worker.h @@ -53,7 +53,7 @@ enum { /* SSO Operations */ static __rte_always_inline struct rte_mbuf * -ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_id) +ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info) { struct rte_mbuf *mbuf; octtx_wqe_t *wqe = (octtx_wqe_t *)(uintptr_t)work; @@ -69,7 +69,7 @@ ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_id) mbuf->data_len = mbuf->pkt_len; mbuf->nb_segs = 1; mbuf->ol_flags = 0; - mbuf->port = port_id; + mbuf->port = rte_octeontx_pchan_map[port_info >> 4][port_info & 0xF]; rte_mbuf_refcnt_set(mbuf, 1); return mbuf; } @@ -89,7 +89,7 @@ ssows_get_work(struct ssows *ws, struct rte_event *ev) ev->event = sched_type_queue | (get_work0 & 0xffffffff); if (get_work1 && ev->event_type == RTE_EVENT_TYPE_ETHDEV) { ev->mbuf = ssovf_octeontx_wqe_to_pkt(get_work1, - (ev->event >> 20) & 0xF); + (ev->event >> 20) & 0x7F); } else { ev->u64 = get_work1; } -- 2.16.1