Re: [RFC PATCH v2 1/4] firmware: qcom_scm: Add support for programming inline crypto keys

Stephen Boyd
2020-03-04T17:04:52Z

Quoting Eric Biggers (2020-03-03 22:49:39)
> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> index 059bb0fbae9e..7fb9f606250f 100644
> --- a/drivers/firmware/qcom_scm.c
> +++ b/drivers/firmware/qcom_scm.c
> @@ -926,6 +927,101 @@ int qcom_scm_ocmem_unlock(enum qcom_scm_ocmem_client id, u32 offset, u32 size)
[...]
> +
> +/**
> + * qcom_scm_ice_set_key() - Set an inline encryption key
> + * @index: the keyslot into which to set the key
> + * @key: the key to program
> + * @key_size: the size of the key in bytes
> + * @cipher: the encryption algorithm the key is for
> + * @data_unit_size: the encryption data unit size, i.e. the size of each
> + * individual plaintext and ciphertext. Given in 512-byte
> + * units, e.g. 1 = 512 bytes, 8 = 4096 bytes, etc.
> + *
> + * Program a key into a keyslot of Qualcomm ICE (Inline Crypto Engine), where it
> + * can then be used to encrypt/decrypt UFS I/O requests inline.
> + *
> + * The UFSHCI standard defines a standard way to do this, but it doesn't work on
> + * these SoCs; only this SCM call does.
> + *
> + * Return: 0 on success; -errno on failure.
> + */
> +int qcom_scm_ice_set_key(u32 index, const u8 *key, int key_size,
> + enum qcom_scm_ice_cipher cipher, int data_unit_size)

Why not make key_size and data_unit_size unsigned?

> +{
> + struct qcom_scm_desc desc = {
> + .svc = QCOM_SCM_SVC_ES,
> + .cmd = QCOM_SCM_ES_CONFIG_SET_ICE_KEY,
> + .arginfo = QCOM_SCM_ARGS(5, QCOM_SCM_VAL, QCOM_SCM_RW,
> + QCOM_SCM_VAL, QCOM_SCM_VAL,
> + QCOM_SCM_VAL),
> + .args[0] = index,
> + .args[2] = key_size,
> + .args[3] = cipher,
> + .args[4] = data_unit_size,
> + .owner = ARM_SMCCC_OWNER_SIP,
> + };
> + u8 *keybuf;
> + dma_addr_t key_phys;
> + int ret;
> +
> + keybuf = kmemdup(key, key_size, GFP_KERNEL);

Is this to make the key physically contiguous? Probably worth a comment
to help others understand why this is here.

> + if (!keybuf)
> + return -ENOMEM;
> +
> + key_phys = dma_map_single(__scm->dev, keybuf, key_size, DMA_TO_DEVICE);
> + if (dma_mapping_error(__scm->dev, key_phys)) {
> + ret = -ENOMEM;
> + goto out;
> + }
> + desc.args[1] = key_phys;
> +
> + ret = qcom_scm_call(__scm->dev, &desc, NULL);
> +
> + dma_unmap_single(__scm->dev, key_phys, key_size, DMA_TO_DEVICE);
> +out:
> + kzfree(keybuf);

And this is because we want to clear key contents out of the slab? What
about if the dma_map_single() bounces to a bounce buffer? I think that
isn't going to happen because __scm->dev is just some firmware device
that doesn't require bounce buffers but it's worth another comment to
clarify this.

> + return ret;
> +}
> +EXPORT_SYMBOL(qcom_scm_ice_set_key);
> +
> /**
> * qcom_scm_hdcp_available() - Check if secure environment supports HDCP.
> *