From 387654d352c2d252c2e683c6ceb4d44eef3a6362 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 18 Mar 2019 21:47:18 -0700 Subject: shinano-common: Disable nonblocking_ffs to avoid recent crashes with adbd Recent changes to adbd have enabled nonblocking_ffs by default. These have seeminly uncovered some bad memory corruption in the kernel ffs gadget driver on every kernel I've tried so far. Unfortunately I've not been able to diagnose what is going wrong, so for now, lets disable the nonblocking_ffs. We still need to root cause the issue as its a problem even with the mainline kernel on HiKey, so its likely a generic kernel issue. Change-Id: I7a0797cc9e8e5f263e533beea23642f768c0f017 Signed-off-by: John Stultz --- rootdir/etc/init.recovery.qcom.rc | 2 ++ rootdir/etc/init.sony.usb.rc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rootdir/etc/init.recovery.qcom.rc b/rootdir/etc/init.recovery.qcom.rc index 039fed3..fb2c886 100644 --- a/rootdir/etc/init.recovery.qcom.rc +++ b/rootdir/etc/init.recovery.qcom.rc @@ -3,3 +3,5 @@ on fs symlink /dev/block/platform/msm_sdcc.1 /dev/block/bootdevice setprop sys.usb.ffs.aio_compat 1 + setprop persist.adb.nonblocking_ffs 0 + setprop ro.adb.nonblocking_ffs 0 diff --git a/rootdir/etc/init.sony.usb.rc b/rootdir/etc/init.sony.usb.rc index 5e536ac..02b7b97 100644 --- a/rootdir/etc/init.sony.usb.rc +++ b/rootdir/etc/init.sony.usb.rc @@ -32,6 +32,8 @@ on fs mkdir /dev/bus/usb 0755 root root setprop sys.usb.ffs.aio_compat 1 + setprop persist.adb.nonblocking_ffs 0 + setprop ro.adb.nonblocking_ffs 0 on charger setprop sys.usb.config mtp -- cgit v1.2.3