From patchwork Fri Jan 27 21:05:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 720926 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v9BP33FPBz9t25 for ; Sat, 28 Jan 2017 08:14:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="koci/k2C"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751553AbdA0VOM (ORCPT ); Fri, 27 Jan 2017 16:14:12 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34093 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751220AbdA0VOH (ORCPT ); Fri, 27 Jan 2017 16:14:07 -0500 Received: by mail-pg0-f66.google.com with SMTP id 3so8088182pgj.1 for ; Fri, 27 Jan 2017 13:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VA/nDizkTB+7NuqKQCWmXtV87sKGGbsuVLBgheENQK8=; b=koci/k2CiGeSVF27xbmJmOaszesys4zkgxYU6HkAi4MFRKbIljFBh97bx8IA+IZKcQ x3Aiau/LjCBRo5cDeS07V8MTIglSQOuD4THRsSlBo2g5szhxlDXwWAGojUNdDLqytNpD J8OVYrSYqoHzeE15N84yvJNCDmECR70xba5Q8o10gsUofW4McrlB3juY5VyErn53KzdO gqLBMygDYIcFiaIwDifPqYJ7ov33oVzoqdGQNOcr42YQDD1rMY55h3A8coCBI7zI3NJF Tz2UXPxp5h2hnTXMkU205N61yW9EtcyFpll5MknIX5HjCsS/vBa0Z2/QE7OIkcFbI/ve BDrg== 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=VA/nDizkTB+7NuqKQCWmXtV87sKGGbsuVLBgheENQK8=; b=KaJA3XK/XrtJo5Qw2dbFfSs4JZB9qRaniOCbsG/O0hdsp5PqlifAwbey//CeIV17lm zgxUZ2iYUyYE3wDPqDDKb6dzSulLDXieEEdxOJlARe4XWVu+MtTCZKtXUU8pyUWWasrs CKaKB4ahs1Rw5oIKqEaYIDn+Mi3HoZCOmz7y40iqm0PcheGagZAouUS65f/G7MSTq1Lm QuaTVLKU3fXJuB/9Lrlju4s5JvEUAHEfYMrXBfjV+uEuNJuP9KEynYaOJhi+NAA0CRJW h1JiqmTd0LclXKxP2gJZT5Sx0lYjI9s1L4Ky6AWUu45Wk0uRkQLIBbqjPullgjjWJRLo mumg== X-Gm-Message-State: AIkVDXKajrdhosAncHsoHFy98/ltMXBBJxCJKqwTlDGphyYPEgrOzNRXD9khfawxq/WOrA== X-Received: by 10.99.174.71 with SMTP id e7mr11674895pgp.3.1485551122149; Fri, 27 Jan 2017 13:05:22 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id m6sm13507963pfm.22.2017.01.27.13.05.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 13:05:21 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, cphealy@gmail.com, Florian Fainelli Subject: [PATCH net-next 2/4] net: dsa: bcm_sf2: Configure traffic classes to queue mapping Date: Fri, 27 Jan 2017 13:05:13 -0800 Message-Id: <20170127210516.16704-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170127210516.16704-1-f.fainelli@gmail.com> References: <20170127210516.16704-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By default, all traffic goes to queue 0, re-configure the traffic classes to quality of service mapping such that priority X maps to queue X, where X is from 0 through 7. Signed-off-by: Florian Fainelli --- drivers/net/dsa/bcm_sf2.c | 9 +++++++++ drivers/net/dsa/bcm_sf2_regs.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 8eecfd227e06..637072da3acf 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -229,6 +229,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); s8 cpu_port = ds->dst[ds->index].cpu_port; + unsigned int i; u32 reg; /* Clear the memory power down */ @@ -240,6 +241,14 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, if (priv->brcm_tag_mask & BIT(port)) bcm_sf2_brcm_hdr_setup(priv, port); + /* Configure Traffic Class to QoS mapping, allow each priority to map + * to a different queue number + */ + reg = core_readl(priv, CORE_PORT_TC2_QOS_MAP_PORT(port)); + for (i = 0; i < 8; i++) + reg |= i << (PRT_TO_QID_SHIFT * i); + core_writel(priv, reg, CORE_PORT_TC2_QOS_MAP_PORT(port)); + /* Clear the Rx and Tx disable bits and set to no spanning tree */ core_writel(priv, 0, CORE_G_PCTL_PORT(port)); diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h index 3b33b8010cc8..6b63c00928ba 100644 --- a/drivers/net/dsa/bcm_sf2_regs.h +++ b/drivers/net/dsa/bcm_sf2_regs.h @@ -238,6 +238,10 @@ enum bcm_sf2_reg_offs { #define P_TXQ_PSM_VDD(x) (P_TXQ_PSM_VDD_MASK << \ ((x) * P_TXQ_PSM_VDD_SHIFT)) +#define CORE_PORT_TC2_QOS_MAP_PORT(x) (0xc1c0 + ((x) * 0x10)) +#define PRT_TO_QID_MASK 0x3 +#define PRT_TO_QID_SHIFT 3 + #define CORE_PORT_VLAN_CTL_PORT(x) (0xc400 + ((x) * 0x8)) #define PORT_VLAN_CTRL_MASK 0x1ff