From patchwork Mon Feb 14 16:09:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 12745773 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 6D7EDC433EF for ; Mon, 14 Feb 2022 16:10:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356149AbiBNQKT (ORCPT ); Mon, 14 Feb 2022 11:10:19 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:53618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242693AbiBNQKS (ORCPT ); Mon, 14 Feb 2022 11:10:18 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB2565FF0B for ; Mon, 14 Feb 2022 08:10:09 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id i14so27622758wrc.10 for ; Mon, 14 Feb 2022 08:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OMqER4NRD5Otzp5gHFYzWyzVuvKEBWmPon9W1scP81E=; b=cpVlbt9KWDeqAjZQ9dsEuDDaENkntWrDih6e5myV7CH/PSn78t29QejoNwQrGhu51B PvdshXgBwg/16Xc82k1qHwLfygCoSQ/ta8FybGfFMUB6MndFvq+LnR0JmM69VAwQi0Pv 2a6Kwpj/Z4yTwS0BuVzI3DrWkLCKET3ilZ/f03/dRNXQt1I2BD2K7uX5LM3g8lr7uStL gQxas/5N38OO5zN/ygia7OUOkhOuoK+zUU7XevKwYhpCQLPE+VXAckEUmtKPiE+vDiNz eU123tAxY2XFqcXIp6DHELrJ5laStzwr/NmvV3TnG1/1eZRQriL6y3L+P8qXeQjUM6gX RYWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OMqER4NRD5Otzp5gHFYzWyzVuvKEBWmPon9W1scP81E=; b=C8oXkQzn/yLpSP7/YEQsBoq4ZHmMLdHnOHRKK5E2tu/1+VT9r8WryJjkY15LFR5uPO jlkJEfiifSXZf7vzPmfXH7Bt/ATmAwMctWUn6PfJNDKHIDVSkQKVr+PMfYzKh/HnX/ex X1maY+3hr31w6xlgaznxE9NkagbaDwG/VyHnyZEMRZTmqhMV5ZqTeTihT3oz6WtCq7l1 WvVyIY8rabMNxo6u6A/tdbQkR71+EkX+j1FetXFoJtUPuXUFWU+L/8rbLllQGlrKY6oA P12Z/gAd5tv8XnajTE93vBvyD+/ktdB6gdOpQMAk5YHlE068LKH2m7ACCytv9bhAGKMC 56ZA== X-Gm-Message-State: AOAM531OF8AcbhjmSK2aYHm5mMVNfKECLTcee0W0P57fkf/Vfsi++pWg +PnVX/QBj5lbxIHufgXJkKFLYw== X-Google-Smtp-Source: ABdhPJxgDu6sRJNqq8FQUZIphNIUVp7AZu9LzYrSIcz73UMn+/yxFe+lkbJAuQuvaseU+Rn1/vUnUw== X-Received: by 2002:a5d:4bd1:: with SMTP id l17mr296664wrt.176.1644855008397; Mon, 14 Feb 2022 08:10:08 -0800 (PST) Received: from srini-hackbox.lan (cpc90716-aztw32-2-0-cust825.18-1.cable.virginm.net. [86.26.103.58]) by smtp.gmail.com with ESMTPSA id k28sm13677022wms.23.2022.02.14.08.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 08:10:07 -0800 (PST) From: Srinivas Kandagatla To: robh+dt@kernel.org, gregkh@linuxfoundation.org Cc: devicetree@vger.kernel.org, ekangupt@qti.qualcomm.com, bkumar@qti.qualcomm.com, linux-kernel@vger.kernel.org, srini@kernel.org, bjorn.andersson@linaro.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v4 01/12] misc: fastrpc: separate fastrpc device from channel context Date: Mon, 14 Feb 2022 16:09:51 +0000 Message-Id: <20220214161002.6831-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20220214161002.6831-1-srinivas.kandagatla@linaro.org> References: <20220214161002.6831-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Currently fastrpc misc device instance is within channel context struct with a kref. So we have 2 structs with refcount, both of them managing the same channel context structure. Separate fastrpc device from channel context and by adding a dedicated fastrpc_device structure, this should clean the structures a bit and also help when adding secure device node support. Signed-off-by: Srinivas Kandagatla --- drivers/misc/fastrpc.c | 46 +++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 4ccbf43e6bfa..7e1c66591716 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -78,7 +78,7 @@ #define USER_PD (1) #define SENSORS_PD (2) -#define miscdev_to_cctx(d) container_of(d, struct fastrpc_channel_ctx, miscdev) +#define miscdev_to_fdevice(d) container_of(d, struct fastrpc_device, miscdev) static const char *domains[FASTRPC_DEV_MAX] = { "adsp", "mdsp", "sdsp", "cdsp"}; @@ -212,8 +212,13 @@ struct fastrpc_channel_ctx { spinlock_t lock; struct idr ctx_idr; struct list_head users; - struct miscdevice miscdev; struct kref refcount; + struct fastrpc_device *fdevice; +}; + +struct fastrpc_device { + struct fastrpc_channel_ctx *cctx; + struct miscdevice miscdev; }; struct fastrpc_user { @@ -1220,10 +1225,14 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) static int fastrpc_device_open(struct inode *inode, struct file *filp) { - struct fastrpc_channel_ctx *cctx = miscdev_to_cctx(filp->private_data); + struct fastrpc_channel_ctx *cctx; + struct fastrpc_device *fdevice; struct fastrpc_user *fl = NULL; unsigned long flags; + fdevice = miscdev_to_fdevice(filp->private_data); + cctx = fdevice->cctx; + fl = kzalloc(sizeof(*fl), GFP_KERNEL); if (!fl) return -ENOMEM; @@ -1608,6 +1617,27 @@ static struct platform_driver fastrpc_cb_driver = { }, }; +static int fastrpc_device_register(struct device *dev, struct fastrpc_channel_ctx *cctx, + const char *domain) +{ + struct fastrpc_device *fdev; + int err; + + fdev = devm_kzalloc(dev, sizeof(*fdev), GFP_KERNEL); + if (!fdev) + return -ENOMEM; + + fdev->cctx = cctx; + fdev->miscdev.minor = MISC_DYNAMIC_MINOR; + fdev->miscdev.fops = &fastrpc_fops; + fdev->miscdev.name = devm_kasprintf(dev, GFP_KERNEL, "fastrpc-%s", domain); + err = misc_register(&fdev->miscdev); + if (!err) + cctx->fdevice = fdev; + + return err; +} + static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) { struct device *rdev = &rpdev->dev; @@ -1637,11 +1667,7 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) if (!data) return -ENOMEM; - data->miscdev.minor = MISC_DYNAMIC_MINOR; - data->miscdev.name = devm_kasprintf(rdev, GFP_KERNEL, "fastrpc-%s", - domains[domain_id]); - data->miscdev.fops = &fastrpc_fops; - err = misc_register(&data->miscdev); + err = fastrpc_device_register(rdev, data, domains[domain_id]); if (err) { kfree(data); return err; @@ -1681,7 +1707,9 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev) fastrpc_notify_users(user); spin_unlock_irqrestore(&cctx->lock, flags); - misc_deregister(&cctx->miscdev); + if (cctx->fdevice) + misc_deregister(&cctx->fdevice->miscdev); + of_platform_depopulate(&rpdev->dev); cctx->rpdev = NULL;