From patchwork Thu Dec 3 20:34:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 84745 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 CAD72A04B0; Thu, 3 Dec 2020 21:37:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D44DFC9DA; Thu, 3 Dec 2020 21:35:04 +0100 (CET) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id CF4BCCA2A for ; Thu, 3 Dec 2020 21:35:02 +0100 (CET) Received: by mail-pf1-f196.google.com with SMTP id q22so2070342pfk.12 for ; Thu, 03 Dec 2020 12:35:02 -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=ijNAd61IGYcSjRFUl2+upCJylzXS4UZOJGcg0UHpk00=; b=gvXRdHe1EIQBJo4NtQSpdoiJa6JhQc10nAiyo2zCEbXtbY1/swrspRdqLnoHNYp1R4 g4DNEnYXMCk/ItLbT9ExjgH2WTI6nLXqOhrF/iSgSjpcwyh6YWvHsm+FTxxoBfTToI5O gEcO59mRrFZPVrPeV1JFQQxLkXYq6zo04VAx+NdaZLNdoqaLpIZMUvUO6EqcCu+Gi9LZ VELxWbktANb5vojbYKe/uGZ54aNsZZozRGZqgfM3cSb7pmoNJfyCIfW78tp95CpGQVKk jJBINAjLryPwlBM3wydTGJSI4Y8y6Myy7tMWlNol57K3ZoQof/U9vuqHUPEfPcfwAQsX wtNA== 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=ijNAd61IGYcSjRFUl2+upCJylzXS4UZOJGcg0UHpk00=; b=HpVN3JV8BFHVNyg7J3ynJVkpyknTps7bcHWs6RDNnvd15avtbXW/l7lce7uH9HtH/5 Zte8vQz6co3nXqyYtj//V6JP4CpsjmxGEkrYAiyhBKB3pXm5rTnrTNXsq/RsWsofTOgZ j14H9lXJj25FilhPHyUyOSBhRfylwDWPDxoJw0S9/OYd2XjPkhZClVr1QZDgYZCHTB8+ DROgzgPp1nZeDwrKy/NJLLvCCZIkxaL8t8P6jLg3K+6IWtAT2aX9YYJ+wRP4PNr81Fkf iGd9NZrrKrnZO+UXYFCPRUqYSVZGt5TmHeBdCfrXecvXmLj6i1It/3ncR3Fy1bxanvwM uhtQ== X-Gm-Message-State: AOAM532QuTWS7Mku2trmdqa7w4DZa4IGO7VVfgs/oL0qYxcDxo3CkBJp Wq7z63hdM/zxvvsYXH0w8SCkieZ+LS+06A== X-Google-Smtp-Source: ABdhPJzG9CdzVn7BFKA84d6PoX2yVQ9BnxfBcdz2peAXi4CkjsyJZW4buqByqb34g1cLYKHxz5Q/4A== X-Received: by 2002:aa7:9387:0:b029:18b:42dd:41c with SMTP id t7-20020aa793870000b029018b42dd041cmr518124pfe.60.1607027700809; Thu, 03 Dec 2020 12:35:00 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id w145sm2709770pff.75.2020.12.03.12.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 12:35:00 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Thu, 3 Dec 2020 12:34:17 -0800 Message-Id: <20201203203418.15064-9-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203203418.15064-1-aboyer@pensando.io> References: <20201203203418.15064-1-aboyer@pensando.io> In-Reply-To: <20201102183527.69209-1-aboyer@pensando.io> References: <20201102183527.69209-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v2 8/9] net/ionic: minor refactorings and helper variables 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 makes the code clearer and conserves resources. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 5 ++--- drivers/net/ionic/ionic_lif.c | 15 ++++++++++----- drivers/net/ionic/ionic_main.c | 18 +++++++----------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index ce6ca9671..a1c35ace3 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -901,7 +901,7 @@ ionic_dev_start(struct rte_eth_dev *eth_dev) struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev); struct ionic_adapter *adapter = lif->adapter; struct ionic_dev *idev = &adapter->idev; - uint32_t allowed_speeds; + uint32_t speed, allowed_speeds; int err; IONIC_PRINT_CALL(); @@ -929,8 +929,7 @@ ionic_dev_start(struct rte_eth_dev *eth_dev) } if (eth_dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) { - uint32_t speed = ionic_parse_link_speeds(dev_conf->link_speeds); - + speed = ionic_parse_link_speeds(dev_conf->link_speeds); if (speed) ionic_dev_cmd_port_speed(idev, speed); } diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 2e33fb8d9..722a89565 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -77,11 +77,14 @@ void ionic_lif_reset(struct ionic_lif *lif) { struct ionic_dev *idev = &lif->adapter->idev; + int err; IONIC_PRINT_CALL(); ionic_dev_cmd_lif_reset(idev, lif->index); - ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); + err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); + if (err) + IONIC_PRINT(WARNING, "Failed to reset lif"); } static void @@ -305,10 +308,11 @@ ionic_dev_add_mac(struct rte_eth_dev *eth_dev, } void -ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused) +ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index) { struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev); struct ionic_adapter *adapter = lif->adapter; + struct rte_ether_addr *mac_addr; IONIC_PRINT_CALL(); @@ -319,11 +323,12 @@ ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused) return; } - if (!rte_is_valid_assigned_ether_addr(ð_dev->data->mac_addrs[index])) + mac_addr = ð_dev->data->mac_addrs[index]; + + if (!rte_is_valid_assigned_ether_addr(mac_addr)) return; - ionic_lif_addr_del(lif, (const uint8_t *) - ð_dev->data->mac_addrs[index]); + ionic_lif_addr_del(lif, (const uint8_t *)mac_addr); } int diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index f77bddaa4..92cf0f398 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -188,8 +188,7 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) done = ionic_wait_ctx_for_completion(lif, qcq, ctx, IONIC_DEVCMD_TIMEOUT); - err = ionic_adminq_check_err(ctx, !done /* timed out */); - return err; + return ionic_adminq_check_err(ctx, !done /* timed out */); } static int @@ -241,10 +240,11 @@ ionic_dev_cmd_wait_check(struct ionic_dev *idev, unsigned long max_wait) int err; err = ionic_dev_cmd_wait(idev, max_wait); - if (err) - return err; - return ionic_dev_cmd_check_error(idev); + if (!err) + err = ionic_dev_cmd_check_error(idev); + + return err; } int @@ -299,22 +299,18 @@ int ionic_init(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; - int err; ionic_dev_cmd_init(idev); - err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - return err; + return ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); } int ionic_reset(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; - int err; ionic_dev_cmd_reset(idev); - err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - return err; + return ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); } int