From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AC485A04DB; Thu, 10 Dec 2020 03:09:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D944CC9A2; Thu, 10 Dec 2020 03:08:05 +0100 (CET) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id B6DC7C980 for ; Thu, 10 Dec 2020 03:08:01 +0100 (CET) Received: by mail-pl1-f196.google.com with SMTP id r4so1971508pls.11 for ; Wed, 09 Dec 2020 18:08:01 -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=LL3mYxc1tABLHfa480e1nK8JVJaEk9MwpQRgIi2Ow2YJhNk7YKa5hRO4oDHEZ1xSIh eWUqlqiSK07Fpee/rAEhj8UJd22ESFgtn3W7l5/Ymj7IxtcgJ9/PRIwdc1J/xzTE8zfJ yYp9HjJDPJxHEfJy/3FAqRoyszJDSURGk+gvXHPFkNzW7fXeG3XKfWmUUqK1N3HMPSc5 k92IGQnbKnMHObcNvInN+hXuZTk8oNagFE7bkJL1TY1b9bY75MQbCOqC7MGu6Sdfs+7Y LRwd1gC/UAiTaJ9uAJf9N/LNGD3jVysFs+b+JhxdygSMbNMh7TiEas8G4SJd3ZQwfKsM 6Jdg== 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=NlVQfco/5goI9VOLH0sHvExRFC7TnoqP9TgdvetXZIGFlaRpA1gjvzMTTJtEmIhKKS J6e4IGwy7EQxnu9UvSXO5MEPHVesQjSPvDcV+nOIZ1Jxf5eAN2AjopkraM3PWe0Hjb4r Tw4aHjsu+IlbayZCGjS3WAEFgYN+4e2l+QMKwA+/FITztmt3pZMQC4VrV0O28c8oFVrR 4SQLOfBQyIPqJHxPqQyChOyMCqte5J3cdsP+3FvFm5mz7YN+EgSSCxL/kiBtH4DRblaU imbtHw0Fhv967DnnXi9kOShwL/Om7TcpndV8qKanPYdOwXrecpkCP//7giq3seVnzZZR iEWw== X-Gm-Message-State: AOAM530pgO7L/wnazmg3TKRfvLoh9pjHZkX3lmkJFATKmCKK8tuVEnJd HOvkE8vgxnWFY69KohQd5y75+kYuOkFajQ== X-Google-Smtp-Source: ABdhPJz5Rm/kK0owkATrFWtgJDdfGTsXA5p8d5dn8gfH7PYBHLr2G/qPrPMkMXDYRllKMNerNYH30A== X-Received: by 2002:a17:902:c583:b029:da:b32c:cf9f with SMTP id p3-20020a170902c583b02900dab32ccf9fmr4502828plx.44.1607566079609; Wed, 09 Dec 2020 18:07:59 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id p185sm1344537pfb.165.2020.12.09.18.07.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 18:07:59 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer , Neel Patel Date: Wed, 9 Dec 2020 18:07:38 -0800 Message-Id: <20201210020743.68927-5-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201210020743.68927-1-aboyer@pensando.io> References: <20201210020743.68927-1-aboyer@pensando.io> In-Reply-To: <20201204201646.51746-1-aboyer@pensando.io> References: <20201204201646.51746-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v4 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) -- 2.17.1