From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (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 98269232377; Mon, 7 Apr 2025 09:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744017238; cv=none; b=JNx4EVE7xGHkQYxFFwKyd5dP2+UVR/lH7uuykvRdyx0SaR/t0NtBI45RLaDu/ofoCFHULFM+dGw597rwGVFNcl48spCmho0RwfCgJaRMkSxPDZ03t6BB/hXqfMrzso9izexskX2fBqtugaUun29gRJ8R5gogmhnX0IHDQGArt08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744017238; c=relaxed/simple; bh=bIzLlpXo9+yFCb4WbrnFzSqHJlINIW8DBUDl/cXxSAc=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=ugZdinSbfjIfsJBR2AliWr/ITzOw4nAnMCM6yHNGB1JhV0kqDIVpfeWJHibmV7Um5+hKFuJe5XUcgu/MijueF9N4m5if5dTUtjKBNVZcgT14a3KTS5DzBA5cIyTjH5nLwSO9IKT+aBdWuzxdgxLflbg5tcErZL1ep59/3V/jrRw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=YpgPdZV6; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="YpgPdZV6" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5378dkqW028065; Mon, 7 Apr 2025 09:13:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= o7FHe/LJ2C/KiKmQAPCfGVQfsjGl6fDGbrok6uaCMcw=; b=YpgPdZV6ESIkFrdu Rsa1OIuE7UyrGsr0NfjvJKaUPKLDtKUYfLNqL2+yrY7QmICaMQ3BppgtIGcwYhyC SbqUEMyVzT/Lt/omQnP8cThS3hQ0Bx4KCiWSL8i1tOiT6NtREJoN8TcZsDGjKBzg 8mw70KdcgOH2NuLsomnGBuglVhUKKdFMxf4RVHlFZRl5QEfSbolFkHk8uF9EQlAN vwTou061LFrDODCS3OPi5AP4gncvE6EN+bwjDcWoxDt6EjYGRxfVQ8QHYSoqRM0S z6NdQoYM6vRKTE6ggIJYzikHyPZSOF4CFliW0S0JYUzIOBzR5LI+LfRMnww0Xp7G xzZ2Rg== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcyuq25-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 07 Apr 2025 09:13:48 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 5379Dlrx032120 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 7 Apr 2025 09:13:47 GMT Received: from [10.239.29.49] (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Mon, 7 Apr 2025 02:13:43 -0700 Message-ID: Date: Mon, 7 Apr 2025 17:13:25 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/3] misc: fastrpc: add support for gpdsp remoteproc To: Srinivas Kandagatla , , , , , , , , CC: , , , , , , "Dmitry Baryshkov" References: <20250320091446.3647918-1-quic_lxu5@quicinc.com> <20250320091446.3647918-3-quic_lxu5@quicinc.com> <30bba296-8e6f-41ee-880e-2d5ecc8fe5a4@linaro.org> Content-Language: en-US From: Ling Xu In-Reply-To: <30bba296-8e6f-41ee-880e-2d5ecc8fe5a4@linaro.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: FXmnH42qQWgTbJpshc5ToQ6Iaj3PcOGE X-Authority-Analysis: v=2.4 cv=Q4vS452a c=1 sm=1 tr=0 ts=67f3974c cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=COk6AnOGAAAA:8 a=KKAkSRfTAAAA:8 a=_yrR5X8AjwJofxW06v8A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=TjNXssC_j7lpFel5tvFf:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: FXmnH42qQWgTbJpshc5ToQ6Iaj3PcOGE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_02,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 clxscore=1011 phishscore=0 bulkscore=0 adultscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070065 在 3/21/2025 1:11 AM, Srinivas Kandagatla 写道: > > > On 20/03/2025 09:14, Ling Xu wrote: >> The fastrpc driver has support for 5 types of remoteprocs. There are >> some products which support GPDSP remoteprocs. Add changes to support >> GPDSP remoteprocs. >> >> Reviewed-by: Dmitry Baryshkov >> Signed-off-by: Ling Xu >> --- >>   drivers/misc/fastrpc.c | 10 ++++++++-- >>   1 file changed, 8 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c >> index 7b7a22c91fe4..80aa554b3042 100644 >> --- a/drivers/misc/fastrpc.c >> +++ b/drivers/misc/fastrpc.c >> @@ -28,7 +28,9 @@ >>   #define SDSP_DOMAIN_ID (2) >>   #define CDSP_DOMAIN_ID (3) >>   #define CDSP1_DOMAIN_ID (4) >> -#define FASTRPC_DEV_MAX        5 /* adsp, mdsp, slpi, cdsp, cdsp1 */ >> +#define GDSP0_DOMAIN_ID (5) >> +#define GDSP1_DOMAIN_ID (6) > > We have already made the driver look silly here, Lets not add domain ids for each instance, which is not a scalable. > > Domain ids are strictly for a domain not each instance. > > >> +#define FASTRPC_DEV_MAX        7 /* adsp, mdsp, slpi, cdsp, cdsp1, gdsp0, gdsp1 */ >>   #define FASTRPC_MAX_SESSIONS    14 >>   #define FASTRPC_MAX_VMIDS    16 >>   #define FASTRPC_ALIGN        128 >> @@ -107,7 +109,9 @@ >>   #define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev) >>     static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", >> -                        "sdsp", "cdsp", "cdsp1" }; >> +                        "sdsp", "cdsp", >> +                        "cdsp1", "gdsp0", >> +                        "gdsp1" }; >>   struct fastrpc_phy_page { >>       u64 addr;        /* physical address */ >>       u64 size;        /* size of contiguous region */ >> @@ -2338,6 +2342,8 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) >>           break; >>       case CDSP_DOMAIN_ID: >>       case CDSP1_DOMAIN_ID: >> +    case GDSP0_DOMAIN_ID: >> +    case GDSP1_DOMAIN_ID: >>           data->unsigned_support = true; >>           /* Create both device nodes so that we can allow both Signed and Unsigned PD */ >>           err = fastrpc_device_register(rdev, data, true, domains[domain_id]); > > > Can you try this patch: only compile tested. > > ---------------------------------->cut<--------------------------------------- > From 3f8607557162e16673b26fa253d11cafdc4444cf Mon Sep 17 00:00:00 2001 > From: Srinivas Kandagatla > Date: Thu, 20 Mar 2025 17:07:05 +0000 > Subject: [PATCH] misc: fastrpc: cleanup the domain names > > Currently the domain ids are added for each instance of domain, this is > totally not scalable approch. > > Clean this mess and create domain ids for only domains not its > instances. > This patch also moves the domain ids to uapi header as this is required > for FASTRPC_IOCTL_GET_DSP_INFO ioctl. > > Signed-off-by: Srinivas Kandagatla > --- >  drivers/misc/fastrpc.c      | 45 ++++++++++++++++++++----------------- >  include/uapi/misc/fastrpc.h |  7 ++++++ >  2 files changed, 32 insertions(+), 20 deletions(-) > > diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c > index 7b7a22c91fe4..b3932897a437 100644 > --- a/drivers/misc/fastrpc.c > +++ b/drivers/misc/fastrpc.c > @@ -23,12 +23,6 @@ >  #include >  #include > > -#define ADSP_DOMAIN_ID (0) > -#define MDSP_DOMAIN_ID (1) > -#define SDSP_DOMAIN_ID (2) > -#define CDSP_DOMAIN_ID (3) > -#define CDSP1_DOMAIN_ID (4) > -#define FASTRPC_DEV_MAX        5 /* adsp, mdsp, slpi, cdsp, cdsp1 */ >  #define FASTRPC_MAX_SESSIONS    14 >  #define FASTRPC_MAX_VMIDS    16 >  #define FASTRPC_ALIGN        128 > @@ -106,8 +100,6 @@ > >  #define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev) > > -static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", > -                        "sdsp", "cdsp", "cdsp1" }; >  struct fastrpc_phy_page { >      u64 addr;        /* physical address */ >      u64 size;        /* size of contiguous region */ > @@ -1769,7 +1761,7 @@ static int fastrpc_get_dsp_info(struct fastrpc_user *fl, char __user *argp) >          return  -EFAULT; > >      cap.capability = 0; > -    if (cap.domain >= FASTRPC_DEV_MAX) { > +    if (cap.domain >= FASTRPC_DOMAIN_MAX) { >          dev_err(&fl->cctx->rpdev->dev, "Error: Invalid domain id:%d, err:%d\n", >              cap.domain, err); >          return -ECHRNG; I tested this patch and saw one issue. Here FASTRPC_DOMAIN_MAX is set to 4, but in userspace, cdsp1 is 4, gdsp0 is 5 and gdsp1 is 6. For example, if we run a demo on gdsp0, cap.domain copied from userspace will be 5 which could lead to wrong message. --Ling Xu > @@ -2255,6 +2247,24 @@ static int fastrpc_device_register(struct device *dev, struct fastrpc_channel_ct >      return err; >  } > > +static int fastrpc_get_domain_id(const char *domain) > +{ > +    if (strncmp(domain, "adsp", 4) == 0) { > +        return ADSP_DOMAIN_ID; > +    } else    if (strncmp(domain, "cdsp", 4) == 0) { > +        return CDSP_DOMAIN_ID; > +    } else if (strncmp(domain, "mdsp", 4) ==0) { > +        return MDSP_DOMAIN_ID; > +    } else if (strncmp(domain, "sdsp", 4) ==0) { > +        return SDSP_DOMAIN_ID; > +    } else if (strncmp(domain, "gdsp", 4) ==0) { > +        return GDSP_DOMAIN_ID; > +    } > + > +    return -EINVAL; > + > +} > + >  static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) >  { >      struct device *rdev = &rpdev->dev; > @@ -2272,15 +2282,10 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) >          return err; >      } > > -    for (i = 0; i < FASTRPC_DEV_MAX; i++) { > -        if (!strcmp(domains[i], domain)) { > -            domain_id = i; > -            break; > -        } > -    } > +    domain_id = fastrpc_get_domain_id(domain); > >      if (domain_id < 0) { > -        dev_info(rdev, "FastRPC Invalid Domain ID %d\n", domain_id); > +        dev_info(rdev, "FastRPC Domain %s not supported\n", domain); >          return -EINVAL; >      } > > @@ -2332,19 +2337,19 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) >      case SDSP_DOMAIN_ID: >          /* Unsigned PD offloading is only supported on CDSP and CDSP1 */ >          data->unsigned_support = false; > -        err = fastrpc_device_register(rdev, data, secure_dsp, domains[domain_id]); > +        err = fastrpc_device_register(rdev, data, secure_dsp, domain); >          if (err) >              goto fdev_error; >          break; >      case CDSP_DOMAIN_ID: > -    case CDSP1_DOMAIN_ID: > +    case GDSP_DOMAIN_ID: >          data->unsigned_support = true; >          /* Create both device nodes so that we can allow both Signed and Unsigned PD */ > -        err = fastrpc_device_register(rdev, data, true, domains[domain_id]); > +        err = fastrpc_device_register(rdev, data, true, domain); >          if (err) >              goto fdev_error; > > -        err = fastrpc_device_register(rdev, data, false, domains[domain_id]); > +        err = fastrpc_device_register(rdev, data, false, domain); >          if (err) >              goto populate_error; >          break; > diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h > index f33d914d8f46..89516abd258f 100644 > --- a/include/uapi/misc/fastrpc.h > +++ b/include/uapi/misc/fastrpc.h > @@ -133,6 +133,13 @@ struct fastrpc_mem_unmap { >      __s32 reserved[5]; >  }; > > +#define ADSP_DOMAIN_ID (0) > +#define MDSP_DOMAIN_ID (1) > +#define SDSP_DOMAIN_ID (2) > +#define CDSP_DOMAIN_ID (3) > +#define GDSP_DOMAIN_ID (4) > + > +#define FASTRPC_DOMAIN_MAX    4 >  struct fastrpc_ioctl_capability { >      __u32 domain; >      __u32 attribute_id; -- Thx and BRs, Ling Xu