Navigation

← Previous Changeset
Next Changeset →

Changeset 3714

Timestamp:

03/12/08 17:29:28 (9 months ago)

Author:

spaetzle

Message:

switch init added to targets, hope that solves network startup problems
thanks to j4n for providing serial access to adm6996

- preinit.arch: removed switch_reset code (not the function), added null command

vlan cleanup at this point has simply no effect, no driver response to
command triggers via /proc/switch/

- preinit: moved switch_reset call prior failsafe startup

certain boards lacks a working power on reset logic, code must invoke this
i havn't done this without access to testboards to avoid trunk brakage at
this point, but it can be done in preinit.arch if necessary

- added /etc/init.d/switch

there's driver respose to proc triggers at this point, all reset and init
code here from now
includes adm6996 init fix

Files:

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/freewrt/package/base-files/files/etc/preinit

r3713	r3714
29	29	[ -f /etc/preinit.arch ] && . /etc/preinit.arch
30	30	[ -f /proc/diag/led/power ] && echo f >/proc/diag/led/power
	31	reset_switch # shell function, defined in preinit.arch
31	32
32	33	# failsafe via hotplug
…	…
50	51	done
51	52	ip addr delete 192.168.1.1/24 broadcast 192.168.1.255 dev eth0
52		~~reset_switch # shell function, defined in preinit.arch~~
53	53
54	54	# ensure busybox is suid root and resume booting

trunk/freewrt/package/fwifupdown/lib/vlan

r3685	r3714
121	121
122	122	# configure switch
123		if [[ $(cat /proc/switch/${IF_VLAN_RAW_DEVICE}/enable) != 1 ]]; then
	123	if [[ -f /proc/switch/${IF_VLAN_RAW_DEVICE}/enable && \
	124	$(cat /proc/switch/${IF_VLAN_RAW_DEVICE}/enable) != 1 ]]; then
124	125	if ! echo 1 > /proc/switch/${IF_VLAN_RAW_DEVICE}/enable 2>&-; then
125	126	mstate 1
…	…
129	130	fi
130	131
131		if [[ $(cat /proc/switch/${IF_VLAN_RAW_DEVICE}/enable_vlan) != 1 ]]; then
	132	if [[ -f /proc/switch/${IF_VLAN_RAW_DEVICE}/enable_vlan && \
	133	$(cat /proc/switch/${IF_VLAN_RAW_DEVICE}/enable_vlan) != 1 ]]; then
132	134	if ! echo 1 > /proc/switch/${IF_VLAN_RAW_DEVICE}/enable_vlan 2>&-; then
133	135	mstate 1
134	136	merr "Enabeling vlan on switch $IF_VLAN_RAW_DEVICE failed"
135		return 1
	137	#return 1
136	138	fi
137	139	fi

trunk/freewrt/target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/init.d/switch

r2653	r3714
3	3	case $1 in
4	4	autostart\|start)
5		# reset switch
6		echo 1 > /proc/switch/eth0/reset
7		echo 1 > /proc/switch/eth0/enable
	5	print 1 >/proc/switch/eth0/reset
	6	if [[ $(cat /proc/switch/eth0/driver) == adm6996 ]]; then
	7	# adm6996 "bad port state after reset" fixup
	8	for ports in /proc/switch/eth7Ivlan/*/ports; do
	9	print >$ports
	10	done
	11	else
	12	# switch-robo resets to a good port state
	13	print 1 >/proc/switch/eth0/enable
	14	fi
	15	print 1 >/proc/switch/eth0/enable_vlan
8	16	;;
9	17	esac

trunk/freewrt/target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/preinit.arch

r2878 r3714

1 1 reset_switch() {
2 echo 1 >/proc/switch/eth0/reset
3 echo 1 >/proc/switch/eth0/enable
2 :
4 3 }
5 4
trunk/freewrt/target/linux/brcm-2.4/asus-wl500g-premium/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/linksys-wrt54g-4/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/linksys-wrt54g/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/linksys-wrt54g3g/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/linksys-wrt54gs-4/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/linksys-wrt54gs/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4
trunk/freewrt/target/linux/brcm-2.4/netgear-wgt634u/files/etc/preinit.arch

r2880 r3714

1 1 reset_switch() {
2 ~~echo >/proc/switch/eth0/vlan/0/ports~~
2 :
3 3 }
4 4

r2878	r3714
1	1	reset_switch() {
2		echo 1 >/proc/switch/eth0/reset
3		echo 1 >/proc/switch/eth0/enable
	2	:
4	3	}
5	4

r2880	r3714
1	1	reset_switch() {
2		~~echo >/proc/switch/eth0/vlan/0/ports~~
	2	:
3	3	}
4	4

Navigation

Changeset 3714

Legend:

Download in other formats: