From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0054.outbound.protection.outlook.com [104.47.32.54]) by dpdk.org (Postfix) with ESMTP id AC1601B50F for ; Fri, 3 Aug 2018 03:00:50 +0200 (CEST) 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:X-MS-Exchange-SenderADCheck; bh=P3QXBXHR+NIDIUZlGoOe7+mFvUxU/ICWO8wA0dcCdBE=; b=A1LANMCcOICHBKFAonQSv1GV3mIhP/jtm6MBkFB5faSnceLn9X2+thTeGHA1AC5435KJiBOF3UlWvzCvMJ34JremglaazNLEdAasJNjISHiHCapqaWU/njBe0Gxeu02EZM4NftAJKVxoT7DKMEEQTKR3hYSJaMooLD/WLWcIjq8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.1.5) by BYAPR07MB5365.namprd07.prod.outlook.com (2603:10b6:a03:64::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1017.15; Fri, 3 Aug 2018 01:00:47 +0000 From: Rasesh Mody To: stable@dpdk.org Cc: Rasesh Mody , yskoh@mellanox.com, Dept-EngDPDKDev@cavium.com Date: Thu, 2 Aug 2018 18:00:28 -0700 Message-Id: <1533258032-11551-1-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [198.186.1.5] X-ClientProxiedBy: CO1PR15CA0061.namprd15.prod.outlook.com (2603:10b6:101:1f::29) To BYAPR07MB5365.namprd07.prod.outlook.com (2603:10b6:a03:64::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03c56c99-53a9-4989-cdb9-08d5f8dc8d14 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB5365; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB5365; 3:eMC8q74poI2P5f5F5ljXpaiHBKK7YLi7ADhfe8iKNfvT3olf6iH5DAj2W6OTPKTXm9vmtqKYouULpaSwknGoWP3w+8IcJH8wHIWTmLR4uKzs+8NeBOR6AL5rIzV6OTbdcV2VU3MCjG74hbAEAWox1fbsM6Wio2e4VMvUuzvxjw36UP9qTgQJUIOi7IQ/6draVJTmDNXv0w61cZI2IMZdUp2XEBu22qfoaJibf/+UqEktbOhoFZRkcPOw1Si8k6x2; 25:3XAKvBb4EpxCpUOMTiStiBwAuR8s7gBqRLkQkNOKLv0ZJv1wY2quxYB0HGCdRa6C143rhi4GWEuiejWHX5c8SxKjASV/AXoHpoDvzZHVAnnnjORYyxVpXZw/vGF4imvJH1Yw3ePyCK3tynlAOXgEjV+XZJARPvd1Fo6tEGPUnmDjoNSwcpJ3yo9GGTjzGkYPINGdAVYXKYLIVWxf0kCLorWysVtPqejMYxF2kaOltFJGma6AMCnb2IDMAnolaOLio4gb+vKFEjPTsFnh04ptksbk+wLlcqz8w7xWxYYOResBDE862GzGBWnQdXkpAldtaoadEIFbkyb65j7Dl+Dp8w==; 31:ez6e7gsYkPlf4l+4HJ8onAuqoMEjSX2lgQzqtCUTKgkeaAnXskUpaDrXGxVjHaqzCV5rcGhXZd9JjgHcKLHYccNvhoHhyKRghPdldE0qIFOtQ8alTpnhtHw/IuP8o1vC7hqoXKmgvTzmG1oumzQD1lfiFIjkqRA3bDd/Ikoj6wx409bXebakzfQGio32fT/hQcJhutf5RtaRNAK4kuumQtnfWokbp6Rvf1asLrcgpEs= X-MS-TrafficTypeDiagnostic: BYAPR07MB5365: X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB5365; 20:dCVhgZBpn/RCMvX2qdqPm4x+/9GYoSMuRb5Oausd9MaZ63cDyyU1rU3yXT+TLKYYUec5jeQBCn9HF3rvAv0GcbsSYvrMk2n9gGWRqPvDyYMpQVArLggPcoruB4/Zzh3zmncaBiLoEUGCaNiO4GYpIMbJzzva0GBlDMxFQpHEX2wZ2XMwzV6sGLZvUcswH+bnsM+5noWRQsqapmm65X7jcJG5adWqifHBYYqC01WKP01QEYU7I8B7UsBADpw0vS5vqHdkL66l/8iBDtGhjpfOTPH6e7bU2p9xEtxeb6Cr8juuRwDbaIbpj4wCmM5VHyhXr7eyEoL+Gv6xCVXSokQT6IvzbH1FYkc0a4Ltc6uEhBjfJYUIz9PHLo0FSYD72VMpCMryhuayod2Xw3Y4rDA8iRBKId695+y7iz81xtyxw1ccdy8WZ92nqpxpFb0E+4mEPitfd5+dnFf5EkOrzkIYcLhF6XbLXGlWze55DZNGslPZ1//I7bjSduT8slGqbvII; 4:mwwykYqrWSDES+pO7MGk8Tr6ncAbeA3B4QW8FI8aeispthXqoWoZYDtXMtEQRZ4m4Yx7WLcgXvKT+G2wo2J7W/YEeGygj6L4IEheTClYElL2BQJ9Jj5B/PH0n1LWTJJo03k2q1cx8xuf5n98sYhzJDJKW1Od74DA4+rPWisESOxU6GwKoWVJMhbtpcfTdG+EcIxA6vRBavXK9J0D/+JHAT4ia+2OArWOyfxxQGYvOaBB/sgyI0F5Ir+R1YtIAef4hKpHL8Yzrmex2ncFCUEyaZ8REIxJxInoi0An35nj5DH6i7aJ/qdI+3Kn6j8uFItc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:BYAPR07MB5365; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB5365; X-Forefront-PRVS: 0753EA505A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(136003)(366004)(346002)(189003)(199004)(55016002)(305945005)(72206003)(3846002)(478600001)(52116002)(107886003)(2906002)(6916009)(21086003)(5660300001)(4720700003)(6666003)(97736004)(81156014)(81166006)(7736002)(51416003)(8936002)(8676002)(26005)(386003)(16526019)(186003)(6116002)(7696005)(86362001)(106356001)(44832011)(4326008)(68736007)(2616005)(956004)(486006)(476003)(14444005)(66066001)(105586002)(2351001)(25786009)(50226002)(48376002)(36756003)(16586007)(316002)(69596002)(47776003)(53936002)(50466002)(2361001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB5365; H:cavium.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BYAPR07MB5365; 23:Pr8hqN1aVSwyZdCo+OVnsOdobo251jqzx2j4fnsCV?= =?us-ascii?Q?dHQWNNaWG9gotvBu35M0HLML14Yr8q+Yw3eb8KBV9NF1/566kujvZGyfVy3l?= =?us-ascii?Q?hdKKzODZFSy+bmSzlDhwS1yq/O/WHEHFkP85Dw7WhcS3N1ObY0u2t2ndcRdj?= =?us-ascii?Q?Sne7Etu0OyEOfsRvlQnS5fGfca4m2dw4Kal4qN/cqvwINooOOfk8PXNGoIUV?= =?us-ascii?Q?TMcWUPGF6TNcWGjsN4w948uDAnSojXkyM0Qz/c8fr+Q0n/2EathyUnYEoqn/?= =?us-ascii?Q?3iho71hAQg8ubHQXFFO40oxOu/izJuuZDM1spDP6S6n28/5N6YNZZAcVvMLh?= =?us-ascii?Q?fi0GpVF5QroD9AqFhzcLivp7vrCu+B3y9/7TEN+0qkuCDzjdpEgTKqeOxHqM?= =?us-ascii?Q?2VKDJKnwJxCsiiNtTa9iGcohoTCb+AckSEEK7lqLaK6s22j7XR/ojPlIbwxj?= =?us-ascii?Q?ujk/JvhWTB4qEQGA3cOBpHwDQR/Ac5QVfhdVbCp+5iSSCC13c9VtnTiYciNG?= =?us-ascii?Q?I+oYKUEIyLP/8ZFsti+lAvKpFjzEUflbrBgGIltbDmDOQBWU4xXikvN97h5D?= =?us-ascii?Q?D6vN0/MdSPFAD+xBIvl02tQArzoEZuPdHSNpGV0BXHrM1Wz3CDl3njKktMeN?= =?us-ascii?Q?GaVdE6ItmIcnGgkwi/r4Blu+ecugkWiHL/ZQ/u9cYEb9i+8hG1dmlxRR/OT1?= =?us-ascii?Q?yP+3gham53a99/sJevbDT2PnbNZNJpZys2MwAYgYiPeG27m0g7qQ+3G6+4FT?= =?us-ascii?Q?eXop8tRTSPW1w5s5vUblSjHf9s40bVB4gkPV6MCpRXUIs25tx//deq85UEIC?= =?us-ascii?Q?o8iVGEE0hkTfZjXjSfpBAchY/OdO6lxnyeq6hTI5IohoWcAnN1cfYf/29hbf?= =?us-ascii?Q?Zz/yybPmiTyFHlYPrLQsnD3+QcOMcRBAFNLLEUNSRHy4EkSXjp5IvC8UL5sb?= =?us-ascii?Q?V49vr3a8rkIL94kzQu58LqM3FdyRYVzp4mf28juMOdT1WC9j2p7D1OemO539?= =?us-ascii?Q?U6DB9GNQAU5miNyWp3pJB2jCHmRDpCu9B+PwWB13vCZpiFnfSznNo/xok9zx?= =?us-ascii?Q?8LI5RgAYGK+TtAhXkkXiYCT9cDrUsbwajB2Vh9p1LBX6pvQcLas/UZEWMY5R?= =?us-ascii?Q?5oScJrK74Q75uFcRZitMqSq3v6GpQNEWMYFBFdP3gJp6Q4PCXTAYIX/mreS9?= =?us-ascii?Q?j/ecOR6M4pV5vrpmeLBH7G1zrSU9JQsaAsDaQ9ZWhVwHMkLZ6YOa1tRA36jq?= =?us-ascii?Q?ewlUUxAQ8Z8mywpUoAHkDkaUSf7a7aNz1CPBbDP6Bh6oDClx6mDUYovuIKLb?= =?us-ascii?Q?HnIbNXrdKBr9g82Kimdps4=3D?= X-Microsoft-Antispam-Message-Info: zEyNtHIYMBsxS7PG2zZNN8QLF9mdZ1/Sem5/rPVgWQEjdADN9zxwPkRH9M5u+foS/kNbGmk1wUppeUDRitt8lj2/lrP6Z4gT4qeD7Stbt4iU8+4hZzhva9T5PqrSTdd+tqbttCygOYeckJVMX5Vv06hQHs7da02FGtaJigCzQhQy5YijBqNgyjRa8sDEFiaFRtAH/SFH0u3fR1aOgJ42sz/Tu2yvUcOQ8vGa43R3WyiuZZcDxXUd+RQOBQ+pxlhw6V9DbrrbwnzRqFnXmWj1OoAYvvLw00wXzcK0qBxdjOvEev9ziGG9jQBm5a9AwzB/rZ/RDeO6WIrypum+G8kuO3zroK5bV75x473BC+vr1Tg= X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB5365; 6:hDENB58EwVGjn4Hvtq4W0jAhVBTYwPruCFUo+RpUZ0hSP8XbPUlSQCDB4DR5xpQ7Czazfi0A0y2ntmpvccdP8Cp9oZiw4paWUDEtMS2+JIujksIQv9gcF88o1avzIn7LHl0qT+LL5egYkGWTCi3sBFLijj24cIvBhrnEe/YlgNiDuJqcGURLoH/vYHKxYiR6xJeyrd/Yo8QazSIT5CjD3si3+RKcTXm7pkjc9YUKwhsSO7+fa5TrWtBF254a8irE1nbsavqAlYibBMlCHOkwMpeA3gm+rGLQp5GP84Tw0SRwyuJjZ0gYqCVWGhvMoNsDq2HAIokA2kfNQm9Ijezs+KgHRFpFvOWC0h5+/DvVmlMbW4CMFe9Rs+j02sCJ+38Yb/UBSLHKKAoijqhim+fA5l9OGCasLUYxQc+umWbYMtEpFrvgyO7ctcXGrPHRnKK7qElQk6NddmCWRLAZZJBhcg==; 5:EAJQiWPAbBKhqL9uEacCugoeJKwdYM08Nduo7P1TchO+X4eiiG9qnejSiZOY8WFNkHOiu5qNg1ZG9o1mJ98l5jynTchiT3PQy6TcdRl66x9Dcipk3TZKc5Fbg8gYPkzWmbLY4xPgstUSPU1bovXLOVy+ivmoOrX/S4qSdAo7ojc=; 7:nTH1IR+pF7q74kkMG+qZBy4OVlIdtHMnINM+4bPzlc1aQHnIpcQbLkgr2w2KCMtvtg4t5ajLQa7hCnMQV7vd0x8KJt25upGAGJTm7l2cALLES+bmJBoz9UTdHySge6Lp+6WQ2Z/W70rAoSvuVMHHkWqt0OECe9NUqZuhqG7QfJACc/t0paALfvvpiC4TLEvaX81+jDaka7DRqd1+qX5J+fnXxflOvtGlGHSjyD4mP22A6XVmZSh0h1szZ7Q0DmJj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2018 01:00:47.5369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03c56c99-53a9-4989-cdb9-08d5f8dc8d14 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB5365 Subject: [dpdk-stable] [PATCH 17.11 1/5] net/qede: fix for devargs 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: Fri, 03 Aug 2018 01:00:51 -0000 [ upstream commit a16aef523c11b6e64a809242c77ff7f2c5e9a864] Do not error out on invalid devarg, log the message and continue. Move check for VF when disabling tx-switching to qede_args_check(). Rename args. Fixes: e10fc775ce1a ("net/qede: replace config option with run-time arg") Signed-off-by: Rasesh Mody --- drivers/net/qede/qede_ethdev.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index cd66a88..96015cd 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -534,12 +534,9 @@ int qede_activate_vport(struct rte_eth_dev *eth_dev, bool flg) params.update_vport_active_tx_flg = 1; params.vport_active_rx_flg = flg; params.vport_active_tx_flg = flg; - if (!qdev->enable_tx_switching) { - if (IS_VF(edev)) { - params.update_tx_switching_flg = 1; - params.tx_switching_flg = !flg; - DP_INFO(edev, "VF tx-switching is disabled\n"); - } + if (~qdev->enable_tx_switching & flg) { + params.update_tx_switching_flg = 1; + params.tx_switching_flg = !flg; } for_each_hwfn(edev, i) { p_hwfn = &edev->hwfns[i]; @@ -1241,10 +1238,10 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev) DP_INFO(edev, "Device is stopped\n"); } -#define QEDE_TX_SWITCHING "vf_txswitch" +#define QEDE_VF_TX_SWITCHING "vf_tx_switching" const char *valid_args[] = { - QEDE_TX_SWITCHING, + QEDE_VF_TX_SWITCHING, NULL, }; @@ -1254,9 +1251,7 @@ static int qede_args_check(const char *key, const char *val, void *opaque) int ret = 0; struct rte_eth_dev *eth_dev = opaque; struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev); -#ifdef RTE_LIBRTE_QEDE_DEBUG_INFO struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); -#endif errno = 0; tmp = strtoul(val, NULL, 0); @@ -1265,8 +1260,10 @@ static int qede_args_check(const char *key, const char *val, void *opaque) return errno; } - if (strcmp(QEDE_TX_SWITCHING, key) == 0) + if (strcmp(QEDE_VF_TX_SWITCHING, key) == 0 && IS_VF(edev)) { qdev->enable_tx_switching = !!tmp; + DP_INFO(edev, "Disabling VF tx-switching\n"); + } return ret; } @@ -1341,7 +1338,8 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) /* Parse devargs and fix up rxmode */ if (qede_args(eth_dev)) - return -ENOTSUP; + DP_NOTICE(edev, false, + "Invalid devargs supplied, requested change will not take effect\n"); /* Sanity checks and throw warnings */ if (rxmode->enable_scatter) -- 1.7.10.3