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

Commit a92558f2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "haven: ctrl: Enable setting trace class"

parents d7ef1fc1 6e9663dc

drivers/virt/haven/hh_ctrl.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */

 */





#define pr_fmt(fmt) "haven: "

#define pr_fmt(fmt) "haven: " fmt





#include <linux/arm-smccc.h>

#include <linux/arm-smccc.h>

#include <linux/debugfs.h>

#include <linux/debugfs.h>
@@ -120,6 +120,7 @@ static int hh_dbgfs_trace_class_clear(void *data, u64 val) 




static int hh_dbgfs_trace_class_get(void *data, u64 *val)

static int hh_dbgfs_trace_class_get(void *data, u64 *val)

{

{

	*val = 0;

	return hh_remap_error(hh_hcall_trace_update_class_flags(0, 0, val));

	return hh_remap_error(hh_hcall_trace_update_class_flags(0, 0, val));

}

}
@@ -211,3 +212,6 @@ static void __exit hh_ctrl_exit(void) 
	hh_dbgfs_unregister();

	hh_dbgfs_unregister();

}

}

module_exit(hh_ctrl_exit);

module_exit(hh_ctrl_exit);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Haven Hypervisor Control Driver");

include/linux/haven/hcall.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -294,7 +294,7 @@ static inline int hh_hcall_trace_update_class_flags( 
			(struct hh_hcall_args){ set_flags, clear_flags, 0 },

			(struct hh_hcall_args){ set_flags, clear_flags, 0 },

			&_resp);

			&_resp);





	if ((ret != 0) && new_flags)

	if (!ret && new_flags)

		*new_flags = _resp.resp1;

		*new_flags = _resp.resp1;





	return ret;

	return ret;