From patchwork Fri Dec 4 20:16:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 84761 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C4ADA09E3; Fri, 4 Dec 2020 21:18:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 716B7C9DC; Fri, 4 Dec 2020 21:17:44 +0100 (CET) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 60D87C9D0 for ; Fri, 4 Dec 2020 21:17:41 +0100 (CET) Received: by mail-pj1-f68.google.com with SMTP id e5so3793563pjt.0 for ; Fri, 04 Dec 2020 12:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=cFf6Ee5nD+nZc/uyGMtB8nsn7crXzqK6yAGkq2mfr8A=; b=fqil6sniZKmEOZ/xKUZ6nZqSdehtXNBSA37AvWX9KZ0oxXMSIkC7geVJrmGZXWqHLX dhozlVwDHp49SPoOZoVqAMWMy9vuFzuIURtAfgwA+ZY9evk5dpJMi+3vjKK2WKKL7Arr HBc4uARZtbmSP8u3JfpKHvxmGpqTpoMtt1IZGOascDJ1Isz51lJ74aaOZ6i09ULOmPpU ZJxOvnIBbu6muFSXxUWBFUUk1odf5z4SxnCQKQiTDSu/MTsREiUjA940g6S42iRr+Y7b M6n/Dopq4Vne4YfIjTw9vWbnPuGmx60YDP4/rPVf5xDedifYe7BlvKWd4axQPeYeBhhK nPrA== 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:in-reply-to:references; bh=cFf6Ee5nD+nZc/uyGMtB8nsn7crXzqK6yAGkq2mfr8A=; b=oA2tKwMtnsCh7fBwP+lQnCA/pPj8XFdFLGY8GAAvMN5o3RO/9QjXWZ2kYpSmHhDgGi 0UBRXBFMY2IL5ksNI7/3QyEv5K0RIVDd2ViT7tcjNpenNIPfsKNhtdEVNa7hHvUr2FGj zsyVUgQNve7ihoodcvxlig15AWJe6DcLqJiEvS6y3mohrcpKq2bgniTtqSokhLXgEhjN irnBvLA8tBJQ9ilJIeQATzcC1i01LY8jMiolHEZpZvEAwHUE/dzpukz9zYAmuu4usc5s 2WPsbCsLxHWXkzmNzMwr0uFrZwu7y188cGfLm1IwSvoOv4gxNd1jco57nKGkznKjck+y DQYQ== X-Gm-Message-State: AOAM5307umVImHBOwDTs/hIsqi+T8om0GA39PtYjx0i8zPb8YebwRDt6 Ze4JNCnwKMtXccieBso3I4T9C/9sqKFoVg== X-Google-Smtp-Source: ABdhPJw4edMDM3JSLSh3E1CJ+l04x8ZtxtfATM0VfrjCUjxa/j0hJjrN4KOn2Ej8Q8zu2r8hmeOYPQ== X-Received: by 2002:a17:902:ab98:b029:d8:c5e8:978a with SMTP id f24-20020a170902ab98b02900d8c5e8978amr5227628plr.56.1607113059320; Fri, 04 Dec 2020 12:17:39 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id z20sm2911805pjq.16.2020.12.04.12.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 12:17:38 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer , Neel Patel Date: Fri, 4 Dec 2020 12:16:41 -0800 Message-Id: <20201204201646.51746-5-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201204201646.51746-1-aboyer@pensando.io> References: <20201204201646.51746-1-aboyer@pensando.io> In-Reply-To: <20201203203418.15064-1-aboyer@pensando.io> References: <20201203203418.15064-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v3 4/9] net/ionic: check for cmd completion more frequently 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" This reduces the startup time a bit. Signed-off-by: Neel Patel Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_dev.h | 4 +++- drivers/net/ionic/ionic_main.c | 36 ++++++++++++++++----------------- drivers/net/ionic/ionic_osdep.h | 10 --------- 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index 532255a60..dc64a6d28 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -20,7 +20,9 @@ #define IONIC_LIFS_MAX 1024 -#define IONIC_DEVCMD_TIMEOUT 30 /* devcmd_timeout */ +#define IONIC_DEVCMD_TIMEOUT 5 /* devcmd_timeout */ +#define IONIC_DEVCMD_CHECK_PERIOD_US 10 /* devcmd status chk period */ + #define IONIC_ALIGN 4096 struct ionic_adapter; diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index 2ade213d2..f77bddaa4 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -144,12 +144,12 @@ static int ionic_wait_ctx_for_completion(struct ionic_lif *lif, struct ionic_qcq *qcq, struct ionic_admin_ctx *ctx, unsigned long max_wait) { - unsigned long step_msec = 1; - unsigned int max_wait_msec = max_wait * 1000; - unsigned long elapsed_msec = 0; + unsigned long step_usec = IONIC_DEVCMD_CHECK_PERIOD_US; + unsigned long max_wait_usec = max_wait * 1000000L; + unsigned long elapsed_usec = 0; int budget = 8; - while (ctx->pending_work && elapsed_msec < max_wait_msec) { + while (ctx->pending_work && elapsed_usec < max_wait_usec) { /* * Locking here as adminq is served inline (this could be called * from multiple places) @@ -160,8 +160,8 @@ ionic_wait_ctx_for_completion(struct ionic_lif *lif, struct ionic_qcq *qcq, rte_spinlock_unlock(&lif->adminq_service_lock); - msec_delay(step_msec); - elapsed_msec += step_msec; + rte_delay_us_block(step_usec); + elapsed_usec += step_usec; } return (!ctx->pending_work); @@ -195,9 +195,9 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) static int ionic_dev_cmd_wait(struct ionic_dev *idev, unsigned long max_wait) { - unsigned long step_msec = 100; - unsigned int max_wait_msec = max_wait * 1000; - unsigned long elapsed_msec = 0; + unsigned long step_usec = IONIC_DEVCMD_CHECK_PERIOD_US; + unsigned long max_wait_usec = max_wait * 1000000L; + unsigned long elapsed_usec = 0; int done; /* Wait for dev cmd to complete.. but no more than max_wait sec */ @@ -205,20 +205,20 @@ ionic_dev_cmd_wait(struct ionic_dev *idev, unsigned long max_wait) do { done = ionic_dev_cmd_done(idev); if (done) { - IONIC_PRINT(DEBUG, "DEVCMD %d done took %ld msecs", - idev->dev_cmd->cmd.cmd.opcode, - elapsed_msec); + IONIC_PRINT(DEBUG, "DEVCMD %d done took %ld usecs", + ioread8(&idev->dev_cmd->cmd.cmd.opcode), + elapsed_usec); return 0; } - msec_delay(step_msec); + rte_delay_us_block(step_usec); - elapsed_msec += step_msec; - } while (elapsed_msec < max_wait_msec); + elapsed_usec += step_usec; + } while (elapsed_usec < max_wait_usec); - IONIC_PRINT(DEBUG, "DEVCMD %d timeout after %ld msecs", - idev->dev_cmd->cmd.cmd.opcode, - elapsed_msec); + IONIC_PRINT(ERR, "DEVCMD %d timeout after %ld usecs", + ioread8(&idev->dev_cmd->cmd.cmd.opcode), + elapsed_usec); return -ETIMEDOUT; } diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index e04bb8f65..a55d59918 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -20,13 +20,8 @@ #include "ionic_logs.h" -#define DELAY(x) rte_delay_us(x) -#define usec_delay(x) DELAY(x) -#define msec_delay(x) DELAY(1000 * (x)) - #define BIT(nr) (1UL << (nr)) #define BIT_ULL(nr) (1ULL << (nr)) -#define BITS_TO_LONGS(nr) div_round_up(nr, 8 * sizeof(long)) #ifndef PAGE_SHIFT #define PAGE_SHIFT 12 @@ -44,11 +39,6 @@ typedef uint16_t __le16; typedef uint32_t __le32; typedef uint64_t __le64; -static inline uint32_t div_round_up(uint32_t n, uint32_t d) -{ - return (n + d - 1) / d; -} - #define ioread8(reg) rte_read8(reg) #define ioread32(reg) rte_read32(reg) #define iowrite8(value, reg) rte_write8(value, reg)