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 2D637A04E7; Mon, 2 Nov 2020 19:38:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7FCE549E0; Mon, 2 Nov 2020 19:36:29 +0100 (CET) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 1B0003976 for ; Mon, 2 Nov 2020 19:36:27 +0100 (CET) Received: by mail-pg1-f194.google.com with SMTP id 62so4248083pgg.12 for ; Mon, 02 Nov 2020 10:36:27 -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; bh=Qa5LPfpYYJpSSUt5DB2QuQbo8kkVH+yKtd2MsRWbamw=; b=wGF81XaNrTfF+vkqXJuA+pJJ0GbvZsaBBO56r0PVXNC173fqi/iIYudhsdpSN6UluK cK+MHc9jvTCqcVtAWpIW5fsG6PfJ1RMgvNkIFIGnmDhlpAu8xAYgtyLAOum03/tG12el ljdNkODaqHTx/w03YYqZM0EhYcg1CtDTQQLlsB/TTA4nm9eQuWu58RipxwWuj/1NR1H0 RTF6GnXphS248HYwew2ouRaU7wISu6EYgf+nrUGZJhZLxYE84meXALUPhhaZ1ZrePTvu I10Gsw1zGpXMK8BjnEfFUQeOf+JrdaFDMtDEXqlz/GGb/krAbwSppfeUXGllNkKt5T+e 0x3Q== 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=Qa5LPfpYYJpSSUt5DB2QuQbo8kkVH+yKtd2MsRWbamw=; b=VnTUmXwBXuGo3aTe5KURrvyi4gufNhf5zx8PmQBcYYQJ9/nok0bJTXkHp9TXhOo8MS vQ0kMyxxbWActcypA456D+dBGbP3cz3B/dhm/B4vqejE+oozm+LSqSJKg9Dvlo2qNFJf vpaxpn7YDXkpTcTUPUwX+GZpjan9yoJ166PMpxiqd7KlAXemJdX6iAexwYDRLMLjy8kq x0izmzudArLQqqpUWHu/eLsI2OxtldAl757Zo89EGYo54rot6DLqq46YIHk0bIPEaOO/ ur9rfJaPLfmCQ3g2IibYqltcZCSLqzVi3RiiXg0P+yqs6dNoJOQMAeTY2ijC5S5IqmO1 fFew== X-Gm-Message-State: AOAM531DwI1FbxlFstnZMMewLqrBYzQ2KolhzMcZWGZFik+LqyXBuFCf tOMP9eFlzx3DBB5mWlXcJ14usHi2yGUaOz78 X-Google-Smtp-Source: ABdhPJxYrJqvCa/YkhTIqb81o3gMK6RdbDGTdBd06hq5xSf5V6KwQv4CN9cL5jAdwxmLda1HGTbGWA== X-Received: by 2002:a05:6a00:8ca:b029:15d:7af3:8360 with SMTP id s10-20020a056a0008cab029015d7af38360mr15193831pfu.12.1604342184996; Mon, 02 Nov 2020 10:36:24 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id s4sm178186pjp.17.2020.11.02.10.36.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Nov 2020 10:36:24 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: cardigliano@ntop.org, Andrew Boyer Date: Mon, 2 Nov 2020 10:35:27 -0800 Message-Id: <20201102183527.69209-9-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201102183527.69209-1-aboyer@pensando.io> References: <20201102183527.69209-1-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH 8/8] ionic: nits - whitespace, logging, 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" These are minor cleanups which did not deserve their own patches. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 10 ++++------ drivers/net/ionic/ionic_lif.c | 22 ++++++++++----------- drivers/net/ionic/ionic_main.c | 4 +--- drivers/net/ionic/ionic_rxtx.c | 33 ++++++++++++++------------------ 4 files changed, 29 insertions(+), 40 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index ff5c2e51a..04d4c989c 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -571,7 +571,7 @@ ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev, if (reta_size != ident->lif.eth.rss_ind_tbl_sz) { IONIC_PRINT(ERR, "The size of hash lookup table configured " - "(%d) doesn't match the number hardware can supported " + "(%d) doesn't match the number hardware can support " "(%d)", reta_size, ident->lif.eth.rss_ind_tbl_sz); return -EINVAL; @@ -605,7 +605,7 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev, if (reta_size != ident->lif.eth.rss_ind_tbl_sz) { IONIC_PRINT(ERR, "The size of hash lookup table configured " - "(%d) doesn't match the number hardware can supported " + "(%d) doesn't match the number hardware can support " "(%d)", reta_size, ident->lif.eth.rss_ind_tbl_sz); return -EINVAL; @@ -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); } @@ -1264,7 +1263,6 @@ eth_ionic_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, } err = ionic_configure_intr(adapter); - if (err) { IONIC_PRINT(ERR, "Failed to configure interrupts"); goto err_free_adapter; diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 2e33fb8d9..018103c5b 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -85,7 +85,8 @@ ionic_lif_reset(struct ionic_lif *lif) } static void -ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats) +ionic_lif_get_abs_stats(const struct ionic_lif *lif, + struct rte_eth_stats *stats) { struct ionic_lif_stats *ls = &lif->info->stats; uint32_t i; @@ -305,10 +306,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 +321,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 @@ -658,7 +661,6 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type, new->base_z = rte_eth_dma_zone_reserve(lif->eth_dev, base /* name */, index /* queue_idx */, total_size, IONIC_ALIGN, socket_id); - if (!new->base_z) { IONIC_PRINT(ERR, "Cannot reserve queue DMA memory"); err = -ENOMEM; @@ -682,8 +684,8 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type, ionic_q_sg_map(&new->q, sg_base, sg_base_pa); } - IONIC_PRINT(DEBUG, "Q-Base-PA = %ju CQ-Base-PA = %ju " - "SG-base-PA = %ju", + IONIC_PRINT(DEBUG, "Q-Base-PA = %#lx CQ-Base-PA = %#lx " + "SG-base-PA = %#lx", q_base_pa, cq_base_pa, sg_base_pa); ionic_q_map(&new->q, q_base, q_base_pa); @@ -839,7 +841,6 @@ ionic_lif_alloc(struct ionic_lif *lif) lif->txqcqs = rte_zmalloc("ionic", sizeof(*lif->txqcqs) * adapter->max_ntxqs_per_lif, 0); - if (!lif->txqcqs) { IONIC_PRINT(ERR, "Cannot allocate tx queues array"); return -ENOMEM; @@ -847,7 +848,6 @@ ionic_lif_alloc(struct ionic_lif *lif) lif->rxqcqs = rte_zmalloc("ionic", sizeof(*lif->rxqcqs) * adapter->max_nrxqs_per_lif, 0); - if (!lif->rxqcqs) { IONIC_PRINT(ERR, "Cannot allocate rx queues array"); return -ENOMEM; @@ -863,8 +863,6 @@ ionic_lif_alloc(struct ionic_lif *lif) IONIC_PRINT(DEBUG, "Allocating Admin Queue"); - IONIC_PRINT(DEBUG, "Allocating Admin Queue"); - err = ionic_admin_qcq_alloc(lif); if (err) { IONIC_PRINT(ERR, "Cannot allocate admin queue"); diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index f77bddaa4..a0cbaebe2 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -181,15 +181,13 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx) if (err) { IONIC_PRINT(ERR, "Failure posting to the admin queue %d (%d)", ctx->cmd.cmd.opcode, err); - return err; } 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 diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index b953aff49..e955fdbfe 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -133,7 +133,7 @@ ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) { struct ionic_qcq *txq; - IONIC_PRINT_CALL(); + IONIC_PRINT(DEBUG, "Stopping TX queue %u", tx_queue_id); txq = eth_dev->data->tx_queues[tx_queue_id]; @@ -164,11 +164,6 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id, uint64_t offloads; int err; - IONIC_PRINT_CALL(); - - IONIC_PRINT(DEBUG, "Configuring TX queue %u with %u buffers", - tx_queue_id, nb_desc); - if (tx_queue_id >= lif->ntxqcqs) { IONIC_PRINT(DEBUG, "Queue index %u not available " "(max %u queues)", @@ -177,6 +172,9 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id, } offloads = tx_conf->offloads | eth_dev->data->dev_conf.txmode.offloads; + IONIC_PRINT(DEBUG, + "Configuring TX queue %u with %u buffers, offloads %lx", + tx_queue_id, nb_desc, offloads); /* Validate number of receive descriptors */ if (!rte_is_power_of_2(nb_desc) || nb_desc < IONIC_MIN_RING_DESC) @@ -215,10 +213,11 @@ ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) struct ionic_qcq *txq; int err; - IONIC_PRINT_CALL(); - txq = eth_dev->data->tx_queues[tx_queue_id]; + IONIC_PRINT(DEBUG, "Starting TX queue %u, %u descs", + tx_queue_id, txq->q.num_descs); + err = ionic_lif_txq_init(txq); if (err) return err; @@ -651,11 +650,6 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, uint64_t offloads; int err; - IONIC_PRINT_CALL(); - - IONIC_PRINT(DEBUG, "Configuring RX queue %u with %u buffers", - rx_queue_id, nb_desc); - if (rx_queue_id >= lif->nrxqcqs) { IONIC_PRINT(ERR, "Queue index %u not available (max %u queues)", @@ -664,6 +658,9 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, } offloads = rx_conf->offloads | eth_dev->data->dev_conf.rxmode.offloads; + IONIC_PRINT(DEBUG, + "Configuring RX queue %u with %u buffers, offloads %lx", + rx_queue_id, nb_desc, offloads); /* Validate number of receive descriptors */ if (!rte_is_power_of_2(nb_desc) || @@ -959,13 +956,11 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) struct ionic_qcq *rxq; int err; - IONIC_PRINT_CALL(); - - IONIC_PRINT(DEBUG, "Allocating RX queue buffers (size: %u)", - frame_size); - rxq = eth_dev->data->rx_queues[rx_queue_id]; + IONIC_PRINT(DEBUG, "Starting RX queue %u, %u descs (size: %u)", + rx_queue_id, rxq->q.num_descs, frame_size); + err = ionic_lif_rxq_init(rxq); if (err) return err; @@ -1045,7 +1040,7 @@ ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) { struct ionic_qcq *rxq; - IONIC_PRINT_CALL(); + IONIC_PRINT(DEBUG, "Stopping RX queue %u", rx_queue_id); rxq = eth_dev->data->rx_queues[rx_queue_id]; -- 2.17.1