Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/815254/?format=api
{ "id": 815254, "url": "http://patchwork.ozlabs.org/api/patches/815254/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170919021947.8971-7-f.fainelli@gmail.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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": "<20170919021947.8971-7-f.fainelli@gmail.com>", "list_archive_url": null, "date": "2017-09-19T02:19:41", "name": "[net-next,v2,06/12] net: dsa: b53: Move Broadcom header setup to b53", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "abdd188152d702ae1c4333a7bfd7dbf11b0b1347", "submitter": { "id": 2800, "url": "http://patchwork.ozlabs.org/api/people/2800/?format=api", "name": "Florian Fainelli", "email": "f.fainelli@gmail.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170919021947.8971-7-f.fainelli@gmail.com/mbox/", "series": [ { "id": 3767, "url": "http://patchwork.ozlabs.org/api/series/3767/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=3767", "date": "2017-09-19T02:19:35", "name": "net: dsa: b53/bcm_sf2 cleanups", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/3767/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/815254/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/815254/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"FDwVN7dF\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xx6Ds6SVcz9s4s\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 19 Sep 2017 12:26:05 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751283AbdISC0D (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 18 Sep 2017 22:26:03 -0400", "from mail-wr0-f194.google.com ([209.85.128.194]:37987 \"EHLO\n\tmail-wr0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751100AbdISC0C (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 18 Sep 2017 22:26:02 -0400", "by mail-wr0-f194.google.com with SMTP id p37so1359807wrb.5\n\tfor <netdev@vger.kernel.org>; Mon, 18 Sep 2017 19:26:02 -0700 (PDT)", "from fainelli-desktop.broadcom.com ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\tq19sm9332458wrb.17.2017.09.18.19.20.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 19:20:08 -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=gQvChS4ObHagUx+OuJMdqliMjpVGfmY6bLCzN8El9BA=;\n\tb=FDwVN7dF3wcF1BJqK4YNSnNJO3uarNoCGfWRgHxCyt065BqCvWyt7RTNgoBi7oNOM3\n\tid8GVF3PiaHEsHmEa4ZXVZZMhrQZKw40A4+nw9TNlNbNbfAqUM3OCB8/qYhyvUeGc3+j\n\tC9w203SH/6NFfzHB9tIurmpjDIo9t4kEvkKmpS5jBWH1kINiHo6hD6yR4abY5bW0AIlT\n\t9sZm8HGIzAzcFz0i+mDTU8qq5K5MS4H/S8LIGdDioSwXsKgrG/duKAxCk6ARABUSWx2F\n\tDOXQuUupHqe8Tg1Rt2QPv7cIv0l5jdzsqDtPkHY9vbMuPWdUr6rj81jzFAbMtAnQKois\n\taD4g==", "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=gQvChS4ObHagUx+OuJMdqliMjpVGfmY6bLCzN8El9BA=;\n\tb=ZLQC+NgAN/31tIGpti3Qmg4kX3V9vPXopMqzaOT1xMJ+Ht4pU9As7YjV1mL4K8Eget\n\tw2t0DTW++rqpN8XJCtdx4fXcpyshM+Z/wgFXRQTxQqHnZmObg7l6fuwUCuQusi44bewG\n\t+YxE9DSAGxjSEOrWJuz3Yid9SePPK+xhqu8Hp9xCfWkY3MB0VejL3DYas0yZJGvgJu9D\n\tkpPDZzWZ42D8pFH2zoI99IqD5d50XQxn3FSPOGJKRAaa086+qlesRGSiVE1RZK0o3CF0\n\tQf2rzE1ccKPAvk6/s5n/0kArReuDsblzG6sM+9z51EM1rNXIqoyXYiEkPgtuMbUMkZGc\n\t+oCA==", "X-Gm-Message-State": "AHPjjUgSQn6SVQwY+2SflDHbxjHvOooZg6NEjeYY+mW59mVaIEsGRCT7\n\tihXJnkug6FwDDiG0J3Y=", "X-Google-Smtp-Source": "ADKCNb77Qyy8ruAhBujJDQpTqwmmd2jGWlMdyuu+z8UgWTtPlxa+ISqVu9UXkS1Z6ZcdYZOSlAIFZw==", "X-Received": "by 10.223.160.23 with SMTP id k23mr30134111wrk.212.1505787609314;\n\tMon, 18 Sep 2017 19:20:09 -0700 (PDT)", "From": "Florian Fainelli <f.fainelli@gmail.com>", "To": "netdev@vger.kernel.org", "Cc": "andrew@lunn.ch, vivien.didelot@savoirfairelinux.com,\n\tdavem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>", "Subject": "[PATCH net-next v2 06/12] net: dsa: b53: Move Broadcom header setup\n\tto b53", "Date": "Mon, 18 Sep 2017 19:19:41 -0700", "Message-Id": "<20170919021947.8971-7-f.fainelli@gmail.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170919021947.8971-1-f.fainelli@gmail.com>", "References": "<20170919021947.8971-1-f.fainelli@gmail.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "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 <vivien.didelot@savoirfairelinux.com>\nSigned-off-by: Florian Fainelli <f.fainelli@gmail.com>\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 f1136619e0e4..44297b7c3795 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", "v2", "06/12" ] }