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

Commit 8b4d6ff5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 68fdd4e2 on remote branch 

Change-Id: I1c7741610bbf939e284581d9983e986966596947
parents 7e482a2d 68fdd4e2

arch/arm64/configs/sdm660-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -598,6 +598,7 @@ CONFIG_QSEE_IPC_IRQ_BRIDGE=y 
CONFIG_QCOM_SMCINVOKE=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_MFSE_QMI=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y

arch/arm64/configs/sdm660_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ CONFIG_QSEE_IPC_IRQ_BRIDGE=y 
CONFIG_QCOM_SMCINVOKE=y

CONFIG_QCOM_EARLY_RANDOM=y

CONFIG_QCOM_CX_IPEAK=y

CONFIG_MFSE_QMI=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_QCOM_BIMC_BWMON=y

CONFIG_ARM_MEMLAT_MON=y

drivers/char/diag/diag_masks.c

+3 −3
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static int diag_cmd_get_log_mask(unsigned char *src_buf, int src_len, 
	int rsp_header_len = sizeof(struct diag_log_config_rsp_t);

	uint32_t mask_size = 0;

	struct diag_log_mask_t *log_item = NULL;

	struct diag_log_config_req_t *req;

	struct diag_log_config_get_req_t *req;

	struct diag_log_config_rsp_t rsp;

	struct diag_mask_info *mask_info = NULL;

	struct diag_md_session_t *info = NULL;
@@ -1189,7 +1189,7 @@ static int diag_cmd_get_log_mask(unsigned char *src_buf, int src_len, 


	mask_info = (!info) ? &log_mask : info->log_mask;

	if (!src_buf || !dest_buf || dest_len <= 0 || !mask_info ||

		src_len < sizeof(struct diag_log_config_req_t)) {

		src_len < sizeof(struct diag_log_config_get_req_t)) {

		pr_err("diag: Invalid input in %s, src_buf: %pK, src_len: %d, dest_buf: %pK, dest_len: %d, mask_info: %pK\n",

		       __func__, src_buf, src_len, dest_buf, dest_len,

		       mask_info);
@@ -1208,7 +1208,7 @@ static int diag_cmd_get_log_mask(unsigned char *src_buf, int src_len, 
		return 0;

	}



	req = (struct diag_log_config_req_t *)src_buf;

	req = (struct diag_log_config_get_req_t *)src_buf;

	read_len += req_header_len;



	rsp.cmd_code = DIAG_CMD_LOG_CONFIG;

drivers/char/diag/diag_masks.h

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, 2018 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, 2018-2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -40,6 +40,13 @@ struct diag_msg_mask_t { 
	uint32_t *ptr;

};



struct diag_log_config_get_req_t {

	uint8_t cmd_code;

	uint8_t padding[3];

	uint32_t sub_cmd;

	uint32_t equip_id;

} __packed;



struct diag_log_config_req_t {

	uint8_t cmd_code;

	uint8_t padding[3];

drivers/devfreq/governor_gpubw_mon.c

+6 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016,2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -213,11 +213,12 @@ static int devfreq_gpubw_event_handler(struct devfreq *devfreq, 
	case DEVFREQ_GOV_SUSPEND:

		{

			struct devfreq_msm_adreno_tz_data *priv = devfreq->data;



			if (priv) {

				priv->bus.total_time = 0;

				priv->bus.gpu_time = 0;

				priv->bus.ram_time = 0;

			}

		}

		break;

	default:

		result = 0;