{"id":815752,"url":"http://patchwork.ozlabs.org/api/patches/815752/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919174654.2122-7-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-7-f.fainelli@gmail.com>","list_archive_url":null,"date":"2017-09-19T17:46:48","name":"[net-next,v3,06/12] net: dsa: b53: Move Broadcom header setup to b53","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"abdd188152d702ae1c4333a7bfd7dbf11b0b1347","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-7-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/815752/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815752/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=\"dWbBM3kL\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxVgy32Hgz9sPm\n\tfor ;\n\tWed, 20 Sep 2017 03:47:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751825AbdISRrV (ORCPT );\n\tTue, 19 Sep 2017 13:47:21 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:34242 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751365AbdISRrT (ORCPT\n\t); Tue, 19 Sep 2017 13:47:19 -0400","by mail-wm0-f68.google.com with SMTP id i131so319973wma.1\n\tfor ; Tue, 19 Sep 2017 10:47:18 -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.15\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 19 Sep 2017 10:47:16 -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=k1VovRKk7XMVSKrtS+hqOIq2c6FWstyfw2eVx/WQtK0=;\n\tb=dWbBM3kLOeXKi+KVy+4SPTXUtIvv7HLtO2NGJmdWMs6S3dOP6Bp08Utq+QIqHlWlwl\n\tqlVXAOoIr31KG2jCBfb37ZuJKENi/lRbd/CsiKhfbca29szQzPaHI76JjoHgLBRJZfSz\n\tRGGre4ymQ23rmP4XA/ZsyeLSW2iA2aeSJWjFnRi7lPXp3HfMWHZdgxPloQjRwdjYtHJw\n\tm+fFmm3KU4xnbAVfz7x1EsmnHbvPz7Sr/qdqCDOZjN+QLveWQlHmGR87pE15BIIv4OZC\n\tB8MGTMQFtVwNM1voLLSrXgvTXHIDpST7WRhDyEkGyryW/253UjHeaBzFnIGfBUZ8mmzm\n\tJRFw==","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=k1VovRKk7XMVSKrtS+hqOIq2c6FWstyfw2eVx/WQtK0=;\n\tb=ofUWe1ubufsnmHzgijGgdstVu0rNdcT11HZbn/KEYf1vB2pW6wnf2LQPuoxBknxyoU\n\tpckOFHUShLQ2wJYSUo+jmoj9jVn4PxTgkd/wdEi30TxI+jqLUQ5iz5mEZ6wxuZSLxQdv\n\t95cTrwYaxeD2YdTGOPJ0/ZtqAw47TsDjTJCjkV9nyZLLbAfRBVG/3FikAOYL8DTEZ5Il\n\t6q5mYrCJC/O55Nv0R5T66uuzdlEmUHJf2oG6YoyRHfShM/j4yNNcFrHmt4TqxHKziUXG\n\tpqJkSLw6lN/81IA3w0ksNhnq9uiOeBYNxziqqotVdAbu6QGUDtqjLPDkNFyhVJEZ21U1\n\tcAUw==","X-Gm-Message-State":"AHPjjUgvbtaCzJTtOC8O6PCF8s3Yud8KNqXXGI73kjFrYTx8dI8MSmUl\n\twKDZFJlWq3FJiZJn8lU2U4utnuWK","X-Google-Smtp-Source":"AOwi7QDXgyv21884f2Q25nKK0NgodgRepE2OoeuhNb3t5KAnvV7dtGwMTFLlCdih7u+7RK2n0dhaLQ==","X-Received":"by 10.28.155.146 with SMTP id d140mr1887802wme.4.1505843237393; \n\tTue, 19 Sep 2017 10:47:17 -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 06/12] net: dsa: b53: Move Broadcom header setup\n\tto b53","Date":"Tue, 19 Sep 2017 10:46:48 -0700","Message-Id":"<20170919174654.2122-7-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":"The code to enable Broadcom tags/headers is largely switch independent,\nand in preparation for enabling it for multiple devices with b53, move\nthe code we have in bcm_sf2.c to b53_common.c\n\nReviewed-by: Vivien Didelot \nSigned-off-by: Florian Fainelli \n---\n drivers/net/dsa/b53/b53_common.c | 47 ++++++++++++++++++++++++++++++++++++++++\n drivers/net/dsa/b53/b53_priv.h | 1 +\n drivers/net/dsa/b53/b53_regs.h | 7 ++++++\n drivers/net/dsa/bcm_sf2.c | 43 ++----------------------------------\n drivers/net/dsa/bcm_sf2_regs.h | 8 -------\n 5 files changed, 57 insertions(+), 49 deletions(-)","diff":"diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex 3297af6aab8a..aa2187c71ea5 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -538,6 +538,53 @@ static void b53_disable_port(struct dsa_switch *ds, int port,\n \tb53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);\n }\n \n+void b53_brcm_hdr_setup(struct dsa_switch *ds, int port)\n+{\n+\tstruct b53_device *dev = ds->priv;\n+\tu8 hdr_ctl, val;\n+\tu16 reg;\n+\n+\t/* Resolve which bit controls the Broadcom tag */\n+\tswitch (port) {\n+\tcase 8:\n+\t\tval = BRCM_HDR_P8_EN;\n+\t\tbreak;\n+\tcase 7:\n+\t\tval = BRCM_HDR_P7_EN;\n+\t\tbreak;\n+\tcase 5:\n+\t\tval = BRCM_HDR_P5_EN;\n+\t\tbreak;\n+\tdefault:\n+\t\tval = 0;\n+\t\tbreak;\n+\t}\n+\n+\t/* Enable Broadcom tags for IMP port */\n+\tb53_read8(dev, B53_MGMT_PAGE, B53_BRCM_HDR, &hdr_ctl);\n+\thdr_ctl |= val;\n+\tb53_write8(dev, B53_MGMT_PAGE, B53_BRCM_HDR, hdr_ctl);\n+\n+\t/* Registers below are only accessible on newer devices */\n+\tif (!is58xx(dev))\n+\t\treturn;\n+\n+\t/* Enable reception Broadcom tag for CPU TX (switch RX) to\n+\t * allow us to tag outgoing frames\n+\t */\n+\tb53_read16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_RX_DIS, ®);\n+\treg &= ~BIT(port);\n+\tb53_write16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_RX_DIS, reg);\n+\n+\t/* Enable transmission of Broadcom tags from the switch (CPU RX) to\n+\t * allow delivering frames to the per-port net_devices\n+\t */\n+\tb53_read16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_TX_DIS, ®);\n+\treg &= ~BIT(port);\n+\tb53_write16(dev, B53_MGMT_PAGE, B53_BRCM_HDR_TX_DIS, reg);\n+}\n+EXPORT_SYMBOL(b53_brcm_hdr_setup);\n+\n static void b53_enable_cpu_port(struct b53_device *dev, int port)\n {\n \tu8 port_ctrl;\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex 5bebe97900e8..77102f685da0 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -309,5 +309,6 @@ 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+void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);\n \n #endif\ndiff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h\nindex e5c86d44667a..5e8b8e31fee8 100644\n--- a/drivers/net/dsa/b53/b53_regs.h\n+++ b/drivers/net/dsa/b53/b53_regs.h\n@@ -210,6 +210,7 @@\n #define B53_BRCM_HDR\t\t\t0x03\n #define BRCM_HDR_P8_EN\t\tBIT(0) /* Enable tagging on port 8 */\n #define BRCM_HDR_P5_EN\t\tBIT(1) /* Enable tagging on port 5 */\n+#define BRCM_HDR_P7_EN\t\tBIT(2) /* Enable tagging on port 7 */\n \n /* Mirror capture control register (16 bit) */\n #define B53_MIR_CAP_CTL\t\t\t0x10\n@@ -249,6 +250,12 @@\n /* Revision ID register (8 bit) */\n #define B53_REV_ID\t\t\t0x40\n \n+/* Broadcom header RX control (16 bit) */\n+#define B53_BRCM_HDR_RX_DIS\t\t0x60\n+\n+/* Broadcom header TX control (16 bit)\t*/\n+#define B53_BRCM_HDR_TX_DIS\t\t0x62\n+\n /*************************************************************************\n * ARL Access Page Registers\n *************************************************************************/\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex 8acbd17bc1fd..49cb51223f70 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -60,45 +60,6 @@ static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)\n \t}\n }\n \n-static void bcm_sf2_brcm_hdr_setup(struct bcm_sf2_priv *priv, int port)\n-{\n-\tu32 reg, val;\n-\n-\t/* Resolve which bit controls the Broadcom tag */\n-\tswitch (port) {\n-\tcase 8:\n-\t\tval = BRCM_HDR_EN_P8;\n-\t\tbreak;\n-\tcase 7:\n-\t\tval = BRCM_HDR_EN_P7;\n-\t\tbreak;\n-\tcase 5:\n-\t\tval = BRCM_HDR_EN_P5;\n-\t\tbreak;\n-\tdefault:\n-\t\tval = 0;\n-\t\tbreak;\n-\t}\n-\n-\t/* Enable Broadcom tags for IMP port */\n-\treg = core_readl(priv, CORE_BRCM_HDR_CTRL);\n-\treg |= val;\n-\tcore_writel(priv, reg, CORE_BRCM_HDR_CTRL);\n-\n-\t/* Enable reception Broadcom tag for CPU TX (switch RX) to\n-\t * allow us to tag outgoing frames\n-\t */\n-\treg = core_readl(priv, CORE_BRCM_HDR_RX_DIS);\n-\treg &= ~(1 << port);\n-\tcore_writel(priv, reg, CORE_BRCM_HDR_RX_DIS);\n-\n-\t/* Enable transmission of Broadcom tags from the switch (CPU RX) to\n-\t * allow delivering frames to the per-port net_devices\n-\t */\n-\treg = core_readl(priv, CORE_BRCM_HDR_TX_DIS);\n-\treg &= ~(1 << port);\n-\tcore_writel(priv, reg, CORE_BRCM_HDR_TX_DIS);\n-}\n \n static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)\n {\n@@ -138,7 +99,7 @@ static void bcm_sf2_imp_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-\tbcm_sf2_brcm_hdr_setup(priv, port);\n+\tb53_brcm_hdr_setup(ds, port);\n \n \t/* Force link status for IMP port */\n \treg = core_readl(priv, offset);\n@@ -247,7 +208,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,\n \n \t/* Enable Broadcom tags for that port if requested */\n \tif (priv->brcm_tag_mask & BIT(port))\n-\t\tbcm_sf2_brcm_hdr_setup(priv, port);\n+\t\tb53_brcm_hdr_setup(ds, port);\n \n \t/* Configure Traffic Class to QoS mapping, allow each priority to map\n \t * to a different queue number\ndiff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h\nindex 49695fcc2ea8..788361ad68a0 100644\n--- a/drivers/net/dsa/bcm_sf2_regs.h\n+++ b/drivers/net/dsa/bcm_sf2_regs.h\n@@ -205,16 +205,8 @@ enum bcm_sf2_reg_offs {\n \n #define CORE_IMP0_PRT_ID\t\t0x0804\n \n-#define CORE_BRCM_HDR_CTRL\t\t0x0080c\n-#define BRCM_HDR_EN_P8\t\t\t(1 << 0)\n-#define BRCM_HDR_EN_P5\t\t\t(1 << 1)\n-#define BRCM_HDR_EN_P7\t\t\t(1 << 2)\n-\n #define CORE_RST_MIB_CNT_EN\t\t0x0950\n \n-#define CORE_BRCM_HDR_RX_DIS\t\t0x0980\n-#define CORE_BRCM_HDR_TX_DIS\t\t0x0988\n-\n #define CORE_ARLA_VTBL_RWCTRL\t\t0x1600\n #define ARLA_VTBL_CMD_WRITE\t\t0\n #define ARLA_VTBL_CMD_READ\t\t1\n","prefixes":["net-next","v3","06/12"]}