From patchwork Wed Aug 31 18:03:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghu Vatsavayi X-Patchwork-Id: 664650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sPYZb3Vh1z9sDk for ; Thu, 1 Sep 2016 04:19:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b=YFyg/MCH; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933405AbcHaSTs (ORCPT ); Wed, 31 Aug 2016 14:19:48 -0400 Received: from mail-by2nam01on0071.outbound.protection.outlook.com ([104.47.34.71]:59296 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932341AbcHaSTq (ORCPT ); Wed, 31 Aug 2016 14:19:46 -0400 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=MO7f8MWRQrbONsv8A7P9u2stYKnJgeYhZOMXIJgjggc=; b=YFyg/MCH0KO5tCbmfBExF8a6ChlB5bGpKS/eXsa1fj3axBmBeCY2zz0ZrHkgfLR8CFYDuS17POuzTcB7NTC3cFuxpsQnoVXpiW+L8cQe0Vw+qHvafcvI+ssP5A1JkjAOhEeOMXYKM6Im4LpvdkTy5EPKD+g3idtbjCvuiMpjULE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Raghu.Vatsavayi@cavium.com; Received: from localhost.caveonetworks.com (50.233.148.156) by CY1PR07MB2133.namprd07.prod.outlook.com (10.164.112.11) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.13; Wed, 31 Aug 2016 18:03:43 +0000 From: Raghu Vatsavayi To: CC: , Raghu Vatsavayi , Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Subject: [PATCH net-next V4 02/10] liquidio: Firmware version management Date: Wed, 31 Aug 2016 11:03:21 -0700 Message-ID: <1472666609-19503-3-git-send-email-rvatsavayi@caviumnetworks.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1472666609-19503-1-git-send-email-rvatsavayi@caviumnetworks.com> References: <1472666609-19503-1-git-send-email-rvatsavayi@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO2PR11CA0004.namprd11.prod.outlook.com (10.141.242.142) To CY1PR07MB2133.namprd07.prod.outlook.com (10.164.112.11) X-MS-Office365-Filtering-Correlation-Id: c0d88aea-c1d1-4669-250e-08d3d1c92564 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2133; 2:vkkCtjgMvcgCRX18Bl32qurRb/w3EUBTnGB6MoPHadwtI3YvaLV6tClE8XmWzFpfXVAayUY0mh1mPufcWBa1asDRNhxUDjaavDlLkvJwLdq0GS8AYZQ844ttDOWNuTs/0yp7EDBOMX5wJrHoPztJwS6tGe03AADM3YAVaUAXmVNbLlsPicY9i8vYqueZKl+H; 3:TMB/OHgrisVVkJ4slckfH566HLg97ZYNfoYyW9oE/rHvCUzl4QaI2xufm6zoHV3fE99/O6BrxSDgBO/8MxYbkkwGOKifTve2GFjodST8a4jySDSU1PTyms2nn25Py08H X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2133; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2133; 25:J8D+DMbJoUQw00LORjLSr9BPxdoSmKFU4UsXWOES5Z2jrT5bImKK1vHzTmg+6+SUR0GJxK4LHkp02hw3NAfC9VC/gAQ/WwsfW4c/vc+hsotog4DT9KMEdXUp03XIqqOqFrIDFSaewD7z9hnY7zpd2ZjTS/8fwNgpjhhXm8mgFI4OEeq8SiY0tgn73GXtdYm0g646Wnu7Tbuna/vAsgyTWSZwAyBWfHJoZjiibGR8CsqjrZg6BMGXDxAKsICLChgnDOLNZMbVXDAxqjWnMf2WXagwTZ2fPHXTh8BYeJGnS850/aB/tnQfLNCyvXAjsg9QHPshW1vmiiOQNo3quXUxORqSCICOp4UF8koZ2AzR50557ifI/rhBQiyKay6eylQBBmUs19nzFH/A6Fgo74HIBk2uCfXCWm6wNnlR1NHXNS1tz02xLyEucOyG5pBg0HP2I5tDDI99nIPO5ARKz3pcPoa5J7pjpFIZLsP1/zWEs4YYnbVtgyTbS8AnJ6i1J29M6TLboH/LKNTUelDU4WAV1tgydVw2Ct41dPrnIWEiPBdO8/1LX/TEDQ87byK6q+Drv7Tq9Ayb5c0vKfdKhgsfMdEmY3oGSf9HChn+0kC92+O1JOY+qf8Hl9o09evXC/7ZqO4b5zFvRY+fPLPVk7xYbp5J4wlpy1/D24tUC8mPo3uSI6vlXlgUvRednRBGZHHM25psKOq1bSK8BVGnhjGOJe5cWeU6zZCA+BmzFyAJdj2TQClQyw74cWYWk+LG8sukqWAGqudGsN7gMRtQIH32Xw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2133; 31:MPMWtdLcXarlJfaNv8++ZMbvt56vxfEuWn+9QlD4MyCCUv00nwO7vg3MXJrOlXhts1QQA/j/6gbMvB01b+sSYJ7Xb8JJ/auSlqFzFl46CiAn7Uq36Z64RJb+lisSHFplevel/yirHe9OP7l4D1txFK8bUnhKQKjz2tT4vEmEPv0MtxrJYodRLPVtZwuHfm42KV+CL6bjc8q1zBtsokpWLQNpCIJxRq4gef7hmH6l9Ow=; 20:j+J1kkVUKj69D7hwwjuosO5hjitqMYcmTsghG3f1ph1W//JCBq1DXKsLCO29/IY+W84+PSFnHN1ox/+qo6pP8g7EpJz5Mnwvima3aF3qvbWdKzcH41BqZ43QRrekz8v+Hr1LPIkY5Kt+3/UHy0MsuspzHk2C3jM6vK3/6vXYHIn/nJl4uDzMSElocKiXQC85WKzJHj7OWeahdsnZPgspw1KewDsN7OYELE1NbfF0sBZljYR/+oCHFgu+0MZ4Swx8OazF5kUslDUx+nmNz8mJbasFZ7Dt9ipEplDNmvKbrKtQ+xFwEKid5HdTNUS3rGGtLuBiIkvBMxjw/gSDoLyFhmLbZdZOB6ezpLxu2Ln8rY7zX699cznmBaA39BMk4N9msDJUc6m2lHCxcA3hYFfHIwmO9uDoMdCPJtmsYaOeoNj10SW2IU8k4x2Vif2FQRbeCcIb+8AntkwuhmtuN7u7v8FAPLBbzWT15hSG/UjJiEyUaJ7JLlmeMN6q+DV8PlQwPcB/AZN2HodM6bZP6jtrI6ypiJkK5SBkUN5rRq5like8KfFHI1qOk8f7+d2c2uSwYog0iEsQKJKvsmUS0LPfsq5lHWk1jTuSBJuA1sLqLvE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:CY1PR07MB2133; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2133; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2133; 4:2V8kGZ6UXS2MJdN/XQjdLXZw6gqGbPi3pRdD0K/5poLyp0BHWqTMCvlH0Kr2Qi1EYN3+j7ajk/JdQ1hqvoLp7JsHeLdAizC+3BpAMgszK+WkxiVdE+xiNdX6HeehdrpwnQOgEl2jEaGpx6jb0lugnvurdtLBp6yWWVE2z1yhxc4/lP6rh+HnuRsVyA0ohmxLUF2dBCAytwKz3lBw9QPkeDxnK3FJjk7d0/ivxBvXDBUDXUzcUxqlmw6MzMod4uLGilL3S/+cCEYygo0s4w67r+aD84Dz4VIFWnXdHhId/0CJpnGFo5u9Fekoz/cZC4c9w9zafdacF4u/iU7dtJMo4fyzxTCzeVeq0BoiOWI0+MFChQwQ9AvvX+uluuDrQybMkcZBL7qVZtlzzLq7IJ1B5A== X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(19580395003)(92566002)(76506005)(97736004)(50986999)(68736007)(42186005)(2906002)(5003940100001)(4326007)(105586002)(76176999)(107886002)(53416004)(229853001)(189998001)(77096005)(69596002)(48376002)(50226002)(33646002)(81166006)(19580405001)(7846002)(66066001)(110136002)(101416001)(8676002)(2351001)(47776003)(586003)(2950100001)(6116002)(5660300001)(305945005)(81156014)(36756003)(106356001)(4001430100002)(7736002)(3846002)(50466002)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2133; H:localhost.caveonetworks.com; 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; CY1PR07MB2133; 23:BsRHFw9dP8JBXSDMkmFrfbk3IJyv4wBgyTXTQmYXt?= =?us-ascii?Q?gBbJ2ds45MxsFGNhO3LkvHLjambkoQTrSXSSTge3g8XpIErn2g503jbMCA+U?= =?us-ascii?Q?QqW6zlz4v/sQui/TR7TMZ+RIgwEPqAZR4P6Uf4igwUV9DSXkDg1Tl298KP+U?= =?us-ascii?Q?noaAGYz8VnORtz/vPAu1fTZB6wiASW1KvbO8Cw9zj/W4rhVsERylMyyvSVqX?= =?us-ascii?Q?mvMN39XPwGu0MKWpmy6GPs6ACX+ucKikARICxvdUTM4e1OoewNugRt/2fNSj?= =?us-ascii?Q?RkHpUOJdqltc5qiid5HqF0OBv1k+ZRLubcwcp2K6mGUi9rmiKVUALwW5dMXJ?= =?us-ascii?Q?JPM45sXV3ZbNpSv5NwlifhF1LlAGoX0VZ5PnLnZ7kfrIqFuQE5Xq5owYKhGO?= =?us-ascii?Q?nTeqAnWIMLPSIS6hSpxbQbi1dhorB8faGSficiN59vGVxsQ0p+o4bbWzJI9W?= =?us-ascii?Q?5BGL507x1P2bi/olr1ZbpgsbKQL5UCY0sU+oUCG+22wyjcD5IDOShaIQyUL/?= =?us-ascii?Q?ZFZrH/D32ak6S2bmmqImYEktU+8VOelZmp7k6Q/fLWWxW0ppnWYPnRXny6eN?= =?us-ascii?Q?GWayGlmFrP7cXEL9ITJWDYpSKgBKMNCf/EFUG+shwswWZoE/EABFqr02zt+0?= =?us-ascii?Q?VdLq4x4+/4dVv4ja3+1vbtbux9XfvfTzyN3MUR0TkG3DpXSmdrvilaAOHEae?= =?us-ascii?Q?5zR1OVedRIM4bxU+f0bg650gJf0IBGl1dQbxEndNNtDKBucEHlJqHxBHusni?= =?us-ascii?Q?nrBfugxI2J2HyjP34xcvJw+Q1XNWg6by/4+abq/IIqIMkP+wlJ0R3Siwx9QX?= =?us-ascii?Q?Ax5sHfJBAVQEMIFnpQCugUvgq7oGs8MTr2evsi/UkkQBTLwqv6b4mlRegzzI?= =?us-ascii?Q?/KfKhOxzLDREnsRDxB0zMhUq+pDUTtDgLkgO88PoKjMpptyfDH7K1rNEXEkE?= =?us-ascii?Q?RELUfDTQyqPxfurGivW3GMdIP52IIQIIIw7z2KVtOAnW88xt9QQQqqUd+EV2?= =?us-ascii?Q?BxgLlRSwgQoPj7/dfmW0f33IqOD1NpwxFkcWDzPGIQyZ7vbqPSs9SSEkQjX6?= =?us-ascii?Q?yHpTZbqVHIuSN6At4ZyxlpluMSFMihylNtNtBbkdje1LD1J+cdCpOsEz0/di?= =?us-ascii?Q?hpS0N9ebGCQB7Wi1Yb6+YrGYsbKdBBW+xM4LQgUUNlQhhMO/9PVFpo3tB2Y8?= =?us-ascii?Q?PaOknoiQM6U/EHZjn51s7f0SafkdBCxDJAhFX/ol3ksi0az6IXlpH/vYw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2133; 6:hwRhXu7zoByhMekRGLwpvH1hqWCKZCsx9SmfKgm+jCKO+cXn0zpW60SjwZ9pTlSl4buQJViCDRPRUPG0GFafltEiby6v76Uys+QIO7kmfTzvfCJr8O8EN7vamJ5RaXy44X38t1qA8AqNy8Ag4f1S/iim691AskmsnJe7eAc7mR+oHbr9ohXod5i7rIvXRpulr5Jrf3aQeOiS31gyzd7wnVK9lmJ20/sK8VFj0oAMv6HWXiLrUm8eY/ZtWkaOAKMTaMdZDgpDmhef8rIpGm97caGHiRXp60DfF/WQBlsYjgE=; 5:QAqyKTQSf+eWicPapsgAzfydbR57QtBtSpgV9E8kZbTqM3fKKkNuApyly4/LtRdGl68Vj2MIMRGHN+UzjLsimziqw80UIQ+I9w0tD6ajDh4jCdlvj7xMqN4RHiwxktxzcI1Tu7yzaZMf2zz2p3YWvw==; 24:T55iQPpvM1XrdAdxyAZT+8lVDoFI6qnWcgZxF5inlit6tC/OTDRIAwZj0dHjNoYKcneHG8vUG1B5zbxwm3/nbMjtOHcIuewV6cstG/aRHX0=; 7:FaRNivNnTw8jDY3nOrIercu7RzQST04TBZeUFXQzIee9a0ngD95q5MCwj6bPoaVNjQN+cwKbnfKsKYJz0YnZb7lSS0LLjmFaMRY+LaL67qMopEZiiRu1QPeptc3QIcRdlZzSykx2qa4ewkbqQQCN59e50svHwg7PHTQRzCRf3TDSzljYOIVpzXtgipMcsx4toKwyUMyq0QnYTefBi+dqFPgOCzUFBfvGPAqoEDgpSsbUrqmQmrCtNkkYsU7EYQO+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 18:03:43.0990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2133 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch contains changes for firmware version management. Signed-off-by: Derek Chickles Signed-off-by: Satanand Burla Signed-off-by: Felix Manlunas Signed-off-by: Raghu Vatsavayi --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 12 ++++++++++-- .../net/ethernet/cavium/liquidio/liquidio_common.h | 20 +++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 2abc110..1bbeae8 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -3230,8 +3230,9 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) union oct_nic_if_cfg if_cfg; unsigned int base_queue; unsigned int gmx_port_id; - u32 resp_size, ctx_size; + u32 resp_size, ctx_size, data_size; u32 ifidx_or_pfnum; + struct lio_version *vdata; /* This is to handle link status changes */ octeon_register_dispatch_fn(octeon_dev, OPCODE_NIC, @@ -3253,11 +3254,18 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) for (i = 0; i < octeon_dev->ifcount; i++) { resp_size = sizeof(struct liquidio_if_cfg_resp); ctx_size = sizeof(struct liquidio_if_cfg_context); + data_size = sizeof(struct lio_version); sc = (struct octeon_soft_command *) - octeon_alloc_soft_command(octeon_dev, 0, + octeon_alloc_soft_command(octeon_dev, data_size, resp_size, ctx_size); resp = (struct liquidio_if_cfg_resp *)sc->virtrptr; ctx = (struct liquidio_if_cfg_context *)sc->ctxptr; + vdata = (struct lio_version *)sc->virtdptr; + + *((u64 *)vdata) = 0; + vdata->major = cpu_to_be16(LIQUIDIO_BASE_MAJOR_VERSION); + vdata->minor = cpu_to_be16(LIQUIDIO_BASE_MINOR_VERSION); + vdata->micro = cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION); num_iqueues = CFG_GET_NUM_TXQS_NIC_IF(octeon_get_conf(octeon_dev), i); diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h index 199a8b9..11df55a 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -30,10 +30,24 @@ #include "octeon_config.h" -#define LIQUIDIO_BASE_VERSION "1.4" -#define LIQUIDIO_MICRO_VERSION ".1" #define LIQUIDIO_PACKAGE "" -#define LIQUIDIO_VERSION "1.4.1" +#define LIQUIDIO_BASE_MAJOR_VERSION 1 +#define LIQUIDIO_BASE_MINOR_VERSION 4 +#define LIQUIDIO_BASE_MICRO_VERSION 1 +#define LIQUIDIO_BASE_VERSION __stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \ + __stringify(LIQUIDIO_BASE_MINOR_VERSION) +#define LIQUIDIO_MICRO_VERSION "." __stringify(LIQUIDIO_BASE_MICRO_VERSION) +#define LIQUIDIO_VERSION LIQUIDIO_PACKAGE \ + __stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \ + __stringify(LIQUIDIO_BASE_MINOR_VERSION) \ + "." __stringify(LIQUIDIO_BASE_MICRO_VERSION) + +struct lio_version { + u16 major; + u16 minor; + u16 micro; + u16 reserved; +}; #define CONTROL_IQ 0 /** Tag types used by Octeon cores in its work. */