Merge "memshare: Respond to query qmi always with boot time init value" (f9388bcc) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/soc/qcom/memshare/msm_memshare.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -641,9 +641,9 @@ static void handle_query_size_req(struct qmi_handle *handle,
		return;
		}

		if (memblock[client_id].size) {
		if (memblock[client_id].init_size) {
		query_resp->size_valid = 1;
		query_resp->size = memblock[client_id].size;
		query_resp->size = memblock[client_id].init_size;
		} else {
		query_resp->size_valid = 1;
		query_resp->size = 0;
		@@ -824,7 +824,7 @@ static int memshare_child_probe(struct platform_device *pdev)
		else if (strcmp(name, "wcnss") == 0)
		memblock[num_clients].peripheral = DHMS_MEM_PROC_WCNSS_V01;

		memblock[num_clients].size = size;
		memblock[num_clients].init_size = size;
		memblock[num_clients].client_id = client_id;

		/*
		@@ -842,6 +842,7 @@ static int memshare_child_probe(struct platform_device *pdev)
		rc);
		return rc;
		}
		memblock[num_clients].size = size;
		memblock[num_clients].allotted = 1;
		shared_hyp_mapping(num_clients);
		}

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-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
		@@ -47,6 +47,8 @@ struct mem_blocks {
		uint32_t guard_band;
		/* Size required for client */
		uint32_t size;
		/* Available memory size for client */
		uint32_t init_size;
		/*
		* start address of the memory block reserved by server memory
		* subsystem to client