From patchwork Sun Nov 20 08:45:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Netanel Belgazal X-Patchwork-Id: 696988 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 3tM52g2gDBz9ssP for ; Sun, 20 Nov 2016 19:47:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=annapurnalabs-com.20150623.gappssmtp.com header.i=@annapurnalabs-com.20150623.gappssmtp.com header.b="yfjukxrh"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbcKTIrA (ORCPT ); Sun, 20 Nov 2016 03:47:00 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36405 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753347AbcKTIqe (ORCPT ); Sun, 20 Nov 2016 03:46:34 -0500 Received: by mail-wm0-f43.google.com with SMTP id g23so100132849wme.1 for ; Sun, 20 Nov 2016 00:46:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=annapurnalabs-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TsdMo8uJSn0K4ZgKrWcndkl5f6OcxvJrsSsC8mipWlw=; b=yfjukxrh7ezk/fzUq9b9SqAUM1slsb/FhIW8ZBtXe3nERNT8584jiZ6X7SsKR/mgBQ PRr9Jl02WAulagN5jsTMGuwMMUlml5b9eDcbW0d+ev4oMPpjXNTiNmNNa4x2GmtREvji UMD864veCLvZlUVSRo6xmZjwb+VHGD8qwNIysTSSSh7nPrtKeD+zUoP4MzV+rcCks8Zt MJQKzVMEEowKXAgE2tPeT72ZJh9G2XIZ4ZsZ4xaOYveIAwOxaE8hMnlnEXkHbtZZT5R2 qWEFYv8eWJ7VRkIJUBp88KWy+JOM7KsxU1ld7UEfLVbUpY9jZb3LkF1ByHeMyiFRbqGo lVbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TsdMo8uJSn0K4ZgKrWcndkl5f6OcxvJrsSsC8mipWlw=; b=P0Ly2x5EKnP55lh06xccEPuhr8+9v2Aj7dVaFDp4ZuKhEZVbezhftsOHSIv4MPIHTm 6W9qV6qAho1A0OrwoqUgewb+bLdvGW+4VJfH7qgLG1lBtXqORzzbuPg6srDqfmSG9X4w vijTm+feF/L3ktVuld7iPgzmrV07nMFwYPqVFChA85OaaGMwOntjkZBiJJPtxz/xXIXI mZEUVpsDbgVdYPgL7hI+z7fuJubUd6r3Mu9htDPUDkJs0WiRVduC9PdM37sqL8C0FA79 JQuT8xQPbjX4yGTf7/JQ5oZ8DZPdsogi7Ga3bIaEyuf7vqebkfNXA+ktyDkbzJRtKvs1 hI3g== X-Gm-Message-State: AKaTC01GK7FS9aSgTMcxmaJQV3HZWJw4zDhQRxk7fygXRxiUo50060IWm12zLjCCBh5KXGuJ X-Received: by 10.28.187.11 with SMTP id l11mr7118983wmf.72.1479631593351; Sun, 20 Nov 2016 00:46:33 -0800 (PST) Received: from ufc3fdb423583570da529.ant.amazon.com ([82.166.188.253]) by smtp.gmail.com with ESMTPSA id pd2sm18288960wjb.31.2016.11.20.00.46.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Nov 2016 00:46:32 -0800 (PST) From: Netanel Belgazal To: linux-kernel@vger.kernel.org, davem@davemloft.net, netdev@vger.kernel.org Cc: Netanel Belgazal , dwmw@amazon.com, zorik@annapurnalabs.com, alex@annapurnalabs.com, saeed@annapurnalabs.com, msw@amazon.com, aliguori@amazon.com, nafea@annapurnalabs.com Subject: [PATCH net 18/18] net/ena: change driver's default timeouts and increase driver version Date: Sun, 20 Nov 2016 10:45:47 +0200 Message-Id: <1479631547-29354-19-git-send-email-netanel@annapurnalabs.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479631547-29354-1-git-send-email-netanel@annapurnalabs.com> References: <1479631547-29354-1-git-send-email-netanel@annapurnalabs.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Driver version was increased to 1.1.2 Signed-off-by: Netanel Belgazal --- drivers/net/ethernet/amazon/ena/ena_com.c | 4 ++-- drivers/net/ethernet/amazon/ena/ena_netdev.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c index b2891f9..9b158f0 100644 --- a/drivers/net/ethernet/amazon/ena/ena_com.c +++ b/drivers/net/ethernet/amazon/ena/ena_com.c @@ -36,9 +36,9 @@ /*****************************************************************************/ /* Timeout in micro-sec */ -#define ADMIN_CMD_TIMEOUT_US (1000000) +#define ADMIN_CMD_TIMEOUT_US (3000000) -#define ENA_ASYNC_QUEUE_DEPTH 4 +#define ENA_ASYNC_QUEUE_DEPTH 16 #define ENA_ADMIN_QUEUE_DEPTH 32 #define MIN_ENA_VER (((ENA_COMMON_SPEC_VERSION_MAJOR) << \ diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h index c081fd3..de1e5ac 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.h +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h @@ -39,12 +39,13 @@ #include #include #include +#include #include "ena_com.h" #include "ena_eth_com.h" #define DRV_MODULE_VER_MAJOR 1 -#define DRV_MODULE_VER_MINOR 0 +#define DRV_MODULE_VER_MINOR 1 #define DRV_MODULE_VER_SUBMINOR 2 #define DRV_MODULE_NAME "ena" @@ -100,7 +101,7 @@ /* Number of queues to check for missing queues per timer service */ #define ENA_MONITORED_TX_QUEUES 4 /* Max timeout packets before device reset */ -#define MAX_NUM_OF_TIMEOUTED_PACKETS 32 +#define MAX_NUM_OF_TIMEOUTED_PACKETS 128 #define ENA_TX_RING_IDX_NEXT(idx, ring_size) (((idx) + 1) & ((ring_size) - 1)) @@ -116,9 +117,9 @@ #define ENA_IO_IRQ_IDX(q) (ENA_IO_IRQ_FIRST_IDX + (q)) /* ENA device should send keep alive msg every 1 sec. - * We wait for 3 sec just to be on the safe side. + * We wait for 6 sec just to be on the safe side. */ -#define ENA_DEVICE_KALIVE_TIMEOUT (3 * HZ) +#define ENA_DEVICE_KALIVE_TIMEOUT (6 * HZ) #define ENA_MMIO_DISABLE_REG_READ BIT(0)