From patchwork Wed Aug 16 17:18:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9904401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F36AD60244 for ; Wed, 16 Aug 2017 17:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCF7E2872B for ; Wed, 16 Aug 2017 17:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D19332885C; Wed, 16 Aug 2017 17:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 555F32872B for ; Wed, 16 Aug 2017 17:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Eyckz/6eilGg/ngBNlr/QF7jupeLOx+7cBWqrSEfE0k=; b=ipAhf5LFXAfFA4wEE4FqiTkUV9 l+f12n7xLE/ZXHsKbTfrCjp1S9kUjtJMy4e/z7W6VUtTGinny+hcfR/E4lKUSIgyyB5AwPP+UAxEE Z29/Fpod+XuYiYSgq153TxstDgMlc1I/OXU0t6NiOYMBT16XK41i5h89SafR5kwWCNw3ue856kj39 HtaUZEqmcGmZECgkgiaoZ5XJ/N5JCZFgrQuQ5LCFEazSKx0D2oYVoEeLvpwHl70FIcjvg8wRVbO10 QDXWZihUJbMJOLw7jLv7s1TKjQauuB8jtyWkNtd7H1X/8IfmgdVrfumzUbZJhbql7sNAQu23nTyHf HcbM7T5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1di2Bq-0002uA-54; Wed, 16 Aug 2017 17:33:10 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1di2BD-00026t-Hb for linux-arm-kernel@bombadil.infradead.org; Wed, 16 Aug 2017 17:32:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DkxiTUb6NzVHhko/ekleMDchrUjss7xl/mMB25IYnv4=; b=E1rqJU0N9mtyeCkj6Zth0VOZY z3UPd6ICjBO9SZdJ/IG1t1fsW6aTN6isoYf2Xk+nf2Z6skaXy9+Xjrnpbnrf+EZ6N7wKC21PiZSeh JJXfjJiwwc2NGmy08e3F4BA4/ItHT7/DuSjByYPb5RIkZOauiLgpYxDc5xjvH4ny7Qp9+g9Tc25CN phDG4d827SXd+Vz0m4cjkD87IAhPxVH8zlSibiT3eBu39BqGqb+BdvaJNv7C77qyxaMMdrte8QmeL QV7H/aRoKuSABng5Vovr0YLUYBisJcc0Y67q8ieoR8Cok+wJ8+7HLi/tvJIw2Ywa6NlnZozoOpQ9Y AZ8t/Hr9Q==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1di1zN-0004uT-Mv for linux-arm-kernel@lists.infradead.org; Wed, 16 Aug 2017 17:20:19 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0486D606B7; Wed, 16 Aug 2017 17:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1502903996; bh=zNFr/LDvETYl/VT/zuBHLdyNPvcrzswdBeKisZZGyPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QfnOu6ihuoBJnGi6H4EVzVvEv3XRFkoORci8u9uN+DIyXpGH+E0QPm0zCwHItawuq mCA6lZMGQrLgj0FOAap5VXS5bCl629neQoNOUr0roqdHve94IRLDZ0bp5ZPPM1WNe3 mu6Q7IfI3kFuSHCNfp17ApIWbX89SI0OY926xajk= Received: from srichara-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7606160727; Wed, 16 Aug 2017 17:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1502903977; bh=zNFr/LDvETYl/VT/zuBHLdyNPvcrzswdBeKisZZGyPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UjNNFLZI1IAYBov7y62stXdnPGDQmuzXTbsX3+LL+EYtfI9chiPnMT9CSDLuKj+5O +SoTV7zFXTjia1C+Wuw4dODftW5cXQDZRcUswa+OEWxnE7wUiu6A1B6TmBLhYCdTdE JcVJ+APvztmaTT7duVXgo90z+XOx59E3nYI45FHU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7606160727 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org From: Sricharan R To: ohad@wizery.com, bjorn.andersson@linaro.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/18] rpmsg: glink: Split rpm_probe to reuse the common code Date: Wed, 16 Aug 2017 22:48:56 +0530 Message-Id: <1502903951-5403-4-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502903951-5403-1-git-send-email-sricharan@codeaurora.org> References: <1502903951-5403-1-git-send-email-sricharan@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170816_182018_106620_B7BC6605 X-CRM114-Status: GOOD ( 21.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sricharan@codeaurora.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bjorn Andersson There is quite some code common in glink_rpm_probe that can reused for glink-smem based transport as well. So split the function and move the code to glink_native_probe that can be used later when we add the support for glink-smem based transport. Also reuse driver's remove as well. Signed-off-by: Bjorn Andersson Signed-off-by: Sricharan R --- drivers/rpmsg/qcom_glink_rpm.c | 85 ++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/drivers/rpmsg/qcom_glink_rpm.c b/drivers/rpmsg/qcom_glink_rpm.c index 870ce32..5f0fa0d 100644 --- a/drivers/rpmsg/qcom_glink_rpm.c +++ b/drivers/rpmsg/qcom_glink_rpm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1155,29 +1156,21 @@ static int glink_rpm_parse_toc(struct device *dev, return -EINVAL; } -static int glink_rpm_probe(struct platform_device *pdev) +struct qcom_glink *qcom_glink_native_probe(struct device *dev, + struct qcom_glink_pipe *rx, + struct qcom_glink_pipe *tx) { - struct qcom_glink *glink; - struct glink_rpm_pipe *rx_pipe; - struct glink_rpm_pipe *tx_pipe; - struct device_node *np; - void __iomem *msg_ram; - size_t msg_ram_size; - struct device *dev = &pdev->dev; - struct resource r; int irq; int ret; + struct qcom_glink *glink; glink = devm_kzalloc(dev, sizeof(*glink), GFP_KERNEL); if (!glink) - return -ENOMEM; + return ERR_PTR(-ENOMEM); glink->dev = dev; - - rx_pipe = devm_kzalloc(&pdev->dev, sizeof(*rx_pipe), GFP_KERNEL); - tx_pipe = devm_kzalloc(&pdev->dev, sizeof(*tx_pipe), GFP_KERNEL); - if (!rx_pipe || !tx_pipe) - return -ENOMEM; + glink->tx_pipe = tx; + glink->rx_pipe = rx; mutex_init(&glink->tx_lock); spin_lock_init(&glink->rx_lock); @@ -1188,14 +1181,48 @@ static int glink_rpm_probe(struct platform_device *pdev) idr_init(&glink->lcids); idr_init(&glink->rcids); - glink->mbox_client.dev = &pdev->dev; + glink->mbox_client.dev = dev; glink->mbox_chan = mbox_request_channel(&glink->mbox_client, 0); if (IS_ERR(glink->mbox_chan)) { if (PTR_ERR(glink->mbox_chan) != -EPROBE_DEFER) - dev_err(&pdev->dev, "failed to acquire IPC channel\n"); - return PTR_ERR(glink->mbox_chan); + dev_err(dev, "failed to acquire IPC channel\n"); + return ERR_CAST(glink->mbox_chan); + } + + irq = of_irq_get(dev->of_node, 0); + ret = devm_request_irq(dev, irq, + qcom_glink_intr, + IRQF_NO_SUSPEND | IRQF_SHARED, + "glink-native", glink); + if (ret) { + dev_err(dev, "failed to request IRQ\n"); + return ERR_PTR(ret); } + ret = qcom_glink_send_version(glink); + if (ret) + return ERR_PTR(ret); + + return glink; +} + +static int glink_rpm_probe(struct platform_device *pdev) +{ + struct qcom_glink *glink; + struct glink_rpm_pipe *rx_pipe; + struct glink_rpm_pipe *tx_pipe; + struct device_node *np; + void __iomem *msg_ram; + size_t msg_ram_size; + struct device *dev = &pdev->dev; + struct resource r; + int ret; + + rx_pipe = devm_kzalloc(&pdev->dev, sizeof(*rx_pipe), GFP_KERNEL); + tx_pipe = devm_kzalloc(&pdev->dev, sizeof(*tx_pipe), GFP_KERNEL); + if (!rx_pipe || !tx_pipe) + return -ENOMEM; + np = of_parse_phandle(dev->of_node, "qcom,rpm-msg-ram", 0); ret = of_address_to_resource(np, 0, &r); of_node_put(np); @@ -1219,27 +1246,13 @@ static int glink_rpm_probe(struct platform_device *pdev) tx_pipe->native.avail = glink_rpm_tx_avail; tx_pipe->native.write = glink_rpm_tx_write; - glink->tx_pipe = &tx_pipe->native; - glink->rx_pipe = &rx_pipe->native; - writel(0, tx_pipe->head); writel(0, rx_pipe->tail); - irq = platform_get_irq(pdev, 0); - ret = devm_request_irq(dev, irq, - qcom_glink_intr, - IRQF_NO_SUSPEND | IRQF_SHARED, - "glink-rpm", glink); - if (ret) { - dev_err(dev, "Failed to request IRQ\n"); - return ret; - } - - glink->irq = irq; - - ret = qcom_glink_send_version(glink); - if (ret) - return ret; + glink = qcom_glink_native_probe(&pdev->dev, &rx_pipe->native, + &tx_pipe->native); + if (IS_ERR(glink)) + return PTR_ERR(glink); platform_set_drvdata(pdev, glink);