{"id":815757,"url":"http://patchwork.ozlabs.org/api/patches/815757/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919174654.2122-11-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":"<20170919174654.2122-11-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-19T17:46:52","name":"[net-next,v3,10/12] net: dsa: b53: Export b53_imp_vlan_setup()","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"36b157b892f828e604d35e014b849640ba4d6f9a","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/20170919174654.2122-11-f.fainelli@gmail.com/mbox/","series":[{"id":3941,"url":"http://patchwork.ozlabs.org/api/series/3941/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3941","date":"2017-09-19T17:46:42","name":"net: dsa: b53/bcm_sf2 cleanups","version":3,"mbox":"http://patchwork.ozlabs.org/series/3941/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815757/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815757/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=\"n+ch5UCg\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxVhH0Dbdz9rvt\n\tfor ;\n\tWed, 20 Sep 2017 03:47:43 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751629AbdISRrb (ORCPT );\n\tTue, 19 Sep 2017 13:47:31 -0400","from mail-wr0-f194.google.com ([209.85.128.194]:38254 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751488AbdISRr3 (ORCPT\n\t); Tue, 19 Sep 2017 13:47:29 -0400","by mail-wr0-f194.google.com with SMTP id p37so178003wrb.5\n\tfor ; Tue, 19 Sep 2017 10:47:28 -0700 (PDT)","from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\tq19sm11543124wrb.17.2017.09.19.10.47.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 19 Sep 2017 10:47:26 -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=Uabn1qnEKHeYrG5takERNtDbIzqC03OYC1d3YELsiCk=;\n\tb=n+ch5UCgZ/nMSc+E4Ojs64yh56lxgBBpampj8oTp7MgucHPt6lFK1vrv1NgRVMjryv\n\tVgosc41mE+QGw+R40USWJFLRP0cDHpjEY8poJkfASpAfQFF5lCTf1Hx0lVqINo8Ly4UV\n\tBS2b0nG8Xo4jV/y/p3/2IFd0ufHlm3i62psc8Nj7IyGMB1kGo00K48AyDPi/UH7F8DEC\n\t36hpD6t/MgDv4TqqTZVqVILwfkAYiJ7VrWuMVbIV4d/VB+kMVgJr50tbDPW8eiBxUfD5\n\trwTS3pGEDK9Z41YHMPMzGm59hXnjD30DQXNV75b+4Q6fwUtY5xL0ZcqIDetJUlaFqQ2t\n\t2JBQ==","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=Uabn1qnEKHeYrG5takERNtDbIzqC03OYC1d3YELsiCk=;\n\tb=ReLY5RCMxX761oszMPLOJAbkREzPS77xtid5r9OsP0+r2m5mi8rOdqUYh8dscHogIs\n\tZ4GBjN3ADa1/CjrXDQm/i3lL266MWrryW0NJNzJxy5naf9q5kkggx/p9kYf78XcELaB1\n\tfPdwMoIL14eMrUKfP9l+8GbdPDw/FO4jlUWeW6Tbc1wfNmme055obaaarB8Vxpogoe1d\n\t8yZzIe02neTYigqXao/51k6xwaJI1Dqt7JXiwY1ioLbR4I30BLloa0UVKgVvNPucfXtW\n\t+ScE12DrIVSpxvr4EHQMs/rhm0Gy6p9ao71MoHEbJqdbxi3vOHhc4j9FUMgrshBl0IUi\n\t/4NQ==","X-Gm-Message-State":"AHPjjUg0a/VDM9BgwME9kmi0EDkSoawkCDaGPItWk4Vb/XSxFOZnw0l8\n\tGlSEYHSJd2CYu02+FH7vl8Zs9Qoq","X-Google-Smtp-Source":"AOwi7QASv9Hy3sh7Pyl0XzybcZxRWCCQhiNaMK8kCyQ67GESn2RVIvdk7lyH80XYDEM/llpNlg7EMw==","X-Received":"by 10.223.198.130 with SMTP id j2mr2214661wrg.52.1505843247506; \n\tTue, 19 Sep 2017 10:47:27 -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 v3 10/12] net: dsa: b53: Export b53_imp_vlan_setup()","Date":"Tue, 19 Sep 2017 10:46:52 -0700","Message-Id":"<20170919174654.2122-11-f.fainelli@gmail.com>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170919174654.2122-1-f.fainelli@gmail.com>","References":"<20170919174654.2122-1-f.fainelli@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"bcm_sf2 and b53 do exactly the same thing, so share that piece.\n\nReviewed-by: Vivien Didelot \nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/b53/b53_common.c | 3 ++-\n drivers/net/dsa/b53/b53_priv.h | 1 +\n drivers/net/dsa/bcm_sf2.c | 23 +----------------------\n 3 files changed, 4 insertions(+), 23 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex 4e37ec27e496..c3f1cd2c33ea 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -484,7 +484,7 @@ static int b53_fast_age_vlan(struct b53_device *dev, u16 vid)\n \treturn b53_flush_arl(dev, FAST_AGE_VLAN);\n }\n \n-static void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n+void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n {\n \tstruct b53_device *dev = ds->priv;\n \tunsigned int i;\n@@ -500,6 +500,7 @@ static void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n \t\tb53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(i), pvlan);\n \t}\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)\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex aabe80eab25d..8f4f83e2e4bd 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -284,6 +284,7 @@ static inline int b53_switch_get_reset_gpio(struct b53_device *dev)\n #endif\n \n /* Exported functions towards other drivers */\n+void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port);\n void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data);\n void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);\n int b53_get_sset_count(struct dsa_switch *ds);\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex 4e8ef4c07eab..08639674947a 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -40,27 +40,6 @@ static enum dsa_tag_protocol bcm_sf2_sw_get_tag_protocol(struct dsa_switch *ds)\n \treturn DSA_TAG_PROTO_BRCM;\n }\n \n-static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n-{\n-\tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n-\tunsigned int i;\n-\tu32 reg;\n-\n-\t/* Enable the IMP Port to be in the same VLAN as the other ports\n-\t * on a per-port basis such that we only have Port i and IMP in\n-\t * the same VLAN.\n-\t */\n-\tfor (i = 0; i < priv->hw_params.num_ports; i++) {\n-\t\tif (!((1 << i) & ds->enabled_port_mask))\n-\t\t\tcontinue;\n-\n-\t\treg = core_readl(priv, CORE_PORT_VLAN_CTL_PORT(i));\n-\t\treg |= (1 << cpu_port);\n-\t\tcore_writel(priv, reg, CORE_PORT_VLAN_CTL_PORT(i));\n-\t}\n-}\n-\n-\n static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)\n {\n \tstruct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);\n@@ -240,7 +219,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \treg |= priv->dev->ports[port].vlan_ctl_mask;\n \tcore_writel(priv, reg, CORE_PORT_VLAN_CTL_PORT(port));\n \n-\tbcm_sf2_imp_vlan_setup(ds, cpu_port);\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","prefixes":["net-next","v3","10/12"]}