diff options
20 files changed, 74 insertions, 28 deletions
diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb Binary files differindex ba569db6..23b8b593 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Bluetooth_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb Binary files differindex cb8dabd7..5c6be8a8 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/General_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb Binary files differindex 406a9a71..8a6999b3 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Global_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb Binary files differindex 6035865e..8995b7c2 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Handset_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb Binary files differindex 3baec2e6..ac15ae7b 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Hdmi_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb Binary files differindex ba973f66..0892b10b 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Headset_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb Binary files differindex b361005f..a465072d 100644 --- a/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-b4-snd-card/Speaker_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb Binary files differindex ba569db6..23b8b593 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Bluetooth_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb Binary files differindex cb8dabd7..5c6be8a8 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/General_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb Binary files differindex 406a9a71..8a6999b3 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb Binary files differindex 6035865e..8995b7c2 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Handset_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb Binary files differindex 3baec2e6..ac15ae7b 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Hdmi_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb Binary files differindex ba973f66..0892b10b 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Headset_cal.acdb diff --git a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb Binary files differindex b361005f..a465072d 100644 --- a/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb +++ b/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Speaker_cal.acdb diff --git a/audio_platform_info_intcodec_b4.xml b/audio_platform_info_intcodec_b4.xml index acb8486f..0495130f 100644 --- a/audio_platform_info_intcodec_b4.xml +++ b/audio_platform_info_intcodec_b4.xml @@ -50,8 +50,8 @@ <!-- TTY --> <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" acdb_id="14"/> + <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" acdb_id="16"/> <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" acdb_id="19"/> - <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_SPEAKER" acdb_id="14"/> <device name="SND_DEVICE_IN_VOICE_TTY_VCO_SPEAKER_MIC" acdb_id="19"/> </acdb_ids> <bit_width_configs> @@ -148,9 +148,9 @@ <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> - <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> + </backend_names> <app_types> <app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" /> diff --git a/audio_platform_info_intcodec_s4.xml b/audio_platform_info_intcodec_s4.xml index 80f8ea44..92e857af 100644 --- a/audio_platform_info_intcodec_s4.xml +++ b/audio_platform_info_intcodec_s4.xml @@ -50,8 +50,8 @@ <!-- TTY --> <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" acdb_id="14"/> + <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" acdb_id="16"/> <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" acdb_id="19"/> - <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_SPEAKER" acdb_id="14"/> <device name="SND_DEVICE_IN_VOICE_TTY_VCO_SPEAKER_MIC" acdb_id="19"/> </acdb_ids> <bit_width_configs> @@ -148,9 +148,9 @@ <device name="SND_DEVICE_IN_HEADSET_MIC_AEC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> - <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/> + </backend_names> <app_types> <app uc_type="PCM_PLAYBACK" mode="default" bit_width="16" id="69936" max_rate="96000" /> diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 916c7b01..dde8ebd3 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -39,7 +39,7 @@ #define DIAG_MDLOG_NUMBER_BUGREPORT "persist.vendor.sys.modem.diag.mdlog_br_num" -#define UFS_BOOTDEVICE "ro.boot.bootdevice" +#define EMMC_BOOTDEVICE "ro.boot.bootdevice" using android::os::dumpstate::CommandOptions; using android::os::dumpstate::DumpFileToFd; @@ -233,22 +233,16 @@ static void DumpF2FS(int fd) { DumpFileToFd(fd, "F2FS - fragmentation", "/proc/fs/f2fs/dm-3/segment_info"); } -static void DumpUFS(int fd) { - DumpFileToFd(fd, "UFS model", "/sys/block/sda/device/model"); - DumpFileToFd(fd, "UFS rev", "/sys/block/sda/device/rev"); - DumpFileToFd(fd, "UFS size", "/sys/block/sda/size"); - DumpFileToFd(fd, "UFS show_hba", "/sys/kernel/debug/ufshcd0/show_hba"); - DumpFileToFd(fd, "UFS err_stats", "/sys/kernel/debug/ufshcd0/stats/err_stats"); - DumpFileToFd(fd, "UFS io_stats", "/sys/kernel/debug/ufshcd0/stats/io_stats"); - DumpFileToFd(fd, "UFS req_stats", "/sys/kernel/debug/ufshcd0/stats/req_stats"); - - std::string bootdev = android::base::GetProperty(UFS_BOOTDEVICE, ""); - if (!bootdev.empty()) { - DumpFileToFd(fd, "UFS Slow IO", "/sys/devices/platform/soc/" + bootdev + "/slowio_cnt"); - - std::string ufs_health = "for f in $(find /sys/devices/platform/soc/" + bootdev + "/health -type f); do if [[ -r $f && -f $f ]]; then echo --- $f; cat $f; echo ''; fi; done"; - RunCommandToFd(fd, "UFS health", {"/vendor/bin/sh", "-c", ufs_health.c_str()}); - } +static void DumpeMMC(int fd) { + DumpFileToFd(fd, "eMMC model", "/sys/block/mmcblk0/device/name"); + DumpFileToFd(fd, "eMMC prv", "/sys/block/mmcblk0/device/prv"); + DumpFileToFd(fd, "eMMC fwrev", "/sys/block/mmcblk0/device/fwrev"); + DumpFileToFd(fd, "eMMC size", "/sys/block/mmcblk0/size"); + DumpFileToFd(fd, "eMMC ext_csd", "/sys/kernel/debug/mmc0/mmc0:0001/ext_csd"); + DumpFileToFd(fd, "eMMC err_stats", "/sys/kernel/debug/mmc0/err_stats"); + DumpFileToFd(fd, "eMMC ring_buffer", "/sys/kernel/debug/mmc0/ring_buffer"); + DumpFileToFd(fd, "eMMC pre_eol_info", "/sys/devices/platform/soc/7c4000.sdhci/mmc_host/mmc0/mmc0:0001/pre_eol_info"); + DumpFileToFd(fd, "eMMC life_time", "/sys/devices/platform/soc/7c4000.sdhci/mmc_host/mmc0/mmc0:0001/life_time"); } // Methods from ::android::hardware::dumpstate::V1_0::IDumpstateDevice follow. @@ -276,7 +270,7 @@ Return<void> DumpstateDevice::dumpstateBoard(const hidl_handle& handle) { DumpFileToFd(fd, "CPU online", "/sys/devices/system/cpu/online"); DumpF2FS(fd); - DumpUFS(fd); + DumpeMMC(fd); DumpFileToFd(fd, "INTERRUPTS", "/proc/interrupts"); DumpFileToFd(fd, "Sleep Stats", "/sys/power/system_sleep/stats"); diff --git a/init.hardware.rc b/init.hardware.rc index 8e143f70..d24c8a8d 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -526,10 +526,10 @@ on property:sys.boot_completed=1 # Setup final cpuset write /dev/cpuset/top-app/cpus 0-7 - write /dev/cpuset/foreground/cpus 0-3,6-7 - write /dev/cpuset/background/cpus 0-1 - write /dev/cpuset/system-background/cpus 0-3 - write /dev/cpuset/restricted/cpus 0-3 + write /dev/cpuset/foreground/cpus 2-7 + write /dev/cpuset/background/cpus 4-5 + write /dev/cpuset/system-background/cpus 2-5 + write /dev/cpuset/restricted/cpus 2-5 # Update DVR cpusets to runtime values. # Kernel cpuset will be apply on PowerHAL diff --git a/mixer_paths_intcodec_b4.xml b/mixer_paths_intcodec_b4.xml index a77e8ace..776de567 100644 --- a/mixer_paths_intcodec_b4.xml +++ b/mixer_paths_intcodec_b4.xml @@ -578,6 +578,10 @@ <path name="deep-buffer-playback speaker" /> </path> + <path name="deep-buffer-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia1" value="1"/> + </path> + <path name="low-latency-playback"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia5" value="1" /> </path> @@ -661,6 +665,10 @@ <path name="low-latency-playback speaker" /> </path> + <path name="low-latency-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia5" value="1"/> + </path> + <path name="audio-ull-playback"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia8" value="1" /> </path> @@ -735,6 +743,10 @@ <path name="audio-ull-playback speaker" /> </path> + <path name="audio-ull-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia8" value="1"/> + </path> + <path name="multi-channel-playback display-port"> <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" /> </path> @@ -780,6 +792,10 @@ <path name="compress-offload-playback bt-sco" /> </path> + <path name="compress-offload-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia4" value="1"/> + </path> + <path name="compress-offload-playback speaker-and-hdmi"> <path name="compress-offload-playback hdmi" /> <path name="compress-offload-playback speaker" /> @@ -1208,6 +1224,11 @@ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> </path> + <path name="voicemmode1-call voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="VoiceMMode1_Tx Mixer INT3_MI2S_TX_MMode1" value="1" /> + </path> + <path name="voicemmode2-call"> <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode1" value="1" /> @@ -1254,6 +1275,11 @@ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" /> </path> + <path name="voicemmode2-call voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer INT3_MI2S_TX_MMode1" value="1" /> + </path> + <!-- VOIP Rx settings --> <path name="audio-playback-voip"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia10" value="1"/> @@ -1862,7 +1888,7 @@ <path name="voice-tty-hco-handset"> <ctl name="TTY Mode" value="HCO" /> - <path name="handset" /> + <path name="voice-speaker" /> </path> <path name="voice-tty-full-headset-mic"> diff --git a/mixer_paths_intcodec_s4.xml b/mixer_paths_intcodec_s4.xml index a77e8ace..776de567 100644 --- a/mixer_paths_intcodec_s4.xml +++ b/mixer_paths_intcodec_s4.xml @@ -578,6 +578,10 @@ <path name="deep-buffer-playback speaker" /> </path> + <path name="deep-buffer-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia1" value="1"/> + </path> + <path name="low-latency-playback"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia5" value="1" /> </path> @@ -661,6 +665,10 @@ <path name="low-latency-playback speaker" /> </path> + <path name="low-latency-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia5" value="1"/> + </path> + <path name="audio-ull-playback"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia8" value="1" /> </path> @@ -735,6 +743,10 @@ <path name="audio-ull-playback speaker" /> </path> + <path name="audio-ull-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia8" value="1"/> + </path> + <path name="multi-channel-playback display-port"> <ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" /> </path> @@ -780,6 +792,10 @@ <path name="compress-offload-playback bt-sco" /> </path> + <path name="compress-offload-playback voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia4" value="1"/> + </path> + <path name="compress-offload-playback speaker-and-hdmi"> <path name="compress-offload-playback hdmi" /> <path name="compress-offload-playback speaker" /> @@ -1208,6 +1224,11 @@ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" /> </path> + <path name="voicemmode1-call voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="VoiceMMode1_Tx Mixer INT3_MI2S_TX_MMode1" value="1" /> + </path> + <path name="voicemmode2-call"> <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer PRI_TDM_TX_0_MMode1" value="1" /> @@ -1254,6 +1275,11 @@ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" /> </path> + <path name="voicemmode2-call voice-tty-hco-handset"> + <ctl name="SEC_TDM_RX_0_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="VoiceMMode2_Tx Mixer INT3_MI2S_TX_MMode1" value="1" /> + </path> + <!-- VOIP Rx settings --> <path name="audio-playback-voip"> <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia10" value="1"/> @@ -1862,7 +1888,7 @@ <path name="voice-tty-hco-handset"> <ctl name="TTY Mode" value="HCO" /> - <path name="handset" /> + <path name="voice-speaker" /> </path> <path name="voice-tty-full-headset-mic"> |