From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B671B29ACD7; Thu, 27 Nov 2025 07:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228757; cv=none; b=Q7WDy8U2Skmsr58A7oxcJod+AlNFw5yXO7XyjQeRzmrloZiRjbhDVoTPz264Fj90XebeHZ0IzWmCO6Y2OQCGAF5+cvw5pztHVVmB/SAJT9trrIp3zSmuuXeeURwqkcdLnrr7elWw+7XnL4+x8/DY6i/BN9WfDAbIKVB8Tfgf00A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228757; c=relaxed/simple; bh=YjYMuJ4WwkDAUrkkzpqXIur0vkDiZXPtn4Yire7fP+g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hnwowjpEMUstjLRryBCoSxstRE0yxxfY0DgBWJJF8stZ/GJRor8XtkH28SvN9wnb3WM87g7tu7/c2PZlKLLAv2cXuRE3+UP0BKagPkomwlKyGBFmBCBsa5qUyCgeuvSM04w7+LwJrRwaworb2LO3/Gnc53w8mrnSnhVfs7DlAfU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aNfbPY9J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aNfbPY9J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6770C4CEF8; Thu, 27 Nov 2025 07:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764228757; bh=YjYMuJ4WwkDAUrkkzpqXIur0vkDiZXPtn4Yire7fP+g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aNfbPY9J53ReZwX208tcTNE2ncueZ+5f5z+43rwRjadX6lt3lW0Y4fXwSHUqfiMTR eqKEgkpvhaHud+M8Dx1r/vG0o9QCWhFtfkqTfz4iZQGUcwhPd1V3xbgzTb38/HmLvI 6rBbLWWJ0eTIwhKAZ0qdmIoaLmr8xapcCcdUPwloU7MD/ovLgWbSR8QEz2waZZ6mqB BNEXzgm4L4FA4w5T75Ketl8vkRViH70/xvc/r1Htl6oTonSqfECHQXyku2pFbhOZpj YaBznN9w0NVhAPg3veh/hyPXTMNQa7lQ+H4HQjUvcAhjFFKKRj5UJXq8Il4N/Wcevz qqNrWgskreIcg== Date: Thu, 27 Nov 2025 08:32:34 +0100 From: Krzysztof Kozlowski To: Kumari Pallavi Cc: kpallavi@qti.qualcomm.com, srini@kernel.org, amahesh@qti.qualcomm.com, arnd@arndb.de, gregkh@linuxfoundation.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, quic_bkumar@quicinc.com, ekansh.gupta@oss.qualcomm.com, linux-kernel@vger.kernel.org, quic_chennak@quicinc.com, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, jingyi.wang@oss.qualcomm.com, aiqun.yu@oss.qualcomm.com, ktadakam@qti.qualcomm.com Subject: Re: [PATCH v4 3/4] misc: fastrpc: Add support for new DSP IOVA formatting Message-ID: <20251127-liberal-azure-turtle-194a9b@kuoka> References: <20251126094545.2139376-1-kumari.pallavi@oss.qualcomm.com> <20251126094545.2139376-4-kumari.pallavi@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20251126094545.2139376-4-kumari.pallavi@oss.qualcomm.com> On Wed, Nov 26, 2025 at 03:15:44PM +0530, Kumari Pallavi wrote: > @@ -685,7 +701,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); > @@ -734,7 +751,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); Some odd alignment here. Are you sure you run checkpatch --strict? > } > > static const struct dma_buf_ops fastrpc_dma_buf_ops = { > @@ -789,7 +807,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); > + map->dma_addr += fastrpc_compute_sid_offset((u64)fl->sctx->sid, > + fl->cctx->soc_data->sid_pos); > } > for_each_sg(map->table->sgl, sgl, map->table->nents, > sgl_index) > @@ -2290,6 +2309,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 +2325,11 @@ 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 = NULL; Drop assignment, not helpful. > + > + soc_data = device_get_match_data(rdev); > + if (!soc_data) > + soc_data = &default_soc_data; > > err = of_property_read_string(rdev->of_node, "label", &domain); > if (err) { > @@ -2350,6 +2382,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 +2520,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); > -- > 2.34.1 >