From patchwork Fri Dec 14 16:48:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1013631 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 43Gc3q6f08z9sB5 for ; Sat, 15 Dec 2018 03:50:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729793AbeLNQuN (ORCPT ); Fri, 14 Dec 2018 11:50:13 -0500 Received: from mout.gmx.net ([212.227.15.18]:43775 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729670AbeLNQuM (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 0MI5JG-1gaaCk3TRe-003uXl; 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 3/8] net: dsa: adding handling of second CPU-Port Date: Fri, 14 Dec 2018 17:48:42 +0100 Message-Id: <20181214164847.4851-4-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:2S9q7pROCez+K0fN+z5NnnFToli31OS89Q/sWYu7SjtvgQWbvw8 H3N90r712vWcv5Q5hnkXiTtcPx7I/K5wNMMvaWhas9LJod+5pOi967HbLFvnDPyCxlrCcEa qTVqSKRiNqyz8/d6QwREDvPl5HqBuIi+kTWJ9TV/47PkN83sJjhJaP4+Slrh0uFRjBcyNcy PjJwYw3r7dFX5GMO75TfQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:gjTr5APVCp8=:9WniiXfAqsFIN7XZ8hSWzt hbEzyoM6CKRHm1A3gZ+0TvGifV4l4Xv+BlpYYV6NHwfur13m5i+5/aL8pIZ+WPjf+RZ3IoGGu fbN1XFDucUerM7jbMK9MPsKj+R7H3QRxok9YaN1AuMOW2NK8jpIek1+ZYNOfYv2+h6E+d+Jry 8H9MLQjxq6bMUwmy1Y2eoQdrn+jSCso1U1YCx8AA68fw9eTfcWQkvYBmY3Y4dk1TB+TI8Tv1n /UGEWewvp9KDfOUZlFKMhy8kD1H0k/7nfrzX7dknykNBf/avc/2n6XnlJl99mqOOad6bL72yt yl+gHTOUpSVw75WHYKJHQ/cBGtnqnUSm8syJhYKtZtGFbuf1+INE05Ai2mEekQuPZDglOEZYs mpm09XCe1eG3azKnRzEl7ZwifzKwFEapPzTqDfL346npgC4hqKQRvDyNVMap49X7V1bNNl1nt bLPrNOHrRgClNj6/oY8A7JfITafSg6hG3SGz/g3Imdyo42jt2bK4Fz7PAj/MhsX+lrqBZ/QIr cDZXdVMfAgkBvC/7H1DSzIuYBvDgMgssR5DOiwramNfVcbJB9GUdzMDBzHaqRrB+AJHyf3YwS QltHZ9saE8LnKmPyY25ubXr+/ZTHRQ9+/mZ0OpFFIq/cZSxNgpNHWYvHqMI3yFfEKZie/RrpG /s5FvuIXM86ED7Rmp2sqs1QCiTJKrWmhRubbUegJqrpmBO+oVY5eTrByS4zLFbqpfwu6OUu++ Xh/p60h7o9pqwkXni54kG/qhGTkuhf0t9mEozRDr8HK5U1wokvzdWv2z4822HpLgrdT6kvsiC Y04CvDPpJSiyGxk6QZ5CsXHxpdrd872tXWM+BBaaMKhtDi6MQZw3tsZDBz790UDYtssWw/Ok5 qpNmrBnB6LM5HYcKdi3QAk/QVTTeJNXs2HJfvJt+jMLshhS+pLRCtEXHVTmfwu Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org this patch adds the core-functionality of multiple cpu-ports currently it uses definition in dts to make connection between cpu and user-port 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 b7c6da2f1f08..8f64535fd2a0 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);