Skip to content

Commit

Permalink
restart bthal on wake, allow user defined module reprobe
Browse files Browse the repository at this point in the history
  • Loading branch information
Kethen committed Feb 2, 2024
1 parent 976ace8 commit 6f3f36e
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 0 deletions.
2 changes: 2 additions & 0 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ endif
PRODUCT_COPY_FILES := \
$(if $(wildcard $(PRODUCT_DIR)init.rc),$(PRODUCT_DIR)init.rc:root/init.rc) \
$(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \
$(if $(wildcard $(PRODUCT_DIR)pre_sleep.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)pre_sleep.sh:system/etc/pre_sleep.sh \
$(if $(wildcard $(PRODUCT_DIR)post_sleep.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)post_sleep.sh:system/etc/post_sleep.sh \
$(if $(wildcard $(PRODUCT_DIR)modules.blocklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blocklist:system/etc/modules.blocklist \
$(if $(wildcard $(PRODUCT_DIR)modules.options),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.options:system/etc/modules.options \
$(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \
Expand Down
2 changes: 2 additions & 0 deletions init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,10 @@ function init_hal_bluetooth()

if [ "$BTLINUX_HAL" = "1" ]; then
start btlinux-1.1
set_property "ro.bliss.bthal" "btlinux"
else
start vendor.bluetooth-1-1
set_property "ro.bliss.bthal" "celadon"
fi
}

Expand Down
122 changes: 122 additions & 0 deletions post_sleep.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
# called from modified suspend hal

# prepare env
DMIPATH=/sys/class/dmi/id
export BOARD=$(cat $DMIPATH/board_name)
export PRODUCT=$(cat $DMIPATH/product_name)
export VENDOR=$(cat $DMIPATH/sys_vendor)
export UEVENT=$(cat $DMIPATH/uevent)

function reprobe_module_if_loaded()
{
module=$1
for modname in $(lsmod | awk '{print $1}')
do
if [ "$module" == "$modname" ]
then
modprobe -rv $module
modprobe -v $module
return
fi
done
echo module $module not loaded, not reprobing
}

# prep the prebaked list here, if there are known devices that definitely needs this work-around
MODULE_RELOAD_LIST=""
# set RESTART_WIFI to true if a wifi module is going to be reloaded, note that users will have to manually turn on wifi again after a wificond restart
RESTART_WIFI=false
# set RESET_BT to true if a bluetooth module is going to be reloaded, note that user might have to manually turn on bluetooth again after bthal restart
RESTART_BT=false

### EXAMPLE:
### if [ "$BOARD" == "xxx" ]
### then
### MODULE_RELOAD_LIST="$MODULE_RELOAD_LIST iwlwifi btusb"
### RESTART_WIFI=true
### RESTART_BT=true
### fi

# usually bluetooth breaks when waking from s3 resets the device, then bthal continues to communicate to it with existing sockets as if the reset had never happened
# while disabling bthal before suspend then starting it after is enough on the steamdeck, reprobing the module should make it work better in a more general sense
RESTART_BT=true
MODULE_RELOAD_LIST="$MODULE_RELOAD_LIST btusb"

# users can use this to flag wificond restart
USER_RESTART_WIFI_FLAG=/data/etc/wake_reload_wifi
if [ -e $USER_RESTART_WIFI_FLAG ]
then
RESTART_WIFI=true
fi

# users can use this to flag bluetooth restart
USER_RESTART_BT_FLAG=/data/etc/wake_reload_bt
if [ -e $USER_RESTART_BT_FLAG ]
then
RESTART_BT=true
fi

# stop services if requested
if $RESTART_BT
then
setprop ctl.stop btlinux-1.1
setprop ctl.stop vendor.bluetooth-1-1
fi

if $RESTART_WIFI
then
setprop ctl.stop wificond
fi

# setprop ctl.stop should be instant, but just in case
if $RESTART_WIFI || $RESTART_BT
then
sleep 0.2
fi

# perform module reprobe
MODULE_RELOAD_LOG=/data/wake_module_reload_log
rm -f $MODULE_RELOAD_LOG
if [ -n "$MODULE_RELOAD_LIST" ]
then
for m in $MODULE_RELOAD_LIST
do
reprobe_module_if_loaded $m 2>&1 | cat >> $MODULE_RELOAD_LOG
done
fi

# let users define a list of modules to reload on wake
USER_MODULE_RELOAD_LIST=/data/etc/wake_module_reload_list
if [ -e $USER_MODULE_RELOAD_LIST ]
then
for m in $(cat $USER_MODULE_RELOAD_LIST)
do
reprobe_module_if_loaded $m 2>&1 | cat >> $MODULE_RELOAD_LOG
done
fi

# start services again
if $RESTART_WIFI
then
setprop ctl.start wificond
fi

if $RESTART_BT
then
bthal=$(getprop ro.bliss.bthal)
case $bthal in
"btlinux")
setprop ctl.start btlinux-1.1
;;
"celadon")
setprop ctl.start vendor.bluetooth-1-1
;;
esac
fi

# allow user defined actions
USER_SCRIPT=/data/etc/post_sleep.sh
if [ -e $USER_SCRIPT ]
then
/system/bin/sh $USER_SCRIPT
fi
17 changes: 17 additions & 0 deletions pre_sleep.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# called from modified suspend hal

# prepare env
DMIPATH=/sys/class/dmi/id
export BOARD=$(cat $DMIPATH/board_name)
export PRODUCT=$(cat $DMIPATH/product_name)
export VENDOR=$(cat $DMIPATH/sys_vendor)
export UEVENT=$(cat $DMIPATH/uevent)

# put prebaked actions here

# allow user defined actions
USER_SCRIPT=/data/etc/pre_sleep.sh
if [ -e $USER_SCRIPT ]
then
/system/bin/sh $USER_SCRIPT
fi

0 comments on commit 6f3f36e

Please sign in to comment.