Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2030178imu; Wed, 21 Nov 2018 05:48:38 -0800 (PST) X-Google-Smtp-Source: AFSGD/WdOTDV+ByhrOR7ata9E9lQ8aWCLx3ibPr586UW4JM//hplB/NY9jE52bNqqTLHicAhCGiD X-Received: by 2002:a63:4101:: with SMTP id o1mr5964860pga.447.1542808118214; Wed, 21 Nov 2018 05:48:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542808118; cv=none; d=google.com; s=arc-20160816; b=FsID3lqRb2m4m8HGA4zBcoT2hT4pDF5vem2/emUBftLISu57BDK4z5cb+9R6pHS9i7 TY2lYp6rx1E7ZofViWPJItYhNj8jgv4oi5UiTPjMf9HRNMwaewIlKj1lMdFqdj55b32K JPChPLi2JKKo999VPTxTfr9tjlZ9XF0tQlBxO/6RrDLTZP1jUkHKMX3f524P2L910pmx 3xXTjOGUHFaR3QdjWXhdcVCXhou47WfZ+JhvVEoTfavuJ9uEYOv3X1cIkA3E2189Tq4g Jl8hc3x2ChtJ/dMvB1JVtJX482dZs853/fYSHHhknc9osHBf9dM48l+aMpHblPWwdu42 wMbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:reply-to:references:in-reply-to :message-id:date:subject:cc:to:from; bh=bdVba6Mx9VHvnJL1k7RdZSueLxF/tATzIppL+QBocmo=; b=Q2TyGGg8WTZ71b0T4nYVd00zx1++b27FTLovv6hDDNG252a9z+yM75wh3VfsC1bNmB 7DXOoXXFGL0xPbBurJ+yf/1ddmL+n50kPUnN+imLcrOr+FtreqD3h66OeNvMlJ1n72F/ VAc8aJXM/983HCY6z6hQ7jH8OnqN5pHzVIYi8TarRzEbBF/o00AJWzncs4QMrFB6sIzf IMYle9Fow9j3thgmBAXOhlHelcfJufR28RBxmR6LJ3Hxm11zAXz0wMSgy6GzhGbXbMll K+bEujZdb3MQtQTm/W3zQneqjvnHYQEG2FtdBpqZkyywtmrRo+tN1Zc1XBXs+r0hPDO0 Z9kA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b6si11664947pgm.216.2018.11.21.05.48.15; Wed, 21 Nov 2018 05:48:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730446AbeKUWP1 (ORCPT + 99 others); Wed, 21 Nov 2018 17:15:27 -0500 Received: from inva021.nxp.com ([92.121.34.21]:46562 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727343AbeKUWP0 (ORCPT ); Wed, 21 Nov 2018 17:15:26 -0500 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DB8E62002A1; Wed, 21 Nov 2018 12:41:20 +0100 (CET) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id CF5C42000C5; Wed, 21 Nov 2018 12:41:20 +0100 (CET) Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.82.91]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 1FB00205F3; Wed, 21 Nov 2018 12:41:20 +0100 (CET) From: Madalin Bucur To: davem@davemloft.net, netdev@vger.kernel.org Cc: leoyang.li@nxp.com, roy.pledge@nxp.com, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Madalin Bucur Subject: [PATCH v3 3/3] dpaa_eth: add ethtool coalesce control Date: Wed, 21 Nov 2018 13:41:09 +0200 Message-Id: <1542800469-6802-4-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1542800469-6802-1-git-send-email-madalin.bucur@nxp.com> References: <1542800469-6802-1-git-send-email-madalin.bucur@nxp.com> Reply-to: madalin.bucur@nxp.com X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow ethtool control of the DPAA QMan portal interrupt coalescing settings. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index 13d6e2272ece..62497119c85f 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c @@ -529,6 +529,75 @@ static int dpaa_get_ts_info(struct net_device *net_dev, return 0; } +static int dpaa_get_coalesce(struct net_device *dev, + struct ethtool_coalesce *c) +{ + struct qman_portal *portal; + u32 period; + u8 thresh; + + portal = qman_get_affine_portal(smp_processor_id()); + qman_portal_get_iperiod(portal, &period); + qman_dqrr_get_ithresh(portal, &thresh); + + c->rx_coalesce_usecs = period; + c->rx_max_coalesced_frames = thresh; + c->use_adaptive_rx_coalesce = false; + + return 0; +} + +static int dpaa_set_coalesce(struct net_device *dev, + struct ethtool_coalesce *c) +{ + const cpumask_t *cpus = qman_affine_cpus(); + bool needs_revert[NR_CPUS] = {false}; + struct qman_portal *portal; + u32 period, prev_period; + u8 thresh, prev_thresh; + int cpu, res; + + if (c->use_adaptive_rx_coalesce) + return -EINVAL; + + period = c->rx_coalesce_usecs; + thresh = c->rx_max_coalesced_frames; + + /* save previous values */ + portal = qman_get_affine_portal(smp_processor_id()); + qman_portal_get_iperiod(portal, &prev_period); + qman_dqrr_get_ithresh(portal, &prev_thresh); + + /* set new values */ + for_each_cpu(cpu, cpus) { + portal = qman_get_affine_portal(cpu); + res = qman_portal_set_iperiod(portal, period); + if (res) + goto revert_values; + res = qman_dqrr_set_ithresh(portal, thresh); + if (res) { + qman_portal_set_iperiod(portal, prev_period); + goto revert_values; + } + needs_revert[cpu] = true; + } + + return 0; + +revert_values: + /* restore previous values */ + for_each_cpu(cpu, cpus) { + if (!needs_revert[cpu]) + continue; + portal = qman_get_affine_portal(cpu); + /* previous values will not fail, ignore return value */ + qman_portal_set_iperiod(portal, prev_period); + qman_dqrr_set_ithresh(portal, prev_thresh); + } + + return res; +} + const struct ethtool_ops dpaa_ethtool_ops = { .get_drvinfo = dpaa_get_drvinfo, .get_msglevel = dpaa_get_msglevel, @@ -545,4 +614,6 @@ const struct ethtool_ops dpaa_ethtool_ops = { .get_rxnfc = dpaa_get_rxnfc, .set_rxnfc = dpaa_set_rxnfc, .get_ts_info = dpaa_get_ts_info, + .get_coalesce = dpaa_get_coalesce, + .set_coalesce = dpaa_set_coalesce, }; -- 2.1.0