From patchwork Tue Dec 11 19:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011340 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 43DqsJ32nvz9sCX for ; Wed, 12 Dec 2018 06:35:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbeLKTej (ORCPT ); Tue, 11 Dec 2018 14:34:39 -0500 Received: from mout.gmx.net ([212.227.15.18]:35729 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbeLKTeP (ORCPT ); Tue, 11 Dec 2018 14:34:15 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MVui8-1gv5yW0MwK-00X4CI; Tue, 11 Dec 2018 20:33:32 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 1/7] [DSA] adding fields for holding information about upstream-port Date: Tue, 11 Dec 2018 20:33:08 +0100 Message-Id: <20181211193314.10695-1-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:6e4Tt0QPCv1129zyq1CTat5YbKXl3QuCfFVnI8ILsXDi2GCjTem y9EFJSDGzeyReuMagnPqrmKiAoMyiGYotXfr4phS/lZpwyoyIAUyBi4yPn933lGaJHi5f6F Gh/Wq+TeMg5CUEXQkTrG2gQTJaXpRZmQTBw6vUl7kF28hC9+sxZ3tzTJ11bbce6b7gv++rE iF0mu9Li+V5aLIRq5G3rQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:48UIIgF5caM=:3VjltdEw65ve3QkcvnWep/ ClFtD4/7B4t2vr8i4hEXl64YPQS+GphTHMQw3WpYwWuXJMv0DBRSpM52LvUi3gsJod4xlc/EI bwkgmSKsfu1r1PI879zu3YkVRx/08rlOWR0qdVfVbUpu3uTI8TY7G3q5Gj1uXGlVy2yhsmbac gif7XbRttj+XrDxg1VUghFC/jhgdOG/cHlrQP+lcbpJBWP+F7/hWcfIKLtpywm3yKZ37BZk3+ L+z7HlMJvufiYyxkKiI658e/xLQIT4+DNW+WSVEWEeLdjAqr/00SSm+WFIIXx2u21R3Ckfd3V h1Kn1ryAVYSNKVkpsobNQHY/q5ipJ0fhxjhZoUpkGQ3f79gJSKLY3mBn9TwRq4feN8XIxyNQt 9barcXf22XmQWiVAi+4YD75hWy3FEpIGMXMnubX9fXtygtWCHIF6ZhaYWbjgcETnYicgiElps NiswbapRgt7ODl2b/X0RKSn898cOnX1t1ZtVu8uQklo9JqYJ5ZlRTKjsy9p75FYQY5hz24weX /sge15oAGS2vSHkQVp7Y/DGoqb5MrehnEdp/6v9h73oV/23G0vJDuhs8t/LS61hs+12y7thH4 IC2nAIR4cKM71Ajp46/IHfuHilMWixHumF6WwIxhSW53Yy5RjMo2laJz2/uZ/9LACPzlPr+0i NeeN31TK9W9gn/ubeQCOWpWX71M+3obzH/Q0MEcg6SAcgycXLcmQ2l0rG00nwGeBWGi7LyjvZ EcBHa/EcSdj74cpq4W2jUq96dyq8LktYaKEK4hiI7JyTEJBhy7j1gVzNWaMZpLEIlzHsv/vcn mubMvup3rzG4YTj5NnFN0rn2XXGyBCvq+lJ0R9JxAH8CS3BzG4Yn7xpJkQDSOJs7KfjwVJT93 edylQgUhYMo7VU4ebjDGXPxK5K1bnQ2trJV2v6uTiGehjvoZ5ipVauqAWx2PTS Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- include/net/dsa.h | 4 ++++ net/dsa/dsa_priv.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/include/net/dsa.h b/include/net/dsa.h index 23690c44e167..3efa81e08993 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -203,6 +203,10 @@ struct dsa_port { struct net_device *bridge_dev; struct devlink_port devlink_port; struct phylink *pl; + + struct net_device *ethernet; + int upstream; + /* * Original copy of the master netdev ethtool_ops */ diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 9e4fd04ab53c..cc0cd7675117 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -81,6 +81,8 @@ struct dsa_slave_priv { /* TC context */ struct list_head mall_tc_list; + + struct net_device *master; }; /* dsa.c */ @@ -188,7 +190,10 @@ static inline struct net_device * dsa_slave_to_master(const struct net_device *dev) { struct dsa_port *dp = dsa_slave_to_port(dev); + struct dsa_slave_priv *p = netdev_priv(dev); + if (p->master) + return p->master; return dp->cpu_dp->master; } From patchwork Tue Dec 11 19:33:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011336 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 43Dqs40Wxkz9sCh for ; Wed, 12 Dec 2018 06:34:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726984AbeLKTeS (ORCPT ); Tue, 11 Dec 2018 14:34:18 -0500 Received: from mout.gmx.net ([212.227.15.19]:38069 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726864AbeLKTeQ (ORCPT ); Tue, 11 Dec 2018 14:34:16 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MWBpJ-1gvMxT2drN-00XLBD; Tue, 11 Dec 2018 20:33:34 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 2/7] [DSA] add helper functions Date: Tue, 11 Dec 2018 20:33:09 +0100 Message-Id: <20181211193314.10695-2-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:Q/my6UytJVxyZLtJc7lh5FOPR8E+ADY9dIGQJ6QokjLi/F4DiGf 6YXNBT8dwo2tASrHjKJ0CTlhZxNHf+mRzlED69h8/IjldXLg78KujPVtRfkiIgE5cPO2YnY M6iUHKu8Vw4yPN3RNfZg3QUEn3L7HvZSS/wJnhnux4ROIWF/tE93C1preTXR+vfs2fuCxyK JvGS2b9zyKQ6jwBcPl34A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:9uJAsunHCT8=:JA4PNchNUuqM1nHmmGKkYd 249Xh7Yb4Baaa1PyJHKwYAy6o7Vwk2Nzlj1nE85GZ0+5zFA1IY9MJ0e1TvuD/P8y3FBuvK6ub 2I1SbUwl+eWg8EJCDrB0zDWFBFhcvvuLstzhy7+OcMGjGqw/N/gVJLrEPyN/12aBgR3EZ1Suj gcL+oQNlhinrJ0Tr1qVMsiy6C1ekkxu4ZLGhLxf905WJUk8ALRYeUBRg0WP1H/vwK3TIcgl2N 94EiQFKPcngLLx6aFtiNj6zgMxVxr9+35qf2RpxKzzRTDywQlS4P1SuzEo0+VlU79zjy8Wc1Q SKJ2z4ooPLloS0iXhjuIIa4Ri4iYfb3GgnLTRaO11L4xUGZ2nPKBGFPXHRzYNM7ZQb486xWoA LdHJB2yzjIFiej9Dmzvb7VUoFEwVrRwinFPYsTJ1ZMQZiKsIHnIAvJXWVxjnyoylmZcwBJ8O4 L3cMouXLQX93IugSNjiedMlQAiaYTVm19KVvcfRz9QCwMelH7Sou7EGpWaJLUxIggPoYd9HyM +S0O19S16cQ7mgm426BXfg3/saSFIa2tEUMqWJMqpN8D0d37OZHNhupUY3yTvxeyvnVwMMLgi nwFVt6OyVFQVJETweKv0u1z6RW4mojl3BiJycgLKHL2yKLH966jtA9Q2ZK9K0gjXvWZosXiHA 3g7rBFqlTcESfsizXECHAd10bnvzGqbRQstPvD5yvy97upni144f5IsHRRU4ufQQjDEygbw3X ImSNWoxRK7RiEyBPbMsAmfcfFq7zw7GTAwP0vONwVd1W4wXjja80MGw5sJuzOvy6MvUuFAMmJ hY8TcAd6plUZWmQSduaFKqaWrmXo10xX4TWL4F37pTrkBUFyyklJ1uPuGEiYz8Y5mP2qQ4F1y wgTZYTied0AufIIdtTGqtZIQ6juAACNJtvI08fzkaOsZ6C/IIM+9a3YCg/7vg5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- include/net/dsa.h | 18 ++++++++++++++++++ net/dsa/dsa2.c | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/net/dsa.h b/include/net/dsa.h index 3efa81e08993..612942ac56de 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -319,6 +319,12 @@ static inline unsigned int dsa_towards_port(struct dsa_switch *ds, int device, return ds->rtable[device]; } + +static inline bool dsa_is_upstream_port(struct dsa_switch *ds, int p) +{ + return dsa_is_cpu_port(ds, p) || dsa_is_dsa_port(ds, p); +} + /* Return the local port used to reach the dedicated CPU port */ static inline unsigned int dsa_upstream_port(struct dsa_switch *ds, int port) { @@ -331,6 +337,18 @@ static inline unsigned int dsa_upstream_port(struct dsa_switch *ds, int port) return dsa_towards_port(ds, cpu_dp->ds->index, cpu_dp->index); } +static inline u8 dsa_port_upstream_port(struct dsa_switch *ds, int port) +{ + /* + * If this port has a specific upstream cpu port, use it, + * otherwise use the switch default. + */ + if (ds->ports[port].upstream) + return ds->ports[port].upstream; + else + return dsa_upstream_port(ds, port); +} + typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid, bool is_static, void *data); struct dsa_switch_ops { diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index a1917025e155..77420675e9ed 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -255,6 +255,24 @@ static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst) dst->cpu_dp = NULL; } +static int dsa_user_parse(struct dsa_port *port, u32 index, + struct dsa_switch *ds) +{ + struct device_node *cpu_port; + const unsigned int *cpu_port_reg; + int cpu_port_index; + + cpu_port = of_parse_phandle(port->dn, "cpu", 0); + if (cpu_port) { + cpu_port_reg = of_get_property(cpu_port, "reg", NULL); + if (!cpu_port_reg) + return -EINVAL; + cpu_port_index = be32_to_cpup(cpu_port_reg); + ds->ports[index].upstream = cpu_port_index; + } + return 0; +} + static int dsa_port_setup(struct dsa_port *dp) { struct dsa_switch *ds = dp->ds; From patchwork Tue Dec 11 19:33:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011339 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 43DqsC4hQbz9sBn for ; Wed, 12 Dec 2018 06:34:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727112AbeLKTek (ORCPT ); Tue, 11 Dec 2018 14:34:40 -0500 Received: from mout.gmx.net ([212.227.15.15]:51571 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726851AbeLKTeP (ORCPT ); Tue, 11 Dec 2018 14:34:15 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LsCdj-1hamJM3fcl-013wyj; Tue, 11 Dec 2018 20:33:36 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 3/7] [DSA] adding handling of second CPU-Port Date: Tue, 11 Dec 2018 20:33:10 +0100 Message-Id: <20181211193314.10695-3-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:uULslvaJwqYnz381Koxpp6SKyzdTC4qeUILpCFIU4cdT8rKSU56 iv/wHJ6crRXZ/tTwcyFwxGkf8fi9XMcpX08h7hsiMoaUzBNf7gG7URiKAKS6pIHeEmAZxSz CofnXo9NEkz0YCFB2C/LjRBv0M2+OZcSVf3kLjI9C37axiUhtijlR/0RUzG7/3fSEEQPrEx xYxLjEitSJkFVYBU+lxEQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ek4UThKCdyQ=:meMDkmieU45Eup87jixZrk FYAlrUIMSYNp119ik5EV9+s1Gwx84nXo9SrCSG/G9Q9tGzOYTcnPCD1nEtEwOvA+MT7J8ovUH N1dYWMa5MW5o+aLpH7GT6R7yxgZg6ftYUWfv48ORI1UtQtWHKi63h8nV1fflVEoZ4Y1ietwWK o3liUs8DoqiHDoZ+EbwiAamJd76Q6TH9unSf4zEBIO6WjOaMh0IVRqHfZvvqmBOgNiNJbYFx2 Y9ZuI0cpr91mDEI2wDT5KYUxXEMCZ03sst6vbFpwIzVd1xCGmDW1h6/uHvwRUj1OUryZpcTbC C+FzVbkOxGXeRolng7+NXaPENhol7G5UH3nQ2qtZEWb0j1T7foHhR/ogTwMQm7OVks4VrEvug r7kXkbC6bAkxyEB19BuMjvFynCzdTlLxDKI4Nyj2EvSMWcojIw4d6rBcHcljyzmDWxL23M/sZ wZXFqelrqY6EojZYjGTkOtHZkFauTYL8ON35nh5gRQ0UBpkY5JEo97Vs42likl4BBrJJEatB5 490LOV0zCLrx41XUsLsEu3IfpE08uCS9KeU6HrvPm690T1QU0mtV7I0awh270y1l+0Sp8mL8D UW3x7SDhXulGHYFaE9ReabvE0XqtEY4FCCn6y7fNnn1vjozFrQC9ULYW84EtLnhqWa6Sr3M9s U/0ntKQ3k8aBA6cvVJ1IRaGkw/59pBu2s4+QYHEYDPLMIfwZhVpFb0mDg7jyRQG/Xfn2zOri7 yGVWEtb7s1feRfgRr8Bx/hqO//1ahvWV061/RT4ZrgXjLKdF2vI5GBucoflPZemLdxyf5VND1 qyAGRokZOZCmj4X+H2S2unEuuJj63lp4nlRBVE/6SdWQTuwmQygC/CIIZIQsao5hXfyUa+H9v wQlr6P82Lp0x+uKB3hLdaKu3/5rJWj3as7MTThsmBTU0jMOFK6+S+C5M14F+4/ Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- net/dsa/dsa2.c | 18 ++++++++++++++++++ net/dsa/slave.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 77420675e9ed..4a6ebfe647f0 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -303,6 +303,8 @@ static int dsa_port_setup(struct dsa_port *dp) ds->index, dp->index); return err; } + if (dp->master) + dp->master->dsa_ptr = dp; break; case DSA_PORT_TYPE_DSA: /* dp->index is used now as port_number. However @@ -323,12 +325,17 @@ static int dsa_port_setup(struct dsa_port *dp) devlink_port_attrs_set(&dp->devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, dp->index, false, 0); + err = dsa_user_parse(dp, dp->index, ds); + if (err) + return err; + err = dsa_slave_create(dp); if (err) dev_err(ds->dev, "failed to create slave for port %d.%d\n", ds->index, dp->index); else devlink_port_type_eth_set(&dp->devlink_port, dp->slave); + break; } @@ -344,6 +351,14 @@ static void dsa_port_teardown(struct dsa_port *dp) case DSA_PORT_TYPE_UNUSED: break; case DSA_PORT_TYPE_CPU: + dsa_port_link_unregister_of(dp); + if (dp->master) + dp->master->dsa_ptr = NULL; + if (dp->ethernet) { + dev_put(dp->ethernet); + dp->ethernet = NULL; + } + break; case DSA_PORT_TYPE_DSA: dsa_port_link_unregister_of(dp); break; @@ -598,6 +613,9 @@ static int dsa_port_parse_cpu(struct dsa_port *dp, struct net_device *master) dp->master = master; dp->dst = dst; + dev_hold(master); + ds->ports[dp->index].ethernet = master; + return 0; } diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 7d0c19e7edcf..f0fdb9e5d05f 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1312,11 +1312,11 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val) int dsa_slave_create(struct dsa_port *port) { const struct dsa_port *cpu_dp = port->cpu_dp; - struct net_device *master = cpu_dp->master; struct dsa_switch *ds = port->ds; const char *name = port->name; struct net_device *slave_dev; struct dsa_slave_priv *p; + struct net_device *master = ds->ports[port->upstream].ethernet; int ret; if (!ds->num_tx_queues) @@ -1355,6 +1355,7 @@ int dsa_slave_create(struct dsa_port *port) p->dp = port; INIT_LIST_HEAD(&p->mall_tc_list); p->xmit = cpu_dp->tag_ops->xmit; + p->master = master; port->slave = slave_dev; netif_carrier_off(slave_dev); From patchwork Tue Dec 11 19:33:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011342 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 43DqsT21Wjz9sCX for ; Wed, 12 Dec 2018 06:35:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726443AbeLKTeN (ORCPT ); Tue, 11 Dec 2018 14:34:13 -0500 Received: from mout.gmx.net ([212.227.15.15]:54729 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbeLKTeN (ORCPT ); Tue, 11 Dec 2018 14:34:13 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M08ia-1hR7Ou3at2-00uML8; Tue, 11 Dec 2018 20:33:36 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 4/7] [DSA] add support for GMAC2 wired to ext Date: Tue, 11 Dec 2018 20:33:11 +0100 Message-Id: <20181211193314.10695-4-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:mNf+lMJ6ZYyVAuGoQxrUK+NE4jg2KXrE9YW3eDBUMs0VsSBu+ru 7NDUQwiFjxltR9n9InSwmxnPcc7OSowC2jtwrHOCn9ePD39GW2JO19SEeCplPK2W3xGK5RT BEB9lEUfNmPU84q+gcmiNLQUCPbGShAq3apwgqmZ0CiHTjaF9ggZRQMU0oXB5VEEyIiyEbK iE1ds/3xmtws2TVrdSccQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:1PNnxaiOx+g=:BJ48jsOM96hzcW9/OPlpch +EtUZvQHyINePnT8kRd7awM+5Cnvbf6mJpTGpOzPaHRq1s+wTlqZqp8AmCKSgT84T1gJCrrDW FiNTULpnsBhURyrrDqIXiSd1IR4FmkeX7FO0tYEyzM0L6oJzZ8fHr9AYSdeumAAMdP7ZSKkEr nU3A5+5BsxF3V4n2WBRK9s11l6SNr/2YleaSpiO6hUPnGdc0carQXidbE9BYkn2qfq+8W5J/a Y1BYFqJeMiaee9s1KtaNu/j3e62sG+QWPm4WxFIgeDgIcYdzUd9VZC7951McjjV8iEEP9yOTJ r9maVURJ6lIqUAbOp8OSOKWxjMv9IavhApVVsGrRYywZ8uVPWwlGvx/Vgyd6RP6xeWKoX+xo+ kl2gS0vtMUkhpdL5UdW2cO9tGLRxuQcaA15GUKUjAyMO3xsnOLWGDL8BtGNh06Dc0lwkljR0a /hXxI7AQEY5NQA3aOLwcGPcROWgJ2tvG03QHKI8broMgc1bh/k13XLwFv4wo4DZUb4ztUn952 uOXuVQX9rQzZVX3u7VDgIMXLuXYqTQXdTPhON/D31R2O6pK/tfSPJ/ImWHWiYf6Wyh+TB1moU xoB6CTueGCnrKVwXGD1KT0lBTED7irt22NAe18K8ahvX8ZZ0/lkqELKmIDn0rSxO1AotYsZja nz1mfyOFMJTjGmcvVBgLkBT2WQ4YDJYBXxP68dW5EKSIpq7SNqi64OOuai7DOFWIwdV8p2Nwh 3BKkQBKkX1wSy7bSAY0fkETckGggiUJbqTOMB//lPg550aS72NiRNUAUEeFsKp1XokokrHBFH 9scqDph1HRVY1C3sA06iSvOAtYcXrX1mz2MoRSvCTgzCIPvELFh++Uy8SSMC+/rGVR2lLgAX6 TOiDpqwg5zUqtSn9pLAlBYN8VwXh/TNQ72GkM40PR9LLyjjrAkzpn5GbMqZTZ5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org based on https://github.com/openwrt/openwrt/blob/master/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch Signed-off-by: Frank Wunderlich --- drivers/net/dsa/mt7530.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a5de9bffe5be..a6a15a063e3e 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1277,6 +1277,11 @@ mt7530_setup(struct dsa_switch *ds) val = mt7530_read(priv, MT7530_MHWTRAP); val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; val |= MHWTRAP_MANUAL; + if (!dsa_is_cpu_port(ds, 5)) { + val |= MHWTRAP_P5_DIS; + val |= MHWTRAP_P5_MAC_SEL; + val |= MHWTRAP_P5_RGMII_MODE; + } mt7530_write(priv, MT7530_MHWTRAP, val); /* Enable and reset MIB counters */ From patchwork Tue Dec 11 19:33:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011337 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 43Dqs641vXz9sC7 for ; Wed, 12 Dec 2018 06:34:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726960AbeLKTeS (ORCPT ); Tue, 11 Dec 2018 14:34:18 -0500 Received: from mout.gmx.net ([212.227.15.19]:54073 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726867AbeLKTeQ (ORCPT ); Tue, 11 Dec 2018 14:34:16 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MIMQR-1gawO50CBr-004BML; Tue, 11 Dec 2018 20:33:38 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 5/7] [DSA] dsa multi cpu (mt7530.c) Date: Tue, 11 Dec 2018 20:33:12 +0100 Message-Id: <20181211193314.10695-5-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:5uvOk/q14HGD/2jzna7B3U2QGMeJRss93L6l5tAEsPqt/qo3/Hw t7VaXEHRIIA7NMGwrxTwhiX8YWXtwfc11WQHdBJ1SWuQqRvy5JKjYFxEgWMT2HoVlUUIT6C PCumzkRhSKMVPZOCsVVLgByZK/mcQb5qnDR0S5uAQV7A29uuY5YeCgJ4lSfy9ZgCcEVclLy buWSmwu++8+erchKPNfCQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:BMNNK1OnT98=:h1qKaSYRqTo/SAex7o6JMe +xB5izfUyJ8DAFJvvoIm3EWFPo+wu252uy3adsuRB+TDLCzOzpLqVCBUU8Cg5d+pzsJgVtD6R +JrvxIPcEYAmkJp7k3B9ag0rF6t9q36bW/N3gjwQvw0ciXHWzy/D3q7Q1gGPNOCCd8DabE8Ew t/nSH0vGsne50a7Yp9x8prNRbLhqqJSd9LM9jKE5ReGbQmqmr/W8+5ZfsYuI1xhOmNHVDGXr5 +CIamvt/Q1Y+tEQuYEVcZgGAAppRmEUZOXFvR1b7fFP7KpfVIp5I7Pe3OjyHtjQGvmY7flKVk KY1EMIyYC59xwMmneq+n3Rjo3woBzRC1jgZNxLqh1pMqW68LdyczPleMiEmb/VMbfrR/POc0y oaqxTgtfkJQZ4kZ6jLN2HLHxzcAdoQ6Gq7wTU5AmaP+6zMXgIf3ryOj91zhEZgsm33xT3ry/J H9lYJq3A4dSIKQS2Wf0uxMo7QLnpHHqd7PaOTeOq+7JRFPm6jz10f1bASY4/tmx9g6kaBSZqG +oD6gOrYqCjcPxX01H5+KrJvIaAoM5E42xLEjYlA9wfJlhJdO/lzvwdGoR3WTyAg0O6i+deym QKencgKCp2yfsVwqvKqT4448fCGpHKxkMP+UxPFLAp31BYIEgHrdsio0iGCYsc471sGecuNmI cldDx7eheSeCgtI2oabkkBNPykfQ7RDS8byKYWhg2aeE6bKh1LJqbGsjFUscoLlTaiCc0+0SJ x6hdguX5BWoZyscaS+/6JYft7snG8zHXcm2Q3I0fO6wrqLTrI9ahmphFsBaQoxtVXfi0oaVcC bigyBayu9tA5z7vfabydBHxLkAPBzWVGEtbqO4x4qB8b9zG4CD+AiDlDwx9kssQAC2IuOqMoY Mz++mS1aqOoBenLrkpwvAXGNisUufN5V/UTbR8pTLCA1txg9tPcYzkXXhsYGB4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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; From patchwork Tue Dec 11 19:33:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011338 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 43Dqs92RTcz9sCX for ; Wed, 12 Dec 2018 06:34:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726907AbeLKTeR (ORCPT ); Tue, 11 Dec 2018 14:34:17 -0500 Received: from mout.gmx.net ([212.227.15.18]:60513 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726858AbeLKTeQ (ORCPT ); Tue, 11 Dec 2018 14:34:16 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M54fe-1hNFmP0NIc-00zIHc; Tue, 11 Dec 2018 20:33:39 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 6/7] [DSA] tell GDMA when we are turning on the special tag Date: Tue, 11 Dec 2018 20:33:13 +0100 Message-Id: <20181211193314.10695-6-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:uFgKQXFf5ffjFoYiHtcDtZDgE2oDlHS562h3FDJ6QC9XXwBnE5y CONdUO19qPjv3zRQmvcGXVS4tLjnPeRJozuJIcvahp7pGrsM5uKsFgEQ4MN0gWFeVMBw9Gx +B8CcF6tBpPNoof+Uq92L/FGvYka5vZkxE7/vtEW/DfB7+lxsQyPUCmTk+/L/6kxVpMovZs B1zP3X69gkvpbYuWNhnLw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:xO9EQCi536I=:b+bOI7S7AJJsRlQortI3Sq i3+ejQQd/dbczxZJbXf0gavnEkFxzLfhTU6IHCKfLC21vUP3qaqNfh/AfsT3MjPoWfzu3q08+ 8ly4JxvNvC6s+4VhsX185bxDZcRG5CiaDoK193i6L5wMvAoJtHiEyynwKcohsLsyVQIqli/6b GeYb+h0nXf6DneF3vg76rFL+RdTBqAYsjvl5L9L1RIgFzdKKgMPRuPnAYEDPzMOY5BQKa+T3Z fyYG2vXwr92E6pKzCn4s5Bknugrbdx4cAA4NGgxKDCWD6H/MZzJcxJUnv5KdZ2a47vkGvbcRw fMlyFYzampC8n2OgBD8aGoEF9mQqz6lyhLQ4S+bGUMqrFGtAqB+sHBwN9c6Sepwgmg5Ikigre 8FfR6vDOtv47SeP0MRI0ikMrPOrwiXRxb01LP29ZR4cI5j3l3EXDk6d8xz3X2BjcObqdF+Lmv gqrPEXl/euUHKzRCtbPoldTvg1sCZO4zfmszDW+oMCGQdomxPfc+SuQb1dQmHAIzC+Fbr6oLi 7wQOhSkXBmPucuWuBnR3xTwUGnwF46/Vqqdk0nPeYE7YPyM6IWXVBsjCRLYdi3F/gUmI+bimt UmGKv+PsRRadlM1sO9myKVmUBqZa00fn28ejntrT4GXe6J3fQDZJPbbFhVO7AqgJdh/7vA8Ef BCfvzFc0JW9QoGFkMscmYzhbjx6C6blefrhkWAs0d4ciO6gl/SLlqQMYS2KWddD/2zpG4qlrn JfnuAuGSFG/QW3P6jz1F9G+RSPOcmvOQ0G5WrfyB9xr+boHBzVqWZN1hAjhsUdo0jixJqigCW w8nWL6CTh4Kal4+vTX4ojDozl5WDtejsCgblaZzWkHBGv2hra+95Wf6lBQw6GOOGciWfGv85v U1JVf8V4RIc0+n9nGv0t8ikqKEh0pOAnZd+ND5Md0FsEDw+lMMkW5YnKB7IZAx Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org based on https://github.com/openwrt/openwrt/blob/master/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch Signed-off-by: Frank Wunderlich --- drivers/net/dsa/mt7530.c | 6 ++++++ drivers/net/dsa/mt7530.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 441320d4d779..83669f53cb36 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -681,6 +681,12 @@ mt7530_cpu_port_enable(struct mt7530_priv *priv, mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); + /* Enable Mediatek header mode on the GMAC that the cpu port + * connects to + */ + regmap_write_bits(priv->ethernet, MTK_GDMA_FWD_CFG(port), + GDMA_SPEC_TAG, GDMA_SPEC_TAG); + /* Setup the MAC by default for the cpu port */ mt7530_write(priv, MT7530_PMCR_P(port), PMCR_CPUP_LINK); diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index d9b407a22a58..310f2536175b 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -23,6 +23,10 @@ #define TRGMII_BASE(x) (0x10000 + (x)) +/* Registers for GDMA configuration access */ +#define MTK_GDMA_FWD_CFG(x) (0x500 + (x * 0x1000)) +#define GDMA_SPEC_TAG BIT(24) + /* Registers to ethsys access */ #define ETHSYS_CLKCFG0 0x2c #define ETHSYS_TRGMII_CLK_SEL362_5 BIT(11) From patchwork Tue Dec 11 19:33:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1011341 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 43DqsL0Pd9z9sDr for ; Wed, 12 Dec 2018 06:35:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbeLKTeO (ORCPT ); Tue, 11 Dec 2018 14:34:14 -0500 Received: from mout.gmx.net ([212.227.15.15]:39693 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbeLKTeN (ORCPT ); Tue, 11 Dec 2018 14:34:13 -0500 Received: from localhost.localdomain ([91.14.83.44]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MBWo2-1ghIBO0hd8-00ATwi; Tue, 11 Dec 2018 20:33:40 +0100 From: Frank Wunderlich To: Andrew Lunn , Vivien Didelot , Florian Fainelli , "David S. Miller" , Matthias Brugger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Frank Wunderlich Subject: [PATCH 7/7] [DSA] mt7530 add linking to mdio Date: Tue, 11 Dec 2018 20:33:14 +0100 Message-Id: <20181211193314.10695-7-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211193314.10695-1-frank-w@public-files.de> References: <20181211193314.10695-1-frank-w@public-files.de> X-Provags-ID: V03:K1:/kdyN1LlQRxSXve23iYRsooYQC7XQPE+MLFtGKmyRq6aCx7CaWF FFL6X0ozaLhzOaPZ3eJCcfEwGzk3S1V9Zo7ZboAQYEsgKPf/nwlEUPzIFwssc85YdjqdhTI JKif1PECzon/COVE/8r0ICX+VLuqtLg/NrMAjNUUUXjJYgNy+taT3P8yofBNTQR2Luwut+W 6g7qSqdsx6j994w1a/V7w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:sZLol5aRfGU=:S/NLkB66pQ1JpOSRV6VaBg mZQkqCMr6AAsAqw8AIO3kNQaYc87G8ISC9zFztrd+Bu3WyotEIEsqPfUgJVr0IauWbYS+yKSx 5o7FC09dWNdbHkP2JZFwkb2T2Fqe2wHrIUPGcqtNve2lf3Tm75Tt+WXVBH0L0yu6qe9E4Q0an okgJVM74knJ8iScSOW6jRYHr0zpoiWW8UYpg1ITvVrXLpFMlJtwxvu+jVYxvIN/IEOgaR3hw4 4wxrNRCQu56Ozu2vdvpkOa7A9P7GHkp7jDAwubgdYihOQ9BFJsqYRFAy9FIY5mPWi6ZeUiQOY H+2DfHacy+/KH2fZXUW/THAHBvCMTQ6jYuyCmSgBuwj7nCR8peeVUF3YtwZkWJIxG/xnX/KTS TKA18J+NcPRiaJuM4anQl/mf8MZ+F6/BwcT4OEOuo8MR0bh4LmWEaSSx1ZTE4WGVMWW4F1Adp /irA6jNdSJ3i8Z2gShraycWxAKhDV/QCL97v2mAjkmqHFOi6+Fv5ZuXV2y8/zPmSK6Xun6eMA tZTEXa8SduPQlvTOiqp6aF6MR1yd05sU0ZgM8jnzB5R8k5ogvEh6/2fIKyWWHYjlkluu98SvP eJ2VF64PEhqmi4XyQrXlbH+i+xIsHMIzVD9/EDeKeu/mo1Y0kDsPJkrpzuIzKZRDkn+d1ylwO KrKMLXmd0qCJWoaGbbhNoQ1ODOv+P8NtuGM/B0CsoETcPKXv5hatDqday83Bh1xuamBa4hy+v jMTUXAKD9lq+gGyzuQUggVXk5HG24S03kKlOewFXCRvVj+ErxHaHh1YBJ9FbwaY0DFyB6wqK9 fHjM8FJiTY61DPAMDTA82uS3LaOb0D1bf4EHB4A88+e1Nc4iM6WlGlRQAjfas7AGAOkyN8eUI 2HmbsWyYREDqIS90ZVBb4UIoA9nqMg8SBLkwOPO4LB8aXjIlfjpM03JTE+/FJ1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org based on https://github.com/openwrt/openwrt/blob/master/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch Signed-off-by: Frank Wunderlich --- drivers/net/dsa/mt7530.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 83669f53cb36..e529bc334459 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1345,7 +1345,7 @@ static int mt7530_probe(struct mdio_device *mdiodev) { struct mt7530_priv *priv; - struct device_node *dn; + struct device_node *dn, *mdio; dn = mdiodev->dev.of_node; @@ -1392,8 +1392,14 @@ mt7530_probe(struct mdio_device *mdiodev) return PTR_ERR(priv->reset); } } + mdio = of_get_parent(dn); + if (!mdio) + return -EINVAL; + + priv->bus = of_mdio_find_bus(mdio); + if (!priv->bus) + return -EPROBE_DEFER; - priv->bus = mdiodev->bus; priv->dev = &mdiodev->dev; priv->ds->priv = priv; priv->ds->ops = &mt7530_switch_ops;