From patchwork Sat Dec 9 12:55:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 32050 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D827199B0; Sat, 9 Dec 2017 13:56:10 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0073.outbound.protection.outlook.com [104.47.32.73]) by dpdk.org (Postfix) with ESMTP id AA5E629CF for ; Sat, 9 Dec 2017 13:56:08 +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=i0IJEf8BCBJ7JCmX/Dj9FWtORL17EV00Tv3aGjtJjZM=; b=dioSRKTEiR1W38xx2E2vfigGglHyNcmAHrKnfl3rkSZGDntG1O3Gs+cfS1lhw1D2i1eFYqui9HCbB4D0mxB0dJOIORlzznUY4ckhOfWRim9zkL8LEPv1WXoXegCxeAd5ubCIFsZnBMd/K+NwbNkF+r2seN1U73XPRzo3L2DdpdQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from localhost.localdomain (103.16.71.47) by DM5PR07MB3468.namprd07.prod.outlook.com (10.164.153.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Sat, 9 Dec 2017 12:56:05 +0000 From: Pavan Nikhilesh To: ferruh.yigit@intel.com, santosh.shukla@cavium.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Sat, 9 Dec 2017 18:25:10 +0530 Message-Id: <20171209125510.20592-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171209125510.20592-1-pbhagavatula@caviumnetworks.com> References: <20171128145855.27106-1-pbhagavatula@caviumnetworks.com> <20171209125510.20592-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [103.16.71.47] X-ClientProxiedBy: SG2PR01CA0102.apcprd01.prod.exchangelabs.com (10.170.138.156) To DM5PR07MB3468.namprd07.prod.outlook.com (10.164.153.23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b07a6767-bdd7-49e4-461e-08d53f0436b5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:DM5PR07MB3468; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3468; 3:zitV1NN5IvN9Y+cythImHIH3TmpyYevklYYIAmAGiUYWA/NU18z6gn7gRvnAbtBEL7XpHpeT3t0SoWXlIpVupjnfssvSzj0yCDANmBmUg9dKb/+OQQVj5l7A0ydxFBfBocuPEG3M+MO9kdbjGqjQBy7DyMGhQpo3nDMSa0D7hPfEKzxih1K//hHaiL4aL6Jn5KxA8WGYXv5qmQ1HF1ShfGrIfsuvu58/FQm0lGqi/joWZzRHF1Yv4z8JQRFI+mQV; 25:GbDuRIZQq4tjAii0L2uYJddrUSIxsfZK7rRHvaKJ1ejSs8avyllRIU0G11oF1cJngKdrCSP1xffsJoFnIgPfS7StvehuQfGrNn6afNNNC/N6ln+rNDpqlItzuDEm5LR7iEl3fIYF6KSGyclVKcsOi4W/8mvr7MK5Lzwz0vjrL+5S2kQ1TBZNSagiJOWlUA7dUAi8Vw9Vmmkim3KLFmqLJd3tLeNtCvHjANlUUogOvkp5ERRCmng1rEXY7HIjmKEHPEHYuwVVytlwp5KIcnBLJNLfd8CgjbAYgRK2N7yRBitGAGzCH39EoHKB4I8lxAEyPfZ7LPO44KulFsGDsK2nFg==; 31:aPDkexbTqzv9nq5279Iq7MbbbF/Hafitgj1z3fdIoDvkt66hKa71d8CS6Ffo4mpxtDXG9OgecxouUJENiGiF1VujTwixqAcBWq9W8CIYJ39cJ9ihktDXfSDb7C8wb7hLZIccJO03lIe8KbhGHBJCV6J38qUI8WkVF4eZsDWbQgKjSTy/DYuXMzap9G7R4RN0fX5zng9lSg1Dr6wHyJDy9+hg+mEbp3TPRSfd5HLk23c= X-MS-TrafficTypeDiagnostic: DM5PR07MB3468: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3468; 20:KD6FN6c0GC3mg1v08wUYZDvD26YaBpXXn/6oghuh95rgKSkaC0YZQn8jdqIIuvY9Mq9F3pNq1uzuAHqtXeuTXehRMS0IeI/yWxeebDqn8hw2LJyMeYuWXY2LxRV3rYCoWRPHH12G97iFL8M7CtT/dopMaW5VH2gW3elrIv+9yy2OrmfLBUsTO/raFDea0s+tz5GaGwDNwLEAonsRE+8uddK7SvPG73mO+ksQy4hVKQcMN6kkQ6SiqRtCjoJYg9YMIvxVBDMjc1i+Z4YCG9xpeCVqNk59X57bewn6rEie2aj5N1BNW+oS57GBU1ZPcN18bvTvRLdr7XYBGIYPIADe04anu9WTySNFlbqfrXlMS+vPEXDAWBy/2ET1hzeO9yOTgqhMfz7g2zTi8ANaQaE1PQ1Ff2k9t/cxsFPrwjEUPMwZ0PmQqFcc/fDweRAPSrUGxQ8ei4+99i+jTsc0v7vFVTRo2FLqnJolPoo97E1jVPKY/qFg3ll0WvzS8XNpUTaPt+hA0xwhHHTdFTHYHKrjTDT9oOk2f6CUVJLMS5NhBX8Ehwrqd6l5R1s5hp1Zm1rlNQN2VYtj0jf1DPSJZ/YBNDeyRBgJa2D46q6ZzxRXZiw=; 4:rFW7dyoYb1tsRAHUxLUbHcYAVcuPm6wNjElU3rlJ0KVHmh3DByYKjTo3neQOdHjyUaG046jXFnAJLPGgmFFc6bSkz6uWDFaiD6r138XuaRzk5o+ZIczZt2o56OobrkZPt0B1XTHdK+ynMn+4a87v5s82wJkFvt8RMJMxM1kVyVH8K/JckkoWtr/HdfIrE/OoRSfgCIYxtsUIy8ElF0ZTo6NQYpphc5/6NggJu77ibqmw2yaRRqQ1kU6qPlzxZXw3ViXtTf36LaByN9xikZzsog== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(93006095)(3231022)(10201501046)(3002001)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123555025)(6072148)(201708071742011); SRVR:DM5PR07MB3468; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR07MB3468; X-Forefront-PRVS: 05168A3970 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(366004)(376002)(199004)(189003)(81166006)(76176011)(16526018)(47776003)(105586002)(51416003)(3846002)(16586007)(72206003)(48376002)(6116002)(106356001)(6486002)(6506006)(36756003)(6512007)(53936002)(1076002)(66066001)(316002)(52116002)(50466002)(2906002)(305945005)(8936002)(50226002)(8676002)(2950100002)(107886003)(25786009)(7736002)(68736007)(478600001)(97736004)(6666003)(4326008)(42882006)(81156014)(5660300001)(33646002)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3468; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; DM5PR07MB3468; 23:twVmUbPewMWTdADSIohlySDdXp1RKHgHWZHRELFRL?= hW6lVak5TvzPZqa64OzLy8m4vPIYJb6/9urdaNlwFznH5jrcddD8khnPaWMspN0bLXuofuTD5caCXp+2MlanHYKPLb5FwajM7WVlOWuJ7knyBId9I8SBKGiIwf/kkb/UPIB4tb5e1dYhvNI3pvi4fnoEIQqwhtspIJ8pLCoWVIgQM1mu9tqDT8jgfqdr5AAtfgBm/qSYb9qM/r+J29YVlWyjp+kFYHv0YLGQPEVDVym/kD4oTjs9vhOurp+46i6cPQDy0ON/nYtWl1Vgce8PP3Y8F0nvklC96+YkBR3z3nCmYZWe6gLx2VcqwH1zNKTA79lNZ0gqM0rVGPRZ2pBpp+DIFAv35R/bmcCyLR3v+J/qk4LUXpqldehEPL5AHcpgOdm89oey5enHIxMG4RMfGqbpHFSJixjK2CJUcb/Zffc4q2jH2YLGKJ94xjiIYbNnE7BUmOzFs2WgYtvtB3Thf+O94B0ovd+AFoRiBpZ64lJqDsk4SLPt1L9P7om1h6aB4tgUOIXKX/BWe6lL6RpXL5Fq6BaG405Nxquk5V05g7rD2zO8S0bN6vHE+tUQjfZuvu/wj/vbKnSk6twZ40b3mQjxHRXnmNscBGqCnmxCkmlTvto+2nOo0Rds8fLvj/HuOJTmn8Bm1Azla76u8rqEv2Oy6Es61A5au7aIFTLey1YYtKfn488RtfKgNhPegenipoHF3s4Fca6PmjzW1oC2qyG3p+g3Kn6OngbOHXwDZkXEZHDKaqnza87a9JA3cldNU6fcK2stbUALt693QCwUMQNvBOhJmfugoQMUE/p8K7F7K7dBqB1hNHNCAhY71Dw64/hMaB9Nfa4gowNY64PtpRhGaM0ZX/+MBa0oXUG8xj2Z0DfJu3aFc28dWRZIHpmb/zEMBLTW/XrkRVRyPW9ERKZkbbv9h0/2qKUkcULWChtA65SIBKNMUgW2h+/jgImbTUk2cXLXghcilNECvY7QrrosiCVhqiMyZ+PVfPACTkzbBYmyRhgQzQu1bz3dtykrTk5ABEEkX2ExojiKm3m9R8KKmcIKGUwUYdQwwO/Xf2rQQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3468; 6:k1BYI4VDtOzME6llbZKVNtUWNmRbCBMXz2RYuK7r27LQvjh5yNPVHMU91mE8/6bDUVZY8hG2/GDQ6XTIv9bre1lRZsG0aQP46dJ506I2tTkIWV2ZgABrXJ9vlDPFYvoHFgiWJBK/2BAfQCSHewS8K2dpvhpWRktR/6TlwU6BH53WWnqfXN29CE0upBXwXv4xa/vC8Tey8cWaahJZ6YTDEJ+4AKz9LnTBL81m3f9ipcFRNmy/qgDraIY2CslRcy2R5ENXSIxOwGsO0q6N1gpwFp51M0x9HQtIRfEySNRPHRq/iaKQ5EJWccQdJzUqOqg1fRHseo7Zayz0dHQEEy/1wpmOJ6YbLmufz9JCgMtHz3Y=; 5:AgmuaXkIZ83ccnj1RrANirpRh0XYQplWQe4oJ8guAvGQhCJlW14S5Cv6ANdt7wngW6xg5E2EnUHkbGeWImaBUoKbIlUrDH657tJwLssPjoWdpt6k1E+PC484UopJMLSNkb/CpNv50fKuM0nNUnh9jI1JhKDjwhNEN51tLXVvG4M=; 24:kh8n2clAf9ssvnIrrmoc9amWlTkUnRfBksaOWYF09THPDU/4EygwhGccC3Be4LiVVT8qrBwqZEVQoC9aWAjQ8c2YBVkt7xA6EKQGXKVRXZc=; 7:0MPPcHrVoXuYMWJ02yJXO7+mt3jVT3sJav52rCBm018IiBtI+jSNtAwT7vaR7hALktZTJwhMb4DHSO3A0kG65QSyfTp8JCurUNAAC8KFJ3wz3UMlUwUM7YqiBvnF/ZywI3xEZwZDpAsNBBtOe+wJOBBJLjvmz5X/DtgoWrOz5vE0cP5OPzLYucyPkgkTm5AcS/+TaTKM74MS2ffPJ+z3foL8oLoZtPaPFk7sMiB7nz+Lq7qtMNw28Il2HiCCIJKa SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2017 12:56:05.6030 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b07a6767-bdd7-49e4-461e-08d53f0436b5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3468 Subject: [dpdk-dev] [PATCH v2 2/2] event/octeontx: fix Rx adapter port id mapping X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. 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..b382232b0 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 = 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; }