Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEDD8C76190 for ; Mon, 22 Jul 2019 21:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9937021951 for ; Mon, 22 Jul 2019 21:41:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=pensando.io header.i=@pensando.io header.b="gNL5ZVdx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732856AbfGVVlA (ORCPT ); Mon, 22 Jul 2019 17:41:00 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:45855 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732831AbfGVVks (ORCPT ); Mon, 22 Jul 2019 17:40:48 -0400 Received: by mail-pf1-f194.google.com with SMTP id r1so17987741pfq.12 for ; Mon, 22 Jul 2019 14:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=7s6bVL1hdHqbTfc8XnXCdyQyDRZ/VzkkhjAOdj6sy7g=; b=gNL5ZVdxOXWJgEYmzig8AXKdc2nQC/NUbpTsQtON3YybS2MflnqAXWHgVwlM4tft0i IHtFHnHArQGS8DQjh+CP+IMj+Kn/ghWNdQk1eZyk5cZcU94GnKTrpJnbFLlf4wMTYg1A BN3Jl8/RmCUO0Cu0EJ16ZduaJg7QqpSgjzWWPuQdWgnqrLfCmcGFNWgFOFtp4IGl1Tua 6r10gWHA3tE8dAeEzM2EnOX40pRGFkpPH47s3IygMg4wKmU4kU+WFCYvDUGc/lF7vYe/ bXMyd05D6BE09QyXy1BPP8Su3h66VtDgqGwwCEk2qmlK+8moAd8B3KjZLOcCJUf30zdl ub2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=7s6bVL1hdHqbTfc8XnXCdyQyDRZ/VzkkhjAOdj6sy7g=; b=iaOFqg8X4NCwHhH/KOGqOfbfuckKeyjUIs+olPjpwSX/4jFxCUrlCUxtni6AiVBNSo YSdLxJjReckO1IQUqM4vHPG9cHuvxmeeqsc7m07Wo9kbzhfFPMYzMY1PSigZ1P4ypwG3 wuxVxenP51ykJvo6vi0NbJaGXRlt2DpwhZYruIlTjNBT/ESqKkkQdGKBlVjV1HbmyOL8 9UTyzZspSrJN5Qla8ASFRxtA2jf/QW7atTxd3wgt2Yt0636+ZQdMbN/u/9lUqltnIIx3 tMKdfooW5go80WqUFSOTYE8znj6nywMfpOINRLI77fKJKs/x0WPSFRuHjf2OJOoRZSf1 xg9w== X-Gm-Message-State: APjAAAXXCagi5ZxefOYAiS7viLQWzY7J8T9O5IRnOOUOgjZ+aZ//2xMz WbqiDlnP8T+GMIbTRWK4Xhhnzg== X-Google-Smtp-Source: APXvYqxdTAkmP6Elr8ovpbCxj2Ho1i0eiisTrqsMfPq7gE7zIIhufF9UclxChJPd3veooI+2lJAtLw== X-Received: by 2002:aa7:9aaf:: with SMTP id x15mr2358586pfi.214.1563831647979; Mon, 22 Jul 2019 14:40:47 -0700 (PDT) Received: from driver-dev1.pensando.io ([12.1.37.26]) by smtp.gmail.com with ESMTPSA id p65sm40593714pfp.58.2019.07.22.14.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jul 2019 14:40:47 -0700 (PDT) From: Shannon Nelson To: snelson@pensando.io, netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH v4 net-next 18/19] ionic: Add coalesce and other features Date: Mon, 22 Jul 2019 14:40:22 -0700 Message-Id: <20190722214023.9513-19-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190722214023.9513-1-snelson@pensando.io> References: <20190722214023.9513-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Interrupt coalescing, tunable copybreak value, and tx timeout. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic.h | 2 +- .../ethernet/pensando/ionic/ionic_ethtool.c | 105 ++++++++++++++++++ .../net/ethernet/pensando/ionic/ionic_lif.c | 13 ++- .../net/ethernet/pensando/ionic/ionic_lif.h | 1 + 4 files changed, 119 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index 9b720187b549..cd08166f73a9 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -11,7 +11,7 @@ struct lif; #define DRV_NAME "ionic" #define DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define DRV_VERSION "0.11.0-k" +#define DRV_VERSION "0.11.0-44-k" #define PCI_VENDOR_ID_PENSANDO 0x1dd8 diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c index 742d7d47f4d8..e6b579a40b70 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -377,6 +377,75 @@ static int ionic_get_coalesce(struct net_device *netdev, return 0; } +static int ionic_set_coalesce(struct net_device *netdev, + struct ethtool_coalesce *coalesce) +{ + struct lif *lif = netdev_priv(netdev); + struct identity *ident = &lif->ionic->ident; + struct ionic_dev *idev = &lif->ionic->idev; + u32 tx_coal, rx_coal; + struct qcq *qcq; + unsigned int i; + + if (coalesce->rx_max_coalesced_frames || + coalesce->rx_coalesce_usecs_irq || + coalesce->rx_max_coalesced_frames_irq || + coalesce->tx_max_coalesced_frames || + coalesce->tx_coalesce_usecs_irq || + coalesce->tx_max_coalesced_frames_irq || + coalesce->stats_block_coalesce_usecs || + coalesce->use_adaptive_rx_coalesce || + coalesce->use_adaptive_tx_coalesce || + coalesce->pkt_rate_low || + coalesce->rx_coalesce_usecs_low || + coalesce->rx_max_coalesced_frames_low || + coalesce->tx_coalesce_usecs_low || + coalesce->tx_max_coalesced_frames_low || + coalesce->pkt_rate_high || + coalesce->rx_coalesce_usecs_high || + coalesce->rx_max_coalesced_frames_high || + coalesce->tx_coalesce_usecs_high || + coalesce->tx_max_coalesced_frames_high || + coalesce->rate_sample_interval) + return -EINVAL; + + if (ident->dev.intr_coal_div == 0) + return -EIO; + + /* Convert from usecs to device units */ + tx_coal = coalesce->tx_coalesce_usecs * + le32_to_cpu(ident->dev.intr_coal_mult) / + le32_to_cpu(ident->dev.intr_coal_div); + rx_coal = coalesce->rx_coalesce_usecs * + le32_to_cpu(ident->dev.intr_coal_mult) / + le32_to_cpu(ident->dev.intr_coal_div); + + if (tx_coal > INTR_CTRL_COAL_MAX || rx_coal > INTR_CTRL_COAL_MAX) + return -ERANGE; + + if (coalesce->tx_coalesce_usecs != lif->tx_coalesce_usecs) { + for (i = 0; i < lif->nxqs; i++) { + qcq = lif->txqcqs[i].qcq; + ionic_intr_coal_init(idev->intr_ctrl, + qcq->intr.index, + tx_coal); + } + lif->tx_coalesce_usecs = coalesce->tx_coalesce_usecs; + } + + if (coalesce->rx_coalesce_usecs != lif->rx_coalesce_usecs) { + for (i = 0; i < lif->nxqs; i++) { + qcq = lif->rxqcqs[i].qcq; + ionic_intr_coal_init(idev->intr_ctrl, + qcq->intr.index, + rx_coal); + } + lif->rx_coalesce_usecs = coalesce->rx_coalesce_usecs; + } + + return 0; +} + static void ionic_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) { @@ -562,6 +631,39 @@ static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags) return 0; } +static int ionic_set_tunable(struct net_device *dev, + const struct ethtool_tunable *tuna, + const void *data) +{ + struct lif *lif = netdev_priv(dev); + + switch (tuna->id) { + case ETHTOOL_RX_COPYBREAK: + lif->rx_copybreak = *(u32 *)data; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + +static int ionic_get_tunable(struct net_device *netdev, + const struct ethtool_tunable *tuna, void *data) +{ + struct lif *lif = netdev_priv(netdev); + + switch (tuna->id) { + case ETHTOOL_RX_COPYBREAK: + *(u32 *)data = lif->rx_copybreak; + break; + default: + return -EOPNOTSUPP; + } + + return 0; +} + static int ionic_get_module_info(struct net_device *netdev, struct ethtool_modinfo *modinfo) @@ -641,6 +743,7 @@ static const struct ethtool_ops ionic_ethtool_ops = { .get_link = ethtool_op_get_link, .get_link_ksettings = ionic_get_link_ksettings, .get_coalesce = ionic_get_coalesce, + .set_coalesce = ionic_set_coalesce, .get_ringparam = ionic_get_ringparam, .set_ringparam = ionic_set_ringparam, .get_channels = ionic_get_channels, @@ -655,6 +758,8 @@ static const struct ethtool_ops ionic_ethtool_ops = { .set_rxfh = ionic_set_rxfh, .get_priv_flags = ionic_get_priv_flags, .set_priv_flags = ionic_set_priv_flags, + .get_tunable = ionic_get_tunable, + .set_tunable = ionic_set_tunable, .get_module_info = ionic_get_module_info, .get_module_eeprom = ionic_get_module_eeprom, .get_pauseparam = ionic_get_pauseparam, diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 68a9975e34c6..8473b065763b 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -744,9 +744,19 @@ static int ionic_change_mtu(struct net_device *netdev, int new_mtu) return err; } +static void ionic_tx_timeout_work(struct work_struct *ws) +{ + struct lif *lif = container_of(ws, struct lif, tx_timeout_work); + + netdev_info(lif->netdev, "Tx Timeout recovery\n"); + ionic_reset_queues(lif); +} + static void ionic_tx_timeout(struct net_device *netdev) { - netdev_info(netdev, "%s: stubbed\n", __func__); + struct lif *lif = netdev_priv(netdev); + + schedule_work(&lif->tx_timeout_work); } static int ionic_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, @@ -2009,6 +2019,7 @@ static int ionic_lif_init(struct lif *lif) ionic_link_status_check(lif); + INIT_WORK(&lif->tx_timeout_work, ionic_tx_timeout_work); return 0; err_out_notifyq_deinit: diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h index 0e6908f959f2..76cc519acd5a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h @@ -180,6 +180,7 @@ struct lif { unsigned int dbid_count; struct dentry *dentry; u32 flags; + struct work_struct tx_timeout_work; }; #define lif_to_txqcq(lif, i) ((lif)->txqcqs[i].qcq) -- 2.17.1