Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ece28cec authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch '4310-q-import_nov' into 'v1-q' 

FP3: Import 8901.3.A.0132

See merge request !18
parents f04e13a9 594f21a4

BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ TARGET_PER_MGR_ENABLED := true 
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab



# Vendor Security Patch Level

VENDOR_SECURITY_PATCH := "2021-03-05"

VENDOR_SECURITY_PATCH := 2021-11-05



# NFC

BOARD_NFC_CHIPSET := pn553

configs/perf/perfboostsconfig.xml

deleted100644 → 0
+0 −168
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

/* Copyright (c) 2017 Qualcomm Technologies, Inc.

 * All Rights Reserved.

 * Confidential and Proprietary - Qualcomm Technologies, Inc.

-->





<!--Ids are used in identifying the boosts, increment ids linearly,

    do not modify Ids, or add in between-->

<!--follow the number format rules while specifying number, can be given

    in any format-->



<BoostConfigs>

    <PerfBoost>



    <!--app lauch boost-->



        <!-- Type="1", main launch boost of 2sec -->



        <!-- SCHEDBOOST resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ BIG resource opcode, value-->

        <Config

            Id="0x00001081" Type="1" Enable="true" Timeout="2000"  Target="sdm632"

            Resources="0x40C00000, 0x1, 0x40800100, 0x40C, 0x40800000, 0x579" />



        <!-- SCHEDBOOST resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- SCHED_SPILL_NR_RUN resource opcode, value-->

        <!-- SCHED_RESTRICT_CLUSTER_SPILL resource opcode, value-->

        <Config

            Id="0x00001081" Type="1" Enable="true" Timeout="2000"

            Resources="0x40C00000, 0x1, 0x40800100, 0x690, 0x40C2C000, 0x1, 0x40C34000, 0x0" />



    <!--app lauch boost (disabling packing)-->

        <!-- DISABLE_POWER_COLLAPSE resource opcode, value-->



        <!-- Type="2", launch boost for disable packing 1.5sec -->

        <Config

            Id="0x00001081" Type="2" Enable="true" Timeout="1500"

            Resources="0x40400000, 0x1" />



    <!-- config_enablePerfBoostForAnimation-->

        <!-- Type="1", Animation boost of 0.6sec -->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->

        <Config

            Id="0x00001083" Enable="true" Timeout="600"  Target="sdm632"

            Resources="0x40800100, 0x40C, 0x40800000, 0x446" />



        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <Config

            Id="0x00001083" Enable="true" Timeout="600"

            Resources="0x40800100, 0x578" />



    <!--Vertical Scroll boost-->

        <!-- Type="1", Vertical Scroll boost -->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->

        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value -->

        <!-- SCHEDBOOST resource opcode, value-->

        <Config

            Id="0x00001080" Type="1" Enable="true"  Target="sdm632"

            Resources="0x40800100, 0xFFF, 0x40800000, 0xFFF, 0x40C00000, 0x2" />



        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->

        <Config

            Id="0x00001080" Type="1" Enable="true"

            Resources="0x40800100, 0xFFF" />



    <!--Horizontal Scroll boost-->

        <!-- Type="2", Horizontal Scroll boost -->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->

        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value -->

        <!-- SCHEDBOOST resource opcode, value-->

        <Config

            Id="0x00001080" Type="2" Enable="true"  Target="sdm632"

            Resources="0x40800100, 0x40C, 0x40800000, 0x446,0x40C00000, 0x2" />



        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->

        <Config

            Id="0x00001080" Type="2" Enable="true"

            Resources="0x40800100, 0x578" />

    <!--Pre-Fling boost-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value -->

        <!-- CPUBOOST_MIN_FREQ BIG CORE resource opcode, value -->

        <!-- SCHEDBOOST resource opcode, value-->

        <!-- Type="4", Pre-Fling boost -->

        <Config

            Id="0x00001080" Type="4" Enable="true" Timeout="80" Target="sdm632"

            Resources="0x40800100, 0x40C, 0x40800000, 0x446,0x40C00000, 0x2"  />



    <!--MTP boost-->

        <!-- SCHEDBOOST resource opcode, value-->

        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- STORAGE CLK SCALING resource opcode, value-->



        <!-- Type="", MTP boost -->



        <Config

            Id="0x00001086" Enable="true"

            Resources="0x40C00000, 0x1, 0x40804100, 0xFFF, 0x40800100, 1400, 0x42C10000, 0x1" />



    <!--PackageInstall boost-->

        <!-- SCHEDBOOST resource opcode, value-->

        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- Type="", Package Install boost -->



        <Config

            Id="0x00001088" Enable="true"

            Resources="0x40C00000, 0x1, 0x40804100, 0xFFF, 0x40800100, 0xFFF" />



    <!--Rotation latency boost-->

        <!-- SCHEDBOOST resource opcode, value-->

        <!-- CPUBOOST_MAX_FREQ BIG Core resource opcode, value-->

        <!-- CPUBOOST_MAX_FREQ LITTLE Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ BIG Core resource opcode, value-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- Type="", Rotation latency boost -->

        <Config

            Id="0x00001089" Enable="true" Timeout="1500" Target="sdm632"

            Resources="0x40C00000, 0x1, 0x40804000, 0xFFF, 0x40804100, 0xFFF, 0x40800000, 0xFFF,

                       0x40800100,0xFFF" />



        <Config

            Id="0x00001089" Enable="true" Timeout="1500"

            Resources="0x40C00000, 0x1, 0x40804100, 0xFFF, 0x40800100, 0xFFF" />



    <!--Rotation animation boost-->

        <!-- CPUBOOST_MIN_FREQ LITTLE Core resource opcode, value-->

        <!-- GPU MIN_FREQUENCY resource opcode,value-->

        <!-- Type="", Rotation animation boost -->

        <Config

            Id="0x00001090" Enable="true" Timeout="1000" Target="sdm632"

            Resources="0x40800100, 1000, 0x4280C000, 596" />



        <Config

            Id="0x00001090" Enable="true" Timeout="1000"

            Resources="0x40800100, 1000, 0x4280C000, 596" />



    <!--Display on Resource -->

        <!-- Display on resource opcode, value -->

        <Config

                Id="0x00001041" Enable="true" Timeout="0" Target="msm8953"

                Resources="0x40000000, 1" />

        <Config

                Id="0x00001041" Enable="true" Timeout="0" Target="sdm450"

                Resources="0x40000000, 1" />

        <Config

                Id="0x00001041" Enable="true" Timeout="0" Target="sdm632"

                Resources="0x40000000, 1" />

    <!--Display off Resource -->

        <!-- Display on resource opcode, value -->

        <Config

                Id="0x00001040" Enable="true" Timeout="0" Target="msm8953"

                Resources="0x40000000, 0x0" />

        <Config

                Id="0x00001040" Enable="true" Timeout="0" Target="sdm450"

                Resources="0x40000000, 0x0" />

        <Config

                Id="0x00001040" Enable="true" Timeout="0" Target="sdm632"

                Resources="0x40000000, 0x0" />



    </PerfBoost>

</BoostConfigs>

configs/qti_whitelist.xml

+3 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <allow-in-power-save package="com.qualcomm.simcontacts" />

    <allow-in-power-save package="com.qualcomm.qti.autoregistration" />

    <allow-in-power-save package="com.qualcomm.qti.server.wigigapp" />

    <!-- allow-in-power-save package="com.qualcomm.qti.StatsPollManager" IKSWO-99124-->

    <allow-in-power-save package="com.qualcomm.qti.StatsPollManager" />

    <allow-in-power-save package="com.qualcomm.qti.gsma.services.nfc" />

    <allow-in-power-save package="com.quicinc.voice.activation" />

    <allow-in-power-save package="com.android.mms" />
@@ -48,6 +48,8 @@ 
    <allow-in-power-save package="com.android.email" />

    <allow-in-power-save package="com.qualcomm.qti.callenhancement" />

    <allow-in-power-save package="com.qualcomm.qti.smartassistant" />

    <!-- These are customer apps that need to freely run in the background -->

    <allow-in-power-save package="com.netcompany.smittestop_exposure_notification" />

    <!-- These telephony applications need access to non-[System]SDK APIs -->

    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />

    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />

device.mk

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ PRODUCT_COPY_FILES += \ 
# Perf

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \

    $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \

    $(LOCAL_PATH)/configs/perf/perf-profile0.conf:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perf-profile0.conf



# Enable vndk-sp Libraries

extract-files.sh

+4 −17
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ set -e 
export DEVICE=FP3

export VENDOR=fairphone



export DEVICE_BRINGUP_YEAR=2020



# Load extract_utils and do some sanity checks

MY_DIR="${BASH_SOURCE%/*}"

if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
@@ -67,7 +65,6 @@ fi 


function blob_fixup() {

    case "${1}" in



    product/etc/permissions/qcrilhook.xml)

        sed -i "s|/system/framework/qcrilhook.jar|/product/framework/qcrilhook.jar|g" "${2}"

        ;;
@@ -88,21 +85,11 @@ function blob_fixup() { 
    esac

}



# Initialize the helper for common device

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"



extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \

        "${KANG}" --section "${SECTION}"



if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then

    # Reinitialize the helper for device

    source "${MY_DIR}/../${DEVICE}/extract-files.sh"

# Initialize the helper

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}"



    extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \

            "${KANG}" --section "${SECTION}"

fi

extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"



COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"

DEVICE_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"



"${MY_DIR}/setup-makefiles.sh"