| Message ID | 20230305022119.1331495-2-luzmaximilian@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | firmware: Add support for Qualcomm UEFI Secure Application | expand |
On 05/03/2023 04:21, Maximilian Luz wrote: > Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible > to other modules. Generally all the qcom_scm calls are a part of qcom_scm.c. I think it is better to make qseecom_scm_call a part qcom_scm.c (as we were previously doing) rather than exporting the core function. If you wish to limit the kernel bloat, you can split the qcom_scm into per-driver backend and add Kconfig symbols to limit the impact. However I think that these functions are pretty small to justify the effort. > > Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> > --- > > Changes in v3: > - Rebase ontop of latest qcom_scm changes. > - Fix doc-comment. > > Changes in v2: > - No functional changes. > > --- > drivers/firmware/qcom_scm.c | 120 ++++++++++++++++--------- > drivers/firmware/qcom_scm.h | 47 ---------- > include/linux/firmware/qcom/qcom_scm.h | 49 ++++++++++ > 3 files changed, 129 insertions(+), 87 deletions(-) > > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index 468d4d5ab550..9b3e4449a563 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -212,16 +212,17 @@ static enum qcom_scm_convention __get_convention(void) > } > > /** > - * qcom_scm_call() - Invoke a syscall in the secure world > - * @dev: device > + * __qcom_scm_call() - Invoke a syscall in the secure world > + * @dev: Device. Depending on the command and number of arguments, this > + * is optional. > * @desc: Descriptor structure containing arguments and return values > * @res: Structure containing results from SMC/HVC call > * > * Sends a command to the SCM and waits for the command to finish processing. > * This should *only* be called in pre-emptible context. > */ > -static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, > - struct qcom_scm_res *res) > +static int __qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, > + struct qcom_scm_res *res) > { > might_sleep(); > switch (__get_convention()) { > @@ -237,17 +238,38 @@ static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, > } > > /** > - * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() > - * @dev: device > + * qcom_scm_call() - Invoke a syscall in the secure world > + * @desc: Descriptor structure containing arguments and return values > + * @res: Structure containing results from SMC/HVC call > + * > + * Sends a command to the SCM and waits for the command to finish processing. > + * This should *only* be called in pre-emptible context. > + * > + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, > + * or other non-zero status codes on failure. > + */ > +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) > +{ > + if (!__scm) > + return -ENODEV; > + > + return __qcom_scm_call(__scm->dev, desc, res); > +} > +EXPORT_SYMBOL_GPL(qcom_scm_call); > + > +/** > + * __qcom_scm_call_atomic() - atomic variation of __qcom_scm_call() > + * @dev: Device. Depending on the command and number of arguments, this > + * is optional. > * @desc: Descriptor structure containing arguments and return values > * @res: Structure containing results from SMC/HVC call > * > * Sends a command to the SCM and waits for the command to finish processing. > * This can be called in atomic context. > */ > -static int qcom_scm_call_atomic(struct device *dev, > - const struct qcom_scm_desc *desc, > - struct qcom_scm_res *res) > +static int __qcom_scm_call_atomic(struct device *dev, > + const struct qcom_scm_desc *desc, > + struct qcom_scm_res *res) > { > switch (__get_convention()) { > case SMC_CONVENTION_ARM_32: > @@ -261,6 +283,26 @@ static int qcom_scm_call_atomic(struct device *dev, > } > } > > +/** > + * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() > + * @desc: Descriptor structure containing arguments and return values > + * @res: Structure containing results from SMC/HVC call > + * > + * Sends a command to the SCM and waits for the command to finish processing. > + * This can be called in atomic context. > + * > + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, > + * or other non-zero status codes on failure. > + */ > +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) > +{ > + if (!__scm) > + return -ENODEV; > + > + return __qcom_scm_call_atomic(__scm->dev, desc, res); > +} > +EXPORT_SYMBOL_GPL(qcom_scm_call_atomic); > + > static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > u32 cmd_id) > { > @@ -287,7 +329,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, > return false; > } > > - ret = qcom_scm_call(dev, &desc, &res); > + ret = __qcom_scm_call(dev, &desc, &res); > > return ret ? false : !!res.result[0]; > } > @@ -312,7 +354,7 @@ static int qcom_scm_set_boot_addr(void *entry, const u8 *cpu_bits) > desc.args[0] = flags; > desc.args[1] = virt_to_phys(entry); > > - return qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); > + return __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); > } > > static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) > @@ -334,7 +376,7 @@ static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) > if (!__scm || __get_convention() == SMC_CONVENTION_LEGACY) > return -EOPNOTSUPP; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return __qcom_scm_call(__scm->dev, &desc, NULL); > } > > /** > @@ -384,7 +426,7 @@ void qcom_scm_cpu_power_down(u32 flags) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); > + __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_cpu_power_down); > > @@ -401,7 +443,7 @@ int qcom_scm_set_remote_state(u32 state, u32 id) > struct qcom_scm_res res; > int ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > return ret ? : res.result[0]; > } > @@ -419,7 +461,7 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable) > > desc.args[1] = enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0; > > - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); > + return qcom_scm_call_atomic(&desc, NULL); > } > > static void qcom_scm_set_download_mode(bool enable) > @@ -499,7 +541,7 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size, > > desc.args[1] = mdata_phys; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = __qcom_scm_call(__scm->dev, &desc, &res); > > qcom_scm_bw_disable(); > qcom_scm_clk_disable(); > @@ -565,7 +607,7 @@ int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size) > if (ret) > return ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > qcom_scm_bw_disable(); > qcom_scm_clk_disable(); > > @@ -600,7 +642,7 @@ int qcom_scm_pas_auth_and_reset(u32 peripheral) > if (ret) > return ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > qcom_scm_bw_disable(); > qcom_scm_clk_disable(); > > @@ -634,7 +676,7 @@ int qcom_scm_pas_shutdown(u32 peripheral) > if (ret) > return ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > qcom_scm_bw_disable(); > qcom_scm_clk_disable(); > @@ -666,7 +708,7 @@ bool qcom_scm_pas_supported(u32 peripheral) > QCOM_SCM_PIL_PAS_IS_SUPPORTED)) > return false; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = __qcom_scm_call(__scm->dev, &desc, &res); > > return ret ? false : !!res.result[0]; > } > @@ -685,7 +727,7 @@ static int __qcom_scm_pas_mss_reset(struct device *dev, bool reset) > struct qcom_scm_res res; > int ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > return ret ? : res.result[0]; > } > @@ -725,8 +767,7 @@ int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) > struct qcom_scm_res res; > int ret; > > - > - ret = qcom_scm_call_atomic(__scm->dev, &desc, &res); > + ret = qcom_scm_call_atomic(&desc, &res); > if (ret >= 0) > *val = res.result[0]; > > @@ -745,7 +786,7 @@ int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); > + return qcom_scm_call_atomic(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_io_writel); > > @@ -775,7 +816,7 @@ int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) > struct qcom_scm_res res; > int ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > return ret ? : res.result[0]; > } > @@ -793,7 +834,7 @@ int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) > struct qcom_scm_res res; > int ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > if (size) > *size = res.result[0]; > @@ -816,7 +857,7 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) > }; > int ret; > > - ret = qcom_scm_call(__scm->dev, &desc, NULL); > + ret = qcom_scm_call(&desc, NULL); > > /* the pg table has been initialized already, ignore the error */ > if (ret == -EPERM) > @@ -837,7 +878,7 @@ int qcom_scm_iommu_set_cp_pool_size(u32 spare, u32 size) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_iommu_set_cp_pool_size); > > @@ -859,7 +900,7 @@ int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size, > }; > struct qcom_scm_res res; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > > return ret ? : res.result[0]; > } > @@ -887,7 +928,7 @@ static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region, > }; > struct qcom_scm_res res; > > - ret = qcom_scm_call(dev, &desc, &res); > + ret = __qcom_scm_call(dev, &desc, &res); > > return ret ? : res.result[0]; > } > @@ -1004,7 +1045,7 @@ int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, u32 size, > .arginfo = QCOM_SCM_ARGS(4), > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_ocmem_lock); > > @@ -1027,7 +1068,7 @@ int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, u32 offset, u32 size) > .arginfo = QCOM_SCM_ARGS(3), > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_ocmem_unlock); > > @@ -1068,7 +1109,7 @@ int qcom_scm_ice_invalidate_key(u32 index) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_ice_invalidate_key); > > @@ -1129,7 +1170,7 @@ int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, > memcpy(keybuf, key, key_size); > desc.args[1] = key_phys; > > - ret = qcom_scm_call(__scm->dev, &desc, NULL); > + ret = qcom_scm_call(&desc, NULL); > > memzero_explicit(keybuf, key_size); > > @@ -1198,7 +1239,7 @@ int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) > if (ret) > return ret; > > - ret = qcom_scm_call(__scm->dev, &desc, &res); > + ret = qcom_scm_call(&desc, &res); > *resp = res.result[0]; > > qcom_scm_clk_disable(); > @@ -1219,7 +1260,7 @@ int qcom_scm_iommu_set_pt_format(u32 sec_id, u32 ctx_num, u32 pt_fmt) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_iommu_set_pt_format); > > @@ -1234,8 +1275,7 @@ int qcom_scm_qsmmu500_wait_safe_toggle(bool en) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - > - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); > + return qcom_scm_call_atomic(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_qsmmu500_wait_safe_toggle); > > @@ -1255,7 +1295,7 @@ int qcom_scm_lmh_profile_change(u32 profile_id) > .owner = ARM_SMCCC_OWNER_SIP, > }; > > - return qcom_scm_call(__scm->dev, &desc, NULL); > + return qcom_scm_call(&desc, NULL); > } > EXPORT_SYMBOL(qcom_scm_lmh_profile_change); > > @@ -1290,7 +1330,7 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, > > desc.args[0] = payload_phys; > > - ret = qcom_scm_call(__scm->dev, &desc, NULL); > + ret = __qcom_scm_call(__scm->dev, &desc, NULL); > > dma_free_coherent(__scm->dev, payload_size, payload_buf, payload_phys); > return ret; > diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h > index e6e512bd57d1..87eb726be7d0 100644 > --- a/drivers/firmware/qcom_scm.h > +++ b/drivers/firmware/qcom_scm.h > @@ -13,53 +13,6 @@ enum qcom_scm_convention { > > extern enum qcom_scm_convention qcom_scm_convention; > > -#define MAX_QCOM_SCM_ARGS 10 > -#define MAX_QCOM_SCM_RETS 3 > - > -enum qcom_scm_arg_types { > - QCOM_SCM_VAL, > - QCOM_SCM_RO, > - QCOM_SCM_RW, > - QCOM_SCM_BUFVAL, > -}; > - > -#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ > - (((a) & 0x3) << 4) | \ > - (((b) & 0x3) << 6) | \ > - (((c) & 0x3) << 8) | \ > - (((d) & 0x3) << 10) | \ > - (((e) & 0x3) << 12) | \ > - (((f) & 0x3) << 14) | \ > - (((g) & 0x3) << 16) | \ > - (((h) & 0x3) << 18) | \ > - (((i) & 0x3) << 20) | \ > - (((j) & 0x3) << 22) | \ > - ((num) & 0xf)) > - > -#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) > - > - > -/** > - * struct qcom_scm_desc > - * @arginfo: Metadata describing the arguments in args[] > - * @args: The array of arguments for the secure syscall > - */ > -struct qcom_scm_desc { > - u32 svc; > - u32 cmd; > - u32 arginfo; > - u64 args[MAX_QCOM_SCM_ARGS]; > - u32 owner; > -}; > - > -/** > - * struct qcom_scm_res > - * @result: The values returned by the secure syscall > - */ > -struct qcom_scm_res { > - u64 result[MAX_QCOM_SCM_RETS]; > -}; > - > int qcom_scm_wait_for_wq_completion(u32 wq_ctx); > int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending); > > diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h > index 1e449a5d7f5c..162746467c22 100644 > --- a/include/linux/firmware/qcom/qcom_scm.h > +++ b/include/linux/firmware/qcom/qcom_scm.h > @@ -11,6 +11,55 @@ > > #include <dt-bindings/firmware/qcom,scm.h> > > +#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ > + (((a) & 0x3) << 4) | \ > + (((b) & 0x3) << 6) | \ > + (((c) & 0x3) << 8) | \ > + (((d) & 0x3) << 10) | \ > + (((e) & 0x3) << 12) | \ > + (((f) & 0x3) << 14) | \ > + (((g) & 0x3) << 16) | \ > + (((h) & 0x3) << 18) | \ > + (((i) & 0x3) << 20) | \ > + (((j) & 0x3) << 22) | \ > + ((num) & 0xf)) > + > +#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) > + > +#define MAX_QCOM_SCM_ARGS 10 > +#define MAX_QCOM_SCM_RETS 3 > + > +enum qcom_scm_arg_types { > + QCOM_SCM_VAL, > + QCOM_SCM_RO, > + QCOM_SCM_RW, > + QCOM_SCM_BUFVAL, > +}; > + > +/** > + * struct qcom_scm_desc - SCM call descriptor. > + * @arginfo: Metadata describing the arguments in args[] > + * @args: The array of arguments for the secure syscall > + */ > +struct qcom_scm_desc { > + u32 svc; > + u32 cmd; > + u32 arginfo; > + u64 args[MAX_QCOM_SCM_ARGS]; > + u32 owner; > +}; > + > +/** > + * struct qcom_scm_res - SCM call response. > + * @result: The values returned by the secure syscall > + */ > +struct qcom_scm_res { > + u64 result[MAX_QCOM_SCM_RETS]; > +}; > + > +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); > +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); > + > #define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF)) > #define QCOM_SCM_CPU_PWR_DOWN_L2_ON 0x0 > #define QCOM_SCM_CPU_PWR_DOWN_L2_OFF 0x1
On 07/03/2023 15:23, Dmitry Baryshkov wrote: > >> Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible >> to other modules. > > Generally all the qcom_scm calls are a part of qcom_scm.c. I think it is > better to make qseecom_scm_call a part qcom_scm.c (as we were previously > doing) rather than exporting the core function. > Other big issue I see in exporting qcom_scm_call() is that there is danger of misuse of this api as this could lead to a path where new apis and its payloads can come directly from userspace via a rogue/hacking modules. This will bypass scm layer completely within kernel. --srini > If you wish to limit the kernel bloat, you can split the qcom_scm into > per-driver backend and add Kconfig symbols to limit the impact. However > I think that these functions are pretty small to justify the effort. > >> >> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Hi, thanks for the review. On 3/7/23 16:23, Dmitry Baryshkov wrote: > On 05/03/2023 04:21, Maximilian Luz wrote: >> Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible >> to other modules. > > Generally all the qcom_scm calls are a part of qcom_scm.c. I think it is better to make qseecom_scm_call a part qcom_scm.c (as we were previously doing) rather than exporting the core function. Only qseecom_scm_call() or the app-related functions as well? I'm asking since qseecom_scm_call() is already quite generic and would still result in moving the core structs to the header. The main reason I did move that to an external module was the possibility of reentrant/incomplete and blocked calls, which seem to be a possibility with that function. My idea was to move this to a separate driver, so we can deal with that more complex and qseecom specific stuff there (in the future). Note that I can't implement that myself because the Surface Pro X (sc8180x) that I'm working on doesn't seem to use that "feature". I guess we could move qseecom_scm_call() function to qcom_scm, then still deal with that in qseecom_scm via some wrapper, if that's okay. A downside of that is that we'd have to make sure that all callers of that function deal with this stuff properly, or maybe even that qseecom_scm is the only caller of that function (I don't know the specifics needed to make incomplete/blocking calls work properly). We can also move it to qcom_scm for now and then always deal with the rest once we get to that point. All I want to say is: We should be aware that these kinds of calls are a possibility on some systems and code should deal with it (even if it's just warnings about it not being implemented for now). Let me know how you'd prefer me to handle this. Regards, Max > If you wish to limit the kernel bloat, you can split the qcom_scm into per-driver backend and add Kconfig symbols to limit the impact. However I think that these functions are pretty small to justify the effort. > >> >> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> >> --- >> >> Changes in v3: >> - Rebase ontop of latest qcom_scm changes. >> - Fix doc-comment. >> >> Changes in v2: >> - No functional changes. >> >> --- >> drivers/firmware/qcom_scm.c | 120 ++++++++++++++++--------- >> drivers/firmware/qcom_scm.h | 47 ---------- >> include/linux/firmware/qcom/qcom_scm.h | 49 ++++++++++ >> 3 files changed, 129 insertions(+), 87 deletions(-) >> >> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c >> index 468d4d5ab550..9b3e4449a563 100644 >> --- a/drivers/firmware/qcom_scm.c >> +++ b/drivers/firmware/qcom_scm.c >> @@ -212,16 +212,17 @@ static enum qcom_scm_convention __get_convention(void) >> } >> /** >> - * qcom_scm_call() - Invoke a syscall in the secure world >> - * @dev: device >> + * __qcom_scm_call() - Invoke a syscall in the secure world >> + * @dev: Device. Depending on the command and number of arguments, this >> + * is optional. >> * @desc: Descriptor structure containing arguments and return values >> * @res: Structure containing results from SMC/HVC call >> * >> * Sends a command to the SCM and waits for the command to finish processing. >> * This should *only* be called in pre-emptible context. >> */ >> -static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, >> - struct qcom_scm_res *res) >> +static int __qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, >> + struct qcom_scm_res *res) >> { >> might_sleep(); >> switch (__get_convention()) { >> @@ -237,17 +238,38 @@ static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, >> } >> /** >> - * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() >> - * @dev: device >> + * qcom_scm_call() - Invoke a syscall in the secure world >> + * @desc: Descriptor structure containing arguments and return values >> + * @res: Structure containing results from SMC/HVC call >> + * >> + * Sends a command to the SCM and waits for the command to finish processing. >> + * This should *only* be called in pre-emptible context. >> + * >> + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, >> + * or other non-zero status codes on failure. >> + */ >> +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) >> +{ >> + if (!__scm) >> + return -ENODEV; >> + >> + return __qcom_scm_call(__scm->dev, desc, res); >> +} >> +EXPORT_SYMBOL_GPL(qcom_scm_call); >> + >> +/** >> + * __qcom_scm_call_atomic() - atomic variation of __qcom_scm_call() >> + * @dev: Device. Depending on the command and number of arguments, this >> + * is optional. >> * @desc: Descriptor structure containing arguments and return values >> * @res: Structure containing results from SMC/HVC call >> * >> * Sends a command to the SCM and waits for the command to finish processing. >> * This can be called in atomic context. >> */ >> -static int qcom_scm_call_atomic(struct device *dev, >> - const struct qcom_scm_desc *desc, >> - struct qcom_scm_res *res) >> +static int __qcom_scm_call_atomic(struct device *dev, >> + const struct qcom_scm_desc *desc, >> + struct qcom_scm_res *res) >> { >> switch (__get_convention()) { >> case SMC_CONVENTION_ARM_32: >> @@ -261,6 +283,26 @@ static int qcom_scm_call_atomic(struct device *dev, >> } >> } >> +/** >> + * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() >> + * @desc: Descriptor structure containing arguments and return values >> + * @res: Structure containing results from SMC/HVC call >> + * >> + * Sends a command to the SCM and waits for the command to finish processing. >> + * This can be called in atomic context. >> + * >> + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, >> + * or other non-zero status codes on failure. >> + */ >> +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) >> +{ >> + if (!__scm) >> + return -ENODEV; >> + >> + return __qcom_scm_call_atomic(__scm->dev, desc, res); >> +} >> +EXPORT_SYMBOL_GPL(qcom_scm_call_atomic); >> + >> static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, >> u32 cmd_id) >> { >> @@ -287,7 +329,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, >> return false; >> } >> - ret = qcom_scm_call(dev, &desc, &res); >> + ret = __qcom_scm_call(dev, &desc, &res); >> return ret ? false : !!res.result[0]; >> } >> @@ -312,7 +354,7 @@ static int qcom_scm_set_boot_addr(void *entry, const u8 *cpu_bits) >> desc.args[0] = flags; >> desc.args[1] = virt_to_phys(entry); >> - return qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); >> + return __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); >> } >> static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) >> @@ -334,7 +376,7 @@ static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) >> if (!__scm || __get_convention() == SMC_CONVENTION_LEGACY) >> return -EOPNOTSUPP; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return __qcom_scm_call(__scm->dev, &desc, NULL); >> } >> /** >> @@ -384,7 +426,7 @@ void qcom_scm_cpu_power_down(u32 flags) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); >> + __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_cpu_power_down); >> @@ -401,7 +443,7 @@ int qcom_scm_set_remote_state(u32 state, u32 id) >> struct qcom_scm_res res; >> int ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> return ret ? : res.result[0]; >> } >> @@ -419,7 +461,7 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable) >> desc.args[1] = enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0; >> - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); >> + return qcom_scm_call_atomic(&desc, NULL); >> } >> static void qcom_scm_set_download_mode(bool enable) >> @@ -499,7 +541,7 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size, >> desc.args[1] = mdata_phys; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = __qcom_scm_call(__scm->dev, &desc, &res); >> qcom_scm_bw_disable(); >> qcom_scm_clk_disable(); >> @@ -565,7 +607,7 @@ int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size) >> if (ret) >> return ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> qcom_scm_bw_disable(); >> qcom_scm_clk_disable(); >> @@ -600,7 +642,7 @@ int qcom_scm_pas_auth_and_reset(u32 peripheral) >> if (ret) >> return ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> qcom_scm_bw_disable(); >> qcom_scm_clk_disable(); >> @@ -634,7 +676,7 @@ int qcom_scm_pas_shutdown(u32 peripheral) >> if (ret) >> return ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> qcom_scm_bw_disable(); >> qcom_scm_clk_disable(); >> @@ -666,7 +708,7 @@ bool qcom_scm_pas_supported(u32 peripheral) >> QCOM_SCM_PIL_PAS_IS_SUPPORTED)) >> return false; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = __qcom_scm_call(__scm->dev, &desc, &res); >> return ret ? false : !!res.result[0]; >> } >> @@ -685,7 +727,7 @@ static int __qcom_scm_pas_mss_reset(struct device *dev, bool reset) >> struct qcom_scm_res res; >> int ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> return ret ? : res.result[0]; >> } >> @@ -725,8 +767,7 @@ int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) >> struct qcom_scm_res res; >> int ret; >> - >> - ret = qcom_scm_call_atomic(__scm->dev, &desc, &res); >> + ret = qcom_scm_call_atomic(&desc, &res); >> if (ret >= 0) >> *val = res.result[0]; >> @@ -745,7 +786,7 @@ int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); >> + return qcom_scm_call_atomic(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_io_writel); >> @@ -775,7 +816,7 @@ int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) >> struct qcom_scm_res res; >> int ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> return ret ? : res.result[0]; >> } >> @@ -793,7 +834,7 @@ int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) >> struct qcom_scm_res res; >> int ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> if (size) >> *size = res.result[0]; >> @@ -816,7 +857,7 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) >> }; >> int ret; >> - ret = qcom_scm_call(__scm->dev, &desc, NULL); >> + ret = qcom_scm_call(&desc, NULL); >> /* the pg table has been initialized already, ignore the error */ >> if (ret == -EPERM) >> @@ -837,7 +878,7 @@ int qcom_scm_iommu_set_cp_pool_size(u32 spare, u32 size) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_iommu_set_cp_pool_size); >> @@ -859,7 +900,7 @@ int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size, >> }; >> struct qcom_scm_res res; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> return ret ? : res.result[0]; >> } >> @@ -887,7 +928,7 @@ static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region, >> }; >> struct qcom_scm_res res; >> - ret = qcom_scm_call(dev, &desc, &res); >> + ret = __qcom_scm_call(dev, &desc, &res); >> return ret ? : res.result[0]; >> } >> @@ -1004,7 +1045,7 @@ int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, u32 size, >> .arginfo = QCOM_SCM_ARGS(4), >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_ocmem_lock); >> @@ -1027,7 +1068,7 @@ int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, u32 offset, u32 size) >> .arginfo = QCOM_SCM_ARGS(3), >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_ocmem_unlock); >> @@ -1068,7 +1109,7 @@ int qcom_scm_ice_invalidate_key(u32 index) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_ice_invalidate_key); >> @@ -1129,7 +1170,7 @@ int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, >> memcpy(keybuf, key, key_size); >> desc.args[1] = key_phys; >> - ret = qcom_scm_call(__scm->dev, &desc, NULL); >> + ret = qcom_scm_call(&desc, NULL); >> memzero_explicit(keybuf, key_size); >> @@ -1198,7 +1239,7 @@ int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) >> if (ret) >> return ret; >> - ret = qcom_scm_call(__scm->dev, &desc, &res); >> + ret = qcom_scm_call(&desc, &res); >> *resp = res.result[0]; >> qcom_scm_clk_disable(); >> @@ -1219,7 +1260,7 @@ int qcom_scm_iommu_set_pt_format(u32 sec_id, u32 ctx_num, u32 pt_fmt) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_iommu_set_pt_format); >> @@ -1234,8 +1275,7 @@ int qcom_scm_qsmmu500_wait_safe_toggle(bool en) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - >> - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); >> + return qcom_scm_call_atomic(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_qsmmu500_wait_safe_toggle); >> @@ -1255,7 +1295,7 @@ int qcom_scm_lmh_profile_change(u32 profile_id) >> .owner = ARM_SMCCC_OWNER_SIP, >> }; >> - return qcom_scm_call(__scm->dev, &desc, NULL); >> + return qcom_scm_call(&desc, NULL); >> } >> EXPORT_SYMBOL(qcom_scm_lmh_profile_change); >> @@ -1290,7 +1330,7 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, >> desc.args[0] = payload_phys; >> - ret = qcom_scm_call(__scm->dev, &desc, NULL); >> + ret = __qcom_scm_call(__scm->dev, &desc, NULL); >> dma_free_coherent(__scm->dev, payload_size, payload_buf, payload_phys); >> return ret; >> diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h >> index e6e512bd57d1..87eb726be7d0 100644 >> --- a/drivers/firmware/qcom_scm.h >> +++ b/drivers/firmware/qcom_scm.h >> @@ -13,53 +13,6 @@ enum qcom_scm_convention { >> extern enum qcom_scm_convention qcom_scm_convention; >> -#define MAX_QCOM_SCM_ARGS 10 >> -#define MAX_QCOM_SCM_RETS 3 >> - >> -enum qcom_scm_arg_types { >> - QCOM_SCM_VAL, >> - QCOM_SCM_RO, >> - QCOM_SCM_RW, >> - QCOM_SCM_BUFVAL, >> -}; >> - >> -#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ >> - (((a) & 0x3) << 4) | \ >> - (((b) & 0x3) << 6) | \ >> - (((c) & 0x3) << 8) | \ >> - (((d) & 0x3) << 10) | \ >> - (((e) & 0x3) << 12) | \ >> - (((f) & 0x3) << 14) | \ >> - (((g) & 0x3) << 16) | \ >> - (((h) & 0x3) << 18) | \ >> - (((i) & 0x3) << 20) | \ >> - (((j) & 0x3) << 22) | \ >> - ((num) & 0xf)) >> - >> -#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) >> - >> - >> -/** >> - * struct qcom_scm_desc >> - * @arginfo: Metadata describing the arguments in args[] >> - * @args: The array of arguments for the secure syscall >> - */ >> -struct qcom_scm_desc { >> - u32 svc; >> - u32 cmd; >> - u32 arginfo; >> - u64 args[MAX_QCOM_SCM_ARGS]; >> - u32 owner; >> -}; >> - >> -/** >> - * struct qcom_scm_res >> - * @result: The values returned by the secure syscall >> - */ >> -struct qcom_scm_res { >> - u64 result[MAX_QCOM_SCM_RETS]; >> -}; >> - >> int qcom_scm_wait_for_wq_completion(u32 wq_ctx); >> int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending); >> diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h >> index 1e449a5d7f5c..162746467c22 100644 >> --- a/include/linux/firmware/qcom/qcom_scm.h >> +++ b/include/linux/firmware/qcom/qcom_scm.h >> @@ -11,6 +11,55 @@ >> #include <dt-bindings/firmware/qcom,scm.h> >> +#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ >> + (((a) & 0x3) << 4) | \ >> + (((b) & 0x3) << 6) | \ >> + (((c) & 0x3) << 8) | \ >> + (((d) & 0x3) << 10) | \ >> + (((e) & 0x3) << 12) | \ >> + (((f) & 0x3) << 14) | \ >> + (((g) & 0x3) << 16) | \ >> + (((h) & 0x3) << 18) | \ >> + (((i) & 0x3) << 20) | \ >> + (((j) & 0x3) << 22) | \ >> + ((num) & 0xf)) >> + >> +#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) >> + >> +#define MAX_QCOM_SCM_ARGS 10 >> +#define MAX_QCOM_SCM_RETS 3 >> + >> +enum qcom_scm_arg_types { >> + QCOM_SCM_VAL, >> + QCOM_SCM_RO, >> + QCOM_SCM_RW, >> + QCOM_SCM_BUFVAL, >> +}; >> + >> +/** >> + * struct qcom_scm_desc - SCM call descriptor. >> + * @arginfo: Metadata describing the arguments in args[] >> + * @args: The array of arguments for the secure syscall >> + */ >> +struct qcom_scm_desc { >> + u32 svc; >> + u32 cmd; >> + u32 arginfo; >> + u64 args[MAX_QCOM_SCM_ARGS]; >> + u32 owner; >> +}; >> + >> +/** >> + * struct qcom_scm_res - SCM call response. >> + * @result: The values returned by the secure syscall >> + */ >> +struct qcom_scm_res { >> + u64 result[MAX_QCOM_SCM_RETS]; >> +}; >> + >> +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); >> +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); >> + >> #define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF)) >> #define QCOM_SCM_CPU_PWR_DOWN_L2_ON 0x0 >> #define QCOM_SCM_CPU_PWR_DOWN_L2_OFF 0x1 >
On 3/8/23 13:53, Srinivas Kandagatla wrote: > > > On 07/03/2023 15:23, Dmitry Baryshkov wrote: >> >>> Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible >>> to other modules. >> >> Generally all the qcom_scm calls are a part of qcom_scm.c. I think it is better to make qseecom_scm_call a part qcom_scm.c (as we were previously doing) rather than exporting the core function. >> > > Other big issue I see in exporting qcom_scm_call() is that there is danger of misuse of this api as this could lead to a path where new apis and its payloads can come directly from userspace via a rogue/hacking modules. This will bypass scm layer completely within kernel. I'm not sure I follow your argument here. If you have the possibility to load your own kernel modules, can you not always bypass the kernel and just directly invoke the respective SCM calls manually? So this is superficial security at best. I guess keeping it in qcom_scm could make it easier to spot new in-kernel users of that function and with that better prevent potential misuse in the kernel itself. But then again I'd hope that our review system is good enough to catch such issues regardless and thoroughly question calls to that function (especially ones involving user-space APIs). Regards, Max > > --srini > >> If you wish to limit the kernel bloat, you can split the qcom_scm into per-driver backend and add Kconfig symbols to limit the impact. However I think that these functions are pretty small to justify the effort. >> > > >>> >>> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
On 08/03/2023 13:48, Maximilian Luz wrote: > On 3/8/23 13:53, Srinivas Kandagatla wrote: >> >> >> On 07/03/2023 15:23, Dmitry Baryshkov wrote: >>> >>>> Make qcom_scm_call, qcom_scm_call_atomic and associated types >>>> accessible >>>> to other modules. >>> >>> Generally all the qcom_scm calls are a part of qcom_scm.c. I think it >>> is better to make qseecom_scm_call a part qcom_scm.c (as we were >>> previously doing) rather than exporting the core function. >>> >> >> Other big issue I see in exporting qcom_scm_call() is that there is >> danger of misuse of this api as this could lead to a path where new >> apis and its payloads can come directly from userspace via a >> rogue/hacking modules. This will bypass scm layer completely within >> kernel. > > I'm not sure I follow your argument here. If you have the possibility to > load your own kernel modules, can you not always bypass the kernel and > just directly invoke the respective SCM calls manually? So this is > superficial security at best. qcom_scm_call() will expose a much bigger window where the user can add new SCM APIs but with the current model of exporting symbols at SCM API level will narrow that down to that API. > > I guess keeping it in qcom_scm could make it easier to spot new > in-kernel users of that function and with that better prevent potential > misuse in the kernel itself. But then again I'd hope that our review > system is good enough to catch such issues regardless and thoroughly > question calls to that function (especially ones involving user-space > APIs). One problem I can immediately see here is the facility that will be exploited and promote more development outside upstream. ex: vendor modules with GKI compliance. --srini > > Regards, > Max > >> >> --srini >> >>> If you wish to limit the kernel bloat, you can split the qcom_scm >>> into per-driver backend and add Kconfig symbols to limit the impact. >>> However I think that these functions are pretty small to justify the >>> effort. >>> >> >> >>>> >>>> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
On 3/8/23 15:20, Srinivas Kandagatla wrote: > > > On 08/03/2023 13:48, Maximilian Luz wrote: >> On 3/8/23 13:53, Srinivas Kandagatla wrote: >>> >>> >>> On 07/03/2023 15:23, Dmitry Baryshkov wrote: >>>> >>>>> Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible >>>>> to other modules. >>>> >>>> Generally all the qcom_scm calls are a part of qcom_scm.c. I think it is better to make qseecom_scm_call a part qcom_scm.c (as we were previously doing) rather than exporting the core function. >>>> >>> >>> Other big issue I see in exporting qcom_scm_call() is that there is danger of misuse of this api as this could lead to a path where new apis and its payloads can come directly from userspace via a rogue/hacking modules. This will bypass scm layer completely within kernel. >> >> I'm not sure I follow your argument here. If you have the possibility to >> load your own kernel modules, can you not always bypass the kernel and >> just directly invoke the respective SCM calls manually? So this is >> superficial security at best. > qcom_scm_call() will expose a much bigger window where the user can add new SCM APIs but with the current model of exporting symbols at SCM API level will narrow that down to that API. > >> >> I guess keeping it in qcom_scm could make it easier to spot new >> in-kernel users of that function and with that better prevent potential >> misuse in the kernel itself. But then again I'd hope that our review >> system is good enough to catch such issues regardless and thoroughly >> question calls to that function (especially ones involving user-space >> APIs). > > One problem I can immediately see here is the facility that will be exploited and promote more development outside upstream. > > ex: vendor modules with GKI compliance. Fair point. I still believe that squashing everything into a single driver is not particularly great code/architecture style, but then again I'm not a fan of vendors not integrating their stuff upstream either. I guess we should be able to find something that has sufficiently low complexity so that it can be implemented in qcom_scm while also preventing external use like that. Regards, Max > > --srini >> >> Regards, >> Max >> >>> >>> --srini >>> >>>> If you wish to limit the kernel bloat, you can split the qcom_scm into per-driver backend and add Kconfig symbols to limit the impact. However I think that these functions are pretty small to justify the effort. >>>> >>> >>> >>>>> >>>>> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 468d4d5ab550..9b3e4449a563 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -212,16 +212,17 @@ static enum qcom_scm_convention __get_convention(void) } /** - * qcom_scm_call() - Invoke a syscall in the secure world - * @dev: device + * __qcom_scm_call() - Invoke a syscall in the secure world + * @dev: Device. Depending on the command and number of arguments, this + * is optional. * @desc: Descriptor structure containing arguments and return values * @res: Structure containing results from SMC/HVC call * * Sends a command to the SCM and waits for the command to finish processing. * This should *only* be called in pre-emptible context. */ -static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, - struct qcom_scm_res *res) +static int __qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, + struct qcom_scm_res *res) { might_sleep(); switch (__get_convention()) { @@ -237,17 +238,38 @@ static int qcom_scm_call(struct device *dev, const struct qcom_scm_desc *desc, } /** - * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() - * @dev: device + * qcom_scm_call() - Invoke a syscall in the secure world + * @desc: Descriptor structure containing arguments and return values + * @res: Structure containing results from SMC/HVC call + * + * Sends a command to the SCM and waits for the command to finish processing. + * This should *only* be called in pre-emptible context. + * + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, + * or other non-zero status codes on failure. + */ +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) +{ + if (!__scm) + return -ENODEV; + + return __qcom_scm_call(__scm->dev, desc, res); +} +EXPORT_SYMBOL_GPL(qcom_scm_call); + +/** + * __qcom_scm_call_atomic() - atomic variation of __qcom_scm_call() + * @dev: Device. Depending on the command and number of arguments, this + * is optional. * @desc: Descriptor structure containing arguments and return values * @res: Structure containing results from SMC/HVC call * * Sends a command to the SCM and waits for the command to finish processing. * This can be called in atomic context. */ -static int qcom_scm_call_atomic(struct device *dev, - const struct qcom_scm_desc *desc, - struct qcom_scm_res *res) +static int __qcom_scm_call_atomic(struct device *dev, + const struct qcom_scm_desc *desc, + struct qcom_scm_res *res) { switch (__get_convention()) { case SMC_CONVENTION_ARM_32: @@ -261,6 +283,26 @@ static int qcom_scm_call_atomic(struct device *dev, } } +/** + * qcom_scm_call_atomic() - atomic variation of qcom_scm_call() + * @desc: Descriptor structure containing arguments and return values + * @res: Structure containing results from SMC/HVC call + * + * Sends a command to the SCM and waits for the command to finish processing. + * This can be called in atomic context. + * + * Returns zero on success, -ENODEV if the SCM device has not been set up yet, + * or other non-zero status codes on failure. + */ +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res) +{ + if (!__scm) + return -ENODEV; + + return __qcom_scm_call_atomic(__scm->dev, desc, res); +} +EXPORT_SYMBOL_GPL(qcom_scm_call_atomic); + static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, u32 cmd_id) { @@ -287,7 +329,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id, return false; } - ret = qcom_scm_call(dev, &desc, &res); + ret = __qcom_scm_call(dev, &desc, &res); return ret ? false : !!res.result[0]; } @@ -312,7 +354,7 @@ static int qcom_scm_set_boot_addr(void *entry, const u8 *cpu_bits) desc.args[0] = flags; desc.args[1] = virt_to_phys(entry); - return qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); + return __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); } static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) @@ -334,7 +376,7 @@ static int qcom_scm_set_boot_addr_mc(void *entry, unsigned int flags) if (!__scm || __get_convention() == SMC_CONVENTION_LEGACY) return -EOPNOTSUPP; - return qcom_scm_call(__scm->dev, &desc, NULL); + return __qcom_scm_call(__scm->dev, &desc, NULL); } /** @@ -384,7 +426,7 @@ void qcom_scm_cpu_power_down(u32 flags) .owner = ARM_SMCCC_OWNER_SIP, }; - qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); + __qcom_scm_call_atomic(__scm ? __scm->dev : NULL, &desc, NULL); } EXPORT_SYMBOL(qcom_scm_cpu_power_down); @@ -401,7 +443,7 @@ int qcom_scm_set_remote_state(u32 state, u32 id) struct qcom_scm_res res; int ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); return ret ? : res.result[0]; } @@ -419,7 +461,7 @@ static int __qcom_scm_set_dload_mode(struct device *dev, bool enable) desc.args[1] = enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0; - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); + return qcom_scm_call_atomic(&desc, NULL); } static void qcom_scm_set_download_mode(bool enable) @@ -499,7 +541,7 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size, desc.args[1] = mdata_phys; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = __qcom_scm_call(__scm->dev, &desc, &res); qcom_scm_bw_disable(); qcom_scm_clk_disable(); @@ -565,7 +607,7 @@ int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size) if (ret) return ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); qcom_scm_bw_disable(); qcom_scm_clk_disable(); @@ -600,7 +642,7 @@ int qcom_scm_pas_auth_and_reset(u32 peripheral) if (ret) return ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); qcom_scm_bw_disable(); qcom_scm_clk_disable(); @@ -634,7 +676,7 @@ int qcom_scm_pas_shutdown(u32 peripheral) if (ret) return ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); qcom_scm_bw_disable(); qcom_scm_clk_disable(); @@ -666,7 +708,7 @@ bool qcom_scm_pas_supported(u32 peripheral) QCOM_SCM_PIL_PAS_IS_SUPPORTED)) return false; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = __qcom_scm_call(__scm->dev, &desc, &res); return ret ? false : !!res.result[0]; } @@ -685,7 +727,7 @@ static int __qcom_scm_pas_mss_reset(struct device *dev, bool reset) struct qcom_scm_res res; int ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); return ret ? : res.result[0]; } @@ -725,8 +767,7 @@ int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) struct qcom_scm_res res; int ret; - - ret = qcom_scm_call_atomic(__scm->dev, &desc, &res); + ret = qcom_scm_call_atomic(&desc, &res); if (ret >= 0) *val = res.result[0]; @@ -745,7 +786,7 @@ int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) .owner = ARM_SMCCC_OWNER_SIP, }; - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); + return qcom_scm_call_atomic(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_io_writel); @@ -775,7 +816,7 @@ int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) struct qcom_scm_res res; int ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); return ret ? : res.result[0]; } @@ -793,7 +834,7 @@ int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) struct qcom_scm_res res; int ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); if (size) *size = res.result[0]; @@ -816,7 +857,7 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) }; int ret; - ret = qcom_scm_call(__scm->dev, &desc, NULL); + ret = qcom_scm_call(&desc, NULL); /* the pg table has been initialized already, ignore the error */ if (ret == -EPERM) @@ -837,7 +878,7 @@ int qcom_scm_iommu_set_cp_pool_size(u32 spare, u32 size) .owner = ARM_SMCCC_OWNER_SIP, }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_iommu_set_cp_pool_size); @@ -859,7 +900,7 @@ int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size, }; struct qcom_scm_res res; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); return ret ? : res.result[0]; } @@ -887,7 +928,7 @@ static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region, }; struct qcom_scm_res res; - ret = qcom_scm_call(dev, &desc, &res); + ret = __qcom_scm_call(dev, &desc, &res); return ret ? : res.result[0]; } @@ -1004,7 +1045,7 @@ int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, u32 size, .arginfo = QCOM_SCM_ARGS(4), }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_ocmem_lock); @@ -1027,7 +1068,7 @@ int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, u32 offset, u32 size) .arginfo = QCOM_SCM_ARGS(3), }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_ocmem_unlock); @@ -1068,7 +1109,7 @@ int qcom_scm_ice_invalidate_key(u32 index) .owner = ARM_SMCCC_OWNER_SIP, }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_ice_invalidate_key); @@ -1129,7 +1170,7 @@ int qcom_scm_ice_set_key(u32 index, const u8 *key, u32 key_size, memcpy(keybuf, key, key_size); desc.args[1] = key_phys; - ret = qcom_scm_call(__scm->dev, &desc, NULL); + ret = qcom_scm_call(&desc, NULL); memzero_explicit(keybuf, key_size); @@ -1198,7 +1239,7 @@ int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, u32 *resp) if (ret) return ret; - ret = qcom_scm_call(__scm->dev, &desc, &res); + ret = qcom_scm_call(&desc, &res); *resp = res.result[0]; qcom_scm_clk_disable(); @@ -1219,7 +1260,7 @@ int qcom_scm_iommu_set_pt_format(u32 sec_id, u32 ctx_num, u32 pt_fmt) .owner = ARM_SMCCC_OWNER_SIP, }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_iommu_set_pt_format); @@ -1234,8 +1275,7 @@ int qcom_scm_qsmmu500_wait_safe_toggle(bool en) .owner = ARM_SMCCC_OWNER_SIP, }; - - return qcom_scm_call_atomic(__scm->dev, &desc, NULL); + return qcom_scm_call_atomic(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_qsmmu500_wait_safe_toggle); @@ -1255,7 +1295,7 @@ int qcom_scm_lmh_profile_change(u32 profile_id) .owner = ARM_SMCCC_OWNER_SIP, }; - return qcom_scm_call(__scm->dev, &desc, NULL); + return qcom_scm_call(&desc, NULL); } EXPORT_SYMBOL(qcom_scm_lmh_profile_change); @@ -1290,7 +1330,7 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val, desc.args[0] = payload_phys; - ret = qcom_scm_call(__scm->dev, &desc, NULL); + ret = __qcom_scm_call(__scm->dev, &desc, NULL); dma_free_coherent(__scm->dev, payload_size, payload_buf, payload_phys); return ret; diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h index e6e512bd57d1..87eb726be7d0 100644 --- a/drivers/firmware/qcom_scm.h +++ b/drivers/firmware/qcom_scm.h @@ -13,53 +13,6 @@ enum qcom_scm_convention { extern enum qcom_scm_convention qcom_scm_convention; -#define MAX_QCOM_SCM_ARGS 10 -#define MAX_QCOM_SCM_RETS 3 - -enum qcom_scm_arg_types { - QCOM_SCM_VAL, - QCOM_SCM_RO, - QCOM_SCM_RW, - QCOM_SCM_BUFVAL, -}; - -#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ - (((a) & 0x3) << 4) | \ - (((b) & 0x3) << 6) | \ - (((c) & 0x3) << 8) | \ - (((d) & 0x3) << 10) | \ - (((e) & 0x3) << 12) | \ - (((f) & 0x3) << 14) | \ - (((g) & 0x3) << 16) | \ - (((h) & 0x3) << 18) | \ - (((i) & 0x3) << 20) | \ - (((j) & 0x3) << 22) | \ - ((num) & 0xf)) - -#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) - - -/** - * struct qcom_scm_desc - * @arginfo: Metadata describing the arguments in args[] - * @args: The array of arguments for the secure syscall - */ -struct qcom_scm_desc { - u32 svc; - u32 cmd; - u32 arginfo; - u64 args[MAX_QCOM_SCM_ARGS]; - u32 owner; -}; - -/** - * struct qcom_scm_res - * @result: The values returned by the secure syscall - */ -struct qcom_scm_res { - u64 result[MAX_QCOM_SCM_RETS]; -}; - int qcom_scm_wait_for_wq_completion(u32 wq_ctx); int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending); diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h index 1e449a5d7f5c..162746467c22 100644 --- a/include/linux/firmware/qcom/qcom_scm.h +++ b/include/linux/firmware/qcom/qcom_scm.h @@ -11,6 +11,55 @@ #include <dt-bindings/firmware/qcom,scm.h> +#define QCOM_SCM_ARGS_IMPL(num, a, b, c, d, e, f, g, h, i, j, ...) (\ + (((a) & 0x3) << 4) | \ + (((b) & 0x3) << 6) | \ + (((c) & 0x3) << 8) | \ + (((d) & 0x3) << 10) | \ + (((e) & 0x3) << 12) | \ + (((f) & 0x3) << 14) | \ + (((g) & 0x3) << 16) | \ + (((h) & 0x3) << 18) | \ + (((i) & 0x3) << 20) | \ + (((j) & 0x3) << 22) | \ + ((num) & 0xf)) + +#define QCOM_SCM_ARGS(...) QCOM_SCM_ARGS_IMPL(__VA_ARGS__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + +#define MAX_QCOM_SCM_ARGS 10 +#define MAX_QCOM_SCM_RETS 3 + +enum qcom_scm_arg_types { + QCOM_SCM_VAL, + QCOM_SCM_RO, + QCOM_SCM_RW, + QCOM_SCM_BUFVAL, +}; + +/** + * struct qcom_scm_desc - SCM call descriptor. + * @arginfo: Metadata describing the arguments in args[] + * @args: The array of arguments for the secure syscall + */ +struct qcom_scm_desc { + u32 svc; + u32 cmd; + u32 arginfo; + u64 args[MAX_QCOM_SCM_ARGS]; + u32 owner; +}; + +/** + * struct qcom_scm_res - SCM call response. + * @result: The values returned by the secure syscall + */ +struct qcom_scm_res { + u64 result[MAX_QCOM_SCM_RETS]; +}; + +int qcom_scm_call(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); +int qcom_scm_call_atomic(const struct qcom_scm_desc *desc, struct qcom_scm_res *res); + #define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF)) #define QCOM_SCM_CPU_PWR_DOWN_L2_ON 0x0 #define QCOM_SCM_CPU_PWR_DOWN_L2_OFF 0x1
Make qcom_scm_call, qcom_scm_call_atomic and associated types accessible to other modules. Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> --- Changes in v3: - Rebase ontop of latest qcom_scm changes. - Fix doc-comment. Changes in v2: - No functional changes. --- drivers/firmware/qcom_scm.c | 120 ++++++++++++++++--------- drivers/firmware/qcom_scm.h | 47 ---------- include/linux/firmware/qcom/qcom_scm.h | 49 ++++++++++ 3 files changed, 129 insertions(+), 87 deletions(-)