BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8250-common: power: Rebase on LA.UM.9.12.r1-09000-SMxx50.0

Browse source
This commit is contained in:
LuK1337 2020-11-20 12:16:35 +01:00
parent a0d9c9cb9d
commit 0eacfc8f9e
9 changed files with 182 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -169,7 +169,7 @@ PRODUCT_COPY_FILES += \
# Power # Power
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.power@1.2-service.oneplus_kona android.hardware.power-service.oneplus_kona
# PowerShare # PowerShare
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

23
power/Android.mk
View file

@ -2,17 +2,21 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.power@1.2-service.oneplus_kona LOCAL_MODULE := android.hardware.power-service.oneplus_kona
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin
LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_STEM := android.hardware.power@1.2-service LOCAL_MODULE_STEM := android.hardware.power-service
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-unused-variable -Wno-unused-variable
ifeq ($(TARGET_USES_INTERACTION_BOOST),true)
LOCAL_CFLAGS += -DINTERACTION_BOOST
endif
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/libxml2/include \ external/libxml2/include \
external/icu/icu4c/source/common external/icu/icu4c/source/common
@ -24,23 +28,22 @@ LOCAL_HEADER_LIBRARIES += \
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
hint-data.c \ hint-data.c \
list.c \ list.c \
main.cpp \
metadata-parser.c \ metadata-parser.c \
power-common.c \ power-common.c \
Power.cpp \ Power.cpp \
powerhintparser.c \ powerhintparser.c \
service.cpp \
utils.c utils.c
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
android.hardware.power@1.2-service.oneplus_kona.rc android.hardware.power-service.oneplus_kona.rc
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
android.hardware.power@1.2 \ android.hardware.power-ndk_platform \
libbase \ libbase \
libbinder_ndk \
libcutils \ libcutils \
libdl \ libdl \
libhidlbase \
libhidltransport \
liblog \ liblog \
libutils \ libutils \
libxml2 libxml2
@ -49,13 +52,13 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.power@1.2-service.oneplus_kona.rc LOCAL_MODULE := android.hardware.power-service.oneplus_kona.rc
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init
LOCAL_MODULE_STEM := android.hardware.power@1.2-service.rc LOCAL_MODULE_STEM := android.hardware.power-service.rc
LOCAL_SRC_FILES := android.hardware.power@1.2-service.rc LOCAL_SRC_FILES := android.hardware.power-service.rc
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)

