From patchwork Wed May 9 12:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 39585 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1DE121B643; Wed, 9 May 2018 14:47:33 +0200 (CEST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id A9A741B62F for ; Wed, 9 May 2018 14:47:26 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id u21-v6so50764482lfu.9 for ; Wed, 09 May 2018 05:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LEqcgExCZ7X6DSKvysZzWbBh8Kvt5SMgKpmXkO0bG+Q=; b=Q/5BMPDPoljhmToIWskgsCglc1bOhI0wWnliOwicJHSlHSupMn0nPevRMSq9DJwUQ+ rLecmKAgBTBY8EB1R8D5ZqdIio9+fEsvQEyfkqZO0UFCJplhES9cq0sxO8c04MehQ6gl 3pTg6hAb5+izmMrUSFkEDql8btIjjPADceYSgi1fhLz1wYCxoiJ9plXSRr1Sr8d6LKzp Tn+Q5/G/dDajkY+C9xb1C7dNvK+YpRha3e3cVLSdCw4/bS4GhkydWYzw/cYfPRBewiIa mANvwgjE6PTL78WCLtYxRnJvViD3IAIGQxchXgVjWXieKVKlSRWkZosYdC9W66miThGY nSAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LEqcgExCZ7X6DSKvysZzWbBh8Kvt5SMgKpmXkO0bG+Q=; b=ZAo8xvZ2VQ1dDf8AtN1b3qqDrduuTyzlvH85o1/XzbbhaeWt7tWcoAc4hzFJmxEvPm 1klxkq44lsPDq+XphMOIPZEdjFJzeQOLr8CryLgGMrpcus9Z80YkWbDQ6P2i7ks77ZDz e41VLM8l6o5GFMXTTHpigollUiV8BYb3OsM8v8V1NoR/5VgoV31b2ybSR1DDJHsnDfrt CoONMbLFm7WTF4ZoFV2WlV03KMiZfxv/LQdbxrv+3Qby1G4L3XeEt+F+6ZpqngEHEgEQ AUVvbcmSzQdE89m9bjwz7r7EYTPazwBRZ8CtXBmJMBwp7uLtCP3N9kxT9shpU00QKNg4 F8lQ== X-Gm-Message-State: ALKqPwcRp6PsJ0XgeEKbf+kMBaDUwHbCNvDzp1X1p21U4CswiqvHqo8B Un4fB4fQjz/Nee2xI2K1OMV8Qg== X-Google-Smtp-Source: AB8JxZog+E/tUwLTR2GaWGwmfUfJLzL5R0IdvyEiEQFPJWCUiE43tB5fsddFadcTT+ddoFuSvwGBBg== X-Received: by 2002:a2e:9911:: with SMTP id v17-v6mr323047lji.57.1525870046349; Wed, 09 May 2018 05:47:26 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id l10-v6sm5149258lja.62.2018.05.09.05.47.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 05:47:25 -0700 (PDT) From: Michal Krawczyk To: Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik Date: Wed, 9 May 2018 14:47:02 +0200 Message-Id: <20180509124714.23305-3-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180509124714.23305-1-mk@semihalf.com> References: <20180509124714.23305-1-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v1 12/24] net/ena: make watchdog configurable 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Rafal Kozik Add variable wd_state to make driver functional without keep alive AENQ handler. The watchdog will be executed only if the aenq group has keep alive enabled. Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 19 +++++++++++++++---- drivers/net/ena/ena_ethdev.h | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-) -- 2.14.1 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 2284a8c50..3383ba059 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -204,7 +204,8 @@ static const struct rte_pci_id pci_id_ena_map[] = { static struct ena_aenq_handlers aenq_handlers; static int ena_device_init(struct ena_com_dev *ena_dev, - struct ena_com_dev_get_features_ctx *get_feat_ctx); + struct ena_com_dev_get_features_ctx *get_feat_ctx, + bool *wd_state); static int ena_dev_configure(struct rte_eth_dev *dev); static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); @@ -489,6 +490,7 @@ ena_dev_reset(struct rte_eth_dev *dev) struct ena_adapter *adapter; int nb_queues; int rc, i; + bool wd_state; adapter = (struct ena_adapter *)(dev->data->dev_private); ena_dev = &adapter->ena_dev; @@ -514,11 +516,12 @@ ena_dev_reset(struct rte_eth_dev *dev) ena_com_admin_destroy(ena_dev); ena_com_mmio_reg_read_request_destroy(ena_dev); - rc = ena_device_init(ena_dev, &get_feat_ctx); + rc = ena_device_init(ena_dev, &get_feat_ctx, &wd_state); if (rc) { PMD_INIT_LOG(CRIT, "Cannot initialize device\n"); return rc; } + adapter->wd_state = wd_state; rte_intr_enable(intr_handle); ena_com_set_admin_polling_mode(ena_dev, false); @@ -1328,7 +1331,8 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count) } static int ena_device_init(struct ena_com_dev *ena_dev, - struct ena_com_dev_get_features_ctx *get_feat_ctx) + struct ena_com_dev_get_features_ctx *get_feat_ctx, + bool *wd_state) { uint32_t aenq_groups; int rc; @@ -1400,6 +1404,8 @@ static int ena_device_init(struct ena_com_dev *ena_dev, goto err_admin_init; } + *wd_state = !!(aenq_groups & BIT(ENA_ADMIN_KEEP_ALIVE)); + return 0; err_admin_init: @@ -1423,6 +1429,9 @@ static void ena_interrupt_handler_rte(void *cb_arg) static void check_for_missing_keep_alive(struct ena_adapter *adapter) { + if (!adapter->wd_state) + return; + if (adapter->keep_alive_timeout == ENA_HW_HINTS_NO_TIMEOUT) return; @@ -1471,6 +1480,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) int queue_size, rc; static int adapters_found; + bool wd_state; memset(adapter, 0, sizeof(struct ena_adapter)); ena_dev = &adapter->ena_dev; @@ -1514,11 +1524,12 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) adapter->id_number); /* device specific initialization routine */ - rc = ena_device_init(ena_dev, &get_feat_ctx); + rc = ena_device_init(ena_dev, &get_feat_ctx, &wd_state); if (rc) { PMD_INIT_LOG(CRIT, "Failed to init ENA device"); return -1; } + adapter->wd_state = wd_state; ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; adapter->num_queues = get_feat_ctx.max_queues.max_sq_num; diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index 1f6a7062f..594e643e2 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -196,6 +196,8 @@ struct ena_adapter { uint64_t keep_alive_timeout; bool trigger_reset; + + bool wd_state; }; #endif /* _ENA_ETHDEV_H_ */