From patchwork Sat Jul 21 11:59:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 142494 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4012005ljj; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeOpLW8fJeUhNm1yvMTaVU6SrPhAeggn7nTUtOVJW69HxNp73Uy7u8AH9SLQtO2BXW1wVmz X-Received: by 2002:a63:6a45:: with SMTP id f66-v6mr5291694pgc.81.1532174381767; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532174381; cv=none; d=google.com; s=arc-20160816; b=ah/NtgZghuLp6D2lKpfu/UsUnmrF5I1yL1NFdFGOIZTCT5EomoRaB+AIYsjcIRhkuP 0P8fvJLFje+RxSH4OVQShS68PBckn8v/oEBLR7w0i0ZvncxCLJ+5E3Tkv7l9we0s/cqb zmihMCNvqrUlmIsLGmSdum9G56+3nc+SLCygZCLFJPzs7p3wG4QPqP62KyJHuVPQgEYa AuVzUqZYxoXIwCei0QluD1FRDviGQeTIPqiO+HOb6JAc1dqBkoYTR/ZKZ6QIl7+7eoPC YCfXYPBhu8H6mkjPax+K3DQeSSltTavKYthdv4XXlznpTBzAlV6RfRxLY4pwMee8XbQ2 RrEg== 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=4oK9K76KxZmXtv4EYvWrY5kvlta67vtsvIcsdP7ITJk=; b=BC18Mu9xKkgvrPEmHdU1tneN02P9OinzTrcFzb+KfoseimPFnbU3CbxUrcFecQ2Lmv XnyLBJLqY2YhS0gi8tSMI2tjvaav3OjvytIn2QDd1q+y2UjZyR6F8OD34FcEZ9/bQiUf IwDhHeW8P5l3UZPTZ1GAjOQBiK4GGUOV/V6YQ/g6TAFSeMMYYxeQA4kGn595uu9+0L0M xAXto6aeer8UtXYuyf8Bph+C2euy+JIamwDoR6wu2UDNSoDA7W7OEMgG2+lezaRvNqXW YUAwqo3dGzZpku0/PWqmjooli9sFThU5Z4Iq56hYSKxZ5bvSbSmwQms+s3MnHyNbZjq0 KL1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K1UtCUGX; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (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 7-v6si2980743pll.369.2018.07.21.04.59.41; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K1UtCUGX; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728132AbeGUMwI (ORCPT + 5 others); Sat, 21 Jul 2018 08:52:08 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:44464 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728028AbeGUMwI (ORCPT ); Sat, 21 Jul 2018 08:52:08 -0400 Received: by mail-lj1-f193.google.com with SMTP id q127-v6so13184225ljq.11 for ; Sat, 21 Jul 2018 04:59:38 -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=95EtP6zyKXSlPMkmbpywBc8oLM61zDOoygw4GvJUQCc=; b=K1UtCUGXtWv0A3op8kRX6qqCsyZZsJ5qGKGwl5nBuKpyUt52VL/lH2eOztMiR6Wif6 jqlomxagmQlWz9QjU3vvYKOyyLS2+GEaNbt95szzvxVOqKRS6DiU1/RXFdK0JQRpNUQd HJnmnU8vxaF9O16R8JzY+uj6e3/GCNbbsMZR4= 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=95EtP6zyKXSlPMkmbpywBc8oLM61zDOoygw4GvJUQCc=; b=dzSdIJ7w5IbYsedGOBES96cuZc0P3gs45+VuRvkoVB2sAOeDSWZhD400DpEBKDk+gX 2YkvUsMkMo1xmAaSCwYJjR4IDRVcEfJuNGO8El8l4x9O8CqHdR/FPt76SMDf3QtJlwtf L4dRSMKaLa04DoajWfMSAYDP+lqw6ij1n8S3JDjOV0FKJuXZ8HIUkKLBCExGgTwkDom/ vvP3J54orCOsLVWnHDg9qOJMqk6JpF4GuDH/NB2bF34KI72fpbXK5U3+TlzucunRM4W3 sEgyMGzdXEK0lnmNmx1tyV1REPzbYatYiJzvwRgfZiap3ECZnVLfZFbKtNCn0gUX3OUz ttJw== X-Gm-Message-State: AOUpUlFlBZM1f9c66M+OIbXbRQjWQiCg9IHySVA5MdEmyBykoEYSoMyL qdznwl/g3MWVtL8OOXK3jCxIvA== X-Received: by 2002:a2e:2d0a:: with SMTP id t10-v6mr2716696ljt.8.1532174377296; Sat, 21 Jul 2018 04:59:37 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id 73-v6sm664260lfs.44.2018.07.21.04.59.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 04:59:36 -0700 (PDT) From: Ivan Khoronzhuk To: davem@davemloft.net, grygorii.strashko@ti.com 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 v4 net-next 3/6] net: ethernet: ti: cpsw: add MQPRIO Qdisc offload Date: Sat, 21 Jul 2018 14:59:20 +0300 Message-Id: <20180721115923.1389-4-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180721115923.1389-1-ivan.khoronzhuk@linaro.org> References: <20180721115923.1389-1-ivan.khoronzhuk@linaro.org> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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. Reviewed-by: Grygorii Strashko Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 82 ++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 4425b537b9dd..f099e0ed138d 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) @@ -454,6 +457,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; }; @@ -1578,6 +1582,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); @@ -2191,6 +2203,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, @@ -2206,6 +2287,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)