From patchwork Fri Aug 12 18:20:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghu Vatsavayi X-Patchwork-Id: 658835 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 3s9vFf4Dszz9sC4 for ; Sat, 13 Aug 2016 04:54:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b=ewJVEw7h; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752801AbcHLSyn (ORCPT ); Fri, 12 Aug 2016 14:54:43 -0400 Received: from mail-by2nam03on0075.outbound.protection.outlook.com ([104.47.42.75]:37600 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752504AbcHLSyk (ORCPT ); Fri, 12 Aug 2016 14:54:40 -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=klaQOn59c4INm54zg2MsT6sWmn9s0n1I37lX5QO1pkc=; b=ewJVEw7hgf5YrVzSRXFLoxuHydYy6BznPh3deSEnQDlXknos/Bu7+Kmq6Ax4PdxhbsANSer91k7SX/9+MRLOnyH/gLaGld8w4PAPvx7mnzQJqXIDW/uu3Bv9D28pXx81NKZF4LdXU2MEB6W6Nu1sCpDfqvRSTRTDhmJWCtxL0vg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Raghu.Vatsavayi@cavium.com; Received: from localhost.caveonetworks.com (50.233.148.156) by BN4PR07MB2129.namprd07.prod.outlook.com (10.164.63.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.557.21; Fri, 12 Aug 2016 18:21:37 +0000 From: Raghu Vatsavayi To: CC: , Raghu Vatsavayi , Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Subject: [PATCH net-next V2 12/18] liquidio: RX control commands Date: Fri, 12 Aug 2016 11:20:29 -0700 Message-ID: <1471026035-15323-13-git-send-email-rvatsavayi@caviumnetworks.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1471026035-15323-1-git-send-email-rvatsavayi@caviumnetworks.com> References: <1471026035-15323-1-git-send-email-rvatsavayi@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CY1PR18CA0036.namprd18.prod.outlook.com (10.163.31.46) To BN4PR07MB2129.namprd07.prod.outlook.com (10.164.63.11) X-MS-Office365-Filtering-Correlation-Id: cb83f25e-b1af-477a-d0bc-08d3c2dd7fed X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2129; 2:YRRNQp27mmwBLdo3hI8uBwlY9QzEMqqVBdto2mJNCdhYTqp03sobvu2G10Vky8XQCY5qCgIKbe60KjvM2C6xB5Jy78TX4wJUxSB57fsdHuLg9XhadNDTFtQP8R06u2HUDfRg0RlJi1dCV8C2yfkQ+UNGVAhA9Vij8nowq4A7KOmBh9FKWdrZ2i+Csr4njs9T; 3:ufLjGx1UJgNWbyAVwdgIxQHSQ37/ScFLWc3DQRAxhfk7x8U+RoCmDtREn/0I6p3Lb9QWpro8IZOwIjN5F0prnR14J+4kch1PFhXe0upXg0gMU0uPMnInB94n8KQ0pXbg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2129; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2129; 25:rSTBcG4j6UDYMdksgj6Ws7iGKBopPzt6iKFtvOtxeBol6cxXU8SLj9VWVW6PnJpxDdO+Rl5SEFrsIbxQkr4TAtlStpnaKE66RH1Nak6t9jdq7jHJ7gnWP3N+TzOnccQLRJnxp1bYn1dUkUxaBYYQVXtjdKKtjBxrGPvPapUZ1gnBJIfwHShvQxY8r5jPWlvr3Lyb9mXTRoSg2TVM+qMIIwh8B3LYupP6lHznqbXl2w/smyzt5QheLY0LyFYFQJCQYRUJHiTIDdZPkvCRQfbT322DwyM4otqVbTiQOO96O7J6HQE8Sy3IRP9zjYzmMLjNFM+gmdJeT0JDIkiZ+tGAobZ6T80m8oOa7QoaBgyFL3s1xGo8JBY2PBHBc9q0+Ws/GUpCSjRw9M+SjWJnLPsEyFisiks/YAED1UpZwC0EL0ZL8VV9wK7BaKRdCTAvy6nzj6pwR2bHP074WNoI5UTKfx+M8nFre+v6NO8zgGpQczNtw6UdNwXClyWuH5lE+hSEErHe6yc9cyEDDH8pSC+91m/whu+ZzAjCJvy1cuf+1Yy557FdN219bfZ90GUZT4rLabMe1HuZ2md+bz/bhB4nFs/IDh9jcd3BZNl5XG8NjaftiOWjT9IsSiV1CJfnPrnGy6APx8cNwtEAD9itbKOYNVkkx0iJ1FbAegtYRJ5YHHBI318UOFpWI7PFTdMNQIyr3ARB6eOCWs1+71yKMXhyIkUEddLQCOsPOx2eRUykHLQ= X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2129; 31:B7cgH6QF86i6Y/EvbUWNQmbmw9rWk5g0ZmKnFZWBaKlJHnJd+XvY1ZKBE4QQ85871OHDS/fnlTWOQDhgDIJ9+MQHfaEUtK2twtArWeXC7TAJG2Y7Sd+c3epPD8lAUCwRZg726j9nDdWj83qL+hEwFEzJRbcHjhP41N3/nwLeOzp/+5iWNWpJIThasf6ZcZcPCGTv4Dz4MvwR00HeanOdLxizh49gCEWnwcOhbFF/0bA=; 20:3+3yZrR4mLLmx1HhfED6Ze7hG4QcoVxsLrXKUc+Fya48p8l06Ii7qByuK2MFmKmtPZmxqRqVYT+kjeHYGAyRkgFk6e5+UJ9KQ8uVFlL/YKIyna64rHUOP6bi7eNGhi3U1OrorK3tAlCPjrb22OPO9vZzD1OXNKlozX/TtjSesaXkl/uEa0/mFZTG44nq/fB5TEWQbAul3bTq08d2XiG2IIbAtO3ttRio8PR0MxpLysCvYPJSA+z2dTXgMCDb6r5Du9osvfYega8OBXk1R2kZr0bxiYxCfQs5GTaP6x4iVv4vAqkLB9wuQYyxv7kUvAxHHshZXVFxk6cbWG1GG57VfTZ9g8n/bBl73p+b+NK1PFh6VyS2xMM0Tnuk5TX80QZdu24EI2vtsgDC6dOHCRTEItm5TMcBb3rOXFiQGcA8XGhsUUDtna0uu0G6hR717eT9NzCAp/oo3DtmbV1/vt0AfIxV+DdRkD9MIFfLQLI/H2gdScudrZ6FzobdKB85pSWKvl8Z4HnVcuIDV9dYQWIxrdgrGiHM4z7I7gu2R7KZzmqI98AX9RqaoPjIkR2vexdABLNSsZqHKRRcUmMD1fKHkxRSLz08jfDJg6yyA44DGgw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:BN4PR07MB2129; BCL:0; PCL:0; RULEID:; SRVR:BN4PR07MB2129; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2129; 4:KE1LVcgg2k0hJNQEOarsX6q/AAriyECCAK7OOO2lk1l5iU6JHSObzjYMxEfz7igjp6Qmwp0qlUWraCmJ3g3985G8dKjbTYDGsBh1YfzgxJbsN9kf2yDlPc6zMni3PcmKja1T1hB4pnlhfN0W2Ox8pSyyTNNkU3TIPd7hND/4306WpUT/f3f+RGv8AI7mu6flywwrEvnMGj7eohV2Xlnthg4eWzzNnXwJRF+Jqo23+O2LyfDC8LGb8SRe9BZ6BBol4pyy1t9njLXd80ZmjJnln/I7XgT8BHXXfxwmEtJRmUqJr72AsH3kRpmkT3z3eH3IDs85j51VHQFoGL/iodyONWwqeZBqLoSifmaBIEyARjwPqZG2t4d0N8MWv+p3S95F X-Forefront-PRVS: 003245E729 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(76176999)(47776003)(3846002)(66066001)(105586002)(586003)(101416001)(6116002)(36756003)(81156014)(8676002)(50986999)(81166006)(4001430100002)(92566002)(97736004)(106356001)(48376002)(50466002)(53416004)(76506005)(33646002)(42186005)(110136002)(229853001)(2351001)(5003940100001)(107886002)(189998001)(68736007)(2950100001)(77096005)(19580395003)(4326007)(2906002)(7736002)(305945005)(50226002)(19580405001)(69596002)(7846002)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR07MB2129; 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; BN4PR07MB2129; 23:7n5zv4+c78ZCDA3/AWnS29L/e568QEsPUyVx86cui?= =?us-ascii?Q?q+/Amys5C1+Ul8Pvy/1q0CRuPt5EhRyYhubaMLwqut956SBKkgyneFOYvRA3?= =?us-ascii?Q?Q3PBdVc7mhWMcEMP7piJO7USaYXkiBisgiDhcBlV6ffjrB8eBWIQp5FXzJBu?= =?us-ascii?Q?VZW/4CUoZWidR5Fz6zsCE7Pj79yoQvwBiWANGDHPa5CAbXhLjqZn1zOvhiMi?= =?us-ascii?Q?bMxxpOeZCjvn3SaOJ9WBwE4qUdO6wiRC2xdKfYibA7wVTlrbx91vbN3d7e1g?= =?us-ascii?Q?u72HpTpMVQPA9/rlbtVs/E7ZRJ4dHOvfcWYpT6Xgro7tBwhTn9gE5MxMpf8l?= =?us-ascii?Q?nWCrb2xAUHNuzcRTwbt5e1bU07PlNST4E35xFmvr+DS5mJmAuIm91aS63buF?= =?us-ascii?Q?45+FnMmd8mGMjSSa+tHqxiyua+X2XxJKoLrEk55mj1I8FfOr3jxdlmWdFkyL?= =?us-ascii?Q?vyxmBTjY+A4Yz7U7MmqrKbrhLMZFnALQzf4Wtkbl7WLOJU7DRIsv7ZtKlK0Q?= =?us-ascii?Q?OncNk5zO3DOM05y99+6YPutubFvD92zSilrFecYx5qM8ieBHoDgwXUWd/4Km?= =?us-ascii?Q?xRBOdNENAOJRYugjFIFTi7SpdXohD3TsnsEytPOSQs3kMlF0qhgRL9yjNL8W?= =?us-ascii?Q?QvAXYANKqqtMgZGo2DnGyMSBG88qAY5yJxcMI+UNcVqbn60ZLG5O5EsXsD9L?= =?us-ascii?Q?I3wUlAh9G3rntuSof4U7F5h4SaKs0Ds2ysB6ARZuM/xPQM9DTESRC+SovPhq?= =?us-ascii?Q?fdJuixitLJJcQU6n3bT9HsYJbvCYN2H1CedCe9ysWmhzf+facbhKztZQB+Ua?= =?us-ascii?Q?VlswcVwFJsek+/qgmUwoV8V8zp+zEqZZGz59KN5vh2Yr67tXda3VaNHhcTs4?= =?us-ascii?Q?gLmfDkghMoGzznB5C5UgfEIEaCQlKbl96VXuYKAV4nuzrDPEINxleF64TEOL?= =?us-ascii?Q?hCl0DJk/BegAFs//0PfbMD5+WNQX12Rg3bkLAt0dwK/M5G1ZxkO/ezIjVSHM?= =?us-ascii?Q?obLtCjFbWzmr6BPxCB8vm9AvJMDoMYuaGXUCDu3DpBa8OLNNtECTn81ifhHa?= =?us-ascii?Q?+4fM7goga7chCYrhE3jI4S4zBv4mgGIBAHbp2o6bvNwtrlQY/U/BEgQy2pwU?= =?us-ascii?Q?CqjpqcOFeu5W28MkQF687hUzMb/Ov8TCCrg5wACMJyRbmuu+y5kzeAz1SZMp?= =?us-ascii?Q?chPckjNj3YRW7Zs6o+kFO2KZQteFEsgST08?= X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2129; 6:5l1VaBRmsNdVulrzjyBSo0ZoiuSkQq0yWLjKpGzds/meUp2x/OoFoh/bFb6W1fntkeEs3aLMNn6XBkcZuhI2rWGKyyoQV0WNrC9ohOs4xH1qb507RaN4vvsmJo9gReM4Iycatld0WleMxnZcVy+yKqly6p/eyymu5eqwC9sqcMheTm1ir7Zg5pPZUzi5dcWtxcPrkNpNikDywmTuxiUr4o0F/RErsAvCRA/BF7fQXVH7aoA+JTJKDfLFAVUoxZiCG+UenJrMsnPSGKbeHoVA1gDS9mMjU/IjPqNLCzCVa6A=; 5:zyi1lzfInDfkGq1XmXQQcJRHnat6SZ9ozveNjHi5vQb3mnp4739ACznxjW2NyP+nNIJYgnHgCzi7QJ4UIhS4dddNQ0UQqBqeESe992ATi7KqlrrPinoTNNhhGrYjrl9EEOMPhyPQGF86H08CR5nPqg==; 24:7/GbkQVTzmndiDEFAVqp38wl+N5zIpJXX2+GffJFAr1ae0k7qO+nMmfW8TIyWGTjpIhI2ExpQbl0mbEv71TopqswS3491xBF2nOmw42CozQ=; 7:vRTZc4qLT0KflMPB8v6OGk53+7n3yULSKQGQmS6BEXjcJD2UzQ7+4kNoN/XrgK3n6ZkAIXX130ik8RHE1j4GRT6jQtoKN4Z+7O8dzkJmzJX5f95pFc0TrV1xBbeAMiqlwT132O9yDljqDNLcUs0Sxh/D08YM2PggOykwTmrI0+cxIacVtwyKMHhbIhE0eeTw7BTcKsuy/s1LKqj6KiEWLvyA0ZdPJMDXPKSY4Ci4hu2IIy3sC7ZyiL7MWfW5WPYk SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2016 18:21:37.1838 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2129 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adds support for RX control commands on cn23xx device. 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 | 100 ++++++++++++++++++--- .../net/ethernet/cavium/liquidio/octeon_device.h | 1 + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 8 +- 3 files changed, 96 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 154584b..9399a99 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -98,6 +98,14 @@ struct liquidio_if_cfg_resp { u64 status; }; +struct liquidio_rx_ctl_context { + int octeon_id; + + wait_queue_head_t wc; + + int cond; +}; + struct oct_link_status_resp { u64 rh; struct oct_link_info link_info; @@ -1374,23 +1382,89 @@ static void octeon_destroy_resources(struct octeon_device *oct) } /** + * \brief Callback for rx ctrl + * @param status status of request + * @param buf pointer to resp structure + */ +static void rx_ctl_callback(struct octeon_device *oct, + u32 status, + void *buf) +{ + struct octeon_soft_command *sc = (struct octeon_soft_command *)buf; + struct liquidio_rx_ctl_context *ctx; + + ctx = (struct liquidio_rx_ctl_context *)sc->ctxptr; + + oct = lio_get_device(ctx->octeon_id); + if (status) + dev_err(&oct->pci_dev->dev, "rx ctl instruction failed. Status: %llx\n", + CVM_CAST64(status)); + WRITE_ONCE(ctx->cond, 1); + + /* This barrier is required to be sure that the response has been + * written fully before waking up the handler + */ + wmb(); + + wake_up_interruptible(&ctx->wc); +} + +/** * \brief Send Rx control command * @param lio per-network private data * @param start_stop whether to start or stop */ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop) { - struct octnic_ctrl_pkt nctrl; + struct octeon_soft_command *sc; + struct liquidio_rx_ctl_context *ctx; + union octnet_cmd *ncmd; + int ctx_size = sizeof(struct liquidio_rx_ctl_context); + struct octeon_device *oct = (struct octeon_device *)lio->oct_dev; + int retval; - memset(&nctrl, 0, sizeof(struct octnic_ctrl_pkt)); + if (oct->props[lio->ifidx].rx_on == start_stop) + return; - nctrl.ncmd.s.cmd = OCTNET_CMD_RX_CTL; - nctrl.ncmd.s.param1 = start_stop; - nctrl.iq_no = lio->linfo.txpciq[0].s.q_no; - nctrl.netpndev = (u64)lio->netdev; + sc = (struct octeon_soft_command *) + octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, + 16, ctx_size); + + ncmd = (union octnet_cmd *)sc->virtdptr; + ctx = (struct liquidio_rx_ctl_context *)sc->ctxptr; + + WRITE_ONCE(ctx->cond, 0); + ctx->octeon_id = lio_get_device_id(oct); + init_waitqueue_head(&ctx->wc); + + ncmd->u64 = 0; + ncmd->s.cmd = OCTNET_CMD_RX_CTL; + ncmd->s.param1 = start_stop; + + octeon_swap_8B_data((u64 *)ncmd, (OCTNET_CMD_SIZE >> 3)); + + sc->iq_no = lio->linfo.txpciq[0].s.q_no; + + octeon_prepare_soft_command(oct, sc, OPCODE_NIC, + OPCODE_NIC_CMD, 0, 0, 0); + + sc->callback = rx_ctl_callback; + sc->callback_arg = sc; + sc->wait_time = 5000; - if (octnet_send_nic_ctrl_pkt(lio->oct_dev, &nctrl) < 0) + retval = octeon_send_soft_command(oct, sc); + if (retval == IQ_SEND_FAILED) { netif_info(lio, rx_err, lio->netdev, "Failed to send RX Control message\n"); + } else { + /* Sleep on a wait queue till the cond flag indicates that the + * response arrived or timed-out. + */ + if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) + return; + oct->props[lio->ifidx].rx_on = start_stop; + } + + octeon_free_soft_command(oct, sc); } /** @@ -1417,10 +1491,8 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx) dev_dbg(&oct->pci_dev->dev, "NIC device cleanup\n"); - send_rx_ctrl_cmd(lio, 0); - if (atomic_read(&lio->ifstate) & LIO_IFSTATE_RUNNING) - txqs_stop(netdev); + liquidio_stop(netdev); if (oct->props[lio->ifidx].napi_enabled == 1) { list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) @@ -3558,7 +3630,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) /* Sleep on a wait queue till the cond flag indicates that the * response arrived or timed-out. */ - sleep_cond(&ctx->wc, &ctx->cond); + if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) { + dev_err(&octeon_dev->pci_dev->dev, "Wait interrupted\n"); + goto setup_nic_wait_intr; + } + retval = resp->status; if (retval) { dev_err(&octeon_dev->pci_dev->dev, "iq/oq config failed\n"); @@ -3758,6 +3834,8 @@ setup_nic_dev_fail: octeon_free_soft_command(octeon_dev, sc); +setup_nic_wait_intr: + while (i--) { dev_err(&octeon_dev->pci_dev->dev, "NIC ifidx:%d Setup failed\n", i); diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h index 8e28ff4..ec3cb22 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.h @@ -277,6 +277,7 @@ struct octdev_props { /* Each interface in the Octeon device has a network * device pointer (used for OS specific calls). */ + int rx_on; int napi_enabled; int gmxport; struct net_device *netdev; diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_main.h b/drivers/net/ethernet/cavium/liquidio/octeon_main.h index ebeef95..366298f 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_main.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_main.h @@ -181,22 +181,26 @@ cnnic_numa_alloc_aligned_dma(u32 size, #define cnnic_free_aligned_dma(pci_dev, ptr, size, orig_ptr, dma_addr) \ free_pages(orig_ptr, get_order(size)) -static inline void +static inline int sleep_cond(wait_queue_head_t *wait_queue, int *condition) { + int errno = 0; wait_queue_t we; init_waitqueue_entry(&we, current); add_wait_queue(wait_queue, &we); while (!(READ_ONCE(*condition))) { set_current_state(TASK_INTERRUPTIBLE); - if (signal_pending(current)) + if (signal_pending(current)) { + errno = -EINTR; goto out; + } schedule(); } out: set_current_state(TASK_RUNNING); remove_wait_queue(wait_queue, &we); + return errno; } static inline void