Merge "soc: qcom: msm_bus: Add debug logging for BCM client votes" (92760fd0) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/soc/qcom/msm_bus/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@ 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
		obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o
		endif

		obj-$(CONFIG_DEBUG_BUS_VOTER) += msm_bus_dbg_voter.o

		obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o

+13 −0

Original line number	Diff line number	Diff line
		@@ -337,6 +337,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,
		@@ -365,6 +367,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

0 → 100644

+1101 −0

File added.

Preview size limit exceeded, changes collapsed.

+2 −0

Original line number	Diff line number	Diff line
		@@ -443,6 +443,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;
		@@ -512,6 +513,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 == false) {
		cur_bcm->dirty = false;
		msm_bus_dbg_remove_bcm(cur_bcm);
		list_del_init(&cur_bcm->link);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,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;