| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9e59d1dc-5805-4cd2-9a65-f3f0f45526d0@oss.qualcomm.com>
Date: Wed, 15 Oct 2025 16:17:09 +0530
From: Kumari Pallavi <kumari.pallavi@....qualcomm.com>
To: Srinivas Kandagatla <srini@...nel.org>, kpallavi@....qualcomm.com,
amahesh@....qualcomm.com, arnd@...db.de, gregkh@...uxfoundation.org
Cc: quic_bkumar@...cinc.com, ekansh.gupta@....qualcomm.com,
linux-kernel@...r.kernel.org, quic_chennak@...cinc.com,
dri-devel@...ts.freedesktop.org, linux-arm-msm@...r.kernel.org,
jingyi.wang@....qualcomm.com, aiqun.yu@....qualcomm.com,
ktadakam@....qualcomm.com
Subject: Re: [PATCH v2 2/3] misc: fastrpc: Add support for new DSP IOVA
formatting
On 10/15/2025 2:22 PM, Srinivas Kandagatla wrote:
>
>
> On 10/15/25 5:57 AM, Kumari Pallavi wrote:
>> Implement the new IOVA formatting required by the DSP architecture change
>> on Kaanapali SoC. Place the SID for DSP DMA transactions at bit 56 in the
>> physical address. This placement is necessary for the DSPs to correctly
>> identify streams and operate as intended.
>> To address this, set SID position to bit 56 based on SoC-specific compatible
>> string from the root node within the physical address; otherwise, default to
>> legacy 32-bit placement.
>> This change ensures consistent SID placement across DSPs.
>>
>> Signed-off-by: Kumari Pallavi <kumari.pallavi@....qualcomm.com>
>> ---
>> drivers/misc/fastrpc.c | 59 +++++++++++++++++++++++++++++++++++++-----
>> 1 file changed, 52 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
>> index 975be54a2491..1a5d620b23f2 100644
>> --- a/drivers/misc/fastrpc.c
>> +++ b/drivers/misc/fastrpc.c
>> @@ -33,7 +33,6 @@
>> #define FASTRPC_ALIGN 128
>> #define FASTRPC_MAX_FDLIST 16
>> #define FASTRPC_MAX_CRCLIST 64
>> -#define FASTRPC_PHYS(p) ((p) & 0xffffffff)
>> #define FASTRPC_CTX_MAX (256)
>> #define FASTRPC_INIT_HANDLE 1
>> #define FASTRPC_DSP_UTILITIES_HANDLE 2
>> @@ -105,6 +104,15 @@
>>
>> #define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev)
>>
>> +/* Extract smmu pa from consolidated iova */
>> +#define IPA_TO_DMA_ADDR(iova, sid_pos) (iova & ((1ULL << sid_pos) - 1ULL))
>> +/*
>> + * Prepare the consolidated iova to send to dsp by prepending the sid
>> + * to smmu pa at the appropriate position
>> + */
>> +#define IOVA_FROM_SID_PA(sid, phys, sid_pos) \
>> + (phys += sid << sid_pos)
>> +
>> struct fastrpc_phy_page {
>> u64 addr; /* physical address */
>> u64 size; /* size of contiguous region */
>> @@ -257,6 +265,10 @@ struct fastrpc_session_ctx {
>> bool valid;
>> };
>>
>> +struct fastrpc_soc_data {
>> + u32 sid_pos;
>> +};
>> +
>> struct fastrpc_channel_ctx {
>> int domain_id;
>> int sesscount;
>> @@ -278,6 +290,7 @@ struct fastrpc_channel_ctx {
>> bool secure;
>> bool unsigned_support;
>> u64 dma_mask;
>> + const struct fastrpc_soc_data *soc_data;
>> };
>>
>> struct fastrpc_device {
>> @@ -387,7 +400,7 @@ static int fastrpc_map_lookup(struct fastrpc_user *fl, int fd,
>> static void fastrpc_buf_free(struct fastrpc_buf *buf)
>> {
>> dma_free_coherent(buf->dev, buf->size, buf->virt,
>> - FASTRPC_PHYS(buf->dma_addr));
>> + IPA_TO_DMA_ADDR(buf->dma_addr, buf->fl->cctx->soc_data->sid_pos));
>> kfree(buf);
>> }
>>
>> @@ -437,8 +450,7 @@ static int fastrpc_buf_alloc(struct fastrpc_user *fl, struct device *dev,
>> buf = *obuf;
>>
>> if (fl->sctx && fl->sctx->sid)
>> - buf->dma_addr += ((u64)fl->sctx->sid << 32);
>> -
>> + IOVA_FROM_SID_PA((u64)fl->sctx->sid, buf->dma_addr, fl->cctx->soc_data->sid_pos);
>
> deleted an empty line for no reason.
>
Ack.
>> return 0;
>> }
>>
>> @@ -682,7 +694,8 @@ static int fastrpc_dma_buf_attach(struct dma_buf *dmabuf,
>> return -ENOMEM;
>>
>> ret = dma_get_sgtable(buffer->dev, &a->sgt, buffer->virt,
>> - FASTRPC_PHYS(buffer->dma_addr), buffer->size);
>> + IPA_TO_DMA_ADDR(buffer->dma_addr, buffer->fl->cctx->soc_data->sid_pos),
>> + buffer->size);
>> if (ret < 0) {
>> dev_err(buffer->dev, "failed to get scatterlist from DMA API\n");
>> kfree(a);
>> @@ -731,7 +744,8 @@ static int fastrpc_mmap(struct dma_buf *dmabuf,
>> dma_resv_assert_held(dmabuf->resv);
>>
>> return dma_mmap_coherent(buf->dev, vma, buf->virt,
>> - FASTRPC_PHYS(buf->dma_addr), size);
>> + IPA_TO_DMA_ADDR(buf->dma_addr,
>> + buf->fl->cctx->soc_data->sid_pos), size);
>> }
>>
>> static const struct dma_buf_ops fastrpc_dma_buf_ops = {
>> @@ -786,7 +800,8 @@ static int fastrpc_map_attach(struct fastrpc_user *fl, int fd,
>> map->dma_addr = sg_phys(map->table->sgl);
>> } else {
>> map->dma_addr = sg_dma_address(map->table->sgl);
>> - map->dma_addr += ((u64)fl->sctx->sid << 32);
>> + IOVA_FROM_SID_PA((u64)fl->sctx->sid,
>> + map->dma_addr, fl->cctx->soc_data->sid_pos);
>> }
>> for_each_sg(map->table->sgl, sgl, map->table->nents,
>> sgl_index)
>> @@ -2283,6 +2298,19 @@ static int fastrpc_get_domain_id(const char *domain)
>> return -EINVAL;
>> }
>>
>> +static const struct fastrpc_soc_data kaanapali_soc_data = {
>> + .sid_pos = 56,
>> +};
>> +
>> +static const struct fastrpc_soc_data default_soc_data = {
>> + .sid_pos = 32,
>> +};
>> +
>> +static const struct of_device_id qcom_soc_match_table[] = {
>> + { .compatible = "qcom,kaanapali", .data = &kaanapali_soc_data },
>> + { },
>> +};
>> +
>> static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
>> {
>> struct device *rdev = &rpdev->dev;
>> @@ -2291,6 +2319,22 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
>> const char *domain;
>> bool secure_dsp;
>> unsigned int vmids[FASTRPC_MAX_VMIDS];
>> + struct device_node *root;
>> + const struct of_device_id *match;
>> + const struct fastrpc_soc_data *soc_data = NULL;
>> +
>> + root = of_find_node_by_path("/");
>> + if (!root)
>> + return -ENODEV;
>> +
>> + match = of_match_node(qcom_soc_match_table, root);
>> + of_node_put(root);
>> + if (!match || !match->data) {
>> + soc_data = &default_soc_data;
>> + dev_dbg(rdev, "no compatible SoC found at root node\n");
>> + } else {
>> + soc_data = match->data;
>> + }
>>
>
> I think you will be better off moving this to below helper function,
> this will simplify the code to:
>
> soc_data = of_machine_get_match_data(qcom_soc_match_table);
> if (!soc_data)
> soc_data = &default_soc_data;
>
> ------------------------>cut<-----------------
> Author: Srinivas Kandagatla <srinivas.kandagatla@....qualcomm.com>
> Date: Sat Oct 4 15:09:46 2025 +0100
>
> of: base: add of_machine_get_match_data helper function
>
> There are atleast 3 instances of this code in drivers, add a helper
> function of_machine_get_match_data to avoid code duplication and better
> error handling.
>
> Signed-off-by: Srinivas Kandagatla
> <srinivas.kandagatla@....qualcomm.com>
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 7043acd971a0..ac4b965f06b6 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -434,6 +434,32 @@ bool of_machine_compatible_match(const char *const
> *compats)
> }
> EXPORT_SYMBOL(of_machine_compatible_match);
>
> +/**
> + * of_machine_get_match_data - Test root of device tree against a
> compatible array
> + * and return data associated with match.
> + * @compats: NULL terminated array of compatible strings to look for in
> root node's compatible property.
> + *
> + * Returns match data if the root node has any of the given compatible
> values in its or NULL if
> + * compatible property nodes not match with compats.
> + */
> +const void *of_machine_get_match_data(const char *const *compats)
> +{
> + const struct of_device_id *match = NULL;
> + struct device_node *root;
> +
> + root = of_find_node_by_path("/");
> + if (root) {
> + match = of_match_node(compats, root);
> + of_node_put(root);
> + }
> +
> + if (!match)
> + return NULL;
> +
> + return match->data;
> +}
> +EXPORT_SYMBOL(of_machine_get_match_data);
> +
> static bool __of_device_is_status(const struct device_node *device,
> const char * const*strings)
> {
> diff --git a/include/linux/of.h b/include/linux/of.h
> index a62154aeda1b..4d6792abf5f7 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -407,6 +407,7 @@ extern int of_alias_get_id(const struct device_node
> *np, const char *stem);
> extern int of_alias_get_highest_id(const char *stem);
>
> bool of_machine_compatible_match(const char *const *compats);
> +void *of_machine_get_match_data(const char *const *compats);
>
> /**
> * of_machine_is_compatible - Test root of device tree for a given
> compatible value
>
> ------------------------>cut<-----------------
>
Ack.
>> err = of_property_read_string(rdev->of_node, "label", &domain);
>> if (err) {
>> @@ -2343,6 +2387,7 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
>>
>> secure_dsp = !(of_property_read_bool(rdev->of_node, "qcom,non-secure-domain"));
>> data->secure = secure_dsp;
>> + data->soc_data = soc_data;
>>
>> switch (domain_id) {
>> case ADSP_DOMAIN_ID:
>
Powered by blists - more mailing lists