{"id":815190,"url":"http://patchwork.ozlabs.org/api/patches/815190/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918214128.27896-13-f.fainelli@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918214128.27896-13-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-18T21:41:28","name":"[net-next,12/12] net: dsa: bcm_sf2: Utilize b53_{enable,disable}_port","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"8d77e7b9333aa909ab233210b81f1bb9e7df5319","submitter":{"id":2800,"url":"http://patchwork.ozlabs.org/api/people/2800/?format=json","name":"Florian Fainelli","email":"f.fainelli@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918214128.27896-13-f.fainelli@gmail.com/mbox/","series":[{"id":3739,"url":"http://patchwork.ozlabs.org/api/series/3739/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3739","date":"2017-09-18T21:41:16","name":"net: dsa: b53/bcm_sf2 cleanups","version":1,"mbox":"http://patchwork.ozlabs.org/series/3739/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815190/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815190/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"M1nAGur0\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwzxS1nsHz9ryv\n\tfor ;\n\tTue, 19 Sep 2017 07:42:20 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751636AbdIRVmR (ORCPT );\n\tMon, 18 Sep 2017 17:42:17 -0400","from mail-wr0-f194.google.com ([209.85.128.194]:32877 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751624AbdIRVmP (ORCPT\n\t); Mon, 18 Sep 2017 17:42:15 -0400","by mail-wr0-f194.google.com with SMTP id b9so1152040wra.0\n\tfor ; Mon, 18 Sep 2017 14:42:14 -0700 (PDT)","from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\te34sm9242761wre.15.2017.09.18.14.42.10\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 14:42:12 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=35yHRz9BB9/G1n7IedRgQjf2LYawSMytCIYj7ZaMgVs=;\n\tb=M1nAGur0goiAtkictOK7QcRKCOMzgS64gYOo948OIqHWL/HJnCJKxJumYUq1ZdbJtY\n\tAhvsrCdMhjl0Gar+4VaR2qalKbJUCZlHaAj37TQdKpHrP//VzoYKaIUSakBP0jssonwq\n\tHeKpjHViVaj1vcCJX4DrwPX3/fX6j+EztUgHglLSqPKblsf8ZWiwbDsf5xJze6XFl358\n\tWyA1SgrBIu/K+crdmIE09m/1B7OXb7sxdK2CbbkVydyX1/auAuc+pTTRwfbiR1CpMZM3\n\tYx+0YLHggTLWSNnCgWaoFs9jdko5nhMZ3K39I6qPRflSNZuuV4Ow8+Gl1WC7+SEen94j\n\tlk4w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=35yHRz9BB9/G1n7IedRgQjf2LYawSMytCIYj7ZaMgVs=;\n\tb=CpE6lGLZIfuNoieq8Tpcm6j6qk2pQMM6eSmLOakLa0IZUcthItz5gmxzEalEttoxSo\n\t3rvto6jsJvtyjRF7rb/ohvqF02uNBT2Hw5XoewA5Nhgzk4skk3HYsxgO2/Rgbyfee/fG\n\t3LKNgUk6TrEn/p/dBLAw1KyeVotGdWwbvtanWDnF2QUbhGGjof/Bq7aWhQIvN8meWl38\n\tXesMh5XJiPHYRthwsRUCnQLcMgK6o6IJqM+fJLd76eYP3AJ9ovA6C0fBGdiVaR+gGrBn\n\tJQXhyNWS6A38E8SldNlDJDARYe4vWjVNDFb2mTUaRGoy8BMnnMpPro5eeWTTWlyMld4s\n\tNBWA==","X-Gm-Message-State":"AHPjjUhQ5eXB0DRgPnFoqrBvm/FBeySuTDCUaepbWZsONL504KFgVMDr\n\tikEa0jMQuNxiiWy0HeI=","X-Google-Smtp-Source":"ADKCNb4bm2R5swemRMX0iL+H0g8WTrAKXjX8UzjLTWpxcrtloluYf1jSwm4W2CHTG3Sxm272jvBaFQ==","X-Received":"by 10.223.150.113 with SMTP id c46mr27664586wra.30.1505770933416;\n\tMon, 18 Sep 2017 14:42:13 -0700 (PDT)","From":"Florian Fainelli ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com,\n\tFlorian Fainelli ","Subject":"[PATCH net-next 12/12] net: dsa: bcm_sf2: Utilize b53_{enable,\n\tdisable}_port","Date":"Mon, 18 Sep 2017 14:41:28 -0700","Message-Id":"<20170918214128.27896-13-f.fainelli@gmail.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170918214128.27896-1-f.fainelli@gmail.com>","References":"<20170918214128.27896-1-f.fainelli@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Export b53_{enable,disable}_port and use these two functions in\nbcm_sf2_port_setup and bcm_sf2_port_disable. The generic functions\ncannot be used without wrapping because we need to manage additional\nswitch integration details (PHY, Broadcom tag etc.).\n\nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/b53/b53_common.c | 8 ++++----\n drivers/net/dsa/b53/b53_priv.h | 2 ++\n drivers/net/dsa/bcm_sf2.c | 26 ++------------------------\n 3 files changed, 8 insertions(+), 28 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex 84068697a509..b9139140a10f 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -502,8 +502,7 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n }\n EXPORT_SYMBOL(b53_imp_vlan_setup);\n \n-static int b53_enable_port(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)\n {\n \tstruct b53_device *dev = ds->priv;\n \tunsigned int cpu_port = dev->cpu_port;\n@@ -530,9 +529,9 @@ static int b53_enable_port(struct dsa_switch *ds, int port,\n \n \treturn 0;\n }\n+EXPORT_SYMBOL(b53_enable_port);\n \n-static void b53_disable_port(struct dsa_switch *ds, int port,\n-\t\t\t struct phy_device *phy)\n+void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy)\n {\n \tstruct b53_device *dev = ds->priv;\n \tu8 reg;\n@@ -542,6 +541,7 @@ static void b53_disable_port(struct dsa_switch *ds, int port,\n \treg |= PORT_CTRL_RX_DISABLE | PORT_CTRL_TX_DISABLE;\n \tb53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);\n }\n+EXPORT_SYMBOL(b53_disable_port);\n \n void b53_brcm_hdr_setup(struct dsa_switch *ds, int port)\n {\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex df8bea4105e4..8b5ba78edfd2 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -311,6 +311,8 @@ int b53_mirror_add(struct dsa_switch *ds, int port,\n \t\t struct dsa_mall_mirror_tc_entry *mirror, bool ingress);\n void b53_mirror_del(struct dsa_switch *ds, int port,\n \t\t struct dsa_mall_mirror_tc_entry *mirror);\n+int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);\n+void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy);\n void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);\n void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable);\n int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex 08639674947a..0072a959db5b 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -163,7 +163,6 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \t\t\t struct phy_device *phy)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\ts8 cpu_port = ds->dst->cpu_dp->index;\n \tunsigned int i;\n \tu32 reg;\n \n@@ -184,9 +183,6 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \t\treg |= i << (PRT_TO_QID_SHIFT * i);\n \tcore_writel(priv, reg, CORE_PORT_TC2_QOS_MAP_PORT(port));\n \n-\t/* Clear the Rx and Tx disable bits and set to no spanning tree */\n-\tcore_writel(priv, 0, CORE_G_PCTL_PORT(port));\n-\n \t/* Re-enable the GPHY and re-apply workarounds */\n \tif (priv->int_phy_mask & 1 << port && priv->hw_params.num_gphy == 1) {\n \t\tbcm_sf2_gphy_enable_set(ds, true);\n@@ -209,23 +205,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \tif (port == priv->moca_port)\n \t\tbcm_sf2_port_intr_enable(priv, port);\n \n-\t/* Set this port, and only this one to be in the default VLAN,\n-\t * if member of a bridge, restore its membership prior to\n-\t * bringing down this port.\n-\t */\n-\treg = core_readl(priv, CORE_PORT_VLAN_CTL_PORT(port));\n-\treg &= ~PORT_VLAN_CTRL_MASK;\n-\treg |= (1 << port);\n-\treg |= priv->dev->ports[port].vlan_ctl_mask;\n-\tcore_writel(priv, reg, CORE_PORT_VLAN_CTL_PORT(port));\n-\n-\tb53_imp_vlan_setup(ds, cpu_port);\n-\n-\t/* If EEE was enabled, restore it */\n-\tif (priv->dev->ports[port].eee.eee_enabled)\n-\t\tb53_eee_enable_set(ds, port, true);\n-\n-\treturn 0;\n+\treturn b53_enable_port(ds, port, phy);\n }\n \n static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,\n@@ -248,9 +228,7 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,\n \telse\n \t\toff = CORE_G_PCTL_PORT(port);\n \n-\treg = core_readl(priv, off);\n-\treg |= RX_DIS | TX_DIS;\n-\tcore_writel(priv, reg, off);\n+\tb53_disable_port(ds, port, phy);\n \n \t/* Power down the port memory */\n \treg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);\n","prefixes":["net-next","12/12"]}