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

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

Merge "soc: qcom: msm_bus: Add debug logging for BCM client votes"

parents 45fa4e19 9f9a1d4b

drivers/soc/qcom/msm_bus/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ ifdef CONFIG_QCOM_BUS_CONFIG_RPMH 
	obj-y += msm_bus_fabric_rpmh.o msm_bus_arb_rpmh.o msm_bus_rules.o \

		msm_bus_bimc_rpmh.o msm_bus_noc_rpmh.o msm_bus_proxy_client.o

	obj-$(CONFIG_OF) += msm_bus_of_rpmh.o

	obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg_rpmh.o

else

	obj-y += msm_bus_fabric_adhoc.o msm_bus_arb_adhoc.o msm_bus_rules.o \

		msm_bus_bimc_adhoc.o msm_bus_noc_adhoc.o msm_bus_qnoc_adhoc.o

	obj-$(CONFIG_OF) += msm_bus_of_adhoc.o

endif



	obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o

endif

drivers/soc/qcom/msm_bus/msm_bus_core.h

+13 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ int msm_bus_dbg_add_client(const struct msm_bus_client_handle *pdata); 
int msm_bus_dbg_rec_transaction(const struct msm_bus_client_handle *pdata,

						u64 ab, u64 ib);

void msm_bus_dbg_remove_client(const struct msm_bus_client_handle *pdata);

int msm_bus_dbg_add_bcm(struct msm_bus_node_device_type *cur_bcm);

void msm_bus_dbg_remove_bcm(struct msm_bus_node_device_type *cur_bcm);



#else

static inline void msm_bus_dbg_client_data(struct msm_bus_scale_pdata *pdata,
@@ -358,6 +360,17 @@ msm_bus_dbg_add_client(const struct msm_bus_client_handle *pdata) 
{

	return 0;

}



static inline int

msm_bus_dbg_add_bcm(struct msm_bus_node_device_type *cur_bcm)

{

	return 0;

}



static inline void

msm_bus_dbg_remove_bcm(struct msm_bus_node_device_type *cur_bcm)

{

}

#endif



#ifdef CONFIG_CORESIGHT

drivers/soc/qcom/msm_bus/msm_bus_dbg_rpmh.c

0 → 100644
+1070 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+2 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ static int bcm_clist_add(struct msm_bus_node_device_type *cur_dev) 
		if (!cur_bcm->dirty) {

			list_add_tail(&cur_bcm->link,

					&cur_rsc->rscdev->bcm_clist[cur_vcd]);

			msm_bus_dbg_add_bcm(cur_bcm);

			cur_bcm->dirty = true;

		}

		cur_bcm->updated = false;
@@ -517,6 +518,7 @@ static int bcm_clist_clean(struct msm_bus_node_device_type *cur_dev) 
			cur_bcm->node_vec[ACTIVE_CTX].vec_b == 0 &&

			!init_time) {

			cur_bcm->dirty = false;

			msm_bus_dbg_remove_bcm(cur_bcm);

			list_del_init(&cur_bcm->link);

		}

	}

drivers/soc/qcom/msm_bus/msm_bus_rpmh.h

+2 −1
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.

 */



#ifndef _ARCH_ARM_MACH_MSM_BUS_ADHOC_H
@@ -207,6 +207,7 @@ struct msm_bus_node_device_type { 
	struct nodevector node_vec[NUM_CTX];

	struct list_head link;

	struct list_head query_link;

	struct list_head dbg_link;

	struct nodeclk clk[NUM_CTX];

	struct nodeclk bus_qos_clk;

	uint32_t num_node_qos_clks;