From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0069.outbound.protection.outlook.com [104.47.32.69]) by dpdk.org (Postfix) with ESMTP id 17AC96932 for ; Tue, 25 Apr 2017 09:29:49 +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; bh=uxwfSAVdMhvqMSsi+jytM3ahepKJucOqMABMxn/pU94=; b=RPwaO0kBZh7//1iP7GPiwOfIfoeoaLI3QVtChqwkk5PwSd19pY2Wr89i1/RwlipPGYRhQzWc/IKhTbZDNSF7A9iyvcuEppjmlyAEIleIxxjv6mJGv6x2fAG9v9Pgd6XcRMCOBlHvxkH794Qjt2XOs+z/p0L8IZc9bMytNmeqMPA= Received: from SN1PR0701CA0056.namprd07.prod.outlook.com (10.163.126.24) by BLUPR0701MB1937.namprd07.prod.outlook.com (10.163.121.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Tue, 25 Apr 2017 07:29:47 +0000 Received: from BN1BFFO11FD023.protection.gbl (2a01:111:f400:7c10::1:121) by SN1PR0701CA0056.outlook.office365.com (2a01:111:e400:52fd::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Tue, 25 Apr 2017 07:29:47 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BN1BFFO11FD023.mail.protection.outlook.com (10.58.144.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1047.9 via Frontend Transport; Tue, 25 Apr 2017 07:29:46 +0000 Received: from avsmtprelay01.qlc.com (10.1.112.194) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.309.2; Tue, 25 Apr 2017 00:29:31 -0700 Received: from avluser05.qlc.com (avluser05.qlc.com [10.1.113.115]) by avsmtprelay01.qlc.com (Postfix) with ESMTP id 7D90B8BF770A7; Tue, 25 Apr 2017 00:29:26 -0700 (PDT) Received: (from rmody@localhost) by avluser05.qlc.com (8.14.4/8.14.4/Submit) id v3P7TQvU032104; Tue, 25 Apr 2017 00:29:26 -0700 X-Authentication-Warning: avluser05.qlc.com: rmody set sender to rasesh.mody@cavium.com using -f From: Rasesh Mody To: CC: Rasesh Mody , Date: Tue, 25 Apr 2017 00:28:44 -0700 Message-ID: <1493105326-31984-9-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1493105326-31984-1-git-send-email-rasesh.mody@cavium.com> References: <1493105326-31984-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39410400002)(39450400003)(39850400002)(39840400002)(39400400002)(2980300002)(428002)(189002)(199003)(9170700003)(110136004)(107886003)(42186005)(305945005)(2906002)(4720700003)(356003)(38730400002)(48376002)(6916009)(6666003)(50226002)(50466002)(5660300001)(36756003)(2950100002)(8936002)(86362001)(81166006)(106466001)(8676002)(2351001)(50986999)(101416001)(76176999)(47776003)(33646002)(87636002)(105586002)(4326008)(54906002)(5003940100001)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1937; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD023; 1:nVODC1ISqYoj7WFKyGeceo2vYPbt3dO4zXja9I+tDSM9PnzWWnH+5UPOb/dJXLfopDCE7lgjhMTQb9HnyHLYNLFpVxVVKfBw0pm0+DH1CrowIHLpFiqJ1nVVG7j6agcJ+nWvkiTq95yw1SW8DFdc7K09G69cly/gLkFmBFLNp5ETNS5x0A+W5dAGB1MBjYumgHNLetFjZd2DTVH21RoYnGC1yJutnu++9Y0tbvGWY02N4j65gxnooYEgNnWbSYRAEadiInFd6o/xSe8JViB2xt0QYmnrpdNZuV+w+Nr5thTA2WT/iBCmjxdqhRh6bzoYkxEgIi4BqSvelQ9+fgrponTbsMVFiABe4uPa2YpZ2FTdBQHcxA2nrzhtWDvjCPdVL1nD+NhHVU8TVfOuUlUKvW4Xs2GCX543/RkH73h7NTqgCpdnEzqpmCGqNLOTaBoUVQ8Ll8WlWZZOjcjFOc2kFMyG8nu3YBzWjSXFybjBYrH3WXm6IreN+xZOAAfk5hBZ7ZHQ03NZ2bnUYnyqf/BD/A== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3db548da-0530-4037-c0b1-08d48bacd9b3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(201703131423075)(201703031133081); SRVR:BLUPR0701MB1937; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 3:D8oT/RB38Z6UxY7vhFHzJEBwGREMxi0Z01Z9yeLGC3zQ2jhyuRwN7SgOJ8BXg0+cF1zr/AkSmD+uu7RZIyBUXiZ3ht3mRAW1KO1WjntHTwtgddh19LTtN1NBJDTbxN90LvWh+MA419gGa8ge61gog0oHKxq3ha3Q+GWO2UZYxRGzy0hfMl9IjipoOV2/x6Cn6tdQ+GMuplZ06XW0UL2rnoR1M5FmuzW2DVS1VB5Wjojx4/uAkDlILLD/FBA6n6fLBaKZxQIVi6YMaUpjcvqcW8Fkp7dqoQLuhropQXdkCxhx/lCtyambOObPNtbdoRBnESwQTmp8FV8eT1bt23zDhF7jS61DtZGtjsGyA0S18pVG33BI6PrOmI0/1VrgjmFFzjnZPbCkCNruStRzU0zRtTI/74syzSYVo4XNN4ubfkN+u+Qj09+D3wd7Yo7mnAqYDpph7MgW3oCczvVZuDo6HA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 25:smPOsgZr5tC4D4hIs3K5hwyIkYM2fxBg6XIhlBz1F8ac9RWYU8Jb0M3UL6it2c9Xz47aR6Co5RaTDgb+8UnOKG1uErdudiuiE+VVtGDsuG17oGvtj/gWhigY6cTw8ct+qX9V/g9DbHN5dte8A2mmbJsd8+z3aarVhxJpPhbAEW7xcpy4jJ8LRn6S3RZyDsxbdkchUNvlEKiNNttOvwskwVDv6nfqktFzAXp6B+Cv/BucylB9/fh0YDyz0jDnMyQxPkmPoWGaxjl4v8n7tBDBwTeLEKRmBhbSum7WA+IHR7LNhd7VI6PNuPVgdMyob0M4K9ZmQt+0tcD3wBfJmqZo0BnqxAeFqlDXVvN4txu7C7SB8ewA/bbnXEPhUlyRs1waqmD3UscB/Re4uEWPLmnikG6X6ZdGM/qA8ieR3KRtyxMSlAG0SOrfc6LCLnAFncfQRGTKm2OxVxmxNNA/JyTmPQ==; 31:VFouUfPGCevIMPGeSZPdtWM4s/YiN8Qu3/pRMXTBIbaZnnmLmlcXLaPxsRbWfqs5KQWrnYnBxY7mgFAjr1f884WGTwlWtdwhJg4cyH+CohxP4q5CAv5qklyCr4IGYBzHwFXGX6+rIcxat3O7LT8ymGoHShEpVwuxRjBnKhG1QWJJu/MZwJAHRE3S4SIk/u52TS+B4J5wx8ttUFSsJXaYjm38qC/d7Y4I0P2zfEubOhhd50PlcgfOp7m7QxyYhmktb4YKLfwW+sIl9enLGZM+zgQCjgE7ENLQiRQZ5TeX5tY= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 20:DPF1Kj5/5tXYUCNGAMEzGPpntfoP4p/DUG+yzUxmAqB3dcFPRa+khgmNF4m+v0ybYfD1p09Bkupaz1x9NWmWyU4yZ9oZUlkrmapu01804etTMc6X8oFryHYy2Lkns13K20BT8BBD/JTqQvFsJD6I2jktYOHl8VXxAQE2oxN6uHP+6cvs2oYxqDSlbP/XnG5eatdKfi36JA4VGz2J2hFtWBx+76fqJzvpw0OQKWucn54VFYy53jXcQ7KnBYY8ga2wWwK3phFAru7ZD4v9V/w7ry+RBfhJ2f09wCQfeddOa2E+9cRNEawUDH4zSYCZLaQ7ANTIxiwVUv3RAA6NxiW6tSXNyAtZcgsTWc3zMZqsZNpQbRZyGmG8gSR9HeF2Gkmnts0BiX1wUF3fVDABSQadgWWdgdvcSezVkcRhwysuZLbBtPkgurot5anEpUjRz1bjcbzNxfHuBphs4b8GRvZSPwmflpF3wQvuFOVcQXfnUrxjg3xeRcjXyZJKQs+W4LV5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(8121501046)(5005006)(13018025)(13017025)(13024025)(13023025)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:BLUPR0701MB1937; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1937; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 4:Lq2u5egox9VeNdVQxy8RQqaVZh4vgr241RFQ0ybF27uyCnuj6Vt/gw3IJ9seQ9g6BVFpLHBOA+hePlICLEjeIFdNbOlrNNXf1Ln6iHidcE8bsj/ZAjGjz2++khH+pcyW2CGVwfV/qUcqbgN+1Qq4avB3mbBZubp5MTnS3yzljBcJyxmkbd0PO8dYiM5D4kHVnQzMu5Qxdqm6mXyzkFsxyhWgQkyy3SeTwYRQVjlALR7F3uTWgp0bVhiwaert4gZAdcs0wys4hiC2aPSRZPR7LUfudfXugEiSPoPIVFDrBkek6znC96zKpnrGM8m0QMe9wWqx1fIJrA2D3ewjgZuNpBQK0ids/F3mvajNNNmHphCKI3preW6Agh3EWYTYg1rOnL0q93GWO0WC1aWcKahODwSKPNE5yKoQyoBZAI7Wz3lpjGvO2ERwR4P1xD1MecGAxqoscLaQmv0nIziMwY/q5oVJenHTE0y2aWkL7sDAD4bBf/ytA9pZ/4BvH6npaPGJfLwR04jmj8LN6sTmnTkD6PNQRAwGtQZPW0yBtvovkmGs3QmIbkpHRWixOGkaNhAXR/+wfTV8HpaOV0HHbgnAoFCqXrp7O5xKZNpBZQBy09AlXoHl+uZWbmT7Sl1KMxxMLw1e2DS+zA5aQqxpnwH/+8bP88el/bJ4c4a0EPCjaiB1eBPLUtaI6KIxxS/0bDkCMvohO8nNzYeINq2uS/MRoZA2nbS+R8/isFvRHpYV5m2jD3BY4KdX0QDCJbpSmVJFaaU7R5M9l258koxz9lxy+Y8y5XT/FGUO40qFYDEUgrL4ZI2xfdXut5iGZ0Ix0Nk2 X-Forefront-PRVS: 0288CD37D9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1937; 23:aOkTXxowmuHNRLLI4fvvwsFjqRd8cxhrI7qBiMm?= =?us-ascii?Q?R5BkwGJRooaeFQXBAx46psVHgRc0aWLnGeg7xyo/MePOSZSZXKvHQ+HFjkWZ?= =?us-ascii?Q?M2zHjaxxHeQEVnVXgPt33oNh+sbNCK8n+i05dsqqefSTKKVJlq2AazcM+m+6?= =?us-ascii?Q?zSjWp0Yx0gRqauZ1cvabbp8kw5GXJtlk3HpAepLZ5T4kzcn3t84ayjHvuVK2?= =?us-ascii?Q?JNp3y6PF6dh6+ToAwVAapwbgsikrbi/HUA5NElFiFLICvdlDmDoqZ9g3TMAl?= =?us-ascii?Q?+EDOR4NKv3khuF6LvNxcTnC0JphLLmdZYVlqWtatWR0Pgh3Ijvq/QPL4RAAc?= =?us-ascii?Q?EagioJnnxyvoZ8oragCa8ihNvZrRdyvP9QJM5Mpvpbq+xGx+Eizqnd5F9a8+?= =?us-ascii?Q?a5fUcsG3ds20lRfxfvLUw6UX570e901L5m9/vu+FJvBMDODWXOm4bAL2YFHV?= =?us-ascii?Q?lbn/BTMkzQ0DYCVIsL0a22AEHVSjxdExAQF9zDNfpeCKHx0utvUusv10a+IO?= =?us-ascii?Q?m2Xa9SP6IRfny6AO4nPobkWs/67eOqjH77aDGzX1NON43Ijj7/03SS9fR/vy?= =?us-ascii?Q?IkNxFncSCA/df+QQHXMrTo2jf60W2XLB6SvD2+nrcRZ3tEK03EZIdDsHZf/y?= =?us-ascii?Q?I1O0uVfApE31k2j3lwUvnWPaGNGWsDlCrNWcM64hWV1jJNd6R05G8hz5sfhc?= =?us-ascii?Q?aNIEZGCJwAUezp87QNreIxqqSMD4nV/XGTzzcy7adzaMhSXMmgE4h4BUVpo4?= =?us-ascii?Q?YsrDVUYslFud/XRQCfGGBFCvAQNef3XpsIlioc2FXFNCM9NLFmzke3xDbMaU?= =?us-ascii?Q?O8NHL+fd9YqBxnIZGe8OfKtmvaYAJBH9RiYP49UHbSCQ5ZrsuqlIP5F0fYUA?= =?us-ascii?Q?mOzSg0iDi9LmPN13rvisdFgT+YYlYIynxaMbflTkcED7kh9W9f2SnFGJ40PU?= =?us-ascii?Q?BZzzIPCx/fCmRhJgc/W4AUT29nj3lHbvGzfsCI+hhjGn4qNKnXkMokZGhtHX?= =?us-ascii?Q?iHJuZ/pa5istIQF2AAsGt9paUvw1auFoe0u0XsC+bIf7VKPQe5BENWUxEEBA?= =?us-ascii?Q?KwdBTX2eSZHuVVqkGTBdY8PKwFY2eKa52jFN+xuFhXQhiC85VJQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 6:SgaCWghuWw//uN4NnGH++7pFS9C3Tpqi30B/38RZDbnXgj+zo2W8qN6GEbRtx+PattcNeGFq/G52vu2NuheECDSrXk202azd+OftVVM4I6yl2g/ptu6DZJc/YJ76VNH/HxRb5agwkHSUg6WTkSvACiak2xlBGtCJzhoO81TfXgm7VNL7DvDZ6PLfafwU3C1xAx2MDE5eN+zBmR2XmXrdVjTAbv/FjDgJKLLnEVqm54PYai7lA4HV3zPnGQgsrwvMmmnKv5xvK86lKEneqYhjtdPIFFYqU8GXH8LyFUcdogRRSPMb9KEHb1k+hjgVg4ZD07UKDvZW4majsGeWw8FfalC/ok+J46pOfmvMkePPDN5hhXgtEFLGf0B0ixRNze/Hs5BkABLBNM/0kYjXJzcaFaRxG1mlCek4MSaAKshCSdKcbnjAHcOVrNm/12upS1GlFavvmRG4rhXkr2/tYb3hgz3wugWQ/b4ERKu7kvQ/rKeg3dFoHLRXMTvoaQpU2e+u9d/rc3lFkw9/8UPtoWTxqA==; 5:0xc7D1HNZnCU+MqI5rLopzEhDiimGJ3/0gqKth3fALs4xHpHzbYrU5JhjXgkmRmaAm892mI3RfgqGYTjCU7bI7fjI4ixMTBGNFYFqFL/yefeZYQtLNbvXhVnCT3wZcmwwPRo9QtyN//lAcXiZDipoQ==; 24:hF2tQ6R3SqLm9TiyO0y4aqRgFLIjij4i1qukQK32wXWN6pU+QTv84M1i/l5s6Ramfv1gaq64nb/Ohz7jDEpqmX81vXAyKRhw3WkAJGVvUV0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1937; 7:wtcteIVnPbJU4dw2adchhozDoPLzsJ7CCLiYjT9IfdhF2+iXDzJzB4s3nlXLXG1wFLpZdBXq7YNf3kz9+DMhngETdyrdVNo1QmxX7mgJHG9Kyq8SNNszOGzc2ACLt7gtyI20/fQuxS9GC3TSyQM6e5QhsWGZJlhgFkBjhzinjE94uKKCFj8d+2/Cq3pT1aKBa96mUpV4xS3DokfxOEyJfuBMM5Ier72Qxv0xfkijGtC+0zfWmf4/cJ1XmPlNle6yHaIrHRAFbuwdM4UsRli+8Yt7+snl0joRijvvT8xjdynNQVFw3aBp+igjBxM+1WKzqR0IHzPNFpQLjBD9f0H5YQ== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2017 07:29:46.5878 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1937 Subject: [dpdk-dev] [PATCH 09/11] net/qede/base: fix macro ecore mfw set field 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, 25 Apr 2017 07:29:50 -0000 Fix ECORE_MFW_SET_FIELD macro Coverity issue: 1423907 Coverity issue: 1423908 Fixes: 0b6bf70d7ee3 ("net/qede/base: support previous driver unload") Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore.h | 2 +- drivers/net/qede/base/mcp_public.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 31470b6..63cbc38 100644 --- a/drivers/net/qede/base/ecore.h +++ b/drivers/net/qede/base/ecore.h @@ -104,7 +104,7 @@ enum ecore_nvm_cmd { #define ECORE_MFW_SET_FIELD(name, field, value) \ do { \ - (name) &= ~((field ## _MASK) << (field ## _SHIFT)); \ + (name) &= ~(field ## _MASK); \ (name) |= (((value) << (field ## _SHIFT)) & (field ## _MASK)); \ } while (0) diff --git a/drivers/net/qede/base/mcp_public.h b/drivers/net/qede/base/mcp_public.h index 8d65390..fcf9847 100644 --- a/drivers/net/qede/base/mcp_public.h +++ b/drivers/net/qede/base/mcp_public.h @@ -1056,16 +1056,16 @@ struct load_req_stc { #define LOAD_REQ_ROLE_MASK 0x000000FF #define LOAD_REQ_ROLE_SHIFT 0 #define LOAD_REQ_LOCK_TO_MASK 0x0000FF00 -#define LOAD_REQ_LOCK_TO_SHIFT 0 /* @DPDK */ +#define LOAD_REQ_LOCK_TO_SHIFT 8 #define LOAD_REQ_LOCK_TO_DEFAULT 0 #define LOAD_REQ_LOCK_TO_NONE 255 #define LOAD_REQ_FORCE_MASK 0x000F0000 -#define LOAD_REQ_FORCE_SHIFT 0 /* @DPDK */ +#define LOAD_REQ_FORCE_SHIFT 16 #define LOAD_REQ_FORCE_NONE 0 #define LOAD_REQ_FORCE_PF 1 #define LOAD_REQ_FORCE_ALL 2 #define LOAD_REQ_FLAGS0_MASK 0x00F00000 -#define LOAD_REQ_FLAGS0_SHIFT 0 /* @DPDK */ +#define LOAD_REQ_FLAGS0_SHIFT 20 #define LOAD_REQ_FLAGS0_AVOID_RESET (0x1 << 0) }; -- 1.7.10.3