From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0059.outbound.protection.outlook.com [104.47.37.59]) by dpdk.org (Postfix) with ESMTP id 0D7821B012 for ; Tue, 19 Dec 2017 19:03:04 +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=50ELBTam0M1lwMpm+mYx1xUZkHs4oshrushwbkTtsQc=; b=demk+LjryO4aA1Ir1BDQfRDwPeN2KuFr9cHJ+Vy0L6ILDriXAk+e/RT00nF7aO9NT615GmclqgpEjUeJ4MyBCnNNHEwI5uINKPhaDZPtTDhKCORFYpx/k7R0y8BUIZZlyUvTB5CtsYlXQDmhz/M2tlWMUN1eeed2yQHYg5Kvx9c= Received: from localhost.localdomain (111.93.218.67) by CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.323.15; Tue, 19 Dec 2017 18:03:01 +0000 From: Pavan Nikhilesh To: santosh.shukla@caviumnetworks.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, Pavan Nikhilesh Date: Tue, 19 Dec 2017 23:31:45 +0530 Message-Id: <20171219180145.1858-2-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171219180145.1858-1-pbhagavatula@caviumnetworks.com> References: <20171128145855.27106-1-pbhagavatula@caviumnetworks.com> <20171219180145.1858-1-pbhagavatula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SG2PR06CA0169.apcprd06.prod.outlook.com (10.175.208.23) To CY4PR07MB3463.namprd07.prod.outlook.com (10.171.252.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48119370-dea6-4722-69e0-08d5470abfaf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603307)(7153051); SRVR:CY4PR07MB3463; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 3:O50JX0oXUOeaav6oOvQR2daX/Xjaq7IhUpe4DreGslvywplmHKYKKH17S4EsambDNqnLxHRgTNswwFUOO2p2OxAad5Dae6C4KxqKj9RFjZPvS6Zg5Q9rnDN8STJJAKvGk9dqj6PliLQUs4qb6HP41ZpYfHicOeaaaIn27SngqUqpI/US3/NeobkEKK4jiqfFqsVjTYBIIHEA34LcFon/IU4oTLsnLmz+m8q5qlv1khr+96UXe3nRfpRfNyILsHPi; 25:nMLXg0tCpCSN2dKTdJCU0YZSfD2XurdOa5seKOxMLtN2HJjwbFPuG7XbPrLfshuioScRJEkWIO4E781WNXrz8jKx9bibEo1NQraqNjHdj3PM7zIh7w+HIJKBxGFkObPhBrR5k/ILbuhF3vLwI9rJRlB+7kLMKnZtEmlhVW6dcvOLNzbbjtKrFtfMR6oPtl9UWG8Bt5fu9ve3y0GWjW93vF50sNo/tqtxYdOPpgeOIKqBIaYoIzgjCnV22qYf4soEy7unNCyxNZEeb7WBCo69v37p9VdAFBxVdlcrHbg6bPBc1yfo66yd8bLdG5ibpibLqxNqs3Ly0Wg19l1VLKG5wA==; 31:6pECR1tmcjRZEc+g8EhPbakp9q51ErqaL9e5AvgW0pxvz63D2FCRVNXjFx3doUnt5K3GWwTgh2DmRyW0GDX+eAGWn3i44+JvU7P3XG3L4UHkpKgzJ6hjYFAVvaCLz0oUcZy7qyNETkIfxV3PSkBGszGL5nN1A8dswHaWPGB2Inujnx1nU+AOZzCJSrw3uhKDcBlg8zgkZmY8iWlQLh5MPY4MpTrvSEEfnx9c9gL014k= X-MS-TrafficTypeDiagnostic: CY4PR07MB3463: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 20:CdIsOOyWIqwX/yf8RASsEE0Vaw1r6Cd0IINeZl6JmXhNToYshUnunKFyPCQXeNFjFghAIEnsyiU6hACOaMWFqcpdGE6LVIoSZyFnxdkcCTD6AMleg0uoisVb90Nh1Wp4iYFwgSkzgzJo1drEjsY6G+2TS6fQJcR7/PX/JhQkeH5NMnvGSD2hflpSEBcXf1PMZedFg8q3wL3VM49GgBqToMbBc9qnUF56HsNaASHkK9lj6bL3MuDRJexmJsGnEKuNIdB0JWheQQiOAohAHwQpuXOgd3l+9aWJw7Gk+YNOEfh5YeWidQEM9YtVEU4h3lCCTUee9tr8N7nXQruks2URa35Vc5WPkVZN4WpnPQqYXvFansKXaOWEb1vioKF8MU2llL31TaHh8+mP7DUn3zA2LimmMEr7S8/T5jKnlA6ETiiM69tNkWw/7mvIMELRilRHIsbw64I0ezu18pC7RJWb+2ozL5mN16xD/1Led8UJhe4fPBcGOTSAgkQfr8RgPxUgnCzVouMdkNheMYp7Qh9K+vYn2yZtdLZsiseJYe2ybIMkc8GhHFfRH03S6BrbvKbGjuUqGkXp7Cdf5ZVpQWSnSvV/ko4+ZhOChmW6JdCA6ro=; 4:yDoAzlnmbVPHAMySN+lRn/Pi48uJ6LPHhoyY8xv5x4N8jhqFwymMt4TnJS0AqMon2M+YNjyyuXRjHzP0NjQiUor6cKnhpq4JprPmYJ7Q4ZqI83iRYgoI8CZj99stlhWHgFVwTGhjMIdCzcjl8m1NJ3IzBf+G/QAkhBnnIuyw3FASp1tQSmCovPFMY+jkRvay2L9p2R4SL+D3pCYhvj1ekIDeIADuf3GqabgG7YsJcFuDCjAyCscR77EO0J6XFRC7vK9n8qrlqopB5gFkqQEXdw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(3231023)(3002001)(10201501046)(93006095)(6041248)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR07MB3463; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR07MB3463; X-Forefront-PRVS: 052670E5A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(346002)(376002)(366004)(396003)(39860400002)(199004)(189003)(48376002)(2906002)(6486002)(72206003)(1076002)(16586007)(68736007)(7736002)(16526018)(50226002)(50466002)(5660300001)(105586002)(47776003)(305945005)(478600001)(66066001)(6512007)(6666003)(42882006)(2950100002)(81156014)(106356001)(3846002)(6116002)(8936002)(97736004)(52116002)(53936002)(5009440100003)(107886003)(81166006)(51416003)(6506007)(316002)(8676002)(36756003)(76176011)(4326008)(25786009)(386003)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3463; 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) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3463; 23:e/LYDTdnScfgUMRHwMRAxZxj5M8+S0RPY4CezvhxA?= =?us-ascii?Q?6vK6Fzv6+nQVFhS0bFacrCY7ZUy3hOTXW/e3Y/MAlUirupLlX9x9gPEjuVu4?= =?us-ascii?Q?k13J++uuBYumjbQJc9qaluadoFPeMbrEBy+0W5+xV+lj7OOwimuvofBlQCey?= =?us-ascii?Q?a88FimKAl1F7TJe7IaPbRvv0lLUXmkG8IBi/w5uQJpyAd+ShrQ9FyqCROXDW?= =?us-ascii?Q?gf18TxaDv4dgxdJyh9nPfnaSF072rRpcXLKjOW7Pz4B8BdEP48KoKBgSizfx?= =?us-ascii?Q?8lsgKJpd26g2RQor47yDdjd2xvWBBzBGsylRtHi9JY74lck/dbdElNCoamIs?= =?us-ascii?Q?kYk3eLcSDY4VXjeFEhv+Iqkf8CZ9ItG1vXDz8ZP7NVHFFoQM7iSE6DYXr2uf?= =?us-ascii?Q?WI4udnF3DVKc6FeceXue7qAPXqCoFpq9W+YHkG0kyL9FfX175Kg5Doxy0LYO?= =?us-ascii?Q?zmT0F5J7lT4WQzDSZ/o+rgVXn5jY4G0cq5Q93xvU1UyjvK+dw5om9amfnKgA?= =?us-ascii?Q?xg71ceGjZvSo9/4KwtURM3AWDE4S95qRHrikWrUa+t6SSmhkW14+LpamkbB/?= =?us-ascii?Q?YiuIhDUH8NFfRsPlQ4+pI5JF+VyY/kipE3UCxHe1/e4FLcEPsJqreljlL+Lf?= =?us-ascii?Q?LweV9xdhrYotmXCPqLhB3QasUBX0m838GxYZXL9kJddtF8Vkj9mlqlqF2cWi?= =?us-ascii?Q?kLtslods1+O1BFpSz7IcpDDq7thr6GPAETk+/b5iKBW3Uwu+q/YY6AEK4UlB?= =?us-ascii?Q?YiYTwHqmba2hDztbF0HN/MCigkEy/wvMMfmVyKgBc5YnrybJsOqMEm9683vK?= =?us-ascii?Q?o2YnTP+2iMqqucPJCGkzsdKx5r0qPcgC2oHcJHL7zgFF5oXd+JxduF6Rwli3?= =?us-ascii?Q?81aQPxKp5NgHmxcjkFajHbTckegaPBhch+hUeS07TIX57YjZnR7r7E+rh0AO?= =?us-ascii?Q?6VwMsMidD5h3euFhJArQMBtpSbV0Ieumls35clLCXarzZxCnOchs5O6lYZUm?= =?us-ascii?Q?jm33pZEV4YnVwDplfuqU9qviQ25dtqplBmNo/TCI+lzstHxjYYx023WaW8Me?= =?us-ascii?Q?gwMRIyKdRWdcGSK2mEOku7ecDeiRxscSdt/9oP5SpA8ypoHwjjUwdUNMr9Uf?= =?us-ascii?Q?tLhH8HuXEJT6VAZWZifKR2blHxCt5Sdj8MPq6VJIu8Y65US5HuDDw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3463; 6:gRb18eCRzLlMsncGG0jiDuzJv2E2fr+EGD0PE87D6+0FMHn0RZxWa92kd+SC2RSiyvulUp0QaZeV+w3lsDbRbTZIQ3/l5mYiVTwqKrg7sXVT0dgQONCLBrYSmwq4oB5pmzvhv5m2G85yV4H9cY8K2FxvxbfDNg9cDRM0Tk5aCGSJdg8dlkpKRuX0M4laR/AY33A4Mo6LaLNU1Kcj0VUzKFrhCGvZB88zmUQALW9bKix9DZ+vWa+Dad6ggmshFAUWkp0pEJ/rN/fEzs2Obo2bd2cj1FgMRbqNA3Cze4ruzzcVqBsY80yx/zPSkzsZN+irGdSr0MJLW/5Dkbn8WIvQ9ARgmc4dEuI4WWeh2cTzvDk=; 5:fJSnwyDhfU19IURk6ocDv6E3hEdGVxqOf6bzxM6rErTu8e+H3F3+XyNdlNpmHYAxWVKwEkEBOP2J0Br1cmwJsfxRXM+FXBU5UVbbOG4VsENArwJTp3PePNAdQgrBI5Xx88AV66C0EY8BGdzZqCvKidAUnyF7thTHVDu3jBe1gC0=; 24:5rXpvNblPnSifrvVEVoYyJAJ4R9fWPD2pNsmU7hV+knEqWNZ04qNPUTdgw9uxtGIhGybjt5wynL2A7ufUb8qTV2jr100Af91LzgwgLRI7LU=; 7:h8w1dDgYd/OgBg7IViiAov5WxZIdjyI1xnp/gCu/v8LN8pldpr50SQdVUfLa6trUk/t7eZXO1GcMNCoRpUS187uXBPQz21rGCOTB+LxX5VPnYcutuSMVSi3aBWFXoUUyxDWpLUNZNPDalvdr4/eaKf1GV9CP6DPJVwbwgrnJbJ0imOoXi8T4H44Tri3Uu/YOKMrmvvoWwMkb2yE9nMDyjr6d77YbMyBw6Cdk+tRj6UA9JrvXu7AryAAmuxRriZrW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2017 18:03:01.7732 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48119370-dea6-4722-69e0-08d5470abfaf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3463 Subject: [dpdk-dev] [PATCH v3 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: , X-List-Received-Date: Tue, 19 Dec 2017 18:03:05 -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. 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.14.1