defconfig / raph : Cleanup and enable ARM64 ACPI Parking Protocol

After commit e066f60, we required to enable ACPI Parking Protocol due to the dependency of `arch_send_wakeup_ipi_mask` which converted to `BUILD_BUG` if `CONFIG_ARM64_ACPI_PARKING_PROTOCOL` not enabled. This commit fixes the following error: ld.lld: error: undefined symbol: __compiletime_assert_27 >>> referenced by smp.h:103 (../arch/arm64/include/asm/smp.h:103) >>> drivers/built-in.o:(cpuidle_latency_notify) Signed-off-by: Rapherion Rollerscaperers <[email protected]>
RaphielGang · May 8, 2020 · 7a70f71 · 7a70f71
1 parent e066f60
commit 7a70f71
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/arch/arm64/configs/raph_beryllium_defconfig b/arch/arm64/configs/raph_beryllium_defconfig
@@ -64,6 +64,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM845=y
+CONFIG_BOARD_XIAOMI_E10=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y
@@ -84,6 +85,7 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 # CONFIG_ARM64_VHE is not set
 CONFIG_RANDOMIZE_BASE=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 # CONFIG_EFI is not set
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -94,7 +96,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_MONITOR=y
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -383,7 +384,6 @@ CONFIG_IDT_P9220=y
 CONFIG_QPNP_SMB2=y
 CONFIG_QPNP_QNOVO=y
 CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
-CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
@@ -673,6 +673,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_SENSORS_SSC=y
 CONFIG_MSM_TZ_LOG=y
+CONFIG_ACPI=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
@@ -741,4 +742,3 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CRC32_ARM64=y
 CONFIG_XZ_DEC=y
 CONFIG_QMI_ENCDEC=y
-CONFIG_BOARD_XIAOMI_E10=y
diff --git a/arch/arm64/configs/raph_dipper_defconfig b/arch/arm64/configs/raph_dipper_defconfig
@@ -64,6 +64,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM845=y
+CONFIG_BOARD_XIAOMI_E1N=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y
@@ -84,6 +85,7 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 # CONFIG_ARM64_VHE is not set
 CONFIG_RANDOMIZE_BASE=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 # CONFIG_EFI is not set
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -94,7 +96,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_MONITOR=y
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -390,7 +391,6 @@ CONFIG_IDT_P9220=y
 CONFIG_QPNP_SMB2=y
 CONFIG_QPNP_QNOVO=y
 CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
-CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
@@ -681,6 +681,7 @@ CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_SENSORS_SSC=y
 CONFIG_BCM_GPS_SPI_DRIVER=y
 CONFIG_MSM_TZ_LOG=y
+CONFIG_ACPI=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
@@ -749,4 +750,3 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CRC32_ARM64=y
 CONFIG_XZ_DEC=y
 CONFIG_QMI_ENCDEC=y
-CONFIG_BOARD_XIAOMI_E1N=y
diff --git a/arch/arm64/configs/raph_polaris_defconfig b/arch/arm64/configs/raph_polaris_defconfig
@@ -64,6 +64,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SDM845=y
+CONFIG_BOARD_XIAOMI_D5X=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y
@@ -84,6 +85,7 @@ CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
 # CONFIG_ARM64_VHE is not set
 CONFIG_RANDOMIZE_BASE=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 # CONFIG_EFI is not set
 CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -94,7 +96,6 @@ CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP_MONITOR=y
-CONFIG_CPU_IDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -387,7 +388,6 @@ CONFIG_IDT_P9220=y
 CONFIG_QPNP_SMB2=y
 CONFIG_QPNP_QNOVO=y
 CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
-CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
@@ -564,12 +564,14 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_QCA_CLD_WLAN=y
 CONFIG_QCACLD_WLAN_LFR3=y
+CONFIG_WLAN_FEATURE_FILS=y
 CONFIG_WLAN_FEATURE_11W=y
 CONFIG_WLAN_FEATURE_LPSS=y
 CONFIG_QCOM_VOWIFI_11R=y
 CONFIG_QCACLD_FEATURE_NAN=y
 CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
 CONFIG_QCACLD_FEATURE_GREEN_AP=y
+CONFIG_QCACLD_FEATURE_METERING=y
 CONFIG_QCOM_TDLS=y
 CONFIG_QCOM_LTE_COEX=y
 CONFIG_WLAN_OFFLOAD_PACKETS=y
@@ -581,7 +583,9 @@ CONFIG_LFR_SUBNET_DETECTION=y
 CONFIG_MCC_TO_SCC_SWITCH=y
 CONFIG_QCACLD_WLAN_LFR2=y
 CONFIG_WLAN_FEATURE_DISA=y
-CONFIG_WLAN_FEATURE_FILS=y
+CONFIG_WLAN_FEATURE_OWE=y
+CONFIG_WLAN_FEATURE_GMAC=y
+CONFIG_WLAN_FEATURE_SAE=y
 CONFIG_GSI=y
 CONFIG_IPA3=y
 CONFIG_RMNET_IPA3=y
@@ -671,6 +675,7 @@ CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_SENSORS_SSC=y
 CONFIG_MSM_TZ_LOG=y
+CONFIG_ACPI=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
@@ -739,4 +744,3 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_CRC32_ARM64=y
 CONFIG_XZ_DEC=y
 CONFIG_QMI_ENCDEC=y
-CONFIG_BOARD_XIAOMI_D5X=y