diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-28 23:34:47 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-28 23:34:47 +0000 |
commit | 0f0d8b18a3f4045676e94583d9ed4346bfa9d362 (patch) | |
tree | 1dcef2b34117c91ed632ed93ee284b540bffc22c | |
parent | b2e7e866a73a5385cb14977b5cfa5f75c6ebd59e (diff) | |
parent | 7da203b409f7801c6dd061909a69b22b56dcbd6e (diff) | |
download | muskie-oreo-m5-release.tar.gz |
Snap for 4448085 from 7da203b409f7801c6dd061909a69b22b56dcbd6e to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-release
Change-Id: I15460272a1c44e94e54ec05517844b77112d65a6
-rw-r--r-- | WCNSS_qcom_cfg.ini | 7 | ||||
-rw-r--r-- | device-common.mk | 11 | ||||
-rw-r--r-- | init-common.rc | 3 | ||||
-rw-r--r-- | init.logging.userdebug.rc | 3 | ||||
-rw-r--r-- | nfc/libnfc-nxp.muskie.conf | 2 | ||||
-rw-r--r-- | self-extractors/extract-lists.txt | 4 | ||||
-rw-r--r-- | self-extractors/qcom/staging/device-partial.mk | 4 | ||||
-rwxr-xr-x | thermal-engine-vr.conf | 4 | ||||
-rwxr-xr-x | thermal-engine.conf | 13 |
9 files changed, 25 insertions, 26 deletions
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index eb53cb9..18219bc 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -61,7 +61,8 @@ gDot11Mode=0 # Enable Rx handling options # Rx_thread=1 RPS=2(default for ROME) NAPI=4(default for ihelium) -rx_mode=4 +# Rx_thread + NAPI = 5 +rx_mode=5 #Enable VHT on 2.4Ghz gEnableVhtFor24GHzBand=1 @@ -235,6 +236,10 @@ ght_mpdu_density=4 # 1 - enable 0 - disable(default) gEnableFlowSteering=1 +ce_service_max_yield_time=500 +ce_service_max_rx_ind_flush=1 +maxMSDUsPerRxInd=8 + ################ Datapath feature set End ################ ############################################# diff --git a/device-common.mk b/device-common.mk index 6d8b6de..29df59a 100644 --- a/device-common.mk +++ b/device-common.mk @@ -76,21 +76,14 @@ PRODUCT_COPY_FILES += \ include device/google/wahoo/device.mk # Kernel modules -ifeq (,$(filter-out muskie_clang walleye_clang, $(TARGET_PRODUCT))) -# if TARGET_PRODUCT == *_clang -BOARD_VENDOR_KERNEL_MODULES += \ - device/google/wahoo-kernel/clang/synaptics_dsx_core_htc.ko \ - device/google/wahoo-kernel/clang/synaptics_dsx_rmi_dev_htc.ko \ - device/google/wahoo-kernel/clang/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/clang/htc_battery.ko -else ifeq (,$(filter-out muskie_gcc walleye_gcc, $(TARGET_PRODUCT))) +ifeq (,$(filter-out walleye_gcc, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_gcc BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \ device/google/wahoo-kernel/gcc/htc_battery.ko -else ifeq (,$(filter-out muskie_kasan walleye_kasan, $(TARGET_PRODUCT))) +else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \ diff --git a/init-common.rc b/init-common.rc index 2b5db77..ca1f526 100644 --- a/init-common.rc +++ b/init-common.rc @@ -39,3 +39,6 @@ on init && property:ro.boot.revision=MP0 # PVT on init && property:ro.boot.revision=MP1 setprop ro.boot.hardware.revision 1.0 + +on boot && property:ro.build.type=userdebug + write /sys/class/uio/uio1/device/rtel/rtel 1 diff --git a/init.logging.userdebug.rc b/init.logging.userdebug.rc index 3d8e5eb..7cc6645 100644 --- a/init.logging.userdebug.rc +++ b/init.logging.userdebug.rc @@ -1,6 +1,3 @@ -on boot - write /sys/class/uio/uio1/device/rtel/rtel 1 - on post-fs-data # SM DUMP logging collection mkdir /data/vendor/modem_dump 0777 system system diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf index 90078e5..973dee6 100644 --- a/nfc/libnfc-nxp.muskie.conf +++ b/nfc/libnfc-nxp.muskie.conf @@ -84,7 +84,7 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 01, ############################################################################### #config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM, #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms -NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 18, 00, D0, 0C} +NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, 82, B2, 00, BA, 1E, 18, 00, D0, 0C} ############################################################################### # NXP RF configuration ALM/PLM settings diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index bfe61ff..f97a318 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -21,8 +21,6 @@ system/framework/embmslibrary.jar \ system/framework/rcsimssettings.jar \ system/framework/vendor.qti.qcril.am-V1.0-java.jar \ - system/lib64/android.hardware.biometrics.fingerprint@2.1.so \ - system/lib64/android.hardware.oemlock@1.0.so \ system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so \ system/lib64/libaptX_encoder.so \ system/lib64/libaptXHD_encoder.so \ @@ -33,7 +31,6 @@ system/lib64/lib-imsvtextutils.so \ system/lib64/lib-imsvt.so \ system/lib64/lib-imsvtutils.so \ - system/lib64/libion.so \ system/lib64/libiperf.so \ system/lib64/librcc.so \ system/lib/com.qualcomm.qti.imsrtpservice@1.0.so \ @@ -44,7 +41,6 @@ system/lib/lib-imsvtextutils.so \ system/lib/lib-imsvt.so \ system/lib/lib-imsvtutils.so \ - system/lib/libion.so \ system/lib/libiperf.so \ system/lib/librcc.so \ system/xbin/iperf3 \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index 9f9a450..983ab3a 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -30,8 +30,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \ vendor/qcom/walleye/proprietary/rcsimssettings.jar:system/framework/rcsimssettings.jar:qcom \ vendor/qcom/walleye/proprietary/vendor.qti.qcril.am-V1.0-java.jar:system/framework/vendor.qti.qcril.am-V1.0-java.jar:qcom \ - vendor/qcom/walleye/proprietary/lib64/android.hardware.biometrics.fingerprint@2.1.so:system/lib64/android.hardware.biometrics.fingerprint@2.1.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/android.hardware.oemlock@1.0.so:system/lib64/android.hardware.oemlock@1.0.so:qcom \ vendor/qcom/walleye/proprietary/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib64/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so:qcom \ @@ -42,7 +40,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/lib64/lib-imsvtextutils.so:system/lib64/lib-imsvtextutils.so:qcom \ vendor/qcom/walleye/proprietary/lib64/lib-imsvt.so:system/lib64/lib-imsvt.so:qcom \ vendor/qcom/walleye/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/lib64/libion.so:system/lib64/libion.so:qcom \ vendor/qcom/walleye/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \ vendor/qcom/walleye/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \ vendor/qcom/walleye/proprietary/com.qualcomm.qti.imsrtpservice@1.0.so:system/lib/com.qualcomm.qti.imsrtpservice@1.0.so:qcom \ @@ -53,7 +50,6 @@ PRODUCT_COPY_FILES := \ vendor/qcom/walleye/proprietary/lib-imsvtextutils.so:system/lib/lib-imsvtextutils.so:qcom \ vendor/qcom/walleye/proprietary/lib-imsvt.so:system/lib/lib-imsvt.so:qcom \ vendor/qcom/walleye/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \ - vendor/qcom/walleye/proprietary/libion.so:system/lib/libion.so:qcom \ vendor/qcom/walleye/proprietary/libiperf.so:system/lib/libiperf.so:qcom \ vendor/qcom/walleye/proprietary/librcc.so:system/lib/librcc.so:qcom \ vendor/qcom/walleye/proprietary/iperf3:system/xbin/iperf3:qcom \ diff --git a/thermal-engine-vr.conf b/thermal-engine-vr.conf index ce6f3a9..e4b0442 100755 --- a/thermal-engine-vr.conf +++ b/thermal-engine-vr.conf @@ -13,5 +13,5 @@ sensor back_therm sampling 1000 thresholds 52000 thresholds_clr 48000 -actions cluster0+cluster1+gpu+battery -action_info 883200+902400+342000000+3 +actions cluster0+cluster1+gpu+battery+report +action_info 883200+902400+342000000+3+1 diff --git a/thermal-engine.conf b/thermal-engine.conf index a3b8c15..ef41dad 100755 --- a/thermal-engine.conf +++ b/thermal-engine.conf @@ -56,8 +56,8 @@ sampling 2000 sensor back_therm thresholds 50000 52000 54000 thresholds_clr 49000 51000 53000 -actions cluster0+cluster1+gpu cluster0+cluster1+gpu cluster0+cluster1+gpu -action_info 1094400+1190400+414000000 883200+902400+342000000 300000+300000+257000000 +actions cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report cluster0+cluster1+gpu+report +action_info 1094400+1190400+414000000+1 883200+902400+342000000+1 300000+300000+257000000+1 [BATTERY-MONITOR] algo_type monitor @@ -76,3 +76,12 @@ thresholds 56000 thresholds_clr 55000 actions shutdown action_info 1 + +[THROTTLING-NOTIFY] +algo_type monitor +sampling 2000 +sensor back_therm +thresholds 40000 +thresholds_clr 39000 +actions report +action_info 1 |