| Message ID | 20200909211011.63229-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | Christian Lamparter |
| Headers | show |
| Series | [v4] gemini: Bring up DSA switches | expand |
Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Linus Walleij > Sent: Mittwoch, 9. September 2020 23:10 > To: Roman Yeryomin <roman@advem.lv>; Sebastian Luft > <sebastian.luft@gmail.com>; Hans Ulli Kroll <ulli.kroll@googlemail.com>; > Hauke Mehrtens <hauke@hauke-m.de>; Christian Lamparter > <chunkeey@gmail.com> > Cc: Pawel Dembicki <paweldembicki@gmail.com>; Linus Walleij > <linus.walleij@linaro.org>; Florian Fainelli <f.fainelli@gmail.com>; openwrt- > devel@lists.openwrt.org > Subject: [PATCH v4] gemini: Bring up DSA switches > > First group the interfaces on the DSA switch into the right LAN/WAN groups. > Tested successfully on the D-Link DIR-685 with the RTL8366RB DSA switch. > > The RTL8366RB is DSA custom tagged and now handled by the kernel tag > parser. (Backported.) > > The Vitesse switches are not capable of supporting DSA per-port tagging. We > suspect they must be handled using some custom VLAN set-up. > > Cc: Pawel Dembicki <paweldembicki@gmail.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ChangeLog v3->v4: > - Rebased patch. > - This now works as expected on the D-Link DIR-685 > with the upstream DSA patches. > - For the Vitesse routers > I don't know what to do, but it should be "something > like this" eventually. I think it looks better with > this script than without it actually. > ChangeLog v2->v3: > - Actually remove the eth1 from the lan list as well on > the Gemini SL93512r. > ChangeLog v1->v2: > - Remove the eth1 from the LAN bridge in both the > Vitesse switch devices, instead bring up each ethernet > master interface independently with "none" protocol. > --- > .../gemini/base-files/etc/board.d/02_network | 27 > +++++++++++++++++++ > 1 file changed, 27 insertions(+) > create mode 100755 target/linux/gemini/base- > files/etc/board.d/02_network > > diff --git a/target/linux/gemini/base-files/etc/board.d/02_network > b/target/linux/gemini/base-files/etc/board.d/02_network > new file mode 100755 > index 000000000000..e2fce015fb44 > --- /dev/null > +++ b/target/linux/gemini/base-files/etc/board.d/02_network > @@ -0,0 +1,27 @@ > +#!/bin/sh > + > +. /lib/functions/uci-defaults.sh > + > +board_config_update > + > +case "$(board_name)" in > +storlink,gemini324) Devices should be sorted alphabetically here. Best Adrian > + # These are all connected to eth1 thru VSC7385 > + ucidef_set_interface "eth" ifname "eth1" protocol "none" > + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth0" > + ;; > +itian,sq201) > + # These are all connected to eth1 thru VSC7395 > + ucidef_set_interface "eth" ifname "eth1" protocol "none" > + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth0" > + ;; > +dlink,dir-685) > + # These are all connected to eth0 thru RTL8366RB > + ucidef_set_interface "eth" ifname "eth0" protocol "none" > + ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" "wan" > + ;; > +esac > + > +board_config_flush > + > +exit 0 > -- > 2.26.2 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/target/linux/gemini/base-files/etc/board.d/02_network b/target/linux/gemini/base-files/etc/board.d/02_network new file mode 100755 index 000000000000..e2fce015fb44 --- /dev/null +++ b/target/linux/gemini/base-files/etc/board.d/02_network @@ -0,0 +1,27 @@ +#!/bin/sh + +. /lib/functions/uci-defaults.sh + +board_config_update + +case "$(board_name)" in +storlink,gemini324) + # These are all connected to eth1 thru VSC7385 + ucidef_set_interface "eth" ifname "eth1" protocol "none" + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth0" + ;; +itian,sq201) + # These are all connected to eth1 thru VSC7395 + ucidef_set_interface "eth" ifname "eth1" protocol "none" + ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "eth0" + ;; +dlink,dir-685) + # These are all connected to eth0 thru RTL8366RB + ucidef_set_interface "eth" ifname "eth0" protocol "none" + ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" "wan" + ;; +esac + +board_config_flush + +exit 0
First group the interfaces on the DSA switch into the right LAN/WAN groups. Tested successfully on the D-Link DIR-685 with the RTL8366RB DSA switch. The RTL8366RB is DSA custom tagged and now handled by the kernel tag parser. (Backported.) The Vitesse switches are not capable of supporting DSA per-port tagging. We suspect they must be handled using some custom VLAN set-up. Cc: Pawel Dembicki <paweldembicki@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ChangeLog v3->v4: - Rebased patch. - This now works as expected on the D-Link DIR-685 with the upstream DSA patches. - For the Vitesse routers I don't know what to do, but it should be "something like this" eventually. I think it looks better with this script than without it actually. ChangeLog v2->v3: - Actually remove the eth1 from the lan list as well on the Gemini SL93512r. ChangeLog v1->v2: - Remove the eth1 from the LAN bridge in both the Vitesse switch devices, instead bring up each ethernet master interface independently with "none" protocol. --- .../gemini/base-files/etc/board.d/02_network | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 target/linux/gemini/base-files/etc/board.d/02_network