Merge "msm: msm_bus: Reset fab clock state after transactions" (c84f2c37) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/msm_bus/msm_bus_fabric_adhoc.c

+31 −1

Original line number	Diff line number	Diff line
		@@ -67,8 +67,10 @@ static int msm_bus_agg_fab_clks(struct device bus_dev, void data)
		int ret = 0;
		int ctx = (int )data;

		if (ctx >= NUM_CTX)
		if (ctx >= NUM_CTX) {
		MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx);
		goto exit_agg_fab_clks;
		}

		node = bus_dev->platform_data;
		if (!node) {
		@@ -89,6 +91,31 @@ exit_agg_fab_clks:
		return ret;
		}

		static int msm_bus_reset_fab_clks(struct device bus_dev, void data)
		{
		struct msm_bus_node_device_type *node = NULL;
		int ret = 0;
		int ctx = (int )data;

		if (ctx >= NUM_CTX) {
		MSM_BUS_ERR("%s: Invalid Context %d", __func__, ctx);
		goto exit_reset_fab_clks;
		}

		node = bus_dev->platform_data;
		if (!node) {
		MSM_BUS_ERR("%s: Can't get device info", __func__);
		goto exit_reset_fab_clks;
		}

		if (node->node_info->is_fab_dev) {
		node->cur_clk_hz[ctx] = 0;
		MSM_BUS_DBG("Resetting for node %d", node->node_info->id);
		}
		exit_reset_fab_clks:
		return ret;
		}


		static int send_rpm_msg(struct device *device)
		{
		@@ -278,6 +305,9 @@ int msm_bus_commit_data(int *dirty_nodes, int ctx, int num_dirty)
		__func__, dirty_nodes[i]);
		}
		kfree(dirty_nodes);
		/* Aggregate the bus clocks */
		bus_for_each_dev(&msm_bus_type, NULL, (void *)&ctx,
		msm_bus_reset_fab_clks);
		return ret;
		}