Merge commit '6fa418fde74c6e2bb22c4d28602178efea7927b0' into remote

Conflicts:
	base.mk
	device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml

Change-Id: Id3c174e34ea301bec6aed82f70f74f561272ea8e
This commit is contained in:
Abhilash Kumar Subhash 2017-07-10 16:57:40 +05:30
commit fc895a297b
7 changed files with 125 additions and 13 deletions

View File

@ -1035,3 +1035,7 @@ PRODUCT_PACKAGES += \
libbacktrace.vndk-sp\
libunwind.vndk-sp\
liblzma.vndk-sp\
ifeq ($(TARGET_USES_QCOM_BSP_ATEL),true)
PRODUCT_PROPERTY_OVERRIDES += persist.radio.multisim.config=dsds
endif

View File

@ -1,4 +1,3 @@
TARGET_USES_QCOM_BSP_ATEL := true
$(call inherit-product, device/qcom/common/base.mk)
# For PRODUCT_COPY_FILES, the first instance takes precedence.
@ -19,10 +18,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.radio.sib16_support=1 \
persist.vendor.radio.rat_on=combine
ifeq ($(TARGET_USES_QCOM_BSP_ATEL),true)
PRODUCT_PROPERTY_OVERRIDES += persist.radio.multisim.config=dsds
endif
ifneq ($(BOARD_FRP_PARTITION_NAME),)
PRODUCT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/bootdevice/by-name/$(BOARD_FRP_PARTITION_NAME)
else

View File

@ -1,4 +1,3 @@
TARGET_USES_QCOM_BSP_ATEL := true
$(call inherit-product, device/qcom/common/base.mk)
# For PRODUCT_COPY_FILES, the first instance takes precedence.
@ -20,10 +19,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.radio.custom_ecc=1 \
persist.vendor.radio.rat_on=combine
ifeq ($(TARGET_USES_QCOM_BSP_ATEL),true)
PRODUCT_PROPERTY_OVERRIDES += persist.radio.multisim.config=dsds
endif
ifneq ($(BOARD_FRP_PARTITION_NAME),)
PRODUCT_PROPERTY_OVERRIDES += ro.frp.pst=/dev/block/bootdevice/by-name/$(BOARD_FRP_PARTITION_NAME)
else

View File

@ -137,6 +137,7 @@ INSTALLED_DTBOIMAGE_TARGET := $(PRODUCT_OUT)/dtbo.img
# Most specific paths must come first in possible_dtbo_dirs
possible_dtbo_dirs = $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/dts $(KERNEL_OUT)/arch/arm/boot/dts
$(shell mkdir -p $(possible_dtbo_dirs))
dtbo_dir = $(firstword $(wildcard $(possible_dtbo_dirs)))
dtbo_objs = $(shell find $(dtbo_dir) -name \*.dtbo)

View File

@ -57,6 +57,10 @@ ifeq ($(call is-board-platform-in-list,sdm660), true)
LOCAL_SRC_FILES += power-660.c
endif
ifeq ($(call is-board-platform-in-list,sdm845), true)
LOCAL_SRC_FILES += power-845.c
endif
ifeq ($(TARGET_USES_INTERACTION_BOOST),true)
LOCAL_CFLAGS += -DINTERACTION_BOOST
endif

96
power/power-845.c Normal file
View File

@ -0,0 +1,96 @@
/*
* Copyright (c) 2017, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dlfcn.h>
#include <stdlib.h>
#define LOG_TAG "QTI PowerHAL"
#include <utils/Log.h>
#include <hardware/hardware.h>
#include <hardware/power.h>
#include "utils.h"
#include "metadata-defs.h"
#include "hint-data.h"
#include "performance.h"
#include "power-common.h"
static int display_fd;
#define SYS_DISPLAY_PWR "/sys/kernel/hbtp/display_pwr"
int set_interactive_override(struct power_module *module, int on)
{
static const char *display_on = "1";
static const char *display_off = "0";
char err_buf[80];
static int init_interactive_hint = 0;
static int set_i_count = 0;
int rc = 0;
set_i_count ++;
ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
if (init_interactive_hint == 0)
{
//First time the display is turned off
display_fd = TEMP_FAILURE_RETRY(open(SYS_DISPLAY_PWR, O_RDWR));
if (display_fd < 0) {
strerror_r(errno,err_buf,sizeof(err_buf));
ALOGE("Error opening %s: %s\n", SYS_DISPLAY_PWR, err_buf);
}
else
init_interactive_hint = 1;
}
else
if (!on ) {
/* Display off. */
rc = TEMP_FAILURE_RETRY(write(display_fd, display_off, strlen(display_off)));
if (rc < 0) {
strerror_r(errno,err_buf,sizeof(err_buf));
ALOGE("Error writing %s to %s: %s\n", display_off, SYS_DISPLAY_PWR, err_buf);
}
}
else {
/* Display on */
rc = TEMP_FAILURE_RETRY(write(display_fd, display_on, strlen(display_on)));
if (rc < 0) {
strerror_r(errno,err_buf,sizeof(err_buf));
ALOGE("Error writing %s to %s: %s\n", display_on, SYS_DISPLAY_PWR, err_buf);
}
}
return HINT_HANDLED; /* Don't excecute this code path, not in use */
}

View File

@ -2402,19 +2402,36 @@ case "$target" in
do
echo "bw_hwmon" > $cpubw/governor
echo 50 > $cpubw/polling_interval
echo "1720 2929 4943 5931 6881" > $cpubw/bw_hwmon/mbps_zones
echo "2288 4577 6500 8132 9155 10681" > $cpubw/bw_hwmon/mbps_zones
echo 4 > $cpubw/bw_hwmon/sample_ms
echo 68 > $cpubw/bw_hwmon/io_percent
echo 34 > $cpubw/bw_hwmon/io_percent
echo 20 > $cpubw/bw_hwmon/hist_memory
echo 10 > $cpubw/bw_hwmon/hyst_length
echo 0 > $cpubw/bw_hwmon/low_power_ceil_mbps
echo 68 > $cpubw/bw_hwmon/low_power_io_percent
echo 34 > $cpubw/bw_hwmon/low_power_io_percent
echo 20 > $cpubw/bw_hwmon/low_power_delay
echo 0 > $cpubw/bw_hwmon/guard_band_mbps
echo 250 > $cpubw/bw_hwmon/up_scale
echo 1600 > $cpubw/bw_hwmon/idle_mbps
done
for llccbw in /sys/class/devfreq/*qcom,llccbw*
do
echo "bw_hwmon" > $llccbw/governor
echo 50 > $llccbw/polling_interval
echo "1720 2929 4943 5931 6881" > $llccbw/bw_hwmon/mbps_zones
echo 4 > $llccbw/bw_hwmon/sample_ms
echo 68 > $llccbw/bw_hwmon/io_percent
echo 20 > $llccbw/bw_hwmon/hist_memory
echo 10 > $llccbw/bw_hwmon/hyst_length
echo 0 > $llccbw/bw_hwmon/low_power_ceil_mbps
echo 68 > $llccbw/bw_hwmon/low_power_io_percent
echo 20 > $llccbw/bw_hwmon/low_power_delay
echo 0 > $llccbw/bw_hwmon/guard_band_mbps
echo 250 > $llccbw/bw_hwmon/up_scale
echo 1600 > $llccbw/bw_hwmon/idle_mbps
done
#Enable mem_latency governor for DDR scaling
for memlat in /sys/class/devfreq/*qcom,memlat-cpu*
do