misc: fastrpc: Add support for new DSP IOVA formatting

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 via OF matching on the fastrpc
node; otherwise, default to legacy 32-bit placement.
This change ensures consistent SID placement across DSPs.

Signed-off-by: Kumari Pallavi <kumari.pallavi@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20251226070534.602021-4-kumari.pallavi@oss.qualcomm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index eb9501fe79bcf26280bd0242bc8857986c26d11c..fcc80206b7c4bea645603f2748cd54aa5c7a0b57 100644 (file)
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -22,6 +22,7 @@
 #include <linux/firmware/qcom/qcom_scm.h>
 #include <uapi/misc/fastrpc.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/bits.h>
 
 #define ADSP_DOMAIN_ID (0)
 #define MDSP_DOMAIN_ID (1)
@@ -33,7 +34,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
@@ -257,6 +257,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 +282,7 @@ struct fastrpc_channel_ctx {
        bool secure;
        bool unsigned_support;
        u64 dma_mask;
+       const struct fastrpc_soc_data *soc_data;
 };
 
 struct fastrpc_device {
@@ -305,6 +310,24 @@ struct fastrpc_user {
        struct mutex mutex;
 };
 
+/* Extract SMMU PA from consolidated IOVA */
+static inline dma_addr_t fastrpc_ipa_to_dma_addr(struct fastrpc_channel_ctx *cctx, dma_addr_t iova)
+{
+       if (!cctx->soc_data->sid_pos)
+               return 0;
+       return iova & GENMASK_ULL(cctx->soc_data->sid_pos - 1, 0);
+}
+
+/*
+ * Prepare the consolidated iova to send to DSP by prepending the SID
+ * to smmu PA at the appropriate position
+ */
+static inline u64 fastrpc_sid_offset(struct fastrpc_channel_ctx *cctx,
+                                    struct fastrpc_session_ctx *sctx)
+{
+       return (u64)sctx->sid << cctx->soc_data->sid_pos;
+}
+
 static void fastrpc_free_map(struct kref *ref)
 {
        struct fastrpc_map *map;
@@ -390,7 +413,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));
+                         fastrpc_ipa_to_dma_addr(buf->fl->cctx, buf->dma_addr));
        kfree(buf);
 }
 
@@ -440,7 +463,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);
+               buf->dma_addr += fastrpc_sid_offset(fl->cctx, fl->sctx);
 
        return 0;
 }
@@ -685,7 +708,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);
+                             fastrpc_ipa_to_dma_addr(buffer->fl->cctx, buffer->dma_addr),
+                             buffer->size);
        if (ret < 0) {
                dev_err(buffer->dev, "failed to get scatterlist from DMA API\n");
                kfree(a);
@@ -734,7 +758,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->dma_addr), size);
+                                fastrpc_ipa_to_dma_addr(buf->fl->cctx, buf->dma_addr), size);
 }
 
 static const struct dma_buf_ops fastrpc_dma_buf_ops = {
@@ -747,6 +771,11 @@ static const struct dma_buf_ops fastrpc_dma_buf_ops = {
        .release = fastrpc_release,
 };
 
+static dma_addr_t fastrpc_compute_dma_addr(struct fastrpc_user *fl, dma_addr_t sg_dma_addr)
+{
+       return sg_dma_addr + fastrpc_sid_offset(fl->cctx, fl->sctx);
+}
+
 static int fastrpc_map_attach(struct fastrpc_user *fl, int fd,
                              u64 len, u32 attr, struct fastrpc_map **ppmap)
 {
@@ -785,12 +814,10 @@ static int fastrpc_map_attach(struct fastrpc_user *fl, int fd,
        }
        map->table = table;
 
-       if (attr & FASTRPC_ATTR_SECUREMAP) {
+       if (attr & FASTRPC_ATTR_SECUREMAP)
                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);
-       }
+       else
+               map->dma_addr = fastrpc_compute_dma_addr(fl, sg_dma_address(map->table->sgl));
        for_each_sg(map->table->sgl, sgl, map->table->nents,
                sgl_index)
                map->size += sg_dma_len(sgl);
@@ -2290,6 +2317,14 @@ 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 int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
 {
        struct device *rdev = &rpdev->dev;
@@ -2298,6 +2333,9 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)
        const char *domain;
        bool secure_dsp;
        unsigned int vmids[FASTRPC_MAX_VMIDS];
+       const struct fastrpc_soc_data *soc_data;
+
+       soc_data = device_get_match_data(rdev);
 
        err = of_property_read_string(rdev->of_node, "label", &domain);
        if (err) {
@@ -2350,6 +2388,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:
@@ -2487,7 +2526,8 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data,
 }
 
 static const struct of_device_id fastrpc_rpmsg_of_match[] = {
-       { .compatible = "qcom,fastrpc" },
+       { .compatible = "qcom,kaanapali-fastrpc", .data = &kaanapali_soc_data },
+       { .compatible = "qcom,fastrpc", .data = &default_soc_data },
        { },
 };
 MODULE_DEVICE_TABLE(of, fastrpc_rpmsg_of_match);