Merge "defconfig: sdm855: enable AOP QMP clock driver" (1bd1c3d1) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/configs/sdm855-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,7 @@ CONFIG_IPA3=y
		CONFIG_RNDIS_IPA=y
		CONFIG_IPA_UT=y
		CONFIG_SPMI_PMIC_CLKDIV=y
		CONFIG_MSM_CLK_AOP_QMP=y
		CONFIG_MSM_GCC_SDM855=y
		CONFIG_MSM_NPUCC_SDM855=y
		CONFIG_MSM_VIDEOCC_SDM855=y

arch/arm64/configs/sdm855_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,7 @@ CONFIG_IPA3=y
		CONFIG_RNDIS_IPA=y
		CONFIG_IPA_UT=y
		CONFIG_SPMI_PMIC_CLKDIV=y
		CONFIG_MSM_CLK_AOP_QMP=y
		CONFIG_MSM_GCC_SDM855=y
		CONFIG_MSM_NPUCC_SDM855=y
		CONFIG_MSM_VIDEOCC_SDM855=y

drivers/clk/qcom/clk-aop-qmp.c

+23 −11

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -137,6 +137,12 @@ static int clk_aop_qmp_prepare(struct clk_hw *hw)
		struct clk_aop_qmp *clk = to_aop_qmp_clk(hw);

		mutex_lock(&clk_aop_lock);
		/*
		* Return early if the clock has been enabled already. This
		* is to avoid issues with sending duplicate enable requests.
		*/
		if (clk->enabled)
		goto err;

		if (clk->level)
		rate = clk->level;
		@@ -175,6 +181,9 @@ static void clk_aop_qmp_unprepare(struct clk_hw *hw)

		mutex_lock(&clk_aop_lock);

		if (!clk->enabled)
		goto err;

		rate = clk->disable_state;

		snprintf(mbox_msg, MAX_LEN, "{class: %s, res: %s, val: %ld}",
		@@ -221,9 +230,10 @@ static struct clk_hw *aop_qmp_clk_hws[] = {
		};

		static int qmp_update_client(struct clk_hw hw, struct device dev,
		struct mbox_chan *mbox)
		struct mbox_chan **mbox)
		{
		struct clk_aop_qmp *clk_aop = to_aop_qmp_clk(hw);
		int ret;

		/* Use mailbox client with blocking mode */
		clk_aop->cl.dev = dev;
		@@ -231,17 +241,19 @@ static int qmp_update_client(struct clk_hw hw, struct device dev,
		clk_aop->cl.tx_tout = MBOX_TOUT_MS;
		clk_aop->cl.knows_txdone = false;

		if (mbox) {
		clk_aop->mbox = mbox;
		if (*mbox) {
		clk_aop->mbox = *mbox;
		return 0;
		}

		/* Allocate mailbox channel */
		mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
		if (IS_ERR(clk_aop->mbox) && PTR_ERR(clk_aop->mbox) != -EPROBE_DEFER) {
		dev_err(dev, "Failed to get mailbox channel %pK %ld\n",
		mbox, PTR_ERR(mbox));
		return PTR_ERR(clk_aop->mbox);
		*mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
		if (IS_ERR(clk_aop->mbox)) {
		ret = PTR_ERR(clk_aop->mbox);
		if (ret != -EPROBE_DEFER)
		dev_err(dev, "Failed to get mailbox channel, ret %d\n",
		ret);
		return ret;
		}

		return 0;
		@@ -259,14 +271,14 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
		* Allocate mbox channel for the first clock client. The same channel
		* would be used for the rest of the clock clients.
		*/
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
		if (ret < 0)
		return ret;

		for (i = 1; i < num_clks; i++) {
		if (!aop_qmp_clk_hws[i])
		continue;
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
		if (ret < 0) {
		dev_err(&pdev->dev, "Failed to update QMP client %d\n",
		ret);