From patchwork Sun Jul 3 20:56:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghu Vatsavayi X-Patchwork-Id: 643837 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 3rjNd46Frvz9sCY for ; Mon, 4 Jul 2016 07:31:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b=hgoe0Gxj; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932316AbcGCVbe (ORCPT ); Sun, 3 Jul 2016 17:31:34 -0400 Received: from mail-sn1nam01on0087.outbound.protection.outlook.com ([104.47.32.87]:17070 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932198AbcGCVbc (ORCPT ); Sun, 3 Jul 2016 17:31:32 -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=JyFZ3Q8xXvDSSVaL9S0+4SMJ9KUHj5FZrYm1zODJ62c=; b=hgoe0GxjSIGLcIa8MJgcG8XSMAWMT6RanvUdV6qav2Pvh3JzIT/hcvFu3xL8QB48K4YYxDBbPDKHCZGLCJTZjmfE9KOWckGLa8HsIZZenML/L2ZUp6cBVI62fhmCxyhwlI0Lxv5hX43dK3fuAtjR0AWH4K66E0P8yBGjcpJydQE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Raghu.Vatsavayi@cavium.com; Received: from localhost.caveonetworks.com (50.233.148.158) by SN1PR07MB2141.namprd07.prod.outlook.com (10.164.47.11) with Microsoft SMTP Server (TLS) id 15.1.528.16; Sun, 3 Jul 2016 20:57:34 +0000 From: Raghu Vatsavayi To: CC: , Raghu Vatsavayi , Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Subject: [PATCH net-next V2 04/10] liquidio: softcommand delay Date: Sun, 3 Jul 2016 13:56:50 -0700 Message-ID: <1467579416-24219-5-git-send-email-rvatsavayi@caviumnetworks.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1467579416-24219-1-git-send-email-rvatsavayi@caviumnetworks.com> References: <1467579416-24219-1-git-send-email-rvatsavayi@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.158] X-ClientProxiedBy: BLUPR0201CA0026.namprd02.prod.outlook.com (10.163.116.36) To SN1PR07MB2141.namprd07.prod.outlook.com (10.164.47.11) X-MS-Office365-Filtering-Correlation-Id: d8547ae7-8391-405c-6893-08d3a384a8e8 X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2141; 2:AiddSWAAA/CKAKfdLFiGfSjV5mOdZmytldONwMwRaAMsQJF6ID2ppNaBR/lb/r5lFMUElNsbM72XB1op2SIBzw3C1r56npPtu2JPl3xrD/zToJ/8jw4exyiQR9bpSIeHJIWSr+i3G7Fdsg/Qr8ibD2M+bDcD0TE7/4aLnsrR4yccCYiVBr1DHay6+eJeVdCc; 3:zqYU2tmk+Y7GnaBpY6hi6+r8RvOVzrT39422BZU8aNVNHKqNanpZSNsGc7uNKHjJ1wohQ/epzbdAiyvOokU6r5mj1075q+A9CM0AmhGxdRU7X0QZMpphKMmqAC+a+Bkq; 25:TFOuoUnzhEygKoy7MsUlIenW/1yuE8FVxzLWqgolLbhYa+liPJxaFIzuy5+E8pQ6roNcZ2p5Ncc/6ShA7J3pYqxzmmkNxBf0n0eIVjecncQ7HJmdgc/bqxLxKb8CKG+SSels6Ho1TsbJhFs0Enaph6AlK0czEj713c9rWzblkFbuPY1yOJdktNoaptw9JbCWQYoriCEqdq3Wecm15QY9BKWtQAXNERh/+d5Ntcu9nML/nYvNlABQMUtzz2rN1fvGkJ3MVDChC7hRpP1VoD2Fbyu7NK3PVn0is5S0yxkAogyp1e8tPY5vYlALE9SURh9LyB+ioqx5BBgB062b7cVdHI17H7OIX4DGsM5yFBpDYjUsTskUNWzgoYZeFMQ5WJEzaVv2KiyJOZC287QUyQKyOBAMBcF9SIgcMA0IgypsFaA=; 31:ODgb1whEUIZ1svcO7HHODTEVBrEdQG5wwNU273yJM6BT8UPv6F9joRhh6WRtANkc+4e0ymKzqCV+H0HM400DjLpq2jjCb7JtbvPnxA4eBBuC7/Y3w+ayyFhmixBxSi4LgSslD8KsimWyj3b4hZ0T6VO82g12e11uJDuPaVqF5GFM7emEOakEPCXC7s+qXNL9vb/Z1/A55/KYsjAE4lvqMA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2141; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2141; 20:qog0QIdHvLai68TpyWxJ2S89R6FHNef8GyG+wOFwT6eGAghG7yVkp+W4vJ/QcH9yQrH/5AIrvqJwEDAipl0rv7yT0BMHVpzBuslF0dLnTw/VjBFgncHhF/AWn6ES3BsSTDLgMtsas649h7J2UiMnD6gfeBwgBSYeV2McUjUV60YgrWkjPicA8TdNLhSO+I8XISNDXRgDbLd5BWnzjJRhnOc0yzCeH6kAXh7qMIqmHATPtcun3xqXDEK3pHMVddMu176k6wO0sM2pF265qmTvQPCvclbt1ddtcMjJEdfHmvlW6VQabxKBkYiZecFLnoqRDg1a3QCpudYeRBfaRm+ooJ8GvEc+DBT6CcHw3gR80gEUV+dr16HZlP/GXcQOrzYFM5MoD2znktZzwXT/7zkYSnJ/NRPLy9O663896I2O1F+ys2BMXaSPBOokCiRZK/mg3tjw8lL+6WTWaye+NaSKpPTxa8bvqLb8uzrYwrtpiaUxggDKgvKNQ+OgqEKMYnn2ubJzdkR1ww8wQBY7B7yCU7LxJEZQc7KSsAR9eCjgQfdb1M+log8Mi1Mh66sggFSYXJ3NSeY2KdEri7zKCYStMorkm7cq+DNEt1IzbyNYzIo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:SN1PR07MB2141; BCL:0; PCL:0; RULEID:; SRVR:SN1PR07MB2141; X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2141; 4:CkPXJp4L0wo0xlFlZ/oKbzhHmcHvt6pLEHwG73OJ4sdAUEg74NICQjLawCisQvBE6Z2HqszkEk6BWkantmXmTOrLuJKx1rdjL3s6N/K9M0gbe/JAHoCO17nvWkhQ0iOFYin2tlHS1t2OqKUB5QVTAbzuSd/PGqN3ohL6t7ZvEG1CJ0bMTl+9CADEHBcG+iEhgnlnCqgDozkLP0E1vssHTeACYC8RFiiUqJ+8eHcxfJTc9hWg2XVfeGYS/JbpZBippYmmFMLnbC+XSz0bMkATct1oF4Y945ytsYqYtap3sQXGnBGqrOg9x/HE/dzfVQScpV9YFkc78XPwDsBzX/GDeQppkhAXCN2zJ7W7UX19zDIDuXZfnC5b7CNxjIEhjV5B X-Forefront-PRVS: 09928BEC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(199003)(189002)(50226002)(4001430100002)(76506005)(47776003)(92566002)(68736007)(7736002)(7846002)(42186005)(305945005)(53416004)(8676002)(81156014)(81166006)(33646002)(107886002)(2906002)(2950100001)(101416001)(3846002)(50466002)(6116002)(19580405001)(575784001)(5003940100001)(4326007)(105586002)(106356001)(69596002)(110136002)(2351001)(19580395003)(76176999)(66066001)(36756003)(48376002)(229853001)(50986999)(77096005)(97736004)(189998001)(586003)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR07MB2141; 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; SN1PR07MB2141; 23:3WNDHjpAY1w1DadaOS/IUkWE9wu2WmS92gdVi7vIv?= =?us-ascii?Q?lm0oyjC3nFLQhyBPDdGFul8TzdKynXclLQSbiAlNvqhWJKK91jByOd3+gO01?= =?us-ascii?Q?TeQeRh2GcCl/A0JyHYQS/fTL5NN8yq7tj4kzYWKB8LuzbFzIVbURpgVTd0Hg?= =?us-ascii?Q?itgvCnHRlh234On5bawpq5dbrx7jNXGRqDfIFGgzUzcB4k4DQzAq9pjjOs5U?= =?us-ascii?Q?RAMcZuZkLEiVJYKyGiqk3ssMFt0ECHPfEbl0W7hsoGdIfmq5f/xRRlUvMyjv?= =?us-ascii?Q?tS23g/XkMOLT3XUh0yNOpKx/7AUOaXM+G/EFxEYIQk+Nr4x6W+uYg+jlnIi7?= =?us-ascii?Q?NpQrQzbS6/R7EhdLuqBk3avk+IgSJ3lVbh+CG4GntlwpEFQi9pdwIm7Hbb6d?= =?us-ascii?Q?BoWGoH4iGCWfNwMrDnSOTWchSwLzaEh7jyxuyiwKa3xi2dbg9YNQc5FQ6bS5?= =?us-ascii?Q?pRVOD87i3VG9/Ci+CkoT14hA4U8zPuxRyV2OTz6cd8j+r1shbnhkv3qaazPn?= =?us-ascii?Q?OzwbXB/3+B5NyCS1gBuClbarZxMm5GqUo/OLurGzaOYngCwVz1kouAew7xa0?= =?us-ascii?Q?jFGIA7ba5Z5hoeFTRrQeWis3n2jGd6U4AhUGsmyQrlNkgE3oBu/hFkpCFzvJ?= =?us-ascii?Q?8MsqyzUVihZxZcxHX923tRFIbsWuwA9F1GbbFvqXWATmt7kdXBpT7rYd0unB?= =?us-ascii?Q?QHldJL4nLyAqCCyuu6cm4O2tScbRZR6TsVYIk2ZdKjUhSOmQUZt8WXbzPjtM?= =?us-ascii?Q?4N58vqyG3YgaXwitnmazHyeMMH4MbbueZOVZnzXIhxnUgu3tXcFRjdiNzLBr?= =?us-ascii?Q?e5e97UV+SXsoR2dsQ8O0G3EVWOKnOvWPjGyrKvjVAlDDDl7tRahypDyhWIsk?= =?us-ascii?Q?4ARP8MiX4hIYpknsJb69swo9HA+J+9M/MQcHfqhQBBfXB1TiTZJhflfAXOin?= =?us-ascii?Q?iI1OH+JlJ3k57lZKxhT/9/vlqftCuWvU7n4oIvhl11INrxNxS1yWTtyVI2Dt?= =?us-ascii?Q?1uI21JTPNZhqsoihwImB++hz89SRwqo1OG9RrvVCIU2vgaA3hKxuq5mlotFo?= =?us-ascii?Q?yraSnsBMWPK0OiTZA1qEcRJHFnayA6v5/VGwE/I1j0VFxZELPu8MGQZ22zSi?= =?us-ascii?Q?3E0o9xU1MA6b/DhJJWhrrj3gRfiPfaiv+D+VTQyVp+lhEBY6em1gIiWASOW3?= =?us-ascii?Q?Sy+5GNcy/fwwFfaEsMKJSYdKtUyW7ctMDKQiGjI0UVx3A6hUXviBnmWlw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR07MB2141; 6:D0OD+OEcsF8ii5abYy3peaah9tfVI4WHIZhhOCMxjBMfoikoOwLwWOJnrIF08lHQXFejLT51uwzT2Ez47PtmaA/ooe6oGxyqLualq0gw9qXiaXuSwfsZ5Lx2xItc3Pc0nsG41lam/Xo/hdrOmT2GHJZM2mM7HK7qASMPRByAfAfIE3DRISZesrdV+0TcEu5XZwtIq43KbutUvWTmL5o74SEKOcjCOlg3TsjvcT8biuDnVHon2XRMOZdFNiJYFUiAG9qX5q2hVH4gr8zjIXlZfA6H5TKpbFgOkkJDmZhfTmE=; 5:RXvlh9MU6qIuMaqhkZrlUbUoeT1UU6dJtl52sYEABuq+leS6Ef8d1uVqVuTLcNoNOjlX1WWGc+7Q2HdBJfKh52dJPgMGHKtyFCW9cAtWH5vzFTk75lkpJSdkWp5KSJm/AMkwjLSu8NpSVH5/CGoSAg==; 24:464fBEz3nLIx1Pvx3cRudk7uFJW05VKUcS4cCSDTLQlU77Umymwdn9pPv5Vo/AEEcbN+4F97KBmiZxFYDzjmFrBSyuM3YK4SSmJWtSvjfu4=; 7:EyMHvA56P8guV8gn4/ErmPHWe3C+OM10yPi2S24DaUQS+BAkW27aZQM4r65AGVHKCj2vuHqE6nwk93GiBO5SjfTTzVlZa5sl24DTfPPWjFwxQMRHtlC41izPsa5/IZlPHgZzUjg8JWYHNKyrl+QS1VB2X+q73yzaygYh5wEWc0jVF9Fn7nM1OTHyWhJ7A0nIMNo33AN6tU3H4U436sFvhJ+UhIHEGc3pEsc4zyG3h7D+3x8VUHFDFrefOZJNWamP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2016 20:57:34.4868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2141 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch updates the delay constant for softcommands in accrodance with new requirements. 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 | 2 +- drivers/net/ethernet/cavium/liquidio/request_manager.c | 3 ++- drivers/net/ethernet/cavium/liquidio/response_manager.c | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 3d229c0..906d32e 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -3555,7 +3555,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) sc->callback = if_cfg_callback; sc->callback_arg = sc; - sc->wait_time = 1000; + sc->wait_time = 3000; retval = octeon_send_soft_command(octeon_dev, sc); if (retval == IQ_SEND_FAILED) { diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c index ef0bdd8..3f7044c 100644 --- a/drivers/net/ethernet/cavium/liquidio/request_manager.c +++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c @@ -523,9 +523,10 @@ static void check_db_timeout(struct work_struct *work) struct octeon_device *oct = (struct octeon_device *)wk->ctxptr; unsigned long iq_no = wk->ctxul; struct cavium_wq *db_wq = &oct->check_db_wq[iq_no]; + u32 delay = 10; __check_db_timeout(oct, iq_no); - queue_delayed_work(db_wq->wq, &db_wq->wk.work, msecs_to_jiffies(1)); + queue_delayed_work(db_wq->wq, &db_wq->wk.work, msecs_to_jiffies(delay)); } int diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.c b/drivers/net/ethernet/cavium/liquidio/response_manager.c index 0cc2f66..709049e 100644 --- a/drivers/net/ethernet/cavium/liquidio/response_manager.c +++ b/drivers/net/ethernet/cavium/liquidio/response_manager.c @@ -52,7 +52,7 @@ int octeon_setup_response_list(struct octeon_device *oct) INIT_DELAYED_WORK(&cwq->wk.work, oct_poll_req_completion); cwq->wk.ctxptr = oct; oct->cmd_resp_state = OCT_DRV_ONLINE; - queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(100)); + queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(50)); return ret; } @@ -162,6 +162,5 @@ static void oct_poll_req_completion(struct work_struct *work) struct cavium_wq *cwq = &oct->dma_comp_wq; lio_process_ordered_list(oct, 0); - - queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(100)); + queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(50)); }