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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0145BC3F2D8 for ; Wed, 4 Mar 2020 05:56:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B89DB2166E for ; Wed, 4 Mar 2020 05:56:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="hJzt7tGl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728339AbgCDF4S (ORCPT ); Wed, 4 Mar 2020 00:56:18 -0500 Received: from mail-eopbgr10070.outbound.protection.outlook.com ([40.107.1.70]:5792 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725271AbgCDF4S (ORCPT ); Wed, 4 Mar 2020 00:56:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P/Qq6Lnqvbx87dPWQJb860VVZJdym8Evd+Tv8l6CNMOVmuj8mXQjVAqaMUcmBK0AbsmljAMwsFCwZmpxDZzgf4hXEZfKODUl4+/D4/W0S3e5Ot2U797DYqlkR89cPwBGGJvkMkXtZ7aKm3eW5fmh2TE5IeZzK68fSaLx72e+mii+nfRDlwNMFlOemF2HLuxxQVfwM+FWqoWBvkSm4fhoxy5aUgUG3EVoWsAEvfDc2Yrz390C9J67DvCgb+DMtntha/F51c/8FdOKJT0/JtCgVAs/PzHaW1x+GFPUGP52DjDEBWkV9Z8gtBnQ9srJ+OXtdcy7uDyIE5zR3Vni9N7Qug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8r4S9Oxc0CwVaJwTeOGVH9gByqHlRlRg1FfulDUxjuc=; b=N7O42db1cf/khGtX1bgQN7HtIj208mTByYUCDDcQQeKbobj+7PbWfSoTXT8C3WI5F6xYjhI1mrEztvlJOrcS71cByol2V9/sC/MbnuZ2/ehCf8EAJKG77smbM+g3JmPgS/Jfncm7vFF5ZSDr/4a7dzc/Y1V6WZQTZDgFDLbudgjR54+AlbyBr+Z/Q1g53zIRV0vr0Ec7659xVey1ZNU+TbAGLzINZmE7zLMD9JiBh1FJdUuEN8qicQEr9CVTuK1v9Uo41gTFtySIrIbw5MoJcKH9NZ/GkKwmNMksA6BfbEY+SSIjkpohmtiVdZ+AhKrCh9VtDqq4t2MT8C2yMRF0DA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8r4S9Oxc0CwVaJwTeOGVH9gByqHlRlRg1FfulDUxjuc=; b=hJzt7tGlpCt3iVcagbGVwHGO40PsFsS+OMLioZoiGplCNsxSm9rDuyYw5rcoHIuUHGitW4/O+BXgJ4MLde8zsZ1rDgBX3d708u/3SEjDkhMrcm9wnjClXPAd95sZBNkvj/9rZhWNUURLbYhUMohpnsmKiNi8w3/C2zmSZXwUbqo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB4947.eurprd04.prod.outlook.com (20.177.40.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Wed, 4 Mar 2020 05:56:11 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::91e2:17:b3f4:d422%3]) with mapi id 15.20.2772.019; Wed, 4 Mar 2020 05:56:11 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de, jassisinghbrar@gmail.com, o.rempel@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, Anson.Huang@nxp.com, leonard.crestez@nxp.com, aisheng.dong@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 4/4] firmware: imx-scu: Support one TX and one RX Date: Wed, 4 Mar 2020 13:49:37 +0800 Message-Id: <1583300977-2327-5-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583300977-2327-1-git-send-email-peng.fan@nxp.com> References: <1583300977-2327-1-git-send-email-peng.fan@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR0401CA0010.apcprd04.prod.outlook.com (2603:1096:3:1::20) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by SG2PR0401CA0010.apcprd04.prod.outlook.com (2603:1096:3:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2772.15 via Frontend Transport; Wed, 4 Mar 2020 05:56:07 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.66] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 69c1ead0-7c0b-4c15-76a2-08d7c000bdb8 X-MS-TrafficTypeDiagnostic: AM0PR04MB4947:|AM0PR04MB4947: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-Forefront-PRVS: 0332AACBC3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(189003)(199004)(52116002)(66556008)(66476007)(316002)(478600001)(66946007)(2906002)(81166006)(8676002)(6506007)(956004)(2616005)(81156014)(4326008)(69590400007)(6512007)(9686003)(6486002)(5660300002)(26005)(36756003)(16526019)(6666004)(8936002)(186003)(86362001)(83323001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB4947;H:AM0PR04MB4481.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LtOe7eNU0kqIuWZlSBUZrkxOoL3ss6TT2MSj2IZmjCjhwyLrDAdH95s8gCvY94vslg6WgLX8DaMm0fy9A2PQdSrMOrZfMWY1rCj+NcR7aqSgQW7Moe8DfXn+RABIRj9u2AsIPZ8EGMXpGocmklOsEl6pvSLA32sNRyPxlQ/GJl4VPABymo4cCneXMd6CUtag3EqN0ZU7dbxBbU7/1i2ymcGRB3quzjXN/RxV57hTBfTedUQQ+MhZ7zD3P6GH8NSf0uNiBd6+JYWL0l6yIGci+/0kRpuTlL6ttL+7ASnbnhy8UJIr+9CrF2W86u/C2Pd6ZrN+xgImqgOFws3mdnhrYQA76X2fje87jkJstKYIuffX71C3ebMG0EHe8r6c1gR9QjLG6q1MWLNHF/VYLWYgSS24ICT3A7WYqG5UvZAiHkIh536LR3wS2IKD+Yta0waWULNXW5FoUU0gNfjQUYJ/+sIEcBqax0Gin6PYa1AzbhGmho2E5etDuUw5HKoCFY3rv6ETB+FcbO0ICcLXNK37iA== X-MS-Exchange-AntiSpam-MessageData: B3W5VqR9g+wIt+7cR9YRsgPNEgYTzVfvb34A+t9e0+vRFbZBp4VVd0U1iVDAid6zVgureITc+noiJEk+W/BZhOu8Nvcl8KNgyRGgkdD2gbvYyGIU7GjL5QGoIhv0GvxSHPZtW3HCPWLpPrcNO9s09w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69c1ead0-7c0b-4c15-76a2-08d7c000bdb8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2020 05:56:11.3499 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t09Vgjg6clWfAsh/+u7XmKiN0mXeU6fxR8WFV/oN5KbH5Vkg+fX7hQPGxv3A+apI8P4I2Yl7uLtnlOAPvJLyxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4947 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Fan Current imx-scu requires four TX and four RX to communicate with SCU. This is low efficient and causes lots of mailbox interrupts. With imx-mailbox driver could support one TX to use all four transmit registers and one RX to use all four receive registers, imx-scu could use one TX and one RX. Signed-off-by: Peng Fan --- V6: None V5: None V4: None V3: Check mbox fsl,imx8-mu-scu for fast_ipc drivers/firmware/imx/imx-scu.c | 54 +++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c index f71eaa5bf52d..e94a5585b698 100644 --- a/drivers/firmware/imx/imx-scu.c +++ b/drivers/firmware/imx/imx-scu.c @@ -38,6 +38,7 @@ struct imx_sc_ipc { struct device *dev; struct mutex lock; struct completion done; + bool fast_ipc; /* temporarily store the SCU msg */ u32 *msg; @@ -115,6 +116,7 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg) struct imx_sc_ipc *sc_ipc = sc_chan->sc_ipc; struct imx_sc_rpc_msg *hdr; u32 *data = msg; + int i; if (!sc_ipc->msg) { dev_warn(sc_ipc->dev, "unexpected rx idx %d 0x%08x, ignore!\n", @@ -122,6 +124,19 @@ static void imx_scu_rx_callback(struct mbox_client *c, void *msg) return; } + if (sc_ipc->fast_ipc) { + hdr = msg; + sc_ipc->rx_size = hdr->size; + sc_ipc->msg[0] = *data++; + + for (i = 1; i < sc_ipc->rx_size; i++) + sc_ipc->msg[i] = *data++; + + complete(&sc_ipc->done); + + return; + } + if (sc_chan->idx == 0) { hdr = msg; sc_ipc->rx_size = hdr->size; @@ -147,6 +162,7 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg) struct imx_sc_chan *sc_chan; u32 *data = msg; int ret; + int size; int i; /* Check size */ @@ -156,7 +172,8 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg) dev_dbg(sc_ipc->dev, "RPC SVC %u FUNC %u SIZE %u\n", hdr->svc, hdr->func, hdr->size); - for (i = 0; i < hdr->size; i++) { + size = sc_ipc->fast_ipc ? 1 : hdr->size; + for (i = 0; i < size; i++) { sc_chan = &sc_ipc->chans[i % 4]; /* @@ -168,8 +185,10 @@ static int imx_scu_ipc_write(struct imx_sc_ipc *sc_ipc, void *msg) * Wait for tx_done before every send to ensure that no * queueing happens at the mailbox channel level. */ - wait_for_completion(&sc_chan->tx_done); - reinit_completion(&sc_chan->tx_done); + if (!sc_ipc->fast_ipc) { + wait_for_completion(&sc_chan->tx_done); + reinit_completion(&sc_chan->tx_done); + } ret = mbox_send_message(sc_chan->ch, &data[i]); if (ret < 0) @@ -246,6 +265,8 @@ static int imx_scu_probe(struct platform_device *pdev) struct imx_sc_chan *sc_chan; struct mbox_client *cl; char *chan_name; + struct of_phandle_args args; + int num_channel; int ret; int i; @@ -253,11 +274,20 @@ static int imx_scu_probe(struct platform_device *pdev) if (!sc_ipc) return -ENOMEM; - for (i = 0; i < SCU_MU_CHAN_NUM; i++) { - if (i < 4) + ret = of_parse_phandle_with_args(pdev->dev.of_node, "mboxes", + "#mbox-cells", 0, &args); + if (ret) + return ret; + + sc_ipc->fast_ipc = of_device_is_compatible(args.np, "fsl,imx8-mu-scu"); + + num_channel = sc_ipc->fast_ipc ? 2 : SCU_MU_CHAN_NUM; + for (i = 0; i < num_channel; i++) { + if (i < num_channel / 2) chan_name = kasprintf(GFP_KERNEL, "tx%d", i); else - chan_name = kasprintf(GFP_KERNEL, "rx%d", i - 4); + chan_name = kasprintf(GFP_KERNEL, "rx%d", + i - num_channel / 2); if (!chan_name) return -ENOMEM; @@ -269,13 +299,15 @@ static int imx_scu_probe(struct platform_device *pdev) cl->knows_txdone = true; cl->rx_callback = imx_scu_rx_callback; - /* Initial tx_done completion as "done" */ - cl->tx_done = imx_scu_tx_done; - init_completion(&sc_chan->tx_done); - complete(&sc_chan->tx_done); + if (!sc_ipc->fast_ipc) { + /* Initial tx_done completion as "done" */ + cl->tx_done = imx_scu_tx_done; + init_completion(&sc_chan->tx_done); + complete(&sc_chan->tx_done); + } sc_chan->sc_ipc = sc_ipc; - sc_chan->idx = i % 4; + sc_chan->idx = i % (num_channel / 2); sc_chan->ch = mbox_request_channel_byname(cl, chan_name); if (IS_ERR(sc_chan->ch)) { ret = PTR_ERR(sc_chan->ch); -- 2.16.4