mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-23 08:38:04 +03:00
(3/6) bcm57xx: preinit
This patch allows the bcm57xx module to work correctly with failsafe mode. insmod doesn't return an error when a module loads but doesn't detect a switch. I added the check_module function to load the module, then make sure it doesn't just exit immediately. This allows preinit to only attempt to load the bcm57xx module when switch-robo and switch-adm dont detect a switch. The activate_gpio parameter to bcm57xx simply instructs the module to attempt to activate the switch via gpio before probing for the switch. Tested on wrt350n. Signed-off-by: Ben Pfountz <netprince (at) vt (dot) edu> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11468 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
8d0837caa2
commit
f833889761
@ -4,7 +4,7 @@ failsafe() {
|
|||||||
lock /tmp/.failsafe
|
lock /tmp/.failsafe
|
||||||
failsafe_ip
|
failsafe_ip
|
||||||
|
|
||||||
echo "0 1 2 3 4 5u*" > /proc/switch/eth0/vlan/0/ports
|
echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
|
||||||
|
|
||||||
set_state failsafe
|
set_state failsafe
|
||||||
[ -x "/usr/sbin/nvram" ] && {
|
[ -x "/usr/sbin/nvram" ] && {
|
||||||
@ -39,8 +39,19 @@ esac
|
|||||||
|
|
||||||
failsafe_ip
|
failsafe_ip
|
||||||
|
|
||||||
|
check_module () {
|
||||||
|
module="$1"; shift; params="$*"
|
||||||
|
|
||||||
|
insmod "$module" "$params"
|
||||||
|
sleep 1
|
||||||
|
grep "^$module" /proc/modules
|
||||||
|
return $?
|
||||||
|
}
|
||||||
|
|
||||||
insmod switch-core
|
insmod switch-core
|
||||||
insmod switch-robo || insmod switch-adm || rmmod switch-core
|
check_module switch-robo || check_module switch-adm || {
|
||||||
|
check_module bcm57xx activate_gpio=0x4 && cpu_port="8u*"
|
||||||
|
} || rmmod switch-core
|
||||||
|
|
||||||
[ -d /proc/switch/eth0 ] && {
|
[ -d /proc/switch/eth0 ] && {
|
||||||
echo 1 > /proc/switch/eth0/reset
|
echo 1 > /proc/switch/eth0/reset
|
||||||
@ -48,7 +59,7 @@ insmod switch-robo || insmod switch-adm || rmmod switch-core
|
|||||||
# this would be easier if we blasted the message across all ports
|
# this would be easier if we blasted the message across all ports
|
||||||
# but we don't want packets leaking across interfaces
|
# but we don't want packets leaking across interfaces
|
||||||
for port in $(seq 0 4); do {
|
for port in $(seq 0 4); do {
|
||||||
echo "$port 5u*" > /proc/switch/eth0/vlan/0/ports
|
echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
|
||||||
netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
|
netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
|
||||||
}; done
|
}; done
|
||||||
} || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
|
} || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
|
||||||
|
Loading…
Reference in New Issue
Block a user