130
power/Power.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -29,83 +29,101 @@
#define LOG_TAG "QTI PowerHAL" #define LOG_TAG "QTI PowerHAL"
#include <android-base/file.h>
#include <android/log.h>
#include <utils/Log.h>
#include "Power.h" #include "Power.h"
#include "power-common.h"
#include <android-base/file.h>
#include <android-base/logging.h>
#include <aidl/android/hardware/power/BnPower.h>
#include <android-base/logging.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
using ::aidl::android::hardware::power::BnPower;
using ::aidl::android::hardware::power::IPower;
using ::aidl::android::hardware::power::Mode;
using ::aidl::android::hardware::power::Boost;
using ::ndk::ScopedAStatus;
using ::ndk::SharedRefBase;
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace power { namespace power {
namespace V1_2 { namespace impl {
namespace implementation {
using ::android::base::WriteStringToFile; void setInteractive(bool interactive) {
using ::android::hardware::power::V1_0::Feature;
using ::android::hardware::power::V1_0::PowerHint;
using ::android::hardware::power::V1_0::PowerStatePlatformSleepState;
using ::android::hardware::power::V1_0::Status;
using ::android::hardware::power::V1_1::PowerStateSubsystem;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
Power::Power() {
power_init();
}
Return<void> Power::setInteractive(bool interactive) {
set_interactive(interactive ? 1:0); set_interactive(interactive ? 1:0);
return Void();
} }
Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) { ndk::ScopedAStatus Power::setMode(Mode type, bool enabled) {
LOG(INFO) << "Power setMode: " << static_cast<int32_t>(type) << " to: " << enabled;
power_hint(static_cast<power_hint_t>(hint), data ? (&data) : NULL); switch(type){
return Void(); case Mode::DOUBLE_TAP_TO_WAKE:
} ::android::base::WriteStringToFile(enabled ? "1" : "0",
"/proc/touchpanel/double_tap_enable", true);
Return<void> Power::setFeature(Feature feature, bool activate) { break;
switch (feature) { case Mode::LOW_POWER:
case Feature::POWER_FEATURE_DOUBLE_TAP_TO_WAKE: case Mode::LAUNCH:
WriteStringToFile(activate ? "1" : "0", "/proc/touchpanel/double_tap_enable", true); case Mode::EXPENSIVE_RENDERING:
case Mode::DEVICE_IDLE:
case Mode::DISPLAY_INACTIVE:
case Mode::AUDIO_STREAMING_LOW_LATENCY:
case Mode::CAMERA_STREAMING_SECURE:
case Mode::CAMERA_STREAMING_LOW:
case Mode::CAMERA_STREAMING_MID:
case Mode::CAMERA_STREAMING_HIGH:
case Mode::VR:
LOG(INFO) << "Mode " << static_cast<int32_t>(type) << "Not Supported";
break;
case Mode::INTERACTIVE:
setInteractive(enabled);
power_hint(POWER_HINT_INTERACTION, NULL);
break;
case Mode::SUSTAINED_PERFORMANCE:
case Mode::FIXED_PERFORMANCE:
power_hint(POWER_HINT_SUSTAINED_PERFORMANCE, NULL);
break; break;
default: default:
LOG(INFO) << "Mode " << static_cast<int32_t>(type) << "Not Supported";
break; break;
} }
return Void(); return ndk::ScopedAStatus::ok();
} }
Return<void> Power::getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_cb) { ndk::ScopedAStatus Power::isModeSupported(Mode type, bool* _aidl_return) {
LOG(INFO) << "Power isModeSupported: " << static_cast<int32_t>(type);
hidl_vec<PowerStatePlatformSleepState> states; switch(type){
states.resize(0); case Mode::DOUBLE_TAP_TO_WAKE:
case Mode::INTERACTIVE:
_hidl_cb(states, Status::SUCCESS); case Mode::SUSTAINED_PERFORMANCE:
return Void(); case Mode::FIXED_PERFORMANCE:
*_aidl_return = true;
break;
default:
*_aidl_return = false;
break;
}
return ndk::ScopedAStatus::ok();
} }
Return<void> Power::getSubsystemLowPowerStats(getSubsystemLowPowerStats_cb _hidl_cb) { ndk::ScopedAStatus Power::setBoost(Boost type, int32_t durationMs) {
LOG(INFO) << "Power setBoost: " << static_cast<int32_t>(type)
hidl_vec<PowerStateSubsystem> subsystems; << ", duration: " << durationMs;
return ndk::ScopedAStatus::ok();
_hidl_cb(subsystems, Status::SUCCESS);
return Void();
} }
Return<void> Power::powerHintAsync(PowerHint_1_0 hint, int32_t data) { ndk::ScopedAStatus Power::isBoostSupported(Boost type, bool* _aidl_return) {
LOG(INFO) << "Power isBoostSupported: " << static_cast<int32_t>(type);
return powerHint(hint, data); *_aidl_return = false;
return ndk::ScopedAStatus::ok();
} }
Return<void> Power::powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) { } // namespace impl
return powerHint(static_cast<PowerHint_1_0> (hint), data);
}
} // namespace implementation
} // namespace V1_2
} // namespace power } // namespace power
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // namespace aidl

54
power/Power.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -27,48 +27,32 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef ANDROID_HARDWARE_POWER_V1_2_POWER_H #ifndef ANDROID_HARDWARE_POWER_POWER_H
#define ANDROID_HARDWARE_POWER_V1_2_POWER_H #define ANDROID_HARDWARE_POWER_POWER_H
#include <android/hardware/power/1.2/IPower.h> #include <aidl/android/hardware/power/BnPower.h>
#include <hidl/MQDescriptor.h> #include "power-common.h"
#include <hidl/Status.h>
#include <hardware/power.h>
namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace power { namespace power {
namespace V1_2 { namespace impl {
namespace implementation {
using ::android::hardware::power::V1_0::Feature; class Power : public BnPower {
using PowerHint_1_0 = ::android::hardware::power::V1_0::PowerHint; public:
using PowerHint_1_2 = ::android::hardware::power::V1_2::PowerHint; Power() : BnPower(){
using ::android::hardware::power::V1_2::IPower; power_init();
using ::android::hardware::Return; }
using ::android::hardware::Void; ndk::ScopedAStatus setMode(Mode type, bool enabled) override;
ndk::ScopedAStatus isModeSupported(Mode type, bool* _aidl_return) override;
struct Power : public IPower { ndk::ScopedAStatus setBoost(Boost type, int32_t durationMs) override;
// Methods from ::android::hardware::power::V1_0::IPower follow. ndk::ScopedAStatus isBoostSupported(Boost type, bool* _aidl_return) override;
Power();
Return<void> setInteractive(bool interactive) override;
Return<void> powerHint(PowerHint_1_0 hint, int32_t data) override;
Return<void> setFeature(Feature feature, bool activate) override;
Return<void> getPlatformLowPowerStats(getPlatformLowPowerStats_cb _hidl_cb) override;
// Methods from ::android::hardware::power::V1_1::IPower follow
Return<void> getSubsystemLowPowerStats(getSubsystemLowPowerStats_cb _hidl_cb) override;
Return<void> powerHintAsync(PowerHint_1_0 hint, int32_t data) override;
// Methods from ::android::hardware::power::V1_2::IPower follow
Return<void> powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) override;
}; };
} // namespace implementation } // namespace impl
} // namespace V1_2
} // namespace power } // namespace power
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android
} // namespace aidl
#endif // ANDROID_HARDWARE_POWER_V1_2_POWER_H #endif // ANDROID_HARDWARE_POWER_POWER_H

