Skip to content

Commit 158ed77

Browse files
cwabbott0andersson
authored andcommitted
firmware: qcom: scm: Add gpu_init_regs call
This will used by drm/msm to initialize GPU registers that Qualcomm's firmware doesn't make writeable to the kernel. Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Connor Abbott <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Acked-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 1613e60 commit 158ed77

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

drivers/firmware/qcom/qcom_scm.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,6 +1394,20 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,
13941394
}
13951395
EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh);
13961396

1397+
int qcom_scm_gpu_init_regs(u32 gpu_req)
1398+
{
1399+
struct qcom_scm_desc desc = {
1400+
.svc = QCOM_SCM_SVC_GPU,
1401+
.cmd = QCOM_SCM_SVC_GPU_INIT_REGS,
1402+
.arginfo = QCOM_SCM_ARGS(1),
1403+
.args[0] = gpu_req,
1404+
.owner = ARM_SMCCC_OWNER_SIP,
1405+
};
1406+
1407+
return qcom_scm_call(__scm->dev, &desc, NULL);
1408+
}
1409+
EXPORT_SYMBOL_GPL(qcom_scm_gpu_init_regs);
1410+
13971411
static int qcom_scm_find_dload_address(struct device *dev, u64 *addr)
13981412
{
13991413
struct device_node *tcsr;

drivers/firmware/qcom/qcom_scm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc,
138138
#define QCOM_SCM_WAITQ_RESUME 0x02
139139
#define QCOM_SCM_WAITQ_GET_WQ_CTX 0x03
140140

141+
#define QCOM_SCM_SVC_GPU 0x28
142+
#define QCOM_SCM_SVC_GPU_INIT_REGS 0x01
143+
141144
/* common error codes */
142145
#define QCOM_SCM_V2_EBUSY -12
143146
#define QCOM_SCM_ENOMEM -5

include/linux/firmware/qcom/qcom_scm.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,29 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,
115115
int qcom_scm_lmh_profile_change(u32 profile_id);
116116
bool qcom_scm_lmh_dcvsh_available(void);
117117

118+
/*
119+
* Request TZ to program set of access controlled registers necessary
120+
* irrespective of any features
121+
*/
122+
#define QCOM_SCM_GPU_ALWAYS_EN_REQ BIT(0)
123+
/*
124+
* Request TZ to program BCL id to access controlled register when BCL is
125+
* enabled
126+
*/
127+
#define QCOM_SCM_GPU_BCL_EN_REQ BIT(1)
128+
/*
129+
* Request TZ to program set of access controlled register for CLX feature
130+
* when enabled
131+
*/
132+
#define QCOM_SCM_GPU_CLX_EN_REQ BIT(2)
133+
/*
134+
* Request TZ to program tsense ids to access controlled registers for reading
135+
* gpu temperature sensors
136+
*/
137+
#define QCOM_SCM_GPU_TSENSE_EN_REQ BIT(3)
138+
139+
int qcom_scm_gpu_init_regs(u32 gpu_req);
140+
118141
#ifdef CONFIG_QCOM_QSEECOM
119142

120143
int qcom_scm_qseecom_app_get_id(const char *app_name, u32 *app_id);

0 commit comments

Comments
 (0)