From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E23BECAAD8 for ; Wed, 14 Sep 2022 10:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229600AbiINKLa (ORCPT ); Wed, 14 Sep 2022 06:11:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbiINKL0 (ORCPT ); Wed, 14 Sep 2022 06:11:26 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E826C27CE9; Wed, 14 Sep 2022 03:11:24 -0700 (PDT) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28EA6UeT001093; Wed, 14 Sep 2022 10:10:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=subject : to : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=qcppdkim1; bh=PqegGpNl0qJyiVy3o716TPoEjNN3fwQINyxJgf9bHko=; b=hH0l4vGVvCyI5B3eAGYn/Ki7Ne3B+X2+UmDkLfG1w4BWkwaGmhW222yduKmVFPXHbLfK 3X5+cBr//p4bXcS37cKmp8gJlkQN6q5Y29Tv4rUReR5jMxjKNiBNPQBGNjawY6oCp+tm Qr1okHQoR5l1IwjuD8tnxC2LOyHuM/+jxfrXlTqHM+4pWO6RbcAHCWt27lq1hfu3+1vD mqFe6FTts/xi8gHSkZ8DUW/s/iR1dOueoabah1TvhM5g6N0Y4FsBub3BqkSrIoEgtDF0 889WWApMG6z8Y9NbNjD9ukT0zXz6SvscTvIblerGOYrLEDKSkbjSFvThRJxFn9Qg8+cd qw== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3jjy06htkg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Sep 2022 10:10:42 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 28EAAfux002847 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Sep 2022 10:10:41 GMT Received: from [10.79.43.230] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 14 Sep 2022 03:10:36 -0700 Subject: Re: [PATCH v6 7/8] remoteproc: qcom: Add support for memory sandbox To: Srinivasa Rao Mandadapu , , , , , , , , , , , , , , , , , References: <1662643422-14909-1-git-send-email-quic_srivasam@quicinc.com> <1662643422-14909-8-git-send-email-quic_srivasam@quicinc.com> From: Sibi Sankar Message-ID: <3c951582-070c-675f-14c7-ca033ca347b6@quicinc.com> Date: Wed, 14 Sep 2022 15:40:33 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <1662643422-14909-8-git-send-email-quic_srivasam@quicinc.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: vLI_AbPmfzToR8czebEypD7BNlSF5HO0 X-Proofpoint-ORIG-GUID: vLI_AbPmfzToR8czebEypD7BNlSF5HO0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-14_03,2022-09-14_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209140049 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/8/22 6:53 PM, Srinivasa Rao Mandadapu wrote: > Update pil driver with SMMU mapping for allowing authorised > memory access to ADSP firmware, by carveout reserved adsp memory > region from device tree file. > > Signed-off-by: Srinivasa Rao Mandadapu > --- > Changes since V5: > -- Remove adsp_rproc_unmap_smmu, adsp_of_unmap_smmu, adsp_of_map_smmu and > adsp_rproc_map_smmu functions. > -- Remove find_loaded_rsc_table call back initialization. > -- Rename adsp_sandbox_needed to has_iommu. > Changes since V4: > -- Split the code and add appropriate APIs for resource allocation and free. > -- Update adsp_unmap_smmu with missing free ops call. > -- Update normalizing length value in adsp_of_unmap_smmu. > Changes since V3: > -- Rename is_adsp_sb_needed to adsp_sandbox_needed. > -- Add smmu unmapping in error case and in adsp stop. > Changes since V2: > -- Replace platform_bus_type with adsp->dev->bus. > -- Use API of_parse_phandle_with_args() instead of of_parse_phandle_with_fixed_args(). > -- Replace adsp->is_wpss with adsp->is_adsp. > -- Update error handling in adsp_start(). > > drivers/remoteproc/qcom_q6v5_adsp.c | 55 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 54 insertions(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > index ccb5592..e55d593 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -48,6 +49,8 @@ > #define LPASS_PWR_ON_REG 0x10 > #define LPASS_HALTREQ_REG 0x0 > > +#define SID_MASK_DEFAULT 0xF > + > #define QDSP6SS_XO_CBCR 0x38 > #define QDSP6SS_CORE_CBCR 0x20 > #define QDSP6SS_SLEEP_CBCR 0x3c > @@ -333,6 +336,42 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw) > return 0; > } > > +static void adsp_unmap_smmu(struct rproc *rproc) > +{ > + struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > + > + iommu_unmap(rproc->domain, adsp->mem_phys, adsp->mem_size); > +} > + > +static int adsp_map_smmu(struct qcom_adsp *adsp, struct rproc *rproc) you could perhaps name the func to adsp_map_carveout/adsp_unmap_carveout > +{ > + struct of_phandle_args args; > + long long sid; > + unsigned long iova; > + int ret; > + > + if (!rproc->domain) > + return -EINVAL; > + > + ret = of_parse_phandle_with_args(adsp->dev->of_node, "iommus", "#iommu-cells", 0, &args); > + if (ret < 0) > + return ret; > + > + sid = args.args[0] & SID_MASK_DEFAULT; > + > + /* Add SID configuration for ADSP Firmware to SMMU */ > + iova = adsp->mem_phys | (sid << 32); > + > + ret = iommu_map(rproc->domain, iova, adsp->mem_phys, > + adsp->mem_size, IOMMU_READ | IOMMU_WRITE); > + if (ret) { > + dev_err(adsp->dev, "Unable to map ADSP Physical Memory\n"); > + return ret; > + } > + > + return 0; > +} > + > static int adsp_start(struct rproc *rproc) > { > struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv; > @@ -343,9 +382,17 @@ static int adsp_start(struct rproc *rproc) > if (ret) > return ret; > > + if (adsp->has_iommu) { > + ret = adsp_map_smmu(adsp, rproc); > + if (ret) { > + dev_err(adsp->dev, "ADSP smmu mapping failed\n"); > + goto disable_irqs; > + } > + } > + > ret = clk_prepare_enable(adsp->xo); > if (ret) > - goto disable_irqs; > + goto adsp_smmu_unmap; > > ret = qcom_rproc_pds_enable(adsp, adsp->proxy_pds, > adsp->proxy_pd_count); > @@ -401,6 +448,9 @@ static int adsp_start(struct rproc *rproc) > qcom_rproc_pds_disable(adsp, adsp->proxy_pds, adsp->proxy_pd_count); > disable_xo_clk: > clk_disable_unprepare(adsp->xo); > +adsp_smmu_unmap: > + if (adsp->has_iommu) > + adsp_unmap_smmu(rproc); > disable_irqs: > qcom_q6v5_unprepare(&adsp->q6v5); > > @@ -429,6 +479,9 @@ static int adsp_stop(struct rproc *rproc) > if (ret) > dev_err(adsp->dev, "failed to shutdown: %d\n", ret); > > + if (adsp->has_iommu) > + adsp_unmap_smmu(rproc); > + > handover = qcom_q6v5_unprepare(&adsp->q6v5); > if (handover) > qcom_adsp_pil_handover(&adsp->q6v5); >