From patchwork Fri Jun 15 18:13:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 138749 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1160779lji; Fri, 15 Jun 2018 11:14:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK07Np4ngWiwyPGKOwt52EF/cKz4f0mCWpwLywTk/B6G75VFy8rMoOkboZGbs5C9XnpaPDO X-Received: by 2002:a17:902:9681:: with SMTP id n1-v6mr75715plp.244.1529086474601; Fri, 15 Jun 2018 11:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529086474; cv=none; d=google.com; s=arc-20160816; b=SHOSc2txsq7vHSihzceyHtFYPpbwPA5JaAQdyMgwopZIZAAl0C6/9rBujuUgzmoAWZ B3HMf3Ko8y6X1U0apT2BJ7j/20uuB4VR/S0+4CIsX7Ad3wqVuJIZMcCWzuYJcWFqG3lX GTW/9pEXK47MNlhwhKNohixt1ZslOvBYr4VKcBqgz+EG4C1YIgQNRJS45E9FJ1bkkn/A WyVsQQ0PlZ0N7RLsaOP3RwhBa6eyZHurv9TcRvKsZuDtDmXXFmIkpOZJHCud3PlvbjCR PsyvJTfVic7ZUoUv2oc9y8dMUgEQw5uAY8RqYOs8v58vv7JfwUnuwjT2BhgauA87SAXK CMiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=m0EPNV9PY6l0QgOuy7PjTTS6a92xNNMAKQ2oPnDBFpI=; b=K0usgnuOVKdAGW1MD+HtIddSf8/8ZFIuqTy0G7oYskXbr8ik0cHym2xQso8sNucPJz Vekyce6a4bJBnvovfZEE4h8gDE7m+ob6xHjkyEmm9oN4uod6lCD5yDiWswQF3ITeePRb W/7nK2kYrZWYdzMi9DZgLDWwdDKhys6FRPg8SsBKqWnGdwHXj2ePEQ/8UwDt95Lnw5Rt DifYs+lPQt6u96nBOZ2+pfzv20uRUHWKjw/r3W/nkHxbOa3Q6iJNJoO6jBSmWk6fzJpr zF+24Mwv9FqeDwVUtAhfu01jYDxfD8JdXV2fa47D4t5+Ktbsx4ZHaZgT4b1vZqUydDGq qZjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jJATUTFH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10-v6si6868265pgu.238.2018.06.15.11.14.34; Fri, 15 Jun 2018 11:14:34 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=jJATUTFH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756537AbeFOSOc (ORCPT + 30 others); Fri, 15 Jun 2018 14:14:32 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34008 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756376AbeFOSNV (ORCPT ); Fri, 15 Jun 2018 14:13:21 -0400 Received: by mail-lf0-f67.google.com with SMTP id o9-v6so15909631lfk.1 for ; Fri, 15 Jun 2018 11:13:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m0EPNV9PY6l0QgOuy7PjTTS6a92xNNMAKQ2oPnDBFpI=; b=jJATUTFHlxG8+iCxeHe84+BuLN52pTFL3qU5jed7GmnovtocReP++itLoL7DutZ0oj WX7+Qy4Lst89Qkdv27epLmWRD8hufiQaHEH9PAVIwkMvnpaK53cQXcZmBBAcoiEOaeMU QXH0K2UQMsLt3yA1aj25dbpix+NNUDxgio1fQ= 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:mime-version:content-transfer-encoding; bh=m0EPNV9PY6l0QgOuy7PjTTS6a92xNNMAKQ2oPnDBFpI=; b=abMysCs33PnhDGQ+gMDHk+WCcrux1dZ/KggTaU0NEUtZEFI452n7NoELC3Xr+Twq7y wLQXa6cdMPIavP3s3GMibGau7fc1IVG8gN/AN9KLKBnsgyEDlQsf3hcVjYsp9QYi7x6K DbwiBORdmODFuXjmjE0ymKKmXtg0qt4ZFjU1sLG0Nrx7oeTWce35ZubGi2Fq3IWX4iXu jxID6mpR6Gt5fEayQXgp1MLk33qvevvkUh67Plu07GvFdNnEgUyiFLO6+CQANUffSb6I L8RUutvPSYee4dMLJhhi1MQiwPeNOxIWNfFWLb1hp6KBSoKTo/Flx+SihmLMy1d6W67E DzNw== X-Gm-Message-State: APt69E2mLfoVxmiRnNqBI2ON4RDVYwE2j5yPJaP6AWmlw/dagKpuB/U+ 06P+hdbdVuDNLMWMJzsqvZfBHg== X-Received: by 2002:a19:1c5:: with SMTP id 188-v6mr1887071lfb.67.1529086399336; Fri, 15 Jun 2018 11:13:19 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id h4-v6sm1543260ljc.8.2018.06.15.11.13.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jun 2018 11:13:18 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net Cc: corbet@lwn.net, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, vinicius.gomes@intel.com, henrik@austad.us, jesus.sanchez-palencia@intel.com, ilias.apalodimas@linaro.org, p-varis@ti.com, spatton@ti.com, francois.ozog@linaro.org, yogeshs@ti.com, nsekhar@ti.com, andrew@lunn.ch, Ivan Khoronzhuk Subject: [PATCH v3 net-next 3/6] net: ethernet: ti: cpsw: add MQPRIO Qdisc offload Date: Fri, 15 Jun 2018 21:13:07 +0300 Message-Id: <20180615181310.10437-4-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615181310.10437-1-ivan.khoronzhuk@linaro.org> References: <20180615181310.10437-1-ivan.khoronzhuk@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org That's possible to offload vlan to tc priority mapping with assumption sk_prio == L2 prio. Example: $ ethtool -L eth0 rx 1 tx 4 $ qdisc replace dev eth0 handle 100: parent root mqprio num_tc 3 \ map 2 2 1 0 2 2 2 2 2 2 2 2 2 2 2 2 queues 1@0 1@1 2@2 hw 1 $ tc -g class show dev eth0 +---(100:ffe2) mqprio |    +---(100:3) mqprio |    +---(100:4) mqprio |     +---(100:ffe1) mqprio |    +---(100:2) mqprio |     +---(100:ffe0) mqprio     +---(100:1) mqprio Here, 100:1 is txq0, 100:2 is txq1, 100:3 is txq2, 100:4 is txq3 txq0 belongs to tc0, txq1 to tc1, txq2 and txq3 to tc2 The offload part only maps L2 prio to classes of traffic, but not to transmit queues, so to direct traffic to traffic class vlan has to be created with appropriate egress map. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 82 ++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 406537d74ec1..edd14def98df 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -39,6 +39,7 @@ #include #include +#include #include "cpsw.h" #include "cpsw_ale.h" @@ -153,6 +154,8 @@ do { \ #define IRQ_NUM 2 #define CPSW_MAX_QUEUES 8 #define CPSW_CPDMA_DESCS_POOL_SIZE_DEFAULT 256 +#define CPSW_TC_NUM 4 +#define CPSW_FIFO_SHAPERS_NUM (CPSW_TC_NUM - 1) #define CPSW_RX_VLAN_ENCAP_HDR_PRIO_SHIFT 29 #define CPSW_RX_VLAN_ENCAP_HDR_PRIO_MSK GENMASK(2, 0) @@ -453,6 +456,7 @@ struct cpsw_priv { u8 mac_addr[ETH_ALEN]; bool rx_pause; bool tx_pause; + bool mqprio_hw; u32 emac_port; struct cpsw_common *cpsw; }; @@ -1577,6 +1581,14 @@ static void cpsw_slave_stop(struct cpsw_slave *slave, struct cpsw_common *cpsw) soft_reset_slave(slave); } +static int cpsw_tc_to_fifo(int tc, int num_tc) +{ + if (tc == num_tc - 1) + return 0; + + return CPSW_FIFO_SHAPERS_NUM - tc; +} + static int cpsw_ndo_open(struct net_device *ndev) { struct cpsw_priv *priv = netdev_priv(ndev); @@ -2190,6 +2202,75 @@ static int cpsw_ndo_set_tx_maxrate(struct net_device *ndev, int queue, u32 rate) return ret; } +static int cpsw_set_mqprio(struct net_device *ndev, void *type_data) +{ + struct tc_mqprio_qopt_offload *mqprio = type_data; + struct cpsw_priv *priv = netdev_priv(ndev); + struct cpsw_common *cpsw = priv->cpsw; + int fifo, num_tc, count, offset; + struct cpsw_slave *slave; + u32 tx_prio_map = 0; + int i, tc, ret; + + num_tc = mqprio->qopt.num_tc; + if (num_tc > CPSW_TC_NUM) + return -EINVAL; + + if (mqprio->mode != TC_MQPRIO_MODE_DCB) + return -EINVAL; + + ret = pm_runtime_get_sync(cpsw->dev); + if (ret < 0) { + pm_runtime_put_noidle(cpsw->dev); + return ret; + } + + if (num_tc) { + for (i = 0; i < 8; i++) { + tc = mqprio->qopt.prio_tc_map[i]; + fifo = cpsw_tc_to_fifo(tc, num_tc); + tx_prio_map |= fifo << (4 * i); + } + + netdev_set_num_tc(ndev, num_tc); + for (i = 0; i < num_tc; i++) { + count = mqprio->qopt.count[i]; + offset = mqprio->qopt.offset[i]; + netdev_set_tc_queue(ndev, i, count, offset); + } + } + + if (!mqprio->qopt.hw) { + /* restore default configuration */ + netdev_reset_tc(ndev); + tx_prio_map = TX_PRIORITY_MAPPING; + } + + priv->mqprio_hw = mqprio->qopt.hw; + + offset = cpsw->version == CPSW_VERSION_1 ? + CPSW1_TX_PRI_MAP : CPSW2_TX_PRI_MAP; + + slave = &cpsw->slaves[cpsw_slave_index(cpsw, priv)]; + slave_write(slave, tx_prio_map, offset); + + pm_runtime_put_sync(cpsw->dev); + + return 0; +} + +static int cpsw_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type, + void *type_data) +{ + switch (type) { + case TC_SETUP_QDISC_MQPRIO: + return cpsw_set_mqprio(ndev, type_data); + + default: + return -EOPNOTSUPP; + } +} + static const struct net_device_ops cpsw_netdev_ops = { .ndo_open = cpsw_ndo_open, .ndo_stop = cpsw_ndo_stop, @@ -2205,6 +2286,7 @@ static const struct net_device_ops cpsw_netdev_ops = { #endif .ndo_vlan_rx_add_vid = cpsw_ndo_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = cpsw_ndo_vlan_rx_kill_vid, + .ndo_setup_tc = cpsw_ndo_setup_tc, }; static int cpsw_get_regs_len(struct net_device *ndev)