From patchwork Fri Dec 14 16:48:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1013630 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Gc3p5cwrz9s4s for ; Sat, 15 Dec 2018 03:50:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729804AbeLNQuN (ORCPT ); Fri, 14 Dec 2018 11:50:13 -0500 Received: from mout.gmx.net ([212.227.15.18]:56073 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729706AbeLNQuM (ORCPT ); Fri, 14 Dec 2018 11:50:12 -0500 Received: from localhost.localdomain ([91.14.94.237]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MCtql-1gfr0U3055-009e6C; Fri, 14 Dec 2018 17:49:13 +0100 From: Frank Wunderlich To: Matthias Brugger , netdev@vger.kernel.org, Sean Wang , Andrew Lunn , linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 5/8] net: dsa: dsa multi cpu (mt7530.c) Date: Fri, 14 Dec 2018 17:48:44 +0100 Message-Id: <20181214164847.4851-6-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181214164847.4851-1-frank-w@public-files.de> References: <20181214164847.4851-1-frank-w@public-files.de> X-Provags-ID: V03:K1:rOldRIXQjk6Jj4M4ljadTmh8ugrQIzZTHXwLF9aMCm5Jw8yVH9/ hzYWKph7N/KdheyxbO9GEu8ozYNyBSELqcPUvr12XxZ7X17y7oBMK9xUu7DAnaaQvIlHrxk SCBKcmgAh6gjAsvIuGpPrfU5Zrmg4IbPTALZrl9yRjhPLpPzlMDnETeB44yOhBg/M660K3Z KX7LxJ3xUku096d4+8TQg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:pBd8BR1Jh78=:VXoSGHUfZpWDMNswW0TGAz g2Ix7HiwRxnvo4RGQ0ilmFgyU2DA+SS9QszyQ9s9iuX3kfLoQvGFFjkMVA1ABAUZTGHGQ+zCS V1xEcORBUDeBMIxj4Gsp/VyYWBG5V5B1bc79iTszmNz+H/Ig+BQ+eRaZY8Zxf8TBkz0tCq/86 cfnpPUwqmZ5xcFxOvks6WV3F7/lb70wwbAV9rhsiw1VwT4JqjKon0NWr+vqRwPAsZoAWTz3Gk 5lnTdiTKvAHak0/e0WIU6+G6EYfq5L9mgk0a6vC4mEjncl4UjyySOvOWJkt4ulOBTUjTV9EbT KQX4ot28GpXWLmEsIbtI7qJ6FONh3FzTizGdAxJHwy9nDrqeOR31QckaD2ZeoEtUY6K3LYF+t dbIYacPmCDMCB0bbdUPimNBjRr7fbkdsHdMpKwG0yzhOPXqowK8oBhcK0sGqrQXwy+jRT4Pfu +Mhai1is+3nUvISQAUXuoCCX24mxItstS7FsCABQY+gcwv8MwoJUhofkca64teRjw4NeRdMF2 ircMa9ar73CddSDVfXG8DbiV6eJGmG9ePEToUgvttC4n0LBoLmp9apycd3geQDsIjcQeAI77E Y/UW+NOI3YMZbE+ZSXhPT2IKBR+hvMtjE3GPLMd+GnxUF7Ji6eDwMkzKNCjH9EagIDutDbo1I RD9Kj0/m11oLOG638w4oufy6UvZTut8klyNC0NN5aSXoOuqnor3ct9ccJdPAJur5A//GZmXE7 sjL9vGq79zVwB3YKhbpqInju179mWVNPgqUWROP43pYUyDYT4Dt3IJVk6y+KPjr2sWqqX372m vBzGK2rU1DvHx1ghWAVUIIkdym0gk4FOiNeLqiINUk3M5hwwh8joR/AF0aB2Jf+QthHQ39o+z GxGIgzAuy1AkJVhJP86QhRGILY2Cf5AvoGXhCUo8LtmGleQ5jEpUmBSLL/YvX5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org implementing changes to mt7530 switch driver for supporting multiple (2) cpu-ports based on https://github.com/openwrt/openwrt/blob/master/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch Signed-off-by: Frank Wunderlich --- drivers/net/dsa/mt7530.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a6a15a063e3e..441320d4d779 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -674,6 +674,9 @@ static int mt7530_cpu_port_enable(struct mt7530_priv *priv, int port) { + u8 port_mask = 0; + int i; + /* Enable Mediatek header mode on the cpu port */ mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); @@ -690,8 +693,14 @@ mt7530_cpu_port_enable(struct mt7530_priv *priv, /* CPU port gets connected to all user ports of * the switch */ + + for (i = 0; i < MT7530_NUM_PORTS; i++) + if ((priv->ds->ports[port].type == DSA_PORT_TYPE_USER) && + (dsa_port_upstream_port(priv->ds, i) == port)) + port_mask |= BIT(i); + mt7530_write(priv, MT7530_PCR_P(port), - PCR_MATRIX(dsa_user_ports(priv->ds))); + PCR_MATRIX(port_mask)); return 0; } @@ -701,6 +710,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port, struct phy_device *phy) { struct mt7530_priv *priv = ds->priv; + u8 upstream = dsa_port_upstream_port(ds, port); mutex_lock(&priv->reg_mutex); @@ -711,7 +721,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port, * restore the port matrix if the port is the member of a certain * bridge. */ - priv->ports[port].pm |= PCR_MATRIX(BIT(MT7530_CPU_PORT)); + priv->ports[port].pm |= PCR_MATRIX(BIT(upstream)); priv->ports[port].enable = true; mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, priv->ports[port].pm); @@ -774,7 +784,8 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; - u32 port_bitmap = BIT(MT7530_CPU_PORT); + u8 upstream = dsa_port_upstream_port(ds, port); + u32 port_bitmap = BIT(upstream); int i; mutex_lock(&priv->reg_mutex); @@ -875,6 +886,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; + u8 upstream = dsa_port_upstream_port(ds, port); int i; mutex_lock(&priv->reg_mutex); @@ -902,8 +914,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, */ if (priv->ports[port].enable) mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, - PCR_MATRIX(BIT(MT7530_CPU_PORT))); - priv->ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT)); + PCR_MATRIX(BIT(upstream))); + priv->ports[port].pm = PCR_MATRIX(BIT(upstream)); mt7530_port_set_vlan_unaware(ds, port); @@ -1194,15 +1206,7 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, static enum dsa_tag_protocol mtk_get_tag_protocol(struct dsa_switch *ds, int port) { - struct mt7530_priv *priv = ds->priv; - - if (port != MT7530_CPU_PORT) { - dev_warn(priv->dev, - "port not matched with tagging CPU port\n"); - return DSA_TAG_PROTO_NONE; - } else { - return DSA_TAG_PROTO_MTK; - } + return DSA_TAG_PROTO_MTK; } static int @@ -1275,7 +1279,7 @@ mt7530_setup(struct dsa_switch *ds) /* Enable Port 6 only; P5 as GMAC5 which currently is not supported */ val = mt7530_read(priv, MT7530_MHWTRAP); - val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; + val &= ~MHWTRAP_P5_DIS & ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; val |= MHWTRAP_MANUAL; if (!dsa_is_cpu_port(ds, 5)) { val |= MHWTRAP_P5_DIS;