4
power/android.hardware.power-service.rc Normal file
View file

@ -0,0 +1,4 @@
service vendor.power /vendor/bin/hw/android.hardware.power-service
class hal
user system
group system

4
power/android.hardware.power@1.2-service.rc
View file

@ -1,4 +0,0 @@
service vendor.power-hal-1-2 /vendor/bin/hw/android.hardware.power@1.2-service
class hal
user system
group system

62
power/service.cpp → power/main.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, The Linux Foundation. All rights reserved. * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -27,55 +27,27 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define LOG_TAG "android.hardware.power@1.2-service"
#include <android/log.h>
#include <hidl/HidlTransportSupport.h>
#include <hardware/power.h>
#include "Power.h" #include "Power.h"
using android::sp; #include <android-base/logging.h>
using android::status_t; #include <android/binder_manager.h>
using android::OK; #include <android/binder_process.h>
// libhwbinder: using aidl::android::hardware::power::impl::Power;
using android::hardware::configureRpcThreadpool;
using android::hardware::joinRpcThreadpool;
// Generated HIDL files
using android::hardware::power::V1_2::IPower;
using android::hardware::power::V1_2::implementation::Power;
int main() { int main() {
ABinderProcess_setThreadPoolMaxThreadCount(0);
status_t status; std::shared_ptr<Power> vib = ndk::SharedRefBase::make<Power>();
android::sp<IPower> service = nullptr; const std::string instance = std::string() + Power::descriptor + "/default";
LOG(INFO) << "Instance " << instance;
ALOGI("Power HAL Service 1.2 is starting."); if(vib){
binder_status_t status = AServiceManager_addService(vib->asBinder().get(), instance.c_str());
service = new Power(); LOG(INFO) << "Status " << status;
if (service == nullptr) { if(status != STATUS_OK){
ALOGE("Can not create an instance of Power HAL interface."); LOG(ERROR) << "Could not register" << instance;
}
goto shutdown;
} }
configureRpcThreadpool(1, true /*callerWillJoin*/); ABinderProcess_joinThreadPool();
return 1; // should not reach
status = service->registerAsService();
if (status != OK) {
ALOGE("Could not register service for Power HAL(%d).", status);
goto shutdown;
} }
ALOGI("Power Service is ready");
joinRpcThreadpool();
//Should not pass this line
shutdown:
// In normal operation, we don't expect the thread pool to exit
ALOGE("Power Service is shutting down");
return 1;
}

50
power/power-common-old.h Normal file
View file

@ -0,0 +1,50 @@
/*
* Copyright (c) 2013, 2018 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.
*/
#define NODE_MAX (64)
#define SCALING_GOVERNOR_PATH "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
#define DCVS_CPU0_SLACK_MAX_NODE "/sys/module/msm_dcvs/cores/cpu0/slack_time_max_us"
#define DCVS_CPU0_SLACK_MIN_NODE "/sys/module/msm_dcvs/cores/cpu0/slack_time_min_us"
#define MPDECISION_SLACK_MAX_NODE "/sys/module/msm_mpdecision/slack_time_max_us"
#define MPDECISION_SLACK_MIN_NODE "/sys/module/msm_mpdecision/slack_time_min_us"
#define SCALING_MIN_FREQ "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq"
#define ONDEMAND_GOVERNOR "ondemand"
#define INTERACTIVE_GOVERNOR "interactive"
#define MSMDCVS_GOVERNOR "msm-dcvs"
#define SCHEDUTIL_GOVERNOR "schedutil"
#define HINT_HANDLED (0)
#define HINT_NONE (-1)
enum CPU_GOV_CHECK {
CPU0 = 0,
CPU1 = 1,
CPU2 = 2,
CPU3 = 3
};

2
sepolicy/private/file_contexts
View file

@ -9,7 +9,7 @@
/sys/devices/platform/soc/soc:goodix_fp/proximity_state u:object_r:sysfs_fpc_proximity:s0 /sys/devices/platform/soc/soc:goodix_fp/proximity_state u:object_r:sysfs_fpc_proximity:s0
# HALs # HALs
/(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.power@1\.2-service u:object_r:hal_power_default_exec:s0 /(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.power-service u:object_r:hal_power_default_exec:s0
/system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1.0-service\.oneplus_kona u:object_r:hal_fod_kona_exec:s0 /system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1.0-service\.oneplus_kona u:object_r:hal_fod_kona_exec:s0
/system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_kona u:object_r:hal_livedisplay_kona_exec:s0 /system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_kona u:object_r:hal_livedisplay_kona_exec:s0
/system/bin/hw/lineage\.powershare@1\.0-service\.oneplus_kona u:object_r:hal_powershare_kona_exec:s0 /system/bin/hw/lineage\.powershare@1\.0-service\.oneplus_kona u:object_r:hal_powershare_kona_exec:s0