| 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: <cdb8f84c-ed62-48ec-b7ce-9744a80e56af@oss.qualcomm.com>
Date: Tue, 30 Sep 2025 10:13:44 +0530
From: Kumari Pallavi <kumari.pallavi@....qualcomm.com>
To: Dmitry Baryshkov <dmitry.baryshkov@....qualcomm.com>,
Jingyi Wang <jingyi.wang@....qualcomm.com>
Cc: Srinivas Kandagatla <srini@...nel.org>,
Amol Maheshwari <amahesh@....qualcomm.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
aiqun.yu@....qualcomm.com, tingwei.zhang@....qualcomm.com,
trilok.soni@....qualcomm.com, yijie.yang@....qualcomm.com,
linux-arm-msm@...r.kernel.org, dri-devel@...ts.freedesktop.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] misc: fastrpc: Add support for new DSP IOVA
formatting
On 9/25/2025 7:55 AM, Dmitry Baryshkov wrote:
> On Wed, Sep 24, 2025 at 04:46:36PM -0700, Jingyi Wang wrote:
>> From: Kumari Pallavi <kumari.pallavi@....qualcomm.com>
>>
>> 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, add an iova-format flag which determines the SID position
>> within the physical address. Set SID position to bit 56 when iova_format
>> is enabled; otherwise, default to legacy 32-bit placement.
>> Initialize the flag to 0 and update to 1 based on SoC-specific compatible
>> string from the root node.
>> This change ensures consistent SID placement across DSPs.
>>
>> Signed-off-by: Kumari Pallavi <kumari.pallavi@....qualcomm.com>
>> Signed-off-by: Jingyi Wang <jingyi.wang@....qualcomm.com>
>> ---
>> drivers/misc/fastrpc.c | 76 ++++++++++++++++++++++++++++++++++++++++++++------
>> 1 file changed, 68 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
>> index 8e1d97873423..db396241b8ce 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,26 @@
>>
>> #define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev)
>>
>> +/*
>> + * By default, the sid will be prepended adjacent to smmu pa before sending
>> + * to DSP. But if the compatible Soc found at root node specifies the new
>> + * addressing format to handle pa's of longer widths, then the sid will be
>> + * prepended at the position specified in this macro.
>> + */
>> +#define SID_POS_IN_IOVA 56
>> +
>> +/* Default width of pa bus from dsp */
>> +#define DSP_DEFAULT_BUS_WIDTH 32
>> +
>> +/* Extract smmu pa from consolidated iova */
>> +#define IOVA_TO_PHYS(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 */
>> @@ -255,6 +274,7 @@ struct fastrpc_session_ctx {
>> int sid;
>> bool used;
>> bool valid;
>> + u32 sid_pos;
>> };
>>
>> struct fastrpc_channel_ctx {
>> @@ -278,6 +298,7 @@ struct fastrpc_channel_ctx {
>> bool secure;
>> bool unsigned_support;
>> u64 dma_mask;
>> + u32 iova_format;
>> };
>>
>> struct fastrpc_device {
>> @@ -391,8 +412,11 @@ static int fastrpc_map_lookup(struct fastrpc_user *fl, int fd,
>>
>> static void fastrpc_buf_free(struct fastrpc_buf *buf)
>> {
>> + uint32_t sid_pos = (buf->fl->sctx ? buf->fl->sctx->sid_pos :
>> + DSP_DEFAULT_BUS_WIDTH);
>> +
>> dma_free_coherent(buf->dev, buf->size, buf->virt,
>> - FASTRPC_PHYS(buf->phys));
>> + IOVA_TO_PHYS(buf->phys, sid_pos));
>> kfree(buf);
>> }
>>
>> @@ -442,7 +466,7 @@ static int fastrpc_buf_alloc(struct fastrpc_user *fl, struct device *dev,
>> buf = *obuf;
>>
>> if (fl->sctx && fl->sctx->sid)
>> - buf->phys += ((u64)fl->sctx->sid << 32);
>> + IOVA_FROM_SID_PA((u64)fl->sctx->sid, buf->phys, fl->sctx->sid_pos);
>>
>> return 0;
>> }
>> @@ -687,7 +711,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->phys), buffer->size);
>> + IOVA_TO_PHYS(buffer->phys, buffer->fl->sctx->sid_pos),
>> + buffer->size);
>> if (ret < 0) {
>> dev_err(buffer->dev, "failed to get scatterlist from DMA API\n");
>> kfree(a);
>> @@ -736,7 +761,7 @@ 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->phys), size);
>> + IOVA_TO_PHYS(buf->phys, buf->fl->sctx->sid_pos), size);
>> }
>>
>> static const struct dma_buf_ops fastrpc_dma_buf_ops = {
>> @@ -793,7 +818,8 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
>> map->phys = sg_phys(map->table->sgl);
>> } else {
>> map->phys = sg_dma_address(map->table->sgl);
>> - map->phys += ((u64)fl->sctx->sid << 32);
>> + IOVA_FROM_SID_PA((u64)fl->sctx->sid, map->phys,
>> + fl->sctx->sid_pos);
>> }
>> map->size = len;
>> map->va = sg_virt(map->table->sgl);
>> @@ -2153,11 +2179,14 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
>> sess->used = false;
>> sess->valid = true;
>> sess->dev = dev;
>> - dev_set_drvdata(dev, sess);
>> + /* Configure where sid will be prepended to pa */
>> + sess->sid_pos =
>> + (cctx->iova_format ? SID_POS_IN_IOVA : DSP_DEFAULT_BUS_WIDTH);
>
> You are using iova_format as a flag. Rename it to something more
> sensible and turn it into a boolean flag.
>
Sure, I'll take it up in next patch series.
>>
>> if (of_property_read_u32(dev->of_node, "reg", &sess->sid))
>> dev_info(dev, "FastRPC Session ID not specified in DT\n");
>>
>> + dev_set_drvdata(dev, sess);
>> if (sessions > 0) {
>> struct fastrpc_session_ctx *dup_sess;
>>
>> @@ -2256,6 +2285,19 @@ static int fastrpc_get_domain_id(const char *domain)
>> return -EINVAL;
>> }
>>
>> +struct fastrpc_soc_data {
>> + u32 dsp_iova_format;
>> +};
>> +
>> +static const struct fastrpc_soc_data kaanapali_soc_data = {
>> + .dsp_iova_format = 1,
>> +};
>> +
>> +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;
>> @@ -2264,6 +2306,23 @@ 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;
>> + u32 iova_format = 0;
>> +
>> + 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) {
>> + dev_dbg(rdev, "no compatible SoC found at root node\n");
>> + } else {
>> + soc_data = match->data;
>> + iova_format = soc_data->dsp_iova_format;
>> + }
>>
>> err = of_property_read_string(rdev->of_node, "label", &domain);
>> if (err) {
>> @@ -2343,7 +2402,8 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
>> err = -EINVAL;
>> goto err_free_data;
>> }
>> -
>> + /* determine where sid needs to be prepended to pa based on iova_format */
>> + data->iova_format = iova_format;
>> kref_init(&data->refcount);
>>
>> dev_set_drvdata(&rpdev->dev, data);
>>
>> --
>> 2.25.1
>>
>
Thanks,
Pallavi
Powered by blists - more mailing lists