Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806740/?format=api
{ "id": 806740, "url": "http://patchwork.ozlabs.org/api/patches/806740/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170828191748.19492-10-vivien.didelot@savoirfairelinux.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": "<20170828191748.19492-10-vivien.didelot@savoirfairelinux.com>", "list_archive_url": null, "date": "2017-08-28T19:17:47", "name": "[net-next,v2,09/10] net: dsa: restore VLAN dump", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "ca97b48e5f5d6416165acdad6a9af90cfd3d79d4", "submitter": { "id": 15889, "url": "http://patchwork.ozlabs.org/api/people/15889/?format=api", "name": "Vivien Didelot", "email": "vivien.didelot@savoirfairelinux.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/20170828191748.19492-10-vivien.didelot@savoirfairelinux.com/mbox/", "series": [ { "id": 246, "url": "http://patchwork.ozlabs.org/api/series/246/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=246", "date": "2017-08-28T19:17:41", "name": "net: dsa: add generic debugfs interface", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/246/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806740/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806740/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>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xh21c6ztBz9s76\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 29 Aug 2017 05:31:00 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751719AbdH1TWw (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 28 Aug 2017 15:22:52 -0400", "from mail.savoirfairelinux.com ([208.88.110.44]:36394 \"EHLO\n\tmail.savoirfairelinux.com\" rhost-flags-OK-OK-OK-OK) by\n\tvger.kernel.org with ESMTP id S1751349AbdH1TVl (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 28 Aug 2017 15:21:41 -0400", "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 542119C1BAC;\n\tMon, 28 Aug 2017 15:21:41 -0400 (EDT)", "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10032)\n\twith ESMTP id QOsCkEk3O0Mx; Mon, 28 Aug 2017 15:21:40 -0400 (EDT)", "from localhost (localhost [127.0.0.1])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTP id 4A4889C23FE;\n\tMon, 28 Aug 2017 15:21:38 -0400 (EDT)", "from mail.savoirfairelinux.com ([127.0.0.1])\n\tby localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new,\n\tport 10026)\n\twith ESMTP id rbtSx7lTImTQ; Mon, 28 Aug 2017 15:21:37 -0400 (EDT)", "from weeman.mtl.sfl (unknown [192.168.50.91])\n\tby mail.savoirfairelinux.com (Postfix) with ESMTPSA id DA24D9C1D1A;\n\tMon, 28 Aug 2017 15:21:37 -0400 (EDT)" ], "X-Virus-Scanned": "amavisd-new at mail.savoirfairelinux.com", "From": "Vivien Didelot <vivien.didelot@savoirfairelinux.com>", "To": "netdev@vger.kernel.org", "Cc": "linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tFlorian Fainelli <f.fainelli@gmail.com>, Andrew Lunn <andrew@lunn.ch>,\n\tEgil Hjelmeland <privat@egil-hjelmeland.no>,\n\tJohn Crispin <john@phrozen.org>, Woojung Huh <Woojung.Huh@microchip.com>,\n\tSean Wang <sean.wang@mediatek.com>,\n\tNikita Yushchenko <nikita.yoush@cogentembedded.com>,\n\tChris Healy <cphealy@gmail.com>,\n\tVivien Didelot <vivien.didelot@savoirfairelinux.com>", "Subject": "[PATCH net-next v2 09/10] net: dsa: restore VLAN dump", "Date": "Mon, 28 Aug 2017 15:17:47 -0400", "Message-Id": "<20170828191748.19492-10-vivien.didelot@savoirfairelinux.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170828191748.19492-1-vivien.didelot@savoirfairelinux.com>", "References": "<20170828191748.19492-1-vivien.didelot@savoirfairelinux.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "This commit defines a dsa_vlan_dump_cb_t callback, similar to the FDB\ndump callback and partly reverts commit a0b6b8c9fa3c (\"net: dsa: Remove\nsupport for vlan dump from DSA's drivers\") to restore the DSA drivers\nVLAN dump operations.\n\nSigned-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>\nReviewed-by: Florian Fainelli <f.fainelli@gmail.com>\nReviewed-by: Andrew Lunn <andrew@lunn.ch>\n---\n drivers/net/dsa/b53/b53_common.c | 41 ++++++++++++++++++++++++++++\n drivers/net/dsa/b53/b53_priv.h | 2 ++\n drivers/net/dsa/bcm_sf2.c | 1 +\n drivers/net/dsa/dsa_loop.c | 38 ++++++++++++++++++++++++++\n drivers/net/dsa/microchip/ksz_common.c | 41 ++++++++++++++++++++++++++++\n drivers/net/dsa/mv88e6xxx/chip.c | 49 ++++++++++++++++++++++++++++++++++\n include/net/dsa.h | 5 ++++\n 7 files changed, 177 insertions(+)", "diff": "diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c\nindex 274f3679f33d..be0c5fa8bd9b 100644\n--- a/drivers/net/dsa/b53/b53_common.c\n+++ b/drivers/net/dsa/b53/b53_common.c\n@@ -1053,6 +1053,46 @@ int b53_vlan_del(struct dsa_switch *ds, int port,\n }\n EXPORT_SYMBOL(b53_vlan_del);\n \n+int b53_vlan_dump(struct dsa_switch *ds, int port, dsa_vlan_dump_cb_t *cb,\n+\t\t void *data)\n+{\n+\tstruct b53_device *dev = ds->priv;\n+\tu16 vid, vid_start = 0, pvid;\n+\tstruct b53_vlan *vl;\n+\tbool untagged;\n+\tint err = 0;\n+\n+\tif (is5325(dev) || is5365(dev))\n+\t\tvid_start = 1;\n+\n+\tb53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid);\n+\n+\t/* Use our software cache for dumps, since we do not have any HW\n+\t * operation returning only the used/valid VLANs\n+\t */\n+\tfor (vid = vid_start; vid < dev->num_vlans; vid++) {\n+\t\tvl = &dev->vlans[vid];\n+\n+\t\tif (!vl->valid)\n+\t\t\tcontinue;\n+\n+\t\tif (!(vl->members & BIT(port)))\n+\t\t\tcontinue;\n+\n+\t\tuntagged = false;\n+\n+\t\tif (vl->untag & BIT(port))\n+\t\t\tuntagged = true;\n+\n+\t\terr = cb(vid, pvid == vid, untagged, data);\n+\t\tif (err)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn err;\n+}\n+EXPORT_SYMBOL(b53_vlan_dump);\n+\n /* Address Resolution Logic routines */\n static int b53_arl_op_wait(struct b53_device *dev)\n {\n@@ -1503,6 +1543,7 @@ static const struct dsa_switch_ops b53_switch_ops = {\n \t.port_vlan_prepare\t= b53_vlan_prepare,\n \t.port_vlan_add\t\t= b53_vlan_add,\n \t.port_vlan_del\t\t= b53_vlan_del,\n+\t.port_vlan_dump\t\t= b53_vlan_dump,\n \t.port_fdb_dump\t\t= b53_fdb_dump,\n \t.port_fdb_add\t\t= b53_fdb_add,\n \t.port_fdb_del\t\t= b53_fdb_del,\ndiff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h\nindex 01bd8cbe9a3f..2b3e59d80fdb 100644\n--- a/drivers/net/dsa/b53/b53_priv.h\n+++ b/drivers/net/dsa/b53/b53_priv.h\n@@ -393,6 +393,8 @@ void b53_vlan_add(struct dsa_switch *ds, int port,\n \t\t struct switchdev_trans *trans);\n int b53_vlan_del(struct dsa_switch *ds, int port,\n \t\t const struct switchdev_obj_port_vlan *vlan);\n+int b53_vlan_dump(struct dsa_switch *ds, int port, dsa_vlan_dump_cb_t *cb,\n+\t\t void *data);\n int b53_fdb_add(struct dsa_switch *ds, int port,\n \t\tconst unsigned char *addr, u16 vid);\n int b53_fdb_del(struct dsa_switch *ds, int port,\ndiff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c\nindex bbcb4053e04e..1907b27297c3 100644\n--- a/drivers/net/dsa/bcm_sf2.c\n+++ b/drivers/net/dsa/bcm_sf2.c\n@@ -1021,6 +1021,7 @@ static const struct dsa_switch_ops bcm_sf2_ops = {\n \t.port_vlan_prepare\t= b53_vlan_prepare,\n \t.port_vlan_add\t\t= b53_vlan_add,\n \t.port_vlan_del\t\t= b53_vlan_del,\n+\t.port_vlan_dump\t\t= b53_vlan_dump,\n \t.port_fdb_dump\t\t= b53_fdb_dump,\n \t.port_fdb_add\t\t= b53_fdb_add,\n \t.port_fdb_del\t\t= b53_fdb_del,\ndiff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c\nindex 7819a9fe8321..0407533f725f 100644\n--- a/drivers/net/dsa/dsa_loop.c\n+++ b/drivers/net/dsa/dsa_loop.c\n@@ -257,6 +257,43 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port,\n \treturn 0;\n }\n \n+static int dsa_loop_port_vlan_dump(struct dsa_switch *ds, int port,\n+\t\t\t\t dsa_vlan_dump_cb_t *cb, void *data)\n+{\n+\tstruct dsa_loop_priv *ps = ds->priv;\n+\tstruct mii_bus *bus = ps->bus;\n+\tstruct dsa_loop_vlan *vl;\n+\tu16 vid, vid_start = 0;\n+\tbool pvid, untagged;\n+\tint err = 0;\n+\n+\tdev_dbg(ds->dev, \"%s\\n\", __func__);\n+\n+\t/* Just do a sleeping operation to make lockdep checks effective */\n+\tmdiobus_read(bus, ps->port_base + port, MII_BMSR);\n+\n+\tfor (vid = vid_start; vid < DSA_LOOP_VLANS; vid++) {\n+\t\tvl = &ps->vlans[vid];\n+\n+\t\tif (!(vl->members & BIT(port)))\n+\t\t\tcontinue;\n+\n+\t\tuntagged = false;\n+\t\tpvid = false;\n+\n+\t\tif (vl->untagged & BIT(port))\n+\t\t\tuntagged = true;\n+\t\tif (ps->pvid == vid)\n+\t\t\tpvid = true;\n+\n+\t\terr = cb(vid, pvid, untagged, data);\n+\t\tif (err)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn err;\n+}\n+\n static const struct dsa_switch_ops dsa_loop_driver = {\n \t.get_tag_protocol\t= dsa_loop_get_protocol,\n \t.setup\t\t\t= dsa_loop_setup,\n@@ -273,6 +310,7 @@ static const struct dsa_switch_ops dsa_loop_driver = {\n \t.port_vlan_prepare\t= dsa_loop_port_vlan_prepare,\n \t.port_vlan_add\t\t= dsa_loop_port_vlan_add,\n \t.port_vlan_del\t\t= dsa_loop_port_vlan_del,\n+\t.port_vlan_dump\t\t= dsa_loop_port_vlan_dump,\n };\n \n static int dsa_loop_drv_probe(struct mdio_device *mdiodev)\ndiff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c\nindex 56cd6d365352..52c7849acc3c 100644\n--- a/drivers/net/dsa/microchip/ksz_common.c\n+++ b/drivers/net/dsa/microchip/ksz_common.c\n@@ -638,6 +638,46 @@ static int ksz_port_vlan_del(struct dsa_switch *ds, int port,\n \treturn 0;\n }\n \n+static int ksz_port_vlan_dump(struct dsa_switch *ds, int port,\n+\t\t\t dsa_vlan_dump_cb_t *cb, void *data)\n+{\n+\tstruct ksz_device *dev = ds->priv;\n+\tstruct vlan_table *vlan_cache;\n+\tbool pvid, untagged;\n+\tu16 val;\n+\tint vid;\n+\tint err = 0;\n+\n+\tmutex_lock(&dev->vlan_mutex);\n+\n+\t/* use dev->vlan_cache due to lack of searching valid vlan entry */\n+\tfor (vid = 0; vid < dev->num_vlans; vid++) {\n+\t\tvlan_cache = &dev->vlan_cache[vid];\n+\n+\t\tif (!(vlan_cache->table[0] & VLAN_VALID))\n+\t\t\tcontinue;\n+\n+\t\tuntagged = false;\n+\t\tpvid = false;\n+\n+\t\tif (vlan_cache->table[2] & BIT(port)) {\n+\t\t\tif (vlan_cache->table[1] & BIT(port))\n+\t\t\t\tuntagged = true;\n+\t\t\tksz_pread16(dev, port, REG_PORT_DEFAULT_VID, &val);\n+\t\t\tif (vid == (val & 0xFFFFF))\n+\t\t\t\tpvid = true;\n+\n+\t\t\terr = cb(vid, pvid, untagged, data);\n+\t\t\tif (err)\n+\t\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tmutex_unlock(&dev->vlan_mutex);\n+\n+\treturn err;\n+}\n+\n struct alu_struct {\n \t/* entry 1 */\n \tu8\tis_static:1;\n@@ -1068,6 +1108,7 @@ static const struct dsa_switch_ops ksz_switch_ops = {\n \t.port_vlan_prepare\t= ksz_port_vlan_prepare,\n \t.port_vlan_add\t\t= ksz_port_vlan_add,\n \t.port_vlan_del\t\t= ksz_port_vlan_del,\n+\t.port_vlan_dump\t\t= ksz_port_vlan_dump,\n \t.port_fdb_dump\t\t= ksz_port_fdb_dump,\n \t.port_fdb_add\t\t= ksz_port_fdb_add,\n \t.port_fdb_del\t\t= ksz_port_fdb_del,\ndiff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c\nindex c66204423641..3717ae098d58 100644\n--- a/drivers/net/dsa/mv88e6xxx/chip.c\n+++ b/drivers/net/dsa/mv88e6xxx/chip.c\n@@ -1011,6 +1011,54 @@ static int mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip,\n \treturn chip->info->ops->vtu_loadpurge(chip, entry);\n }\n \n+static int mv88e6xxx_port_vlan_dump(struct dsa_switch *ds, int port,\n+\t\t\t\t dsa_vlan_dump_cb_t *cb, void *data)\n+{\n+\tstruct mv88e6xxx_chip *chip = ds->priv;\n+\tstruct mv88e6xxx_vtu_entry next = {\n+\t\t.vid = chip->info->max_vid,\n+\t};\n+\tbool untagged;\n+\tu16 pvid;\n+\tint err;\n+\n+\tif (!chip->info->max_vid)\n+\t\treturn -EOPNOTSUPP;\n+\n+\tmutex_lock(&chip->reg_lock);\n+\n+\terr = mv88e6xxx_port_get_pvid(chip, port, &pvid);\n+\tif (err)\n+\t\tgoto unlock;\n+\n+\tdo {\n+\t\terr = mv88e6xxx_vtu_getnext(chip, &next);\n+\t\tif (err)\n+\t\t\tbreak;\n+\n+\t\tif (!next.valid)\n+\t\t\tbreak;\n+\n+\t\tif (next.member[port] ==\n+\t\t MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)\n+\t\t\tcontinue;\n+\n+\t\tuntagged = false;\n+\t\tif (next.member[port] ==\n+\t\t MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNTAGGED)\n+\t\t\tuntagged = true;\n+\n+\t\terr = cb(next.vid, next.vid == pvid, untagged, data);\n+\t\tif (err)\n+\t\t\tbreak;\n+\t} while (next.vid < chip->info->max_vid);\n+\n+unlock:\n+\tmutex_unlock(&chip->reg_lock);\n+\n+\treturn err;\n+}\n+\n static int mv88e6xxx_atu_new(struct mv88e6xxx_chip *chip, u16 *fid)\n {\n \tDECLARE_BITMAP(fid_bitmap, MV88E6XXX_N_FID);\n@@ -3820,6 +3868,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {\n \t.port_vlan_prepare\t= mv88e6xxx_port_vlan_prepare,\n \t.port_vlan_add\t\t= mv88e6xxx_port_vlan_add,\n \t.port_vlan_del\t\t= mv88e6xxx_port_vlan_del,\n+\t.port_vlan_dump\t\t= mv88e6xxx_port_vlan_dump,\n \t.port_fdb_add = mv88e6xxx_port_fdb_add,\n \t.port_fdb_del = mv88e6xxx_port_fdb_del,\n \t.port_fdb_dump = mv88e6xxx_port_fdb_dump,\ndiff --git a/include/net/dsa.h b/include/net/dsa.h\nindex c0d1b6c47a50..b4994c58547f 100644\n--- a/include/net/dsa.h\n+++ b/include/net/dsa.h\n@@ -315,6 +315,8 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)\n /* FDB (and MDB) dump callback */\n typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid,\n \t\t\t bool is_static, void *data);\n+typedef int dsa_vlan_dump_cb_t(u16 vid, bool pvid, bool untagged, void *data);\n+\n struct dsa_switch_ops {\n \t/*\n \t * Legacy probing.\n@@ -421,6 +423,9 @@ struct dsa_switch_ops {\n \t\t\t\t struct switchdev_trans *trans);\n \tint\t(*port_vlan_del)(struct dsa_switch *ds, int port,\n \t\t\t\t const struct switchdev_obj_port_vlan *vlan);\n+\tint\t(*port_vlan_dump)(struct dsa_switch *ds, int port,\n+\t\t\t\t dsa_vlan_dump_cb_t *cb, void *data);\n+\n \t/*\n \t * Forwarding database\n \t */\n", "prefixes": [ "net-next", "v2", "09/10" ] }