From patchwork Mon Nov 28 07:36:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandor Yu X-Patchwork-Id: 26564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5491822wrr; Sun, 27 Nov 2022 23:39:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf5gJvXhn9T9JQZDKvj+THZ4irzKAhh0ZgHa00tk2wpOeK7rFQXQEsDb1uUvQRaSmQU6i4oH X-Received: by 2002:a50:fe0e:0:b0:46a:cb3b:d117 with SMTP id f14-20020a50fe0e000000b0046acb3bd117mr12631888edt.103.1669621170251; Sun, 27 Nov 2022 23:39:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669621170; cv=pass; d=google.com; s=arc-20160816; b=0fK+978BJVSNJoi/w1v1g6EL/e26X1FeVHeIGZ93pgCtff9zzTxgTX7MsAA5SEu8gf YTfrDLIL510DA2SUU8fu4B7vXInFoXvdC8SFaCFiUV/Lc4/cXLkjroIZrDz9SqSmO8tF Hlscny3ZP3RechiB0WMAvxnoLT5DiNXGsZDIk1I6tphIGbLcFcZpJeXSQ7Sk0TnYWxwc 8JYr5+ibvwyCsPHOhjmmj8or5w+eQiePT+6Fe5W9VBeV+l/zUlBx5T488yVpVIoH6rXb 76lWSrX+auEwTGxK1aBeQLp31IN6muscaLvjlV2IAWzjZmNqA+m1eOhSBlsvq5WThquK c9yQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CI6HiPRkfFukA+gvkjMZqgx2ImVxcURakl6FJilSdaY=; b=EvfxI86UoS0jeUI8VHpits4srqtPDxaras4zB3N1V72d85b0Esdq1DE5OOT7KA5F8Q x8ouhyTMMtZq5SElzj6rG2uKlk/OM4lopR28NVwNoYCGilQbX6eFMlO3QarX3J0/wgJ6 ePS3vEUsML32kg545GTQZdZgJuJkhuW/e3VS4l/kDV/ITM+58YD9Ef+8+fCzQeztOJtQ p8El9/JAz5D7tVT5PlQPdbw+NnQTTAogrLr20kddO3Y9xXAxY2TsP1SDdo9rq4vk5jni nWWaGTcEwycoSijLeSMGwqIIFSgsFKJL6LvnT5jLqiflXrNL4FWjuaykur/PQ3aEwSDJ TLOw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Qs7H3fnq; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xf9-20020a17090731c900b007b28c65347esi9520254ejb.695.2022.11.27.23.39.07; Sun, 27 Nov 2022 23:39:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Qs7H3fnq; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229937AbiK1HiI (ORCPT + 99 others); Mon, 28 Nov 2022 02:38:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229979AbiK1HiC (ORCPT ); Mon, 28 Nov 2022 02:38:02 -0500 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2085.outbound.protection.outlook.com [40.107.105.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E801581E; Sun, 27 Nov 2022 23:38:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLEU1Ok++iNyaRfnYtrWOiNbaKSqHJI5PfEZ0OUrHHCFpuYWyChr6KIKr84Mw8IQlOhoz2RYqACcTbxtfGQjli02W1ciXtWQ1y7GinU1I7cMNWxAE9Zt3d+0vO//10W1j5wIEFPSkz6rw+8Ny6QaOolJGXyBfc4b4rLoOVS1YXep6j73mHkVoc9BsOs6n6aDP8nMKdcQ5v0i/nPiC7JDi9XbLau9h8INl/L8ElP0MPuzBPR/d9HAR0f1B5RmQuI98ok4Cqn5p4gfeYcY+ebGTMOFtAr7eEMF7c+gVwG0j64eAnE57E32+HzNzPggjUStiFNKR7gQX0k7Dk2+AjUhRA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CI6HiPRkfFukA+gvkjMZqgx2ImVxcURakl6FJilSdaY=; b=GKF0EIEepxd7X8BGE4tVVAHrEtvzki3ycdInl0BnoBA39y7pyJ55sZxekz+qdgS0Ocn6Ps1+2ByegXXCqYu9bdTJCAF3OREhSfxTR1Sp8v8Sl0nljoR1K1gdzy5labUbabaagTzAnCZUsjZPpwZlY+w/766IE0TrwI1AdDD/Gxz2+gJvJACob4OeG9QqjGQgaNoJqZPv1ONME+FYvA4ohtj83quM6fi/o0s2NNjNqviTuHslfrIwlEHKqwCEkJEJ2DPtS8DsWOpd4qa/tRid+2o0Nk7fcLNiMpFbYfDxAepGIrUoaRl6LdQXj1/TNcHDyC+SMFP7d1dY0ImVhoDH3Q== 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=CI6HiPRkfFukA+gvkjMZqgx2ImVxcURakl6FJilSdaY=; b=Qs7H3fnqhjwIqFUwAVajbCvI0lUgtwtOP6sfX9tgkbNWp/plCL5btqZihvBiXYo6ELAwtuxfS2Q8SPlTU4JrniQGhkRd4HZ/hnmPXqjvz6o0Nm7jPr+C+mOtRW87ljG+VjdxEcohIYzeJGSaKqHPV9h7SXIEVd/HBcKzlbyqNuc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9448.eurprd04.prod.outlook.com (2603:10a6:102:2b1::21) by DBBPR04MB7754.eurprd04.prod.outlook.com (2603:10a6:10:1ee::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.21; Mon, 28 Nov 2022 07:37:57 +0000 Received: from PAXPR04MB9448.eurprd04.prod.outlook.com ([fe80::d0c6:7b1d:6982:d400]) by PAXPR04MB9448.eurprd04.prod.outlook.com ([fe80::d0c6:7b1d:6982:d400%6]) with mapi id 15.20.5857.022; Mon, 28 Nov 2022 07:37:56 +0000 From: Sandor Yu To: andrzej.hajda@intel.com, neil.armstrong@linaro.org, robert.foss@linaro.org, Laurent.pinchart@ideasonboard.com, jonas@kwiboo.se, jernej.skrabec@gmail.com, airlied@gmail.com, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, vkoul@kernel.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org Cc: kernel@pengutronix.de, linux-imx@nxp.com, Sandor.yu@nxp.com, oliver.brown@nxp.com Subject: [PATCH v5 01/10] drm: bridge: cadence: convert mailbox functions to macro functions Date: Mon, 28 Nov 2022 15:36:09 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: SI1PR02CA0051.apcprd02.prod.outlook.com (2603:1096:4:1f5::6) To PAXPR04MB9448.eurprd04.prod.outlook.com (2603:10a6:102:2b1::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9448:EE_|DBBPR04MB7754:EE_ X-MS-Office365-Filtering-Correlation-Id: d7c0b582-22ac-4720-92b9-08dad113778a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JtJCSr19NO3ZXa6NuFTHD0dxEpw4ndqd53QbZG3OoKbVRFQ0Ib9+z8wJDA/t4On/ojmHwPEWota5QyMkDVX0zuoOET/qNU0X48hezBsIEMDGJdIfikXf8f7BOASOv54GxSXQ7OBAwS2BdnUOtqnJ2Nh0tK/NqkcQr02uQcFtXg1mpAhsiybzQ8PxbrTepSczbhzS5ZWBtiwF8IcJXAoCd+rnGx2gDrhkYYzQbBlzu7ZsKRuDUJHFgya7uFJcaoJ7GUqYvBeNzrV7Eg+5mY9BWThRox2qR0hfQvLyfhN3AMyDto0wCP39yzdD0ikKRIl/lOCSQ5jeqol8jREgiHowS9zdXTsc+H4stkYDyhxAOixEAeNkHq4rHy3FkxDdNRj4nHlAp2ph8KovcBNAf+bLUAakO2qfhZ98HZoH720a/BsW1XeaclO3ROxn+wUb2hoyg/JrFY07royGth/bfUOEfhBXOqOgxxNRnCBxARsyLfaz4y95Bcjf6ZE5TBs19pG4VT6KRpQA0oWPhYKI/doPNlfu6yUW1Z3ZwRb/f2Nfx2aPI4fTPui2VI34tqXCcHSpIyGC0HxF9AdViThMDkmzj020YKpFJfAqhPLBmhbSH9hgX2VoED0esy0BhNzqzhuhMAAAFYWiaTtu3TuoezWYnG8oONrwgceMnPQoI0iVZZGL2TxTH2FAtrxUHKzwn1HZD3M74VrHJvtyLqVOQvlUFQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9448.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(39860400002)(136003)(396003)(366004)(376002)(451199015)(38100700002)(38350700002)(6486002)(316002)(478600001)(921005)(8936002)(2906002)(41300700001)(83380400001)(26005)(6512007)(86362001)(2616005)(6666004)(36756003)(15650500001)(7416002)(6506007)(52116002)(8676002)(66476007)(66556008)(186003)(30864003)(5660300002)(4326008)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EKFbeHU6x6OtMiGfHuUNZI2ljOFGI4ikboReyM4AEYLMKBk/DQW4b3CyykDjzkQxxXLcZ8Rmo/J2lywpA/8Hf/gAx7XHvbYm/bKdzhkg61B/77s2GwJMcxFiT22C35+emYhZvpgBTBgYPAHjd28XfjvV9JooQGDumDNvInyFo6sajaUBXhWPo6DcHrguPPTo9RARHqOrUJhZQQIwfyd/mLX585PHHQImu3mOOcZbiVIqPrjwIZzlI8ED90iPIbVbnLjdnVJR9pfIAfSu5LsdrPqkRVPdFvRcFN9FrFpuwLwJY9HnJYiL+lz6EayYSDRCClSt3HSwMO3FPxtP3Ue1+LFasJJpnmJMQtC05MLC+3MOdf6GOC2gUgRtaRjGQ5O/la5trWMPyi9cca9GpqHoSR6IfqOgZw6TREg/bj0UDQ33lQ8ozNS+4PMN60iwWRRHTdSK3rNZzcSRCeuEDa7Wf/onLB22jo+SG6nZjC2ZwO/W1CSPdgufwiU4Q/bSHhVGh57t0DLgokgROjheNJRRf53LZmVaQp9N7uLVW3aUicCXSCkKLHgIW/YLI/ta7VkPMh0X4Sh4TndcvIY2kl+x0Zn27pj93rvlgz1ylk+Qk4NEr6bxWG1wOQ3dO24rdyerTSQgYFzvvAQbJ1hD7Y2M7EGMGrj2MLDh+EkRD/SiS/ImlAuHxoAnPf/e0LOVqYXYU3u/oenNQ1netCzKxDSz493TlMB8Gn6waE0qMnfF6j4s4dx1UgVjLqfhpEnAttdwPpAnyyTxZVzur6NqDO4OZBuKy6tv41lc80YvKVGGpF8GV5TBw4TiwDaezUSJMLAj/HiznFhJMP4lNynTM8kDf/2foRblLLCBtwrgCQowxem6Iad3a2Yh+Rd2ccAb1lk8ljn+DTU8EJRWK9eAQSJLEIL74iytTjrGJRf+djL5aleOpkJODK7Q8LKi2K6/MNSyVJFJ06WB3AgieARHiGe57OZqMMyY2d6UnhERCfebKwJb6mvBSHKY1UHF8RgXQintLBl5qs6PrPpecsK+wrJ02SpyBd4LKRyHilVS4TGXghOLHvXKUn26M7OGW5tRgKGsE64sXltlG8nFiIZuyDUtr8K+ScyiYpO0Usce5X0Wwdfarhdme7EQrPiqcpo/Cj8fevOZMQ+C3qqyxbj7Vfrjy4Qk1Ynt0/WtWIRWhZTUh3wDY9lCpCQ646iNUpR4ejW1nrv77W/e+1A7pzGyuapUuQP00zBf2ZZj2gwPP8SzbiWBLMbWp+lLUjrJ7hAeEqGYMO4klkPwv9bzyyVeYVH/925Xhf2tr2+s5tFl4pbYkZfxPEKOgVq5UlXoSJoZRDiNtgpKGxCTLyvnTGDw8W/5Vrm9r7qFG0Wtgev9bINV7GbUBzbfM9kLxTv1ULD0ru1oEV9txF++yh0+DMxcTi4XAXXLoaCULPZF1lqdzorIlst+1UelIFBraxkaZ4xt2DmLMApcISJPTSuGalJJCIUWihBPnEAUqPBnyg3uBZzAs9EEEK00i2l6PCA37wXaidlvB1yqlalRSrFEPc5+eaElpn/jBxM0YpDTEK17qtJb/bqB/Y40w5JcKhV86sjwa2Tn X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7c0b582-22ac-4720-92b9-08dad113778a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9448.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 07:37:56.9000 (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: CpvUWSodQlN6bCyxswUlQAcCssQrZzMKS46aXFD9A9nupjlyQFuxpmc+O5eImVOgLnUbuUShfonrGG0yyMeWfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7754 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750724688310608628?= X-GMAIL-MSGID: =?utf-8?q?1750724688310608628?= Mailbox access functions could be share to other mhdp driver and HDP-TX HDMI/DP PHY drivers, move those functions to head file include/drm/bridge/cdns-mhdp-mailbox.h and convert them to macro functions. Signed-off-by: Sandor Yu --- .../drm/bridge/cadence/cdns-mhdp8546-core.c | 197 +------------- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 1 - include/drm/bridge/cdns-mhdp-mailbox.h | 240 ++++++++++++++++++ 3 files changed, 242 insertions(+), 196 deletions(-) create mode 100644 include/drm/bridge/cdns-mhdp-mailbox.h diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index 31442a922502..b77b0ddcc9b3 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -55,200 +56,6 @@ #include "cdns-mhdp8546-hdcp.h" #include "cdns-mhdp8546-j721e.h" -static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp) -{ - int ret, empty; - - WARN_ON(!mutex_is_locked(&mhdp->mbox_mutex)); - - ret = readx_poll_timeout(readl, mhdp->regs + CDNS_MAILBOX_EMPTY, - empty, !empty, MAILBOX_RETRY_US, - MAILBOX_TIMEOUT_US); - if (ret < 0) - return ret; - - return readl(mhdp->regs + CDNS_MAILBOX_RX_DATA) & 0xff; -} - -static int cdns_mhdp_mailbox_write(struct cdns_mhdp_device *mhdp, u8 val) -{ - int ret, full; - - WARN_ON(!mutex_is_locked(&mhdp->mbox_mutex)); - - ret = readx_poll_timeout(readl, mhdp->regs + CDNS_MAILBOX_FULL, - full, !full, MAILBOX_RETRY_US, - MAILBOX_TIMEOUT_US); - if (ret < 0) - return ret; - - writel(val, mhdp->regs + CDNS_MAILBOX_TX_DATA); - - return 0; -} - -static int cdns_mhdp_mailbox_recv_header(struct cdns_mhdp_device *mhdp, - u8 module_id, u8 opcode, - u16 req_size) -{ - u32 mbox_size, i; - u8 header[4]; - int ret; - - /* read the header of the message */ - for (i = 0; i < sizeof(header); i++) { - ret = cdns_mhdp_mailbox_read(mhdp); - if (ret < 0) - return ret; - - header[i] = ret; - } - - mbox_size = get_unaligned_be16(header + 2); - - if (opcode != header[0] || module_id != header[1] || - req_size != mbox_size) { - /* - * If the message in mailbox is not what we want, we need to - * clear the mailbox by reading its contents. - */ - for (i = 0; i < mbox_size; i++) - if (cdns_mhdp_mailbox_read(mhdp) < 0) - break; - - return -EINVAL; - } - - return 0; -} - -static int cdns_mhdp_mailbox_recv_data(struct cdns_mhdp_device *mhdp, - u8 *buff, u16 buff_size) -{ - u32 i; - int ret; - - for (i = 0; i < buff_size; i++) { - ret = cdns_mhdp_mailbox_read(mhdp); - if (ret < 0) - return ret; - - buff[i] = ret; - } - - return 0; -} - -static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id, - u8 opcode, u16 size, u8 *message) -{ - u8 header[4]; - int ret, i; - - header[0] = opcode; - header[1] = module_id; - put_unaligned_be16(size, header + 2); - - for (i = 0; i < sizeof(header); i++) { - ret = cdns_mhdp_mailbox_write(mhdp, header[i]); - if (ret) - return ret; - } - - for (i = 0; i < size; i++) { - ret = cdns_mhdp_mailbox_write(mhdp, message[i]); - if (ret) - return ret; - } - - return 0; -} - -static -int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value) -{ - u8 msg[4], resp[8]; - int ret; - - put_unaligned_be32(addr, msg); - - mutex_lock(&mhdp->mbox_mutex); - - ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL, - GENERAL_REGISTER_READ, - sizeof(msg), msg); - if (ret) - goto out; - - ret = cdns_mhdp_mailbox_recv_header(mhdp, MB_MODULE_ID_GENERAL, - GENERAL_REGISTER_READ, - sizeof(resp)); - if (ret) - goto out; - - ret = cdns_mhdp_mailbox_recv_data(mhdp, resp, sizeof(resp)); - if (ret) - goto out; - - /* Returned address value should be the same as requested */ - if (memcmp(msg, resp, sizeof(msg))) { - ret = -EINVAL; - goto out; - } - - *value = get_unaligned_be32(resp + 4); - -out: - mutex_unlock(&mhdp->mbox_mutex); - if (ret) { - dev_err(mhdp->dev, "Failed to read register\n"); - *value = 0; - } - - return ret; -} - -static -int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val) -{ - u8 msg[6]; - int ret; - - put_unaligned_be16(addr, msg); - put_unaligned_be32(val, msg + 2); - - mutex_lock(&mhdp->mbox_mutex); - - ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX, - DPTX_WRITE_REGISTER, sizeof(msg), msg); - - mutex_unlock(&mhdp->mbox_mutex); - - return ret; -} - -static -int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr, - u8 start_bit, u8 bits_no, u32 val) -{ - u8 field[8]; - int ret; - - put_unaligned_be16(addr, field); - field[2] = start_bit; - field[3] = bits_no; - put_unaligned_be32(val, field + 4); - - mutex_lock(&mhdp->mbox_mutex); - - ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX, - DPTX_WRITE_FIELD, sizeof(field), field); - - mutex_unlock(&mhdp->mbox_mutex); - - return ret; -} - static int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp, u32 addr, u8 *data, u16 len) @@ -2058,7 +1865,7 @@ static void cdns_mhdp_atomic_disable(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state) { struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge); - u32 resp; + u32 resp = 0; dev_dbg(mhdp->dev, "%s\n", __func__); diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h index bedddd510d17..10c878bf0e63 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h @@ -212,7 +212,6 @@ struct phy; #define MB_MODULE_ID_HDCP_TX 0x07 #define MB_MODULE_ID_HDCP_RX 0x08 #define MB_MODULE_ID_HDCP_GENERAL 0x09 -#define MB_MODULE_ID_GENERAL 0x0a /* firmware and opcodes */ #define FW_NAME "cadence/mhdp8546.bin" diff --git a/include/drm/bridge/cdns-mhdp-mailbox.h b/include/drm/bridge/cdns-mhdp-mailbox.h new file mode 100644 index 000000000000..0249322a74b0 --- /dev/null +++ b/include/drm/bridge/cdns-mhdp-mailbox.h @@ -0,0 +1,240 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Cadence MHDP Firmware Access API function by Malibox. + * + * Copyright (C) 2022 NXP Semiconductor, Inc. + * + */ +#ifndef CDNS_MHDP_MAILBOX_H +#define CDNS_MHDP_MAILBOX_H + +#include +#include + +/* mailbox regs offset */ +#define CDNS_MAILBOX_FULL 0x00008 +#define CDNS_MAILBOX_EMPTY 0x0000c +#define CDNS_MAILBOX_TX_DATA 0x00010 +#define CDNS_MAILBOX_RX_DATA 0x00014 + +#define MAILBOX_RETRY_US 1000 +#define MAILBOX_TIMEOUT_US 2000000 + +/* Module ID Code */ +#define MB_MODULE_ID_GENERAL 0x0A +#define MB_MODULE_ID_DP_TX 0x01 + +/* General Commands */ +#define GENERAL_REGISTER_WRITE 0x05 +#define GENERAL_REGISTER_READ 0x07 + +/* DP TX Command */ +#define DPTX_WRITE_FIELD 0x08 + +/* MHDP Firmware access functions by Mailbox */ +#define cdns_mhdp_mailbox_read(__mhdp) \ +({ \ + int ret, empty, val; \ +\ + WARN_ON(!mutex_is_locked(&(__mhdp)->mbox_mutex)); \ +\ + do { \ + ret = readx_poll_timeout(readl, (__mhdp)->regs + CDNS_MAILBOX_EMPTY, \ + empty, !empty, MAILBOX_RETRY_US, \ + MAILBOX_TIMEOUT_US); \ + if (ret < 0) \ + break; \ +\ + val = readl((__mhdp)->regs + CDNS_MAILBOX_RX_DATA) & 0xff; \ + } while (0); \ +\ + (ret < 0) ? ret : val; \ +}) + +#define cdns_mhdp_mailbox_write(__mhdp, __val) \ +({ \ + int ret, full; \ +\ + WARN_ON(!mutex_is_locked(&(__mhdp)->mbox_mutex)); \ +\ + do { \ + ret = readx_poll_timeout(readl, (__mhdp)->regs + CDNS_MAILBOX_FULL, \ + full, !full, MAILBOX_RETRY_US, \ + MAILBOX_TIMEOUT_US); \ + if (ret < 0) \ + break; \ +\ + writel((__val), (__mhdp)->regs + CDNS_MAILBOX_TX_DATA); \ + } while (0); \ +\ + ret; \ +}) + +#define cdns_mhdp_mailbox_recv_header(__mhdp, __module_id, __opcode, __req_size) \ +({ \ + u32 mbox_size, i; \ + u8 header[4]; \ + int ret; \ +\ + do { \ + /* read the header of the message */ \ + for (i = 0; i < sizeof(header); i++) { \ + ret = cdns_mhdp_mailbox_read(__mhdp); \ + if (ret < 0) \ + break; \ +\ + header[i] = ret; \ + } \ +\ + mbox_size = get_unaligned_be16(header + 2); \ +\ + if ((__opcode) != header[0] || (__module_id) != header[1] || \ + (__req_size) != mbox_size) { \ + /* If the message in mailbox is not what we want, we need to + * clear the mailbox by reading its contents. */ \ + for (i = 0; i < mbox_size; i++) \ + if (cdns_mhdp_mailbox_read(__mhdp) < 0) \ + break; \ +\ + ret = -EINVAL; \ + } \ +\ + ret = 0; \ +\ + } while (0); \ +\ + ret; \ +}) + +#define cdns_mhdp_mailbox_recv_data(mhdp, buff, buff_size) \ +({ \ + u32 i; \ + int ret; \ +\ + do { \ + for (i = 0; i < buff_size; i++) { \ + ret = cdns_mhdp_mailbox_read(mhdp); \ + if (ret < 0) \ + break; \ +\ + ((u8 *)buff)[i] = ret; \ + } \ +\ + ret = 0; \ +\ + } while (0); \ +\ + ret; \ +}) + +#define cdns_mhdp_mailbox_send(mhdp, module_id, opcode, size, message) \ +({ \ + u8 header[4]; \ + int ret, i; \ +\ + header[0] = opcode; \ + header[1] = module_id; \ + put_unaligned_be16(size, header + 2); \ +\ + do { \ + for (i = 0; i < sizeof(header); i++) { \ + ret = cdns_mhdp_mailbox_write(mhdp, header[i]); \ + if (ret < 0) \ + break; \ + } \ +\ + for (i = 0; i < size; i++) { \ + ret = cdns_mhdp_mailbox_write(mhdp, ((u8 *)message)[i]); \ + if (ret < 0) \ + break;; \ + } \ + ret = 0; \ + } while (0); \ +\ + ret; \ +}) + +#define cdns_mhdp_reg_read(mhdp, addr, value) \ +({ \ + u8 msg[4], resp[8]; \ + int ret; \ +\ + put_unaligned_be32(addr, msg); \ +\ + mutex_lock(&mhdp->mbox_mutex); \ +\ + do { \ + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL, \ + GENERAL_REGISTER_READ, \ + sizeof(msg), msg); \ + if (ret < 0) \ + break; \ +\ + ret = cdns_mhdp_mailbox_recv_header(mhdp, MB_MODULE_ID_GENERAL, \ + GENERAL_REGISTER_READ, \ + sizeof(resp)); \ + if (ret < 0) \ + break; \ +\ + ret = cdns_mhdp_mailbox_recv_data(mhdp, resp, sizeof(resp)); \ + if (ret < 0) \ + break; \ +\ + /* Returned address value should be the same as requested */ \ + if (memcmp(msg, resp, sizeof(msg))) { \ + ret = -EINVAL; \ + break; \ + } \ +\ + *((u32 *)value) = get_unaligned_be32(resp + 4); \ + ret = 0; \ + } while (0); \ +\ + mutex_unlock(&mhdp->mbox_mutex); \ + if (ret < 0) { \ + dev_err(mhdp->dev, "Failed to read register\n"); \ + *((u32 *)value) = 0; \ + } \ +\ + ret; \ +}) + +#define cdns_mhdp_reg_write(mhdp, addr, val) \ +({ \ + u8 msg[8]; \ + int ret; \ +\ + put_unaligned_be32(addr, msg); \ + put_unaligned_be32(val, msg + 4); \ +\ + mutex_lock(&mhdp->mbox_mutex); \ +\ + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL, \ + GENERAL_REGISTER_WRITE, sizeof(msg), msg); \ +\ + mutex_unlock(&mhdp->mbox_mutex); \ +\ + ret; \ +}) + +#define cdns_mhdp_reg_write_bit(mhdp, addr, start_bit, bits_no, val) \ +({ \ + u8 field[8]; \ + int ret; \ +\ + put_unaligned_be16(addr, field); \ + field[2] = start_bit; \ + field[3] = bits_no; \ + put_unaligned_be32(val, field + 4); \ +\ + mutex_lock(&mhdp->mbox_mutex); \ +\ + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX, \ + DPTX_WRITE_FIELD, sizeof(field), field); \ +\ + mutex_unlock(&mhdp->mbox_mutex); \ +\ + ret; \ +}) + +#endif