Merge "defconfig: Enable sysmon qmi config for kona" (e794019e) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ CONFIG_MSM_SERVICE_LOCATOR=y
		CONFIG_MSM_SERVICE_NOTIFIER=y
		CONFIG_MSM_SUBSYSTEM_RESTART=y
		CONFIG_MSM_PIL=y
		CONFIG_MSM_SYSMON_QMI_COMM=y
		CONFIG_MSM_PIL_SSR_GENERIC=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_QCOM_DCC_V2=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -536,6 +536,7 @@ CONFIG_MSM_SERVICE_LOCATOR=y
		CONFIG_MSM_SERVICE_NOTIFIER=y
		CONFIG_MSM_SUBSYSTEM_RESTART=y
		CONFIG_MSM_PIL=y
		CONFIG_MSM_SYSMON_QMI_COMM=y
		CONFIG_MSM_PIL_SSR_GENERIC=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_QCOM_DCC_V2=y

drivers/soc/qcom/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -394,6 +394,15 @@ config MSM_SYSMON_GLINK_COMM
		subsystems within the SoC about other subsystems' power-up/down
		state-changes.

		config MSM_SYSMON_QMI_COMM
		bool "MSM System Monitor communication support using QMI transport"
		depends on QCOM_QMI_HELPERS && MSM_SUBSYSTEM_RESTART
		help
		This option adds support for MSM System Monitor APIs using the
		QMI layer. The APIs provided may be used for notifying
		subsystems within the SoC about other subsystems' power-up/down
		state-changes.

		config MSM_PIL_SSR_GENERIC
		tristate "MSM Subsystem Boot Support"
		depends on MSM_PIL && MSM_SUBSYSTEM_RESTART

drivers/soc/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,8 @@ obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o
		obj-$(CONFIG_QCOM_DCC_V2) += dcc_v2.o
		obj-$(CONFIG_MSM_SERVICE_NOTIFIER) += service-notifier.o
		obj-$(CONFIG_MSM_SERVICE_LOCATOR) += service-locator.o
		obj-$(CONFIG_MSM_SYSMON_GLINK_COMM) += sysmon-glink.o sysmon-qmi.o
		obj-$(CONFIG_MSM_SYSMON_GLINK_COMM) += sysmon-glink.o
		obj-$(CONFIG_MSM_SYSMON_QMI_COMM) += sysmon-qmi.o
		obj-$(CONFIG_MSM_PIL_SSR_GENERIC) += subsys-pil-tz.o
		obj-$(CONFIG_MEM_SHARE_QMI_SERVICE) += memshare/
		obj-$(CONFIG_MSM_PIL) += peripheral-loader.o

drivers/soc/qcom/sysmon-qmi.c

+13 −13

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "sysmon-qmi: %s: " fmt, __func__
		@@ -48,7 +48,7 @@
		.data_type = QMI_EOTI, \
		.elem_len = 0, \
		.elem_size = 0, \
		.is_array = NO_ARRAY, \
		.array_type = NO_ARRAY, \
		.tlv_type = 0x00, \
		.offset = 0, \
		.ei_array = NULL, \
		@@ -162,7 +162,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_req_msg_ei[] = {
		.data_type = QMI_DATA_LEN,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct qmi_ssctl_subsys_event_req_msg,
		subsys_name_len),
		@@ -172,7 +172,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_req_msg_ei[] = {
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = QMI_SSCTL_SUBSYS_NAME_LENGTH,
		.elem_size = sizeof(char),
		.is_array = VAR_LEN_ARRAY,
		.array_type = VAR_LEN_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct qmi_ssctl_subsys_event_req_msg,
		subsys_name),
		@@ -182,7 +182,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_req_msg_ei[] = {
		.data_type = QMI_SIGNED_4_BYTE_ENUM,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct qmi_ssctl_subsys_event_req_msg,
		event),
		@@ -192,7 +192,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_req_msg_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct qmi_ssctl_subsys_event_req_msg,
		evt_driven_valid),
		@@ -202,7 +202,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_req_msg_ei[] = {
		.data_type = QMI_SIGNED_4_BYTE_ENUM,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct qmi_ssctl_subsys_event_req_msg,
		evt_driven),
		@@ -216,7 +216,7 @@ static struct qmi_elem_info qmi_ssctl_subsys_event_resp_msg_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct qmi_ssctl_subsys_event_resp_msg,
		resp),
		@@ -343,7 +343,7 @@ static struct qmi_elem_info qmi_ssctl_shutdown_resp_msg_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct qmi_ssctl_shutdown_resp_msg,
		resp),
		@@ -471,7 +471,7 @@ static struct qmi_elem_info qmi_ssctl_get_failure_reason_resp_msg_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(
		struct qmi_ssctl_get_failure_reason_resp_msg,
		@@ -482,7 +482,7 @@ static struct qmi_elem_info qmi_ssctl_get_failure_reason_resp_msg_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct qmi_ssctl_get_failure_reason_resp_msg,
		@@ -493,7 +493,7 @@ static struct qmi_elem_info qmi_ssctl_get_failure_reason_resp_msg_ei[] = {
		.data_type = QMI_DATA_LEN,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct qmi_ssctl_get_failure_reason_resp_msg,
		@@ -504,7 +504,7 @@ static struct qmi_elem_info qmi_ssctl_get_failure_reason_resp_msg_ei[] = {
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = QMI_SSCTL_ERROR_MSG_LENGTH,
		.elem_size = sizeof(char),
		.is_array = VAR_LEN_ARRAY,
		.array_type = VAR_LEN_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct qmi_ssctl_get_failure_reason_resp_msg,