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.9 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 576B0C4BA0A for ; Wed, 26 Feb 2020 04:46:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2251C222C2 for ; Wed, 26 Feb 2020 04:46:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="BEXTFHOL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726928AbgBZEq4 (ORCPT ); Tue, 25 Feb 2020 23:46:56 -0500 Received: from mail-eopbgr10062.outbound.protection.outlook.com ([40.107.1.62]:13172 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726112AbgBZEqy (ORCPT ); Tue, 25 Feb 2020 23:46:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mMsmQtZUpsjE9lNLyKFsXklc8vF5/4rnm4ZAV1CfcFyw8EuMmiwh+cuLNU9yBeWG5VpLWgsnmo8KFIIag8dELlNinWnzGHZCa2EbdBdN1NHv4Jl5eTg7phMvdP6dwjJkzzIs44v6tjJMVGJJnN7CU0Oi9Gg9Px+qtNbOrDjK/YhBfyC7bA02wvESmy/r4wVxAQEO2SX3lIaF3X8rvFFh03vjpU1trLpPLNfq02bMDIaWx8QV95Btk70VjCNxQ/Nyw5C0Y39MfXzuERB1zY46k6HFT6yAM05i17I2GhxkJME+7LsaeKARJaUF+dQD/vVBY5YRCIxK6bJNOZ6PNzW/CQ== 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=MokspyUUPXnsqkeM6Sk7d7/SS049QCzUl7YPWaEQFAo=; b=eRWsRbWhIs+1wMeZvWhkjGHSeVdp69R1cXW7VpynEEd8MBDR1R93LHLx8P4OZXkNFZWNmHiPd8NwQ+c+gYoSMBT4CU4Cf6t/lPiZM9sBycJGhoVxesetSI3HM4aYwIq2OxgCVi19p9Kd+LWbdpLlZaeLz05VyjgwlCw1FGncFc8qVgPaGw5+yL9DkJqKiGpPxzAm4n5ZdkKHB4TShznluo8Znc5fzuwur4SdCj0gHvtZWv8mHSe1dM+2w9K27HTUHSXPbci0apUQbxiAA2iIJeuRGkAUuE6t083hokGLUEXeZJ8boWVGsb6SUu/diALl4iP8eKF4aY79t3/33Zm01w== 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=MokspyUUPXnsqkeM6Sk7d7/SS049QCzUl7YPWaEQFAo=; b=BEXTFHOLx+6jSOqvVNHohmippk2GoxwSkFJC0C7giqh438C0hGkXzYvgR/0hydfnzEIrIsaLbtaOLUlOaMJ3n2+ntfO0ljl3shorzzVn7yipXvjkUr6QOr4cB2WPx6XwTiTj9NOTjRZRs07JYyDhNB/SZgXm/+0vEnx7dceVTEc= 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 AM0PR04MB4291.eurprd04.prod.outlook.com (52.134.126.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.14; Wed, 26 Feb 2020 04:46:51 +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.2750.021; Wed, 26 Feb 2020 04:46:51 +0000 From: peng.fan@nxp.com To: shawnguo@kernel.org, s.hauer@pengutronix.de, jassisinghbrar@gmail.com, o.rempel@pengutronix.de, robh+dt@kernel.org 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 V3 2/4] mailbox: imx: restructure code to make easy for new MU Date: Wed, 26 Feb 2020 12:40:41 +0800 Message-Id: <1582692043-683-3-git-send-email-peng.fan@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1582692043-683-1-git-send-email-peng.fan@nxp.com> References: <1582692043-683-1-git-send-email-peng.fan@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0135.apcprd06.prod.outlook.com (2603:1096:1:1f::13) 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 SG2PR06CA0135.apcprd06.prod.outlook.com (2603:1096:1:1f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2772.14 via Frontend Transport; Wed, 26 Feb 2020 04:46:47 +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: 338ae4c1-78de-45e7-733b-08d7ba76e566 X-MS-TrafficTypeDiagnostic: AM0PR04MB4291:|AM0PR04MB4291: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-Forefront-PRVS: 0325F6C77B X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(376002)(346002)(396003)(136003)(39860400002)(189003)(199004)(69590400006)(6486002)(6666004)(316002)(6512007)(9686003)(86362001)(8936002)(2906002)(36756003)(4326008)(8676002)(81156014)(5660300002)(15650500001)(81166006)(52116002)(478600001)(66946007)(956004)(2616005)(66476007)(66556008)(186003)(16526019)(6506007)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR04MB4291;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: I+PBwkWc9ErOQRthjjYp0zPzinx+6Q27dR+E8KgiXaUwg1njxNeZ+xaKL1tODP+Up7KiUaeZpSulxeknZoaqn2KABWToFzl8CWjmFqOXEfTSc0VqOK5AvfWDqs9MkFx+Pd+GVmad1o1w/qyGLPtTlbR7/RFoYXeeY3XAnsy1KM6geQygci5+2ImPD+SiAcNKaoiRKamKR6jkrCLjcCkOH9qmdW5PMnTWf0yCOOcJVCFts1DX1wZ9swGUT4tVgaCC3/1QcqRwNDyKAKNZmQEC6Mkfo0OYL1aAIZTJwAiKISPvivbremXzyW+7i+u4v+s4WaRoGDApSGIuFlW5omeRVIwWigrc/gl3GYTKVcgc1Im26ZoW0hEmI+DRt7S6zOm5qFvEx/lek30Llp39KI1q1EBZ+z4HKVUQCPPFgxQ/9U3T0QQFj/l+eOtYvgg4fC3vJL9YEGFevVkfImFS+xsC2EGjY1lkRNMq2F/lD7ghVdJ4QLHE9kPvgq0hhSbfoaOVI/Fod7Tus3WrU9m9ROMSuBKM/OJN5IM6YmGdJg4uexk= X-MS-Exchange-AntiSpam-MessageData: xStXns5zUw+bNgLEqKfikea/o0D62+KIsI52SNeo54DkQfCVkcxjJWnvuJ74vgsMgEOf54gDFmd8nG3ypremJVG7ZPNtR1i3Udj1oqps6pE0FwndtJ6SVXV1LLTFK9mjOX49DsG/Bk/8zlPDzlHw6w== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 338ae4c1-78de-45e7-733b-08d7ba76e566 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2020 04:46:51.6876 (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: RyNXbwt+jiCVv5jWbJ2M1wa0mOOF+FHQ6EtQHR+9nGW+3lDlw7YP93kdm0Z2dG3bUmdKHWlQxTt6hQCSTN5KPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4291 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Fan Add imx_mu_generic_tx for data send and imx_mu_generic_rx for interrupt data receive. Add 'type' for MU type. With these, it will be a bit easy to introduce i.MX8/8X SCU type MU dedicated to communicate with SCU. Signed-off-by: Peng Fan --- V3: New patch, restructure code. drivers/mailbox/imx-mailbox.c | 100 ++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 33 deletions(-) diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 2cdcdc5f1119..901a3431fdb5 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -36,7 +36,17 @@ enum imx_mu_chan_type { IMX_MU_TYPE_RXDB, /* Rx doorbell */ }; +enum imx_mu_type { + IMX_MU_TYPE_GENERIC, +}; + +struct imx_mu_priv; +struct imx_mu_con_priv; + struct imx_mu_dcfg { + enum imx_mu_type type; + int (*tx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp, void *data); + int (*rx)(struct imx_mu_priv *priv, struct imx_mu_con_priv *cp); u32 xTR[4]; /* Transmit Registers */ u32 xRR[4]; /* Receive Registers */ u32 xSR; /* Status Register */ @@ -67,20 +77,6 @@ struct imx_mu_priv { bool side_b; }; -static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = { - .xTR = {0x0, 0x4, 0x8, 0xc}, - .xRR = {0x10, 0x14, 0x18, 0x1c}, - .xSR = 0x20, - .xCR = 0x24, -}; - -static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = { - .xTR = {0x20, 0x24, 0x28, 0x2c}, - .xRR = {0x40, 0x44, 0x48, 0x4c}, - .xSR = 0x60, - .xCR = 0x64, -}; - static struct imx_mu_priv *to_imx_mu_priv(struct mbox_controller *mbox) { return container_of(mbox, struct imx_mu_priv, mbox); @@ -111,6 +107,40 @@ static u32 imx_mu_xcr_rmw(struct imx_mu_priv *priv, u32 set, u32 clr) return val; } +static int imx_mu_generic_tx(struct imx_mu_priv *priv, + struct imx_mu_con_priv *cp, + void *data) +{ + u32 *arg = data; + + switch (cp->type) { + case IMX_MU_TYPE_TX: + imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]); + imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0); + break; + case IMX_MU_TYPE_TXDB: + imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0); + tasklet_schedule(&cp->txdb_tasklet); + break; + default: + dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type); + return -EINVAL; + } + + return 0; +} + +static int imx_mu_generic_rx(struct imx_mu_priv *priv, + struct imx_mu_con_priv *cp) +{ + u32 dat; + + dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]); + mbox_chan_received_data(cp->chan, (void *)&dat); + + return 0; +} + static void imx_mu_txdb_tasklet(unsigned long data) { struct imx_mu_con_priv *cp = (struct imx_mu_con_priv *)data; @@ -123,7 +153,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p) struct mbox_chan *chan = p; struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox); struct imx_mu_con_priv *cp = chan->con_priv; - u32 val, ctrl, dat; + u32 val, ctrl; ctrl = imx_mu_read(priv, priv->dcfg->xCR); val = imx_mu_read(priv, priv->dcfg->xSR); @@ -152,8 +182,7 @@ static irqreturn_t imx_mu_isr(int irq, void *p) imx_mu_xcr_rmw(priv, 0, IMX_MU_xCR_TIEn(cp->idx)); mbox_chan_txdone(chan, 0); } else if (val == IMX_MU_xSR_RFn(cp->idx)) { - dat = imx_mu_read(priv, priv->dcfg->xRR[cp->idx]); - mbox_chan_received_data(chan, (void *)&dat); + priv->dcfg->rx(priv, cp); } else if (val == IMX_MU_xSR_GIPn(cp->idx)) { imx_mu_write(priv, IMX_MU_xSR_GIPn(cp->idx), priv->dcfg->xSR); mbox_chan_received_data(chan, NULL); @@ -169,23 +198,8 @@ static int imx_mu_send_data(struct mbox_chan *chan, void *data) { struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox); struct imx_mu_con_priv *cp = chan->con_priv; - u32 *arg = data; - - switch (cp->type) { - case IMX_MU_TYPE_TX: - imx_mu_write(priv, *arg, priv->dcfg->xTR[cp->idx]); - imx_mu_xcr_rmw(priv, IMX_MU_xCR_TIEn(cp->idx), 0); - break; - case IMX_MU_TYPE_TXDB: - imx_mu_xcr_rmw(priv, IMX_MU_xCR_GIRn(cp->idx), 0); - tasklet_schedule(&cp->txdb_tasklet); - break; - default: - dev_warn_ratelimited(priv->dev, "Send data on wrong channel type: %d\n", cp->type); - return -EINVAL; - } - return 0; + return priv->dcfg->tx(priv, cp, data); } static int imx_mu_startup(struct mbox_chan *chan) @@ -367,6 +381,26 @@ static int imx_mu_remove(struct platform_device *pdev) return 0; } +static const struct imx_mu_dcfg imx_mu_cfg_imx6sx = { + .type = IMX_MU_TYPE_GENERIC, + .tx = imx_mu_generic_tx, + .rx = imx_mu_generic_rx, + .xTR = {0x0, 0x4, 0x8, 0xc}, + .xRR = {0x10, 0x14, 0x18, 0x1c}, + .xSR = 0x20, + .xCR = 0x24, +}; + +static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = { + .type = IMX_MU_TYPE_GENERIC, + .tx = imx_mu_generic_tx, + .rx = imx_mu_generic_rx, + .xTR = {0x20, 0x24, 0x28, 0x2c}, + .xRR = {0x40, 0x44, 0x48, 0x4c}, + .xSR = 0x60, + .xCR = 0x64, +}; + static const struct of_device_id imx_mu_dt_ids[] = { { .compatible = "fsl,imx7ulp-mu", .data = &imx_mu_cfg_imx7ulp }, { .compatible = "fsl,imx6sx-mu", .data = &imx_mu_cfg_imx6sx }, -- 2.16.4