Merge "msm: tspp2: Enable VBIF clocks properly" (d7d7e828) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/clock-8092.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -6974,6 +6974,8 @@ static struct clk_lookup mpq_clocks_8092[] = {
		CLK_LOOKUP("", bcc_vbif_tspp2_clk.c, ""),
		CLK_LOOKUP("bcc_vbif_tspp2_clk", bcc_vbif_tspp2_clk.c,
		"fc724000.msm_tspp2"),
		CLK_LOOKUP("vbif_core_clk", bcc_vbif_axi_clk.c, "fc724000.msm_tspp2"),
		CLK_LOOKUP("iface_vbif_clk", bcc_vbif_ahb_clk.c, "fc724000.msm_tspp2"),
		CLK_LOOKUP("bcc_vbif_tspp2_clk", bcc_vbif_tspp2_clk.c,
		"fc74a000.msm_tsc"),
		CLK_LOOKUP("bcc_vbif_dem_core_clk", bcc_vbif_dem_core_clk.c,

drivers/media/platform/msm/broadcast/tspp2.c

+110 −11

Original line number	Diff line number	Diff line
		@@ -805,6 +805,8 @@ struct tspp2_iommu_info {
		* @tspp2_ahb_clk: TSPP2 AHB clock.
		* @tspp2_core_clk: TSPP2 core clock.
		* @tspp2_vbif_clk: TSPP2 VBIF clock.
		* @vbif_ahb_clk: VBIF AHB clock.
		* @vbif_axi_clk: VBIF AXI clock.
		* @tspp2_klm_ahb_clk: TSPP2 KLM AHB clock.
		* @tsif_ref_clk: TSIF reference clock.
		* @batches: An array of filter batch objects.
		@@ -851,6 +853,8 @@ struct tspp2_device {
		struct clk *tspp2_ahb_clk;
		struct clk *tspp2_core_clk;
		struct clk *tspp2_vbif_clk;
		struct clk *vbif_ahb_clk;
		struct clk *vbif_axi_clk;
		struct clk *tspp2_klm_ahb_clk;
		struct clk *tsif_ref_clk;
		struct tspp2_filter_batch batches[TSPP2_NUM_BATCHES];
		@@ -1388,6 +1392,58 @@ static int tspp2_tsif_start(struct tspp2_tsif_device *tsif_device)
		return (ctl & TSIF_STS_CTL_START) ? 0 : -EBUSY;
		}


		static int tspp2_vbif_clock_start(struct tspp2_device *device)
		{
		int ret;

		if (device->tspp2_vbif_clk) {
		ret = clk_prepare_enable(device->tspp2_vbif_clk);
		if (ret) {
		pr_err("%s: Can't start tspp2_vbif_clk\n", __func__);
		return ret;
		}
		}

		if (device->vbif_ahb_clk) {
		ret = clk_prepare_enable(device->vbif_ahb_clk);
		if (ret) {
		pr_err("%s: Can't start vbif_ahb_clk\n", __func__);
		goto disable_vbif_tspp2;
		}
		}
		if (device->vbif_axi_clk) {
		ret = clk_prepare_enable(device->vbif_axi_clk);
		if (ret) {
		pr_err("%s: Can't start vbif_ahb_clk\n", __func__);
		goto disable_vbif_ahb;
		}
		}

		return 0;

		disable_vbif_ahb:
		if (device->vbif_ahb_clk)
		clk_disable_unprepare(device->vbif_ahb_clk);
		disable_vbif_tspp2:
		if (device->tspp2_vbif_clk)
		clk_disable_unprepare(device->tspp2_vbif_clk);

		return ret;
		}

		static void tspp2_vbif_clock_stop(struct tspp2_device *device)
		{
		if (device->tspp2_vbif_clk)
		clk_disable_unprepare(device->tspp2_vbif_clk);

		if (device->vbif_ahb_clk)
		clk_disable_unprepare(device->vbif_ahb_clk);

		if (device->vbif_axi_clk)
		clk_disable_unprepare(device->vbif_axi_clk);
		}

		/**
		* tspp2_tsif_stop() - Stop TSIF device HW.
		*
		@@ -1499,14 +1555,6 @@ static int tspp2_clock_start(struct tspp2_device *device)
		tspp2_core_clk = 1;
		}

		if (device->tspp2_vbif_clk) {
		if (clk_prepare_enable(device->tspp2_vbif_clk) != 0) {
		pr_err("%s: Can't start tspp2_vbif_clk\n", __func__);
		goto err_clocks;
		}
		tspp2_vbif_clk = 1;
		}

		if (device->tspp2_klm_ahb_clk) {
		if (clk_prepare_enable(device->tspp2_klm_ahb_clk) != 0) {
		pr_err("%s: Can't start tspp2_klm_ahb_clk\n", __func__);
		@@ -1573,9 +1621,6 @@ static void tspp2_clock_stop(struct tspp2_device *device)
		if (device->tspp2_klm_ahb_clk)
		clk_disable_unprepare(device->tspp2_klm_ahb_clk);

		if (device->tspp2_vbif_clk)
		clk_disable_unprepare(device->tspp2_vbif_clk);

		if (device->tspp2_core_clk)
		clk_disable_unprepare(device->tspp2_core_clk);

		@@ -2636,6 +2681,7 @@ static int tspp2_pipe_memory_init(struct tspp2_pipe *pipe)
		int partition = 0;
		int hlos_group_attached = 0;
		int cpz_group_attached = 0;
		int vbif_clk_started = 0;

		if (pipe->cfg.is_secure) {
		domain = pipe->device->iommu_info.cpz_domain_num;
		@@ -2658,6 +2704,18 @@ static int tspp2_pipe_memory_init(struct tspp2_pipe *pipe)
		__func__, ret);
		return ret;
		}

		if ((pipe->device->num_secured_opened_pipes +
		pipe->device->num_non_secured_opened_pipes) == 0) {
		ret = tspp2_vbif_clock_start(pipe->device);
		if (ret) {
		pr_err(
		"%s: tspp2_vbif_clock_start failed, ret=%d\n",
		__func__, ret);
		return ret;
		}
		vbif_clk_started = 1;
		}
		} else {
		/*
		* We need to attach the group to enable the IOMMU and support
		@@ -2672,6 +2730,14 @@ static int tspp2_pipe_memory_init(struct tspp2_pipe *pipe)
		*/
		if ((pipe->device->num_secured_opened_pipes +
		pipe->device->num_non_secured_opened_pipes) == 0) {
		ret = tspp2_vbif_clock_start(pipe->device);
		if (ret) {
		pr_err("%s: tspp2_vbif_clock_start failed, ret=%d\n",
		__func__, ret);
		goto err_out;
		}
		vbif_clk_started = 1;

		pr_debug("%s: attaching HLOS group\n", __func__);
		ret = iommu_attach_group(
		pipe->device->iommu_info.hlos_domain,
		@@ -2736,6 +2802,9 @@ err_out:
		pipe->device->iommu_info.cpz_group);
		}

		if (vbif_clk_started)
		tspp2_vbif_clock_stop(pipe->device);

		return ret;
		}

		@@ -2784,7 +2853,11 @@ static void tspp2_pipe_memory_terminate(struct tspp2_pipe *pipe)
		iommu_detach_group(
		pipe->device->iommu_info.hlos_domain,
		pipe->device->iommu_info.hlos_group);
		tspp2_vbif_clock_stop(pipe->device);
		}
		} else if ((pipe->device->num_secured_opened_pipes +
		pipe->device->num_non_secured_opened_pipes) == 0) {
		tspp2_vbif_clock_stop(pipe->device);
		}

		pipe->iova = 0;
		@@ -7165,6 +7238,12 @@ static void tspp2_clocks_put(struct tspp2_device *device)
		if (device->tspp2_vbif_clk)
		clk_put(device->tspp2_vbif_clk);

		if (device->vbif_ahb_clk)
		clk_put(device->vbif_ahb_clk);

		if (device->vbif_axi_clk)
		clk_put(device->vbif_axi_clk);

		if (device->tspp2_core_clk)
		clk_put(device->tspp2_core_clk);

		@@ -7174,6 +7253,8 @@ static void tspp2_clocks_put(struct tspp2_device *device)
		device->tspp2_ahb_clk = NULL;
		device->tspp2_core_clk = NULL;
		device->tspp2_vbif_clk = NULL;
		device->vbif_ahb_clk = NULL;
		device->vbif_axi_clk = NULL;
		device->tspp2_klm_ahb_clk = NULL;
		device->tsif_ref_clk = NULL;
		}
		@@ -7207,6 +7288,8 @@ static int msm_tspp2_clocks_setup(struct platform_device *pdev,
		device->tspp2_ahb_clk = NULL;
		device->tspp2_core_clk = NULL;
		device->tspp2_vbif_clk = NULL;
		device->vbif_ahb_clk = NULL;
		device->vbif_axi_clk = NULL;
		device->tspp2_klm_ahb_clk = NULL;
		device->tsif_ref_clk = NULL;

		@@ -7246,6 +7329,22 @@ static int msm_tspp2_clocks_setup(struct platform_device *pdev,
		}
		}

		device->vbif_ahb_clk = clk_get(&pdev->dev, "iface_vbif_clk");
		if (IS_ERR(device->vbif_ahb_clk)) {
		pr_err("%s: Failed to get %s", __func__, "iface_vbif_clk");
		ret = PTR_ERR(device->vbif_ahb_clk);
		device->vbif_ahb_clk = NULL;
		goto err_clocks;
		}

		device->vbif_axi_clk = clk_get(&pdev->dev, "vbif_core_clk");
		if (IS_ERR(device->vbif_axi_clk)) {
		pr_err("%s: Failed to get %s", __func__, "vbif_core_clk");
		ret = PTR_ERR(device->vbif_axi_clk);
		device->vbif_axi_clk = NULL;
		goto err_clocks;
		}

		if (data->tspp2_klm_ahb_clk) {
		device->tspp2_klm_ahb_clk =
		clk_get(&pdev->dev, data->tspp2_klm_ahb_clk);