/* * This header provides constants specific to AM33XX pinctrl bindings. */ #ifndef _DT_BINDINGS_PINCTRL_AM33XX_H #define _DT_BINDINGS_PINCTRL_AM33XX_H #include <dt-bindings/pinctrl/omap.h> /* am33xx specific mux bit defines */ #undef PULL_ENA #undef INPUT_EN #define PULL_DISABLE (1 << 3) #define INPUT_EN (1 << 5) #define SLEWCTRL_SLOW (1 << 6) #define SLEWCTRL_FAST 0 /* update macro depending on INPUT_EN and PULL_ENA */ #undef PIN_OUTPUT #undef PIN_OUTPUT_PULLUP #undef PIN_OUTPUT_PULLDOWN #undef PIN_INPUT #undef PIN_INPUT_PULLUP #undef PIN_INPUT_PULLDOWN #define PIN_OUTPUT (PULL_DISABLE) #define PIN_OUTPUT_PULLUP (PULL_UP) #define PIN_OUTPUT_PULLDOWN 0 #define PIN_INPUT (INPUT_EN | PULL_DISABLE) #define PIN_INPUT_PULLUP (INPUT_EN | PULL_UP) #define PIN_INPUT_PULLDOWN (INPUT_EN) /* undef non-existing modes */ #undef PIN_OFF_NONE #undef PIN_OFF_OUTPUT_HIGH #undef PIN_OFF_OUTPUT_LOW #undef PIN_OFF_INPUT_PULLUP #undef PIN_OFF_INPUT_PULLDOWN #undef PIN_OFF_WAKEUPENABLE #endif <option value='emaclite-cleanup'>emaclite-cleanup</option> <option value='master'>master</option> <option value='nds-private-remove' selected='selected'>nds-private-remove</option> <option value='packet-loop-back'>packet-loop-back</option> <option value='packet-rx-pump-back'>packet-rx-pump-back</option> </select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table> <table class='tabs'><tr><td> <a href='/cgit.cgi/linux/net-next.git/?h=nds-private-remove'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/net?h=nds-private-remove'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/net'> <input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='efa5356b0d9753b9d7e63e41459eba106cce30f3'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='efa5356b0d9753b9d7e63e41459eba106cce30f3'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'> <tr><th>author</th><td>Roopa Prabhu <roopa@cumulusnetworks.com></td><td class='right'>2017-01-31 22:59:54 -0800</td></tr> <tr><th>committer</th><td>David S. Miller <davem@davemloft.net></td><td class='right'>2017-02-03 15:21:22 -0500</td></tr> <tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>efa5356b0d9753b9d7e63e41459eba106cce30f3</a> (<a href='/cgit.cgi/linux/net-next.git/patch/net?id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>4b017636bfcb26f0f908e762ef871374d9fb2995</a> /<a href='/cgit.cgi/linux/net-next.git/tree/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net</a></td></tr> <tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&id=b3c7ef0adadc5768e0baa786213c6bd1ce521a77'>b3c7ef0adadc5768e0baa786213c6bd1ce521a77</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3&id2=b3c7ef0adadc5768e0baa786213c6bd1ce521a77'>diff</a>)</td></tr></table> <div class='commit-subject'>bridge: per vlan dst_metadata netlink support</div><div class='commit-msg'>This patch adds support to attach per vlan tunnel info dst metadata. This enables bridge driver to map vlan to tunnel_info at ingress and egress. It uses the kernel dst_metadata infrastructure. The initial use case is vlan to vni bridging, but the api is generic to extend to any tunnel_info in the future: - Uapi to configure/unconfigure/dump per vlan tunnel data - netlink functions to configure vlan and tunnel_info mapping - Introduces bridge port flag BR_LWT_VLAN to enable attach/detach dst_metadata to bridged packets on ports. off by default. - changes to existing code is mainly refactor some existing vlan handling netlink code + hooks for new vlan tunnel code - I have kept the vlan tunnel code isolated in separate files. - most of the netlink vlan tunnel code is handling of vlan-tunid ranges (follows the vlan range handling code). To conserve space vlan-tunid by default are always dumped in ranges if applicable. Use case: example use for this is a vxlan bridging gateway or vtep which maps vlans to vn-segments (or vnis). iproute2 example (patched and pruned iproute2 output to just show relevant fdb entries): example shows same host mac learnt on two vni's and vlan 100 maps to vni 1000, vlan 101 maps to vni 1001 before (netdev per vni): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan1001 vlan 101 master bridge 00:02:00:00:00:03 dev vxlan1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan1000 vlan 100 master bridge 00:02:00:00:00:03 dev vxlan1000 dst 12.0.0.8 self after this patch with collect metdata in bridged mode (single netdev): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan0 vlan 101 master bridge 00:02:00:00:00:03 dev vxlan0 src_vni 1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan0 vlan 100 master bridge 00:02:00:00:00:03 dev vxlan0 src_vni 1000 dst 12.0.0.8 self CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> </div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>Diffstat</a> (limited to 'net')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/Makefile?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_netlink.c?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_netlink.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 32.1%;'/><td class='rem' style='width: 15.2%;'/><td class='none' style='width: 52.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_netlink_tunnel.c?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_netlink_tunnel.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_private.h?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_private.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_private_tunnel.h?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_private_tunnel.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 75.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_vlan.c?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_vlan.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit.cgi/linux/net-next.git/diff/net/bridge/br_vlan_tunnel.c?h=nds-private-remove&id=efa5356b0d9753b9d7e63e41459eba106cce30f3'>net/bridge/br_vlan_tunnel.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 50.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 49.7%;'/></tr></table></td></tr> </table><div class='diffstat-summary'>7 files changed, 641 insertions, 48 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/net/bridge/Makefile b/net/bridge/Makefile