drivers: qcom: Add BCM vote macro to header

The macro to generate a Bus Controller Manager (BCM) TCS command is used
by the interconnect driver but might also be interesting to other
drivers that need to construct TCS commands for sub processors so move
it out of the sdm845 specific file and into the header.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>

diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index c3fd632af1190d3cf1e32fa34ec1346724bdc3df..a32bfaeb7e613af452aaac836189c623109c09e8 100644 (file)
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/clk-provider.h>
@@ -12,23 +12,13 @@
 #include <linux/platform_device.h>
 #include <soc/qcom/cmd-db.h>
 #include <soc/qcom/rpmh.h>
+#include <soc/qcom/tcs.h>
 
 #include <dt-bindings/clock/qcom,rpmh.h>
 
 #define CLK_RPMH_ARC_EN_OFFSET         0
 #define CLK_RPMH_VRM_EN_OFFSET         4
 
-#define BCM_TCS_CMD_COMMIT_MASK                0x40000000
-#define BCM_TCS_CMD_VALID_SHIFT                29
-#define BCM_TCS_CMD_VOTE_MASK          0x3fff
-#define BCM_TCS_CMD_VOTE_SHIFT         0
-
-#define BCM_TCS_CMD(valid, vote)                               \
-       (BCM_TCS_CMD_COMMIT_MASK |                              \
-       ((valid) << BCM_TCS_CMD_VALID_SHIFT) |                  \
-       ((vote & BCM_TCS_CMD_VOTE_MASK)                         \
-       << BCM_TCS_CMD_VOTE_SHIFT))
-
 /**
  * struct bcm_db - Auxiliary data pertaining to each Bus Clock Manager(BCM)
  * @unit: divisor used to convert Hz value to an RPMh msg
@@ -269,7 +259,7 @@ static int clk_rpmh_bcm_send_cmd(struct clk_rpmh *c, bool enable)
        }
 
        cmd.addr = c->res_addr;
-       cmd.data = BCM_TCS_CMD(enable, cmd_state);
+       cmd.data = BCM_TCS_CMD(1, enable, 0, cmd_state);
 
        ret = rpmh_write_async(c->dev, RPMH_ACTIVE_ONLY_STATE, &cmd, 1);
        if (ret) {

diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c
index 93df67345b39d077a73b2cb7794e24fbf29df392..57955596bb5967ec8a7477cd38caa0b4d744acba 100644 (file)
--- a/drivers/interconnect/qcom/sdm845.c
+++ b/drivers/interconnect/qcom/sdm845.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
  *
  */
 
@@ -20,23 +20,6 @@
 #include <soc/qcom/rpmh.h>
 #include <soc/qcom/tcs.h>
 
-#define BCM_TCS_CMD_COMMIT_SHFT                30
-#define BCM_TCS_CMD_COMMIT_MASK                0x40000000
-#define BCM_TCS_CMD_VALID_SHFT         29
-#define BCM_TCS_CMD_VALID_MASK         0x20000000
-#define BCM_TCS_CMD_VOTE_X_SHFT                14
-#define BCM_TCS_CMD_VOTE_MASK          0x3fff
-#define BCM_TCS_CMD_VOTE_Y_SHFT                0
-#define BCM_TCS_CMD_VOTE_Y_MASK                0xfffc000
-
-#define BCM_TCS_CMD(commit, valid, vote_x, vote_y)             \
-       (((commit) << BCM_TCS_CMD_COMMIT_SHFT) |                \
-       ((valid) << BCM_TCS_CMD_VALID_SHFT) |                   \
-       ((cpu_to_le32(vote_x) &                                 \
-       BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_X_SHFT) |    \
-       ((cpu_to_le32(vote_y) &                                 \
-       BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_Y_SHFT))
-
 #define to_qcom_provider(_provider) \
        container_of(_provider, struct qcom_icc_provider, provider)
 

diff --git a/include/soc/qcom/tcs.h b/include/soc/qcom/tcs.h
index 262876a59e86dd509d721af8598b69e76c130150..7a2a055ba6b0a0b0155cf6a52332053c78ff7ac1 100644 (file)
--- a/include/soc/qcom/tcs.h
+++ b/include/soc/qcom/tcs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  */
 
 #ifndef __SOC_QCOM_TCS_H__
@@ -53,4 +53,22 @@ struct tcs_request {
        struct tcs_cmd *cmds;
 };
 
+#define BCM_TCS_CMD_COMMIT_SHFT                30
+#define BCM_TCS_CMD_COMMIT_MASK                0x40000000
+#define BCM_TCS_CMD_VALID_SHFT         29
+#define BCM_TCS_CMD_VALID_MASK         0x20000000
+#define BCM_TCS_CMD_VOTE_X_SHFT                14
+#define BCM_TCS_CMD_VOTE_MASK          0x3fff
+#define BCM_TCS_CMD_VOTE_Y_SHFT                0
+#define BCM_TCS_CMD_VOTE_Y_MASK                0xfffc000
+
+/* Construct a Bus Clock Manager (BCM) specific TCS command */
+#define BCM_TCS_CMD(commit, valid, vote_x, vote_y)             \
+       (((commit) << BCM_TCS_CMD_COMMIT_SHFT) |                \
+       ((valid) << BCM_TCS_CMD_VALID_SHFT) |                   \
+       ((cpu_to_le32(vote_x) &                                 \
+       BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_X_SHFT) |    \
+       ((cpu_to_le32(vote_y) &                                 \
+       BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_Y_SHFT))
+
 #endif /* __SOC_QCOM_TCS_H__ */