From patchwork Tue May 17 06:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851948 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 F2F88C433EF for ; Tue, 17 May 2022 06:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240209AbiEQGsC (ORCPT ); Tue, 17 May 2022 02:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239615AbiEQGsA (ORCPT ); Tue, 17 May 2022 02:48:00 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2084.outbound.protection.outlook.com [40.107.104.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D3E645060; Mon, 16 May 2022 23:47:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VOxMpYsRzcj62TaXGNKZoj1mPxjNHWDf4MGspnAahJ3n8kzKOh2h13W5jbbjdkAL6XiSN5zicKM/9yyEATO1yV0KNPXDiiNShlBS0HpkV7OgXZparVrY4fPazkgTua9j12cBykGssOQYVvLcdz3UFsBHByBrwjDhLG4TiIiNP0+0LcKkBolpKz2CheO+/XUwNS4YKU5J1i0YRUZrZveVMMUDJZUGBbc4Ysl7uMWBSaQr60SAn7vSQhheGFPWyk/sFrcw11+EhE/0sy5sswYv2sZUHnCZLka8gxOI49w59iroRSqtLhIKvxkewydw/wTIuM2j25ush+pUYJXMeJO9Rw== 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=nBJ6N5+W0sIpUXtUGdnCD9H+FmqUaDWN+3rhFUIF5js=; b=lQQHvMNUIMKdJZMUswYYXRvMN/v9eI+nSGlLvsVR5xKS8oaJv8k8dS4ggOOt2pUCJ3OLgNfvXzv6YcqoXZFTWpp5QC0kQX0AXiGyUhVSA4AfAnDoEd2qvrOLIiM0dF+UW9xuWkdJjd0+eVnsw29R7vmkVocG30Q7ekKsNv/D5KKFZMlBoYOpj2bi3qyoW9AdFoznqT7NBp5VFD/Vmf8avQJezastW/NFZVtqFeqa1ITOb9Ii+MnzfQjS0xUUDHqKp65LdEBmEjR5RvrSVWuvxwXIAio/LOuY6ZAj7fEbwvRb0e2upNLKMiLAOfvkmyV9c4vfsmRVszEKRuVi3CKAfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nBJ6N5+W0sIpUXtUGdnCD9H+FmqUaDWN+3rhFUIF5js=; b=XpgW4D7TGNrrV0wq1ApA0XZ4mij5TYEGhuH9xWTbJv8L2IwHfVX2DQairpoYaIlLxAHQGs0VXGxjiqjAM+tmVBAXRSGOwNDXUdCtrYLbgQ/YahmAsWpei3ZNN9Oy0Huw4czmpfiHI5i7XUjxQY5Mkmg0l2XpeftVCztqFkC3eNU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by HE1PR0402MB2697.eurprd04.prod.outlook.com (2603:10a6:3:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:47:56 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:47:56 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Date: Tue, 17 May 2022 14:49:32 +0800 Message-Id: <20220517064937.4033441-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2a8706d-bfc8-47f5-52d3-08da37d12c47 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2697:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e8EPm5fO5Pgx3J0WIW7sTE72W1JZsMLOH/QpA+gUAzkYIpIo/WG1gOjuZt4Cn+ZAEeiKMBMP9zY+shPY/Og8lGYjEheja5qK8dk+p0pk+1xOlf2DDURzv3DY3I45pn3NJBHCh/n6DHzjVqv8A20+VlRSwGipy13lQ2zEL2RS+DQ6lLgpKr08gvXSzY3RRG3siTrDcp/00Nedwpch0BcgCC14b8JBep5UlxCwiM/MFHnncemFwsd8uRdu9EoRJ48SPEhTByx4CLEKIGi5kHrFERgUylWtLQ5/m43GC8e4kZz+3yspBo8S05AAcfMogQyyaE5Zuz0Rtu02hX0JYfG4lENtnTgW0Ui8I7sQCmZvCCC7aBtvqOpFhidYTElx68Q6F7j9oVevQUyzDErcKrkYEP9CSnWQy/+8bcRNdFcwlmbAD5u+y7aSd8wUwFmkrJlJ1C5cTc1ycMSuHsvuM1JNuzeO0eEOWx7RM160JhY1SrZR+JfzeAvLvfxCmEyDzm33XTLx2CeORDrPrNnB7Ycawb2AjIbKgz7Oz2GeoubxUbKwrzmEeCuH6oqJsXtbcqAPVm/QMxHLkH90ZaVFkG8JUZAfcET9HjXhEwB/+gM/57R0EDz5lsF92IcNM1ILqR8apNyeb3EnfxKaY7u8OQ+oBueFb3lab8lyU5G9Bc80ObEPIA+stOrLnd+BCYd4AXkfGc7o9x19E4UCpY2WBqzjFoQFjDlLOJKyfWCkAj0x1hY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(86362001)(6506007)(2906002)(6512007)(38100700002)(6666004)(38350700002)(52116002)(316002)(8676002)(4326008)(508600001)(6486002)(26005)(66946007)(921005)(66476007)(1076003)(66556008)(8936002)(2616005)(186003)(7416002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HRXtrRNF9cQUfo8/NwZzDnvzKpNhLGZmRyfuqo8FJc6Ph4M4ZzjHnrNjSHSLrZnlrC80zYalk9iPkkUPR++FTGgSCy9uPE6RwTVpua+l/La+1Aa8fuZwJYu85hGJ2YiCnJtYgr1Psybz6HQWQOYwZzoiFd92Z37ZhfhZuuDfDMWDg+05pKCOGkxW6wWeyfd8jxD2h4UYaydGV8yyHEeWgJQXiS0bApdunJmzxo8IQmjIUTH1ihbMYtYEFXMpNB4KpY2mIcN46BxdBs4dHIiOr5BP7cQrMH5NT/2ALQzx5ZgTVD5QNG0JOLmF8VZlkh1eES5072J5deO1RNfFlYARUEDAxJbKrc1iicwzwY2nClGqPPFR4MZ62LIiO5f3OeMUFlsQ1YZOpn7/xfVJvZ/IZ2pp3UBwnSup6sY5l/JIbvj6otdG0RP++S2sZSpeh7L+VoOAa1zTRYW/DDpym1naltJMV4hcxhnRy/YCnOPkSHq5bnk/aHDGCUGDvmFavFO5DbS/XJp73Dz8+rlMUB2xip1f+u0i0HU6M3wFh/KkOE0Y+8461OsiEVCS87phY6Q8dxesYGSUFOh2GQnfkd0BXnRwU2BbqIKo7VWbMzpwknhp3QKdpfccGefkeMmgFkZONsZURMFn7SMvZHSmIDW70GbfOVWIrBXp28UYh8tWJiCfZHkzaExUmHBYjyPZzACbYJfibjZQOI3SHEvZLxWjm25Rex61qOVRlzBDjLM+Yr+omCC2YDRXpRrIRg6j9H/Z+x4ceNpaJXnH3uU8zI/Wtst13R6evLDe/WB/xa+jUxTdpj5KLqjk4QexAB8JVePmDi+uRiIIhIYLvXT/4YqJAXz23e783Vt+7Bqn43TP4P4qQEM3TZv2RAP66dldlFep/N4wcmwoU7skscU3iJBYGPxkvCgaUkJRT5AR622pUT/ejmfHgb62FuxOqpupcykoVCbW2j6hYsuFOQS2qfHV310VQ/Ewc6egpY6ePQAH3JwK8suuGOjZHUmNedDGqm3ewEtn66fYmQGzG5rAeB1zw7HaETrThZZDalFNzdJsKV/vlBLdIrzVNK2Az4KHkxpp7B7gl26NDQNYh+Fp+EIwkCoeZPp6BrskBJavm9Fpo8VW5jys0FSO1vjYIVmD3pBGPyNR4iM52FPXjY4LvFPNWxNbuN0DnIkZSzlgSjx8jx/qAtme7OMsXnePEfpQuTKDdWPJ8YOQoundL562LZ0MP0A2djb0fk/aWLdx2kVDZyz9+UrbX3/tiZ0uN8fkNxrOpzYzyqqQMM/g4h5/2uycs7ZD3SnlsdKVyMwsYpsuQMJMC1gVJKRzX37QEQRo2NajfsCBLS8Jxrqu018G/hL9AVKQMtH8qJhXQ1INbD8gbWdzGsBbmUuqpJjHBxAeaCznbOC99QAkYUKCJbnwK90G3qf1xHhqvRuvuBkAirQQFjdf38ePuCZYhpUzcjNR3a/M1o31na5PaydY+k0PLradvQkQxhBeDX4PJk4oNIPEWZgNdWf8JPp9CllzJ8U0WAFnbKm9PGScUuE2E8HpS8Y/Eg60ESOjtwrYmzy9cljTMSDq6TsJNfy30NQfq6qPHAmzGR8s/uNT9UML3CEqg32Uxmc57LEK1VWsT9v8BSU5USXSU2KfZibNJGKfHu6MIb5F1e9hskPI61Coq3YdR6K/GhXHMYVzpJ5t83Y4yuk+iVFWjTIxTjjapxjbznlllMNnuhk6PMUcDxGh1vjSsZeCeQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2a8706d-bfc8-47f5-52d3-08da37d12c47 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:47:55.9254 (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: KyzpiDTRfvTWsMwafGsuTS6sBMfSH5Vfe9o3Zc24WJShYV0lwlV/3IAYIesmwJZize38cqnsiBK1RrOwFm71rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2697 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan Add i.MX8QXP compatible Add a new property fsl,resource-id for SoC which supports SCFW. This property is used to check whether remote process is under control of Linux or not. Add fsl,entry-address to specify the entry address which used by SCFW to kick M4. To i.MX8QM/QXP, when M4 is in the same hardware partition with Cortex-A cores, need power up M4 through SCFW, then M4 could start. So introduce power-domains property Signed-off-by: Peng Fan Reviewed-by: Rob Herring --- .../bindings/remoteproc/fsl,imx-rproc.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml index 3a1f59ad79e2..70322e57b6ff 100644 --- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml @@ -22,6 +22,7 @@ properties: - fsl,imx8mn-cm7 - fsl,imx8mp-cm7 - fsl,imx8mq-cm4 + - fsl,imx8qxp-cm4 - fsl,imx8ulp-cm33 - fsl,imx93-cm33 @@ -54,12 +55,26 @@ properties: minItems: 1 maxItems: 32 + power-domains: + maxItems: 8 + fsl,auto-boot: $ref: /schemas/types.yaml#/definitions/flag description: Indicate whether need to load the default firmware and start the remote processor automatically. + fsl,entry-address: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Specify CPU entry address for SCU enabled processor. + + fsl,resource-id: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This property is to specify the resource id of the remote processor in SoC + which supports SCFW + required: - compatible From patchwork Tue May 17 06:49:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851949 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 804DAC433EF for ; Tue, 17 May 2022 06:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240232AbiEQGsK (ORCPT ); Tue, 17 May 2022 02:48:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240284AbiEQGsF (ORCPT ); Tue, 17 May 2022 02:48:05 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140041.outbound.protection.outlook.com [40.107.14.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 293934506C; Mon, 16 May 2022 23:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e4NwxJ1bE7ayqMeEHOqpQ0FpGUGOlzwPt5gS9g3eRww6+qRT5ZWjKqnXI2LsCb5FKBKLM3IDMNSJNKlwZIoJvPWWJecpBfgDBbjogdqDLAziZ9hjfVHLLd82ftKZwltlrOQIdiVy0s2/b5sUfTzVpAnX/jCnKgNX40YhhMm4fiPlxATur1qzD2GAjcKeRh3Chs4VRq6v+98LLhh35eAu4dl7aIgTlnjBbOxMRQxZjgMyJ1+7Acx9bDIh7p68uDVFxqeZQCq4nVxLyoUKyD038BfMaBMm981yRj8ITGGX6SC88LCjwoVCuqThDmWuYhR7NjHXudxN3gs0MoevV4NCtg== 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=0LTRmW3FdXQ9htHY7wyw2zraFCLcc7fpw4cOPtZaCS0=; b=FaN68tej/rcpSqz+iUYoQl7b+FZJ3e8bncXijzWY+oG9ByGHPjPper6QGO8C+BOKBptj6Uj2yKKJUbytDsW06MLXQgbu4GD5SscCkTYowDxw16/3PZbiBpJpiwddiywW8MYYwncY1vxkFHDSiLhZS5TCz4/tvAEiJoEcINGT2V+A/BNz9K5XwXKs+nmZw8zu1IeeMY44zDDPUVSRG2yB8oriHPbMaW6TNsROqb/0plaJIsyCTctt2alufsVXTuw8PuEvMlTjCt/Ca5jT8nyjLHzWkJ+0g6YzncczY3BdVwfMvSX0xONEHeASt9SotpO9lgktYaQSeICNxGsNVlh2aQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0LTRmW3FdXQ9htHY7wyw2zraFCLcc7fpw4cOPtZaCS0=; b=g1KSZkJwFMCmpqcSxAXvjcuarf+0VWpqwiAJ8TztGRdRltiRA6l+IC7/1zVCzi9Q36Aq/P2m6farQCYt/kcioBSMfHuCtvaUbtpmYg341DLGuq6BZVJBY1T5J3gf/0xPuogHccXXnOHrUzJP4bTgb9WOF/YDbtJimtisVQpy9tA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB6PR04MB3157.eurprd04.prod.outlook.com (2603:10a6:6:f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:48:00 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:48:00 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Date: Tue, 17 May 2022 14:49:33 +0800 Message-Id: <20220517064937.4033441-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c3b7b591-c186-4e43-1960-08da37d12edc X-MS-TrafficTypeDiagnostic: DB6PR04MB3157:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulf7B5DrqWmC4bg7QmNPRF3P2zpFX8oSa1i+iripXNii1vZ7M+8Asd+YuLhKZws1+k814K4wSapLcHQikrB1wxitPF3dlG1WtSt32rFqg24X4gKnDao47QDs1aoj9ESxCQECd11YOtUe99uFHpP9o5A2Z+kyChhit/0yOTwilWfHCPX0jK6+/Nb9UpcQpRJISlh/QBP9Shb/otXpmZobBiFj/8U4rdRZbgtFBcWSmueDIF4CdB5Ue3JWEqaILfwZ7TSLoYozkyF7KQlLgfjzWtHit0ZuH97wE4BOFFnfoW7trZiHvplZS/PaiS2qT+Iar73w3iKrV/P6tv3ahpOPSVO6Et9I+GM4/HrWsI2227vZw2ZV2FryiNuPVbETGrZqFJbygjVLu1ST5dxoZvu3f+6pZUH+pIlRxNeslXUq6Bbc1XmgHwIzfcRYQYpyX7NCl1FVpERNDhwSW+HkcwJm12hf7A3d7yHnGNcsG9gbUHt6gYf9DXpNVGMcKH4CF6JwgyHVptyzdkf2E9NZZioAcXhex3k9597w50XT4UN1ifW3dqavYOn+sA4RboA3tgkW8MuYldIn5jVLAaukRyRgCqHQ6GHgMuuHgm1an/UZW8Riiw6/kz+8m6YNT4TY6hSuXgrMgup0sTZt39f5EKwsTtv4uOR8NpCDfm4gQNlx/kZ3eg1AMu0Ep3s5wCBHOTigOIOHcs5toh89UmcV4zJnpr49dSFg6/E9ejBmDQSD8yc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(86362001)(66946007)(66476007)(6666004)(52116002)(1076003)(6486002)(2616005)(186003)(7416002)(38100700002)(66556008)(2906002)(8936002)(921005)(508600001)(38350700002)(4744005)(316002)(26005)(6512007)(6506007)(4326008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qfcB2pSXOKOCniSF1lVsCi9iup4LmWAyBklIbegKRAXRXglLX4kKPfML8ynd9yqwyaNjezRUK2Yn019TYNaz4zpJcxM1eGO2EbQR0jkP0+NyjM3JVTij8j0BGcrZwYNSgtiIBBFr6eWiszhPuQDT69QIdxQ0GClAvDRdZ72PR59z7L9M6J5H4os8vTrFxFW7xyHQS/rYQEDMsC+u/EvcblQe5IMfv6+s41JS2Cj8Kkn4EhOXf3fhZpEAoN+YkfdoimwYXr3QVX3xe0pQUv/rh6Vi4tsPq7GiHaO57pn2axU/HVMu3lxZwfraqOlO1VvNrodIEMQxeewNzao6nR/qLO5++eGpowk8lZqMSaqc9GtuoN0GTQrTUpJ/ubCjLv+FBBn+7Vs0uzmQs8ntAwlR0siym3JbwFb5v3Lk+Ybk3+mPuUIxdCOvaK7DAbYiBj3qWXs1OYdcLSkWPV+/pgE4jxK/H/A8lH+AYDEoyMJYKPZ1mNCfSYExuz8/fmHmRlQSaeQCZCmQDcLcTP0O4pT+NV8wtcRaEHe4TxzQ2kGPFdGjDu9foG+ZmlVcSn9JEeVIu+nBpbTIx5kciQ3avtpiC6VduSTC0QmORNGQnHJ8cftaA3yikIdU+TDKzVysFblD4haJl0i8pI0bGZ3nR92BmcoopfuMNOF/rYXdepu9hMDj9v9rWWOzjVc1NE33rr0cjdMYcTOvrR3ec70GwrKG1mD5gNn0CSOpdq2YgNzZ6qK8yEFly+THCp+qGquvdXA2VVt0r8oMPyF+GEsvRmkK4baBdGyMphBut1KPzYvbCoS2xdYKzlp+6WnHav8O2YWmUpf5CVxAZBByqAukuGcAhvsDElsxcfuj1QgZq66hDoL7rvRh7kgb84vhi6rwVoHQPVVItI3HzrkUQiyUwE6dqkFe28RGgsb8Yg4A594rX/yzg8GV/Y2DdE9YExY66Fw0lxb0qhdgckayy0aIsWGIbO4NrrfRgP9Fm0ce26i0aI97hiGcVotS98c3Q+T+v1+a3YSJnIBgj2B3yNbb5mkxFEL17LU3t3B3FjXUgt97N9QOnmHDiorzLrCr0CytAwjRVoXuebK87wXln79yPNEtHzXpEt09ErITSflQ7mdjS+d/l8SItjrUXKF6gcsLKP73EvBGVryvwEWKThk6nakKIo45Ps7x3a5Ut5zn5xr4MUny/76lmbieI6kJ8BjfjbTpB5xANXuhk8MEmcz1aEogOcsbSFS5Q5VZ3wg99DBf6hcC+WP5+5HyJTlT8oWL169Il6Xae5sX1YwKG6F3cr6YinI3tSgCgnGowQ7SxIGsGLY+k34E3127wVC3PSKROoicmlLREkT2VnMpPCFOFlKABvsSA4xhTL915ap/jhEIKWcX6mRzlpqz4HVl9bk2cPhvN1yjLTWkPIEgmsxQZR1c/8Ev5bWTiqOEs5U9jk3zgi034K+YNoj4dhtF0PZTW2mjClG5bI+SLsZUfRze10dHOMfsU6/Mo6/nEjQVgkDhLWFogkX2l7Elr7l8qQH6PEJFxjDr6N+jzXu5jSrUkQff4cRGPAdHvhVv99cbDM3lvOJHYS30/UIuRsBf9R/pdOMKKlc1HWvNE3tLcK8c3h5+TBL1mC8mkv9OJ2HRdmPRaYpX6O4ONDQIhiGaQyHGiew+2IThuZXktcXbp2SB+UP5r4OWswonV3Nr8ou2YevXodQnD2dfH8J4uF1Y/RavUojJXq5pzip+PFPJAo2TSwIT+Q== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3b7b591-c186-4e43-1960-08da37d12edc X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:48:00.3496 (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: 6JvAF13BB6NkN/jUxEZ4aNm+3lO6q8LHA0nE/bsJqoN9c5kN1ZumpWwOWWznhrvQgqWhZIKpw1Jx/nyQvW5p/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3157 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan Add i.MX8QM compatible Signed-off-by: Peng Fan Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml index 70322e57b6ff..64e783234e38 100644 --- a/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml +++ b/Documentation/devicetree/bindings/remoteproc/fsl,imx-rproc.yaml @@ -23,6 +23,7 @@ properties: - fsl,imx8mp-cm7 - fsl,imx8mq-cm4 - fsl,imx8qxp-cm4 + - fsl,imx8qm-cm4 - fsl,imx8ulp-cm33 - fsl,imx93-cm33 From patchwork Tue May 17 06:49:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851950 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 819DDC433EF for ; Tue, 17 May 2022 06:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240509AbiEQGsZ (ORCPT ); Tue, 17 May 2022 02:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229708AbiEQGsO (ORCPT ); Tue, 17 May 2022 02:48:14 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2070.outbound.protection.outlook.com [40.107.104.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CF7745501; Mon, 16 May 2022 23:48:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VDfZ5MUfE9x2Q8Pmz7k1Ri6ObJAsxv03sSYpL5T3TIF/uHYzaRuW2owkYkJNsuGpoSWTyNQhoxZ2hVsl2VpGcszCKZ8dBtd/paH9Fc5lmv9Uqdos2yXJXCiPgKU9Gdru1THzHqDILe1bDDeB2RyBmeMZF78phb4fkOqPyXXkQNdmEqx7YdwNUyvgKh6NqSJ2AIlrUWBBqJUbG/Cut2cuGRYKcdcZSazQcAGZj66ajmMpT9U0dPf0bXRKAVeUxk+rFwx9pbWC3igWyvZ0QHKiCsUPqsEcSVu2paI4ihg9KY4VtrpFNFoDMIl/RTlGMD4OLIYfQZ1IyKmKil+lHgAYZQ== 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=bxcF2hjHTnS4H6LCIJ38mZBtW0CJeJTzz6kD1KSz+5s=; b=JVp1xEulQaxEfQ4bXWnodH7KvYM4XiuiVSykuTxlekZdFajfaAMuEg0IrBoj5vSCTaZ0aKPzOOqSsgiQZj3gx2MwABLhD6qC4MGClpaK6CU8au0eVit49gtGKZWeHyPnsXlzuy2q6ivNgRsBSPNoUZ6PDFc9LP8oXjy6MYcGBnE/2KLzW1d12hAWcz5+A7hpb6Zq05FLDwdr/lB/i5Q5QGfC1nsGc7bHPqf1/16sjoVcMzyeU6des2A9t5NR1PcJu62+1zZIneaCd6je/3mqy1vCa8inaWCdIc1ikUVJbYkQOsaKC1rulaBp4e1Ve8SeahLhGO8CdwkX03HvOd5yNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bxcF2hjHTnS4H6LCIJ38mZBtW0CJeJTzz6kD1KSz+5s=; b=fwvvZJ+Z0scsaNthRFQ1yNMksFe5wPKcMunZ3M8S2CfMSEGBXECnq5iinEnE2XLBTF3VPCkrd5WUJE5XXTon83nK7DAzueoCuyGMqm4saZYAS0MAUcBhSIIASrYxHZu1514qA2/TM3vSUEJkqj78KIwApIFCgFQhWGQJ8wnepnY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB6PR04MB3157.eurprd04.prod.outlook.com (2603:10a6:6:f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:48:05 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:48:05 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Date: Tue, 17 May 2022 14:49:34 +0800 Message-Id: <20220517064937.4033441-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0600903-6e21-41c4-95ec-08da37d131b3 X-MS-TrafficTypeDiagnostic: DB6PR04MB3157:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uOtwQ+HxN8ujWc82x6BIoS/qvR8SNnjZgDdBu8yLy3Aa7KHnVitvATuV2gjC1yFlaaXItkUxwt6rVdWgzXd+xYHdyh8cDvmvyddBTYoeMpgijCUEmMYYxGHTLHsKPGj2L43wdsGnBS6CMplrirmR/s0noTp72hw85otuWEii27NKwlBfSptjDtCXMNqGZ1xUZHvmF3LRR3JZcgRLJiGPAv0ecQV3MTQTjfR/04uJjX41RdRw7YJNaJY3Oga+O8axIIL6f69cnZJrALE81M3W2LaHD2TMt1eAuQceNUzo3rhIzbWXnZ5iQzGzmV/bSBeJCqCQnHQJGAxL86hX3mXVatuHRAnm9NjWodY8C9njCYtJJCTcIAo44qkkm1yXRW5AgUA42roiFk0W4itM5Ogy2obtJwE0E+cDs7SPlks+8ME8vSxut2va2PzEggjdsBJANfmVAQVznOZ0ftEc19CUXo3JvyVpZ8bY0k3d9l5vUBxHLISNWbPLFmCZkJH0QCMP6o9txsMHmfBhnVd+MP4rvkpxYMUpLmO025fQ2PlNgBRCveouWM/2etpE5EdcP9rI7c8PPZH8g0DD27m+94eeLBZhCvDldGAwC/YU/ofLR4V7SXNrI9qOGADxATGeO/p4ITvSuk83rWuPhCiflcFqlIT6zIss3cpxnYFjjRZAC5aQoWtM7JCAbB2Ny5e2Tf315muywUGkvlpg/7DiwuTznKWVRn5qBuDYsBlVqLlsV3U= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(86362001)(83380400001)(66946007)(66476007)(6666004)(52116002)(1076003)(6486002)(2616005)(186003)(7416002)(38100700002)(66556008)(2906002)(8936002)(921005)(508600001)(38350700002)(316002)(26005)(6512007)(6506007)(4326008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B+9SaT/vyLv1N+egPn02TreDa1cwd7g0xitrI93s415IZvMF76TzbmeY9zFjo1gVnHRbURf1vWketWML705Rg4++os7tuDuaGS2YCJx48PeMRDH48qBxRUaDzRR/wgNm8q1YKVoUnNr3qzfqND7QAPDe6uR5XoB7UagfxrXFeyXAfiwy3YaSGjM9YnZGrpOtkR/YFzlK8FVKkF8e3Qtm7ZXTX8J7PeCkYlm247PQB4Db7SRQ2CThYA4xIreehy02WZ3A/BDfmw4pNYhHdSV/uSRdKfP7ZEvzdU2ZgjjKyfFO8A9rbRVKt+dcDwLtfd27mijUlia6glG6Ofia8a15W2RujYOzTTEIfOA09n05n3SlHr72lUtxOH9SgmxA2sDz7XYJ/yGB9eKKzZZQ5KwC6LLRXqcvyhZ4Lm6DdcML4qTLrDB0QTY0KOZucb0NjcAar8WSGUW18r0JT+l6k0DOx0x5tc0yIoEy6hqMn1605i5Ye2eoBPT6UfzSJYVlWljHxXtjwxqR5VxI4ht3RknGQoc1B1Y/fDiD34J69Yw+y655QvUeR+rvckjD5Eo/ZOMCdCTIXk7JjmfdsuUCWl7YHWi5C2iObz+CvDe6Yq5lS96vVcM3v4IN4xgdftBQ/GhPzT/07T02tSdkr/iUI8G0wHPJasiPELiDcPgw/CPmp4TqMysxxIsfc+6Wz9AHQDVUvrORGd2aUxJN3JUl4kKDcqzVfp7fjO3mludf9TCFAl/URhbRSB5SLaqB6Ou1uMZ4BekpV830TsXP0149vCpRHNNSg5tSbpU4/n+5KvI/LTFeqOvpBqcivaz4f41yiL8Aj3JMM1OGuOCqiwZPKZ/k5rRcmgIdnduG2cptocJ2vS8HgP+AGMi0se8zk9Hg52HGVi+8N48arZB8gBXN6fZojxRqa8fnqW4ArzzHUg2Mi1B8rN6J8ch1NmVBaZsMVIPRcYZmjRmtlSvjjGYYbmJN2bzV3mc8uxSnB9lvoXmhLR+o4hG1UCrYl/Kr4I8LhtNc84NTubFSHVfV6xxMmOKrkCy/yTQGViq4hroq/2O50lf3mDX98H2vjRpK8USVVqFrZCFb2OxI4l+5vkIymf4AOmNlhyegdJu1aCKYrPtAB9ZgaSWe8LHXxRU8f1tdIRAH1S9I5Te4dPDx9iMhRFgHjCAAdXggixB1/Ei8VQu8gfBBXQ/OXjEIsV4npSTKp8gPU8OsSXPtFlC+m/rpq4bfanQiOsn07DEAkiAJZE0zMU7K2pqmOz4R4nAmxGZneCM+L1g+XsrkdYkIfzefFc0hkwOI3n5YmJrSjfCfkScbCwUWl4U5H/liymy6PoFvIHX4r0qjbmQdsTuhQPRjOysZxAT3aJNTdcbs674wPdTjQRwnRAw+nOFcb21L8fIb05AriYeGqYF9fC2Jkc/29qF7/l1XEjVRxzwlZn2VTmSqn7HLMbDEjgKi56e6Pd5N0fxWiz/OmsgoLIvFFX0JmS2L+XAN/bwZqLfp18iBIDqBG6QhluIh4OqmCrvUFIfRLeXGTWQbquGydJNeSJhiKob7O3rTDA9qu229cNRCDb22aSSCgWxuUTXGixxpw6+zkh2jorYwwOXsSryoD6JdfP3sCTXP/edtrwKAUCjC6O14fZbtJkiQZ5V2k5KhJZL4heZ4eo1CtDoHchGlv7WjMfRzrEN+2NXJGm50oPHp2no0JyJz7F2Fxgd5RAD19Umh4H5EO8F/W4uWFRA1OhSSBmLuuw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0600903-6e21-41c4-95ec-08da37d131b3 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:48:04.8829 (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: DF73OjL+1P89kIX7hqTA7UlCx9Ys6+PbF6YKbdPh1pYw1FZVFb1DqC26fcZkp9ELuXplgWY3xb4lbh9aUfdzEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3157 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux could only do IPC with M4, it could not start, stop, update image. We disable recovery reboot when M4 is managed by SCFW, because remoteproc core still not support M4 auto-recovery without loading image. Signed-off-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 4a3352821b1d..2e751fc90760 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +60,8 @@ #define IMX_SIP_RPROC_STARTED 0x01 #define IMX_SIP_RPROC_STOP 0x02 +#define IMX_SC_IRQ_GROUP_REBOOTED 5 + /** * struct imx_rproc_mem - slim internal memory structure * @cpu_addr: MPU virtual address of the memory region @@ -89,6 +92,10 @@ struct imx_rproc { struct work_struct rproc_work; struct workqueue_struct *workqueue; void __iomem *rsc_table; + struct imx_sc_ipc *ipc_handle; + struct notifier_block rproc_nb; + u32 rproc_pt; /* partition id */ + u32 rsrc_id; /* resource id */ }; static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = { { 0xD0000000, 0xa0000000, 0x10000000, 0 }, }; +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { + { 0x08000000, 0x08000000, 0x10000000, 0 }, + /* TCML/U */ + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM }, + /* OCRAM(Low 96KB) */ + { 0x21000000, 0x00100000, 0x00018000, 0 }, + /* OCRAM */ + { 0x21100000, 0x00100000, 0x00040000, 0 }, + /* DDR (Data) */ + { 0x80000000, 0x80000000, 0x60000000, 0 }, +}; + static const struct imx_rproc_att imx_rproc_att_imx8mn[] = { /* dev addr , sys addr , size , flags */ /* ITCM */ @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { .method = IMX_RPROC_MMIO, }; +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = { + .att = imx_rproc_att_imx8qxp, + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp), + .method = IMX_RPROC_SCU_API, +}; + static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = { .att = imx_rproc_att_imx8ulp, .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp), @@ -683,6 +708,22 @@ static void imx_rproc_free_mbox(struct rproc *rproc) mbox_free_channel(priv->rx_ch); } +static int imx_rproc_partition_notify(struct notifier_block *nb, + unsigned long event, void *group) +{ + struct imx_rproc *priv = container_of(nb, struct imx_rproc, rproc_nb); + + /* Ignore other irqs */ + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED))) + return 0; + + rproc_report_crash(priv->rproc, RPROC_WATCHDOG); + + pr_info("Partition%d reset!\n", priv->rproc_pt); + + return 0; +} + static int imx_rproc_detect_mode(struct imx_rproc *priv) { struct regmap_config config = { .name = "imx-rproc" }; @@ -692,6 +733,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) struct arm_smccc_res res; int ret; u32 val; + u8 pt; switch (dcfg->method) { case IMX_RPROC_NONE: @@ -702,6 +744,51 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) if (res.a0) priv->rproc->state = RPROC_DETACHED; return 0; + case IMX_RPROC_SCU_API: + ret = imx_scu_get_handle(&priv->ipc_handle); + if (ret) + return ret; + ret = of_property_read_u32(dev->of_node, "fsl,resource-id", &priv->rsrc_id); + if (ret) { + dev_err(dev, "No fsl,resource-id property\n"); + return ret; + } + + /* + * If Mcore resource is not owned by Acore partition, It is kicked by ROM, + * and Linux could only do IPC with Mcore and nothing else. + */ + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) + return 0; + + priv->rproc->state = RPROC_DETACHED; + priv->rproc->recovery_disabled = true; + + /* Get partition id and enable irq in SCFW */ + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt); + if (ret) { + dev_err(dev, "not able to get resource owner\n"); + return ret; + } + + priv->rproc_pt = pt; + priv->rproc_nb.notifier_call = imx_rproc_partition_notify; + + ret = imx_scu_irq_register_notifier(&priv->rproc_nb); + if (ret) { + dev_warn(dev, "register scu notifier failed.\n"); + return ret; + } + + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), + true); + if (ret) { + imx_scu_irq_unregister_notifier(&priv->rproc_nb); + dev_warn(dev, "Enable irq failed.\n"); + return ret; + } + + return 0; default: break; } @@ -855,6 +942,7 @@ static const struct of_device_id imx_rproc_of_match[] = { { .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq }, { .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn }, { .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn }, + { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp }, { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp }, { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 }, {}, From patchwork Tue May 17 06:49:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851953 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 67D96C433EF for ; Tue, 17 May 2022 06:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240465AbiEQGsi (ORCPT ); Tue, 17 May 2022 02:48:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240417AbiEQGsP (ORCPT ); Tue, 17 May 2022 02:48:15 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2070.outbound.protection.outlook.com [40.107.104.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BB0A45783; Mon, 16 May 2022 23:48:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cMv8CQzmvQE50dbPMIJWfOwMcklV0+ARoD+H78VssR3kWRvYgmNMTwnGA70SteBKllxunIf0QdxneKJ8KoJOoQj/JtIfDEzQ63j1+QA+/d1B+YhutWHk1q3aNr7ulxaVC5CcqhlbeBDbICX9obt/j5PhPD95gxGtDLUYJS1e2wtZJi1bALbxMWjP7zHbyzssgz5qgFZNaeyIXPj0P/SQz2ajlkkzXC89yMARxiKT48jqrR8Ruv4BOsQDNmhsJmqYcoWN2+f6rihDBhnYg5ERg6WnyLsztelng4l0BDXGIWWbsn1RknoC6zaJYt2EZ3k10lOR8fhmWYtht2Psc0uipA== 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=XzIIga4SKH3PAi57EQES3x6WD/56ITSVis1y1OOLy80=; b=VJgNUpQvPmAufI0+MF5s9qLzJMAD+w6/MnV5Ev3aE+voINW2rUBhFNbUWhgrx4s28f40fECNHx4u3RdtahhccBuSFrY/sJ+dFkvrsiAnB0sbUiJaNw+uo/n/wrLQQ5cy+9B9lo3Pe9IbgtSmC85AFoGW6Q2uMGC5Revr8tSRn8q6a6vlQHVdN1Oy8kP7k6b4vldd93kS3EHsU9qgHSWx3UrX08aHV5XHnkO2e/g+VeBzHniQsFccliLuZ7lnvJ/FzGc1F+t3O3YmfUdij+aULu8XVTsEE904xqaa/zt8yYpIMXM3gCDLZ+pEz7o3J/0fjgCe9xPNNde7jTi0/6PKPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XzIIga4SKH3PAi57EQES3x6WD/56ITSVis1y1OOLy80=; b=mxKYkVoCJtWMMGL98+Wu58eIRINt5Iybj72/LoZGosMuAe3PfRmbJkhwqMPV/eJKPonuZbJPaZod6QYpJ3El4XheA6ovLyZsuvd0OFpws6nYDLWitJ9GQT/6P2NRkFGYidKfwm/7Jli41ZnodP6acO9KkcvEmpajCQSdOx7o01I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB6PR04MB3157.eurprd04.prod.outlook.com (2603:10a6:6:f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:48:09 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:48:09 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 4/6] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP Date: Tue, 17 May 2022 14:49:35 +0800 Message-Id: <20220517064937.4033441-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36a491fc-be6f-45e7-cec2-08da37d13437 X-MS-TrafficTypeDiagnostic: DB6PR04MB3157:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gL0bJycpoEVmmZljhE/n8vDHi/Gdbl033ElNd7sxl8Pl6ACJX+KD+B1/qrFnBp6t3TE+u7K76eFp39KejlF3XB4WoMwrAEXw60BACCPl3tp8Rgl3PG4JVV0bZQaloDpizid/i7qMiAVnt0IROU3GZag1NblDqisBAI6YpyQ6PdlR2e/LzTFFp5Pkrg0c3mCTOsZeyyQ1vxr5k81wjDnXZTeTr8dqkDuaIRx/54JMDjsjK6RMerq6luIdrvt+32Ij1tqqJdjSMnKDd1kH7hFiPsEEtKp8qRWWGXXFXuKaEWH9vCqpbQM3BesDXqUBzvQyjU1KsDAxYkYKu8BTVZFXEitkzL8oBPAo11k2w4C7RJtVOwj9Ko81gtjRhq+avG3j7O/dm6SZDVpQt2tMQz+xeIZP9KKGyw4Hjd+Nx8kOGvxj+0dVk99gTwq0iLnpeU3O/08Fa6DjvkN29N57Z9h5wjwShX1BZ8/uH1G4Yl6KhFwSU1uXqHXDH/ZUxhzze2obdKwEWAF5T6Iqim8kpVyH14R4VcWNdd64HSmWYFUsHP2eAD0eDi0uBmdFSZePVByoZ+owNrqnXtovjmA+KDAwFnaldaw+2yDtB9fay3Kpf4FGhNy5HqYwrY/yQxX8bUkP2Ds4ogEghxftn1RLCXfR1XBDfnzbg85BqP1oLuHZnLhQ5TC1lMAa1p4eVR5Ob1mEgTxIhK1nULLc69ScJbj2qdC1UzoDb293fUjcNeXiaFM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(86362001)(83380400001)(66946007)(66476007)(6666004)(52116002)(1076003)(6486002)(2616005)(186003)(7416002)(38100700002)(66556008)(2906002)(8936002)(921005)(508600001)(38350700002)(316002)(26005)(6512007)(6506007)(4326008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5UEF2fy1rfoydAejEQZh2rbua3H1a6WQPawAax247Fbbiq1K7zZFKWGlRLOp4oLioZaM6bjtkRBM6HGdy9IaI+bwjhryDWYlpMHMdyyHjTB34rrpSq3fcOaU8cD35teLr+jOR/DqNniWOYQMUt7z+FfaF6xtClF6TnaoMhMVm1q53a0Vmj+8TVXxU3H8WCjG7cFdUvh2q3/wWvvBTefAXgmA4PJpcwKWoH/QiuvhWUYdp+rsVpAxir/5/WSSnYn7J4VKAYBBU9rCGQPpLqhhEKYfXLbltj1wQ+rn8UD/8p5tO9zLSj6eW2ORFknleyhFrF5Gu8jOERxa3uckvssE4Fsso/kP26JnzMcmjMdj+l8coZyX5VMi0jOafIpEbzGHnxCqkPj7WqrYBWy/iFnfHz0MwTaNfoI8wAhR5LO3YhuZBsBrruQzJgUf70fW4h/1FlQPgAO6OQ/PoFzTxNtvFmCjglL+uXRx7ptiygZCNauSTl4/Hhv7keoPuB6HgULqAa4Nzany0Yn3MvhtLr6M9DL1CyTKaY43pt04lfvf12g5XFNdnTQC4Wy/1lOgJ17kdL8My5ug0LxujytC8EmIFIMJ2DJLOTAUfln6x1uQvmQDstXFvxqrAOZ7Sj3MjBmbgj2ss2cjCV9gN8/kBbBfJuh8vcZTE0gnsNgmVDjUVCduuX9OyCWmRfur4C4/tzehbW7iwkwL6Ph+VRdxo5OOvBqIWC0f390qPLl4MVu5fcIsGRaAHDBHZl/jfve1c3uEdlvIYrhTa8TIipY+TZ49MRVHb5nIem06WMDZ9oh7cWCMRwyjqzPEmnqK+xB5QamnL76BiGWYiaXp5Vov2hF1Bfhf3smBDzWBGVgFLR7BdoY5Cky36vzcA5cGBhpUoCPd9zGk4Xg1eGv4at6gp+SgKcphvTo4MKygA+A3b0Ib6I91rDzMF5ZOyLdkRWxbfnNqjCyLtj9mqqIHQkDCiP0SFiF+4qb7ti1nucttdBCHp23BWoS1Ucf5v2gt4prPF9xLLPIKNBSxEg2lBRfNbMQ37Wi4wSMBuiQ0apBW/4iQhpbcigjsqNmMsYrIzcHfGBVVyqmG2Mdt3mWq5Xcd45cUl9LQvyN1IHEHg1AVoltUoVAm6KgkD7kt2wITnPtuUBAFiq6dkIcxxJq3AAspUHMIVsONdQaWITIYu8sQpTBIU4PE78kMnq8Tx7FEDac53U4RiUkPHtltdFgcpfhfq6BFq81TNAMf/xKxnMUxxmUzY36eIJ9CKwLK38BQFCBtI01FRPrzsTfHvR+cU3y554vBMbZMkb95XeIp5HaCs7o25+KQNT0lJo75g1RckhgJBuqyslIp/lTFPQN1iZYu3JDHTfShDqU9EUjkBrywKb1GcxogBui2U4r8INLVTB2pcwiBhgOIEnIl7R5hMTJQBng8ylyMfpCzDP7ZaZf/VVNaaugMQ6MIfL8ON5bs818e/afKC5x15W4pVWlBr/N9CGeb7VwjX3b2TF/1Aiy8Qdy+CHU5UQxyDvVEo/8gfg8+gv7xR+lvKnGSs+AyCZLlhV3/13mX6wrPcTVR3n6GcP9ka+onnAxTqsSN3KEPz+2xdJXGZDZc6zN1xUqmXXhiiMT7BBRY2NS6w3XRepwEWePvHPG3UdOXkpoKxopsesazUZf8mhmXD/MscO7YXXfVKOzxevAZ0ZUg6q07gGiMsmL13SVPuiXmehSsHRxLRbFQc7aRiEJvzCZLV+CscKTK27EIuA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36a491fc-be6f-45e7-cec2-08da37d13437 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:48:09.2455 (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: ww1N84zVXRaGyIL1WX6cdI4zch4izf4kGqckSf9xFGd9biQlCevhnJymYB/0qKtz39rGhWX7x/ef9hmD17x5wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3157 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan When M4 is in the same hardware partition with Cortex-A, it could be start/stop by Linux. Added power domain to make sure M4 could run, it requires several power domains to work. Make clk always optional for i.MX8QXP, because SCFW handles it when power up M4 core. Signed-off-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 69 +++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 2e751fc90760..49cce9dd55c7 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -96,6 +97,10 @@ struct imx_rproc { struct notifier_block rproc_nb; u32 rproc_pt; /* partition id */ u32 rsrc_id; /* resource id */ + u32 entry; /* cpu start address */ + int num_pd; + struct device **pd_dev; + struct device_link **pd_dev_link; }; static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -335,6 +340,9 @@ static int imx_rproc_start(struct rproc *rproc) arm_smccc_smc(IMX_SIP_RPROC, IMX_SIP_RPROC_START, 0, 0, 0, 0, 0, 0, &res); ret = res.a0; break; + case IMX_RPROC_SCU_API: + ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, true, priv->entry); + break; default: return -EOPNOTSUPP; } @@ -364,6 +372,9 @@ static int imx_rproc_stop(struct rproc *rproc) if (res.a1) dev_info(dev, "Not in wfi, force stopped\n"); break; + case IMX_RPROC_SCU_API: + ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc_id, false, priv->entry); + break; default: return -EOPNOTSUPP; } @@ -724,6 +735,56 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, return 0; } +static int imx_rproc_attach_pd(struct imx_rproc *priv) +{ + struct device *dev = priv->dev; + int ret, i; + + priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains", + "#power-domain-cells"); + if (priv->num_pd < 0) + return priv->num_pd; + + if (!priv->num_pd) + return 0; + + priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL); + if (!priv->pd_dev) + return -ENOMEM; + + priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link), + GFP_KERNEL); + + if (!priv->pd_dev_link) + return -ENOMEM; + + for (i = 0; i < priv->num_pd; i++) { + priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i); + if (IS_ERR(priv->pd_dev[i])) { + ret = PTR_ERR(priv->pd_dev[i]); + goto detach_pd; + } + + priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS | + DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); + if (!priv->pd_dev_link[i]) { + dev_pm_domain_detach(priv->pd_dev[i], false); + ret = -EINVAL; + goto detach_pd; + } + } + + return 0; + +detach_pd: + while (--i >= 0) { + device_link_del(priv->pd_dev_link[i]); + dev_pm_domain_detach(priv->pd_dev[i], false); + } + + return ret; +} + static int imx_rproc_detect_mode(struct imx_rproc *priv) { struct regmap_config config = { .name = "imx-rproc" }; @@ -758,8 +819,12 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) * If Mcore resource is not owned by Acore partition, It is kicked by ROM, * and Linux could only do IPC with Mcore and nothing else. */ - if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) - return 0; + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { + if (of_property_read_u32(dev->of_node, "fsl,entry-address", &priv->entry)) + return -EINVAL; + + return imx_rproc_attach_pd(priv); + } priv->rproc->state = RPROC_DETACHED; priv->rproc->recovery_disabled = true; From patchwork Tue May 17 06:49:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851951 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 35E60C433FE for ; Tue, 17 May 2022 06:48:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240490AbiEQGs3 (ORCPT ); Tue, 17 May 2022 02:48:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240498AbiEQGsZ (ORCPT ); Tue, 17 May 2022 02:48:25 -0400 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2070.outbound.protection.outlook.com [40.107.104.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53BCD45077; Mon, 16 May 2022 23:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gp0lKhdYhXAWfFFB735bLTjoV3VYr2N8IM/XhPUXEBF4T9Gmw2SUM1ADqybkZ2r/4nBf3Gwdpag+YU9QbBS05xN7aG8d4LL/TWFmX4Mcr4WKqrDB2/SIxMDPOPkIM+ydea4hIKKbUzxhp7GDykOvLmPaAuaMO9alDb5Z8tnG03ET4/x6xHw78XJyA5UdtPqFXsygC0yqdGQ699BZqtApOAkitoSnyLlsYiqbxV5aNNuuEhOn9g8xfK5+mBaESodnlHb8OpWQjd05QbmGE2ElQczNXpUa1WIycoW4glRMZdMcOzVuuHVX4L/mmR9WC+sJg7xzmehNi1DAKEo4txlyng== 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=FZAm33iGvkMlh6uUBGRS/NdPZnoxf1Hy6yiwq3vkeEE=; b=oKcm55QwxmfoDWePCQINBSYAPYG7E6d0qKsKBIkIBeNfICH8aIv9rFRWIKBkpZAJqFzTsiFnMg+rleAhoEbxIeAZ53XjlHSZB7XpZSOYL57meXuaYWjcgJFOw3ywsy03T1eH2KDn+YyHiARj4GkyWcr4jaKMiP9joOUefyDegETZEIHDi17UGEMWhdI5niZrg0IFMLzbFoTn9MYYexPtK0EQ2mebAq03vJJuTzaJvyyYDpcWHjQEtNZo6qbb5FjkNVT470tVyH9EmWeptPBIVOvZe2Qh0EVRQxC+z7GDh+tkGpG0LKghgC59EKn7aqRJhM2jIPzAudgIQsQKVRIWEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FZAm33iGvkMlh6uUBGRS/NdPZnoxf1Hy6yiwq3vkeEE=; b=UMUiEvuy39jTZcqya23dHpYSlrKQerY6F7JXuLw5ljPfyoEJNMhTy5soCbDxkLGYSvpDcrNCb9xpgDTu7+x6vKfVS18Ng65zWoIWDXb0zf9/CI7nS1VgOMWcYZjPthGapejO3gSf1QfZcb+6MBWIj0cQ+kMQ0is9pESEKrBOMZg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB6PR04MB3157.eurprd04.prod.outlook.com (2603:10a6:6:f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:48:13 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:48:13 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 5/6] remoteproc: imx_rproc: support i.MX8QM Date: Tue, 17 May 2022 14:49:36 +0800 Message-Id: <20220517064937.4033441-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8e199b5-f477-42a0-faaf-08da37d136c9 X-MS-TrafficTypeDiagnostic: DB6PR04MB3157:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ae9g5lG0ako7swd/nA40kM65Q2awxbqfljxExOrG0suSZxveuF1Z86AhsU7LC9wZiP7Y0B27MVB3uxDOZjDwePJYZtjNFwyKR890kztbUKgI2NgUN+kMpfRiQZu7DoE6Cf8fbYCcwH9w8pLLPOMGz0zwcFQ5mMEkwRhtmJao7wQ3rRsRBzwYQ5fZh+qzNRzzNu97xsUPbDCGHe1hh0XFZnpTZj7TGCrrstzH1sOO2gPlHyGXhqdQRb9jlGWNNiV+HpHqHVvQqnFixTsa8Jkx/FkswTl0vOWtrxfu0DWGnfCG/JMxI/M0CqwxSW2D3pLw+abtfouFuokkElL8yDVa/e6eBjlTSRWqO9rldAgp10ECuCgyjDQkEw4VNAcEEicL3Sa8/Yb8+GoobHXmIEf7chGORwu7YLJhnu/qsf73JR7zRch/hxtU9KiXWVmyLNlWLJJmDTUyTpnb2wsMJKkvfHAJ9cJgvCCRvclIj1DXZ4CIyrbU2SajNLlTsNVzv2fpH7t1Sx2cLz9cRERUzCIJ0jTdUasL7+abGyPxrWE4TQkKyooay54pkS/ZD1B/juZYDe5nb2xIvcDF1BL+a8jDmt9SxWaTvUDer4OLv0dViEXGee18srSzuP/cazmJ1rcce19JIcVqYbtuCzByubB9WaNtr97faKJLiGCoaKA2C2gGtufsQ0oNe4BteV0lU/GE9U/MRvFsQGarQA39XXbKeqgsCjOMeIBBSDFC2bXj9k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(5660300002)(86362001)(83380400001)(66946007)(66476007)(6666004)(52116002)(1076003)(6486002)(2616005)(186003)(7416002)(38100700002)(66556008)(2906002)(8936002)(921005)(508600001)(38350700002)(316002)(26005)(6512007)(6506007)(4326008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O5YXjrrzY2QcHaMj2x73nD1iwa40L/JhuarBkAu7ltC8IBM9jn3PJ0mlQ6nYz5eECYagNrAuA7rSO4GNjehGLq6fVpmqdEcoXjIZaOGHUnb1A6/T+f7NZItdpeYa2xOvPKx0BfLyqaN8mvIlIDgoU/b+NB+K4RwU7p5ftn9RoChp93eLfeZYR8RyL/bWYEMh2dmd56YWqaJOnsm0IpnboQ2FDq2eixdpoWhKbsYYtPdYpKP/uFXH4pfueUbY8cbCRSwJQmQt6tjPHDR8KXbjBOD7p4Faw9l7kYCgKXAA928ymnkPPGWATgOOKLzIA7YgNdEG+/yULPmuD5Wp7d7+U8/seEX8NmmLBPh8h58HzExoFTm/8ClCjicrY924jAowluJsba6GG4F6BWaljBt2gzWS/ndOu3H7a303dTh8xVIfNwKj3xpfeapgSDyXlbUv1NuvLx7L2Ra6KRN7ScTgvI6leunVqusFgrAAJJ3fZjEsqQzZYbin5Xrahk/z1ronJWr3HHNmaJFsb6M4IpWg43SVYCbYjYozXCHXPg5+rYfkI+N5IXKyp28wzxIaO8vNcNR6ziZnq5T0NmidwmeDztPemYTPrwsOpc8KppAH1RpeeDjhhCPNUEJMFTMB/679VTbprwBP4XnSr/Nhbe1AGZzhtx5mYC33XCiensnPVuGgbtKZkwkf63EqXcMePg868sgyCR5/56ZLABqcDL4C4GYbIBmXsg3TYIge7UxYNvFA8yPpFHBQllVPyOXHpLVkyLCQBNMfOwVq6on3NyETf/L8LNLGwDtKpa5GPGr6JuN80EdJAAPR4Ad1fLoL7Kg98BnU8SxqdCn11T60eiA/Tmd3Hj21IrDaR8zOQ7r5KBFoEWL07Odl1g2jvxlhz8uwqIQ1MtGENH6+T6TmtNzU8oT0nkZyqBcCMNcn7zFCm8QnS1smY/DC5F8De1QTZEfaAb8S82/CChtyVO4jIPGhfBV7TIb7W43Yhap/i1amwRaxBZGNhg9xRQFE3sF3teF0InMA7qVvSyYO1eJr3Ns36TIroNgLJpsfmVLHanktbzDPvKeAUWB7JBL8LvhZPB5DpBkhn41+lnt40Dy/a/CnkY5tYB13BG30cSVfmP6NPRpdpMIjB59XwElROQXkTgmfpskAiLqBBqL5Cdcl0VuwIE14dGirZexTDyQsj+Pl6XpsnKo0dF28JZE8q86ylvNSHN3WQECtyyOgOntaoVmC3sVVz5fwtRWvGd+1sPXP53Kt/h7SJYfvhSppIhxbUrsq6kwgenjNOb3Ia1nca6NAQP+7XOQjQYYZmEEj5kNt30BaXLiUArG8pl7uy6DX1uLVMBbtg0hw4BLuoTiEm7zaxWFkzJQ70nvsUfbTTdB9FBxt87dlLqbtUVXx6vyMkQHKKsHJrfsgZQLB6Y5ZvZ7tTUis6XmM/dkPfetlYR+jPHkzjQEbmUAJKSowglJ9nGbSdd6DnKbqN0YjSQc/PQePR9RWIzUoYVZV4n9sCM422P/jeH34Smu/EVT+oLjNh2o0Ci8RGf/FsA2X3ZGLPGXA4U2JwqGe0UVteBFkqF6WlA2cGCVuxCJfKOzaoQWfAnedwodayDRKxa3QhLsO6HyIl1neGdYqWo5OyLHAD5GbfrNzDarOsy+D2eOe5hkBO1K5q4DT/450IC8ElgMsej1WLeuKEiH7RvJ2acll+cZvYy1kqES3YX4oCBM4Muty1Kq3cl5yf81quBRvUDlAVAgccA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8e199b5-f477-42a0-faaf-08da37d136c9 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:48:13.6057 (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: 6W79IIrmKk1I0FRrjPjTbivFN9kDXablkI90g1aL0OUYBck6XdTubvIoEpBEXqazIG5QxYIvk+dDxQWbDOI4Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3157 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan Most logic are same as i.MX8QXP, but i.MX8QM has two general purpose M4 cores, the two cores runs independently and they has different resource id, different start address from SCFW view. Signed-off-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 41 +++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 49cce9dd55c7..8326193c13d6 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -3,6 +3,7 @@ * Copyright (c) 2017 Pengutronix, Oleksij Rempel */ +#include #include #include #include @@ -75,10 +76,13 @@ struct imx_rproc_mem { size_t size; }; -/* att flags */ +/* att flags: lower 16 bits specifying core, higher 16 bits for flags */ /* M4 own area. Can be mapped at probe */ -#define ATT_OWN BIT(1) -#define ATT_IOMEM BIT(2) +#define ATT_OWN BIT(31) +#define ATT_IOMEM BIT(30) + +#define ATT_CORE_MASK 0xffff +#define ATT_CORE(I) BIT((I)) struct imx_rproc { struct device *dev; @@ -99,6 +103,7 @@ struct imx_rproc { u32 rsrc_id; /* resource id */ u32 entry; /* cpu start address */ int num_pd; + u32 core_index; struct device **pd_dev; struct device_link **pd_dev_link; }; @@ -129,6 +134,19 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = { { 0xD0000000, 0xa0000000, 0x10000000, 0 }, }; +static const struct imx_rproc_att imx_rproc_att_imx8qm[] = { + /* dev addr , sys addr , size , flags */ + { 0x08000000, 0x08000000, 0x10000000, 0}, + /* TCML */ + { 0x1FFE0000, 0x34FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)}, + { 0x1FFE0000, 0x38FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)}, + /* TCMU */ + { 0x20000000, 0x35000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)}, + { 0x20000000, 0x39000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)}, + /* DDR (Data) */ + { 0x80000000, 0x80000000, 0x60000000, 0 }, +}; + static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { { 0x08000000, 0x08000000, 0x10000000, 0 }, /* TCML/U */ @@ -279,6 +297,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { .method = IMX_RPROC_MMIO, }; +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = { + .att = imx_rproc_att_imx8qm, + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm), + .method = IMX_RPROC_SCU_API, +}; + static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = { .att = imx_rproc_att_imx8qxp, .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp), @@ -395,6 +419,11 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da, for (i = 0; i < dcfg->att_size; i++) { const struct imx_rproc_att *att = &dcfg->att[i]; + if (att->flags & ATT_CORE_MASK) { + if (!((BIT(priv->core_index)) & (att->flags & ATT_CORE_MASK))) + continue; + } + if (da >= att->da && da + len < att->da + att->size) { unsigned int offset = da - att->da; @@ -815,6 +844,11 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) return ret; } + if (priv->rsrc_id == IMX_SC_R_M4_1_PID0) + priv->core_index = 1; + else + priv->core_index = 0; + /* * If Mcore resource is not owned by Acore partition, It is kicked by ROM, * and Linux could only do IPC with Mcore and nothing else. @@ -1008,6 +1042,7 @@ static const struct of_device_id imx_rproc_of_match[] = { { .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn }, { .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn }, { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp }, + { .compatible = "fsl,imx8qm-cm4", .data = &imx_rproc_cfg_imx8qm }, { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp }, { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 }, {}, From patchwork Tue May 17 06:49:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 12851952 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 D65FBC433FE for ; Tue, 17 May 2022 06:48:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238671AbiEQGsg (ORCPT ); Tue, 17 May 2022 02:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240528AbiEQGsZ (ORCPT ); Tue, 17 May 2022 02:48:25 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7164146B08; Mon, 16 May 2022 23:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gw4Onc0YGP0g2dAOIWEQjysuH+5k9ZKxpddmfOzdcDvMc21gp3drXTv1DgJZx1SQRNXsGLuC1ys1FPrVUPYOKJDRILSVqiB48sbDkVIbw7iSR7/i0HkCIJ3vwg6VqYBThXuDrWDd/We9m7zv+TDTMryuMbBtcLyz4/Qc2Ue3XOxKktVtqGn2bPllZVNTpHlFJnjOgeIf48ePWdQHORJ7F+zuoHHBoPA69nGbF0CsuSiDq6yps89DupQjVDnNxP6MmTyR2U8iYNZ2ZzO0uDZJEettiZbXD2gdcCeawrDM6RSfayLG5vGBPuQuFWzFqYbicGGbUGdOLRkCaYu7mDO3Mw== 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=nVUlkDzaLXjx+FjJJi1SM8LUxfuSsRJdEY4yS/AYgI0=; b=CgqTQbUUmzRNdywtwKhZIx1zpZ9D5g3KuRcqld5X8iMK/AEqGWfvGoTOUbxoMRY8HBzDNJl3nSB8GMSI5GJnJCw7zbL3YUuJxDjpbkkU0r0npKuFD20/6Oh1xxhj41xA3yAIoYkprfM6lAQUZtGttKl54iG/jMxlKpqjh5sc9JKI3EuYOyoqIW6qy7HABqXPZ5W8a9QBQEAllSg2G+Ubk00qoers4uMZlryckU0jnqiGZTFZFkgArbL2TjYzB/4UtUyFbgVBS25Y8rCtvfsbO7u4zaop6UpEXvQFvkcUuZvT+kyNqra6GrKp8yZLQ1cNg3N56YfB7QBsiH74yg6Lng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nVUlkDzaLXjx+FjJJi1SM8LUxfuSsRJdEY4yS/AYgI0=; b=BhEEhKNyjlwkj6RqKbx7GprhoZRwyu9mcliBZsEunCSEmViDi7jLLQL0gxDW1egn0PaKlFpvdANs3X9S3F/qr0YtakjIlwR/W1gFYeV04Itwg8Ydb6VsXIAwO9F9GvlfuWfC3CavVF8l6JmUUFh3mxylXBb/5KsgsHZ8UAPF0LQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by HE1PR0402MB2697.eurprd04.prod.outlook.com (2603:10a6:3:e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Tue, 17 May 2022 06:48:18 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5250.014; Tue, 17 May 2022 06:48:17 +0000 From: "Peng Fan (OSS)" To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: devicetree@vger.kernel.org, Peng Fan Subject: [PATCH V3 6/6] remoteproc: imx_rproc: request mbox channel later Date: Tue, 17 May 2022 14:49:37 +0800 Message-Id: <20220517064937.4033441-7-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517064937.4033441-1-peng.fan@oss.nxp.com> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2P153CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::11) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52e33be8-a22d-4c2c-a198-08da37d1395e X-MS-TrafficTypeDiagnostic: HE1PR0402MB2697:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uXC5nxrB3OG+OKjKj0t0uGFJoPKc2cZnpfJpbz7Dw3PiOH0/eCyOwsPH9zP6cBo1kR5PnOy2IZmlfBx1COtarOI058Wk2QEWkRvW0bPl/tERJcaN7Z7LzKATaAXGnlpQzLTnK2RMPqO/0wVby3xwdZN0mG8rMMVd+2nmtSaNysuj0zERDcXjDULQgns+UxvVwtVRploj8aV0zOblPtE3ZwgOSTVSzAuQSCr/CWGxFmW2WNeR99uHnAC3vTR5962LhzFlMDu02YwcDjOVf6wO5I8B4PoBuAb2VedimC08AU/KhBLJm5MqCUJEBX4xFjFeXdCFN0taZhR/TCFWJato83zgKaVxxtd8pzBfsMSVidy0YS8uAqeRnHDR7npFnC9nYFIchuoLucRovqQXvkKSC7XDHqHy57pNZjs0KLS6m2Wi5WGPV+7FlZN3CqVd67uEMipDDlWGZ3kFYC9OIQl4hfha0q8wa62W0ZG+Bq/mdFk62U0SkcgXixplqaNyZCKSnP/1kypSKPz+e+hk4o954Lx0WE4mV4C79oN73ffVnOQMDHeO9nLcAhh6deLSL2DUKDbdQCmqCF9eW5DWXJjLSkgcMReSwycX2dnQAUtDwae1dsq2TfT0yoYmbOQGC2SL9EJJyF28tURpVaEdGIlRPovbsO1Gs5HIsWMaHXiyH9tEvLWmulVsoxSgZb+idtzrL/0R/xedWh6EUNHA2vcDzCFR7WQb7h/4M4anMYwKrw4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(86362001)(6506007)(2906002)(6512007)(38100700002)(6666004)(38350700002)(52116002)(316002)(8676002)(4326008)(508600001)(6486002)(26005)(66946007)(921005)(66476007)(1076003)(83380400001)(66556008)(8936002)(2616005)(186003)(7416002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0WMbisVCZ7pyKfphZlJCo1dgGmm7pB00vnm8tzTFMDGHpGyWuycM0ja1VaA6FhKMxCiUAXbrJxK2/PAeOsaiaVHKTf6VbzJ6E0Bz2h4VgWkK7OnK21tSVZk1CSM9P3440knM09NHE0M33ABdNy729I6ZjiZrNoNRBxIQC5CO1EOiyIW+gZh0IRctjBYwl2uB2rAQKLZHgAvDfvVTFXDn2X5PUSoxyH2DhS7GzfJMEsuPZkhpzyJ8IU/aC925JuHUMc0cmQVBXqTQA/craolIZl3qkVmKzWfYsPFj7BLQSgltZNUjvk7V6KR5gE0MsYrVm8xcceS0VL60KevqCZdddrhzSk0BWrhN/14FIVfzFZH3GeQ5gwHnM9OYJZiI7YAeiSK5vfmQ1AEMDWtmp4TQR4eGX/+EEtwXMP2c5hXQHi5+lMK1YYgjQogPK0/q+EYgVSHfNmKCB908EQb+5dGZc7zgTYquYdIva2v6ceQ+hZLX2kF5gjJG9Q70BdH2EKULzWR0MRVs8+KGENte5G0t/r/4DsgfztJNGYAHMpdOOauC/3dWlzxfGWvip+5hN/2gexGkZFWwhH1kA98URv3WDV926rHrkxYIBqznE60/pBCrGIrnWgvTU2n+oORXJshcQIt54Plh2BeFQoHKzkLwio+/htVfDVNl0hB/MMXZDrvbMEeGsU0XgfsbZodRLoIaEOs4C5OsZX+zfMB/dwRyYGa+B13B2l0WdmN65ObH+5c5xcgZG5txY1xPBUAKzothKEiSVz4oz5F6ZWdVHh+pIS0rntpW9edVnTvM99g/Gq0mtVsxkuJnIUu5r2BfluEfDHmQ3Tdz81LiF2Sjwhzbqq7z7mZ4LCz78FsDvlDBSfQs0aO+ruVxWSi3EtEc14T6uGZcRP3ykz22+B5hiGq5HYjnPPMRMuge4lATUpgqNefyBtxoXCbp2d6rtq0CRA5G87xzSOknm95CzMuvQ0ZVnnyuUhrzMdEkVIH0rUcygjaO/utsLqCI+QIW0mWCBFpKRM7TL1F/PEKeoDkMGmFqfSgK4rtqulEv+kj47gnATyzPrNkChTyuWXN5cDui0qDTQ74XhId+8/2DtXnYX1UF8/JNec1rt/s0GFTTry5cAvXqKIAVkCpTt5UNU8zuboZ2ioj40MEhlAUtMUnWEADNHJTZahKasuUC6N7T1Qc6EEcg5J5KIVP9XcuOmuKsOnzAXz7r6do1EdamAx8QFs8gvXQGKFpohcM6vesFuIT6iy9K/xiBbGCbNdOwlpq34FoxdnqscCcqGwNWqA9ZwhOZE/7OQIyUNbCi3oG7cQ/YHRGgKaIC/ZFBxrNhzDHJIzmhWOYFBD5BXedsAxPeQ9JsEu/6+LI8qQVh+uQYiQR2GmzzpntrNwLdk3GWT5AVYsoXTLFhNz3tyxq4WrsZdo+K5LFOC6ft7S7XZgqB56B0TnSl4AxbIOKRSJL2/3pQr0ZBFNCEok3td7+1KnlOSIdS9eLX741KUhcL7vY/xORYPcL1PC292TR7+nOIe3ZGGXazB4prCjL1Fkr1E1GLeeJkqrhyGokaB5f9cR7woO3Ke8w5+8PgKHDhMNDB7CgFsgbQ3VBWrfSZZRMV16rDdVgoKhFzwb80sovY4iqxk+Ji7G16ylLZWtfHZn/3/SypG0dQSBrX+y2kxuqRz5w6j52aps/K19+S7CbOWdBzXMTmZDaWedeRxQ4wS6yrl5XgdFEAdU+UQSUOI+urbEZAOsM+Lw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52e33be8-a22d-4c2c-a198-08da37d1395e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2022 06:48:17.9354 (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: zSQDx+p+ZN5ONlpbciB4c79b09lw87CEWI+F2trwYaM/cpzU+94gzDT+CH/c/vOLV3zd/cokP1KqruI4mCp4QA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2697 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan It is possible that when remote processor crash, the communication channel will be broken with garbage value in mailbox, such as when Linux is issuing a message through mailbox, remote processor crashes, we need free & rebuild the mailbox channels to make sure no garbage value in mailbox channels. So move the request/free to start/stop for managing remote procesosr in Linux, move to attach/detach for remote processor is out of control of Linux. Previous, we just request mbox when attach for CM4 boot early before Linux, but if mbox defer probe, remoteproc core will do resource cleanup and corrupt resource table for later probe. So move request mbox ealier and still keep mbox request when attach for self recovery case, but keep a check when request/free mbox. Signed-off-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 8326193c13d6..8fe139624ecc 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -84,6 +84,9 @@ struct imx_rproc_mem { #define ATT_CORE_MASK 0xffff #define ATT_CORE(I) BIT((I)) +static int imx_rproc_xtr_mbox_init(struct rproc *rproc); +static void imx_rproc_free_mbox(struct rproc *rproc); + struct imx_rproc { struct device *dev; struct regmap *regmap; @@ -355,6 +358,10 @@ static int imx_rproc_start(struct rproc *rproc) struct arm_smccc_res res; int ret; + ret = imx_rproc_xtr_mbox_init(rproc); + if (ret) + return ret; + switch (dcfg->method) { case IMX_RPROC_MMIO: ret = regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask, @@ -405,6 +412,8 @@ static int imx_rproc_stop(struct rproc *rproc) if (ret) dev_err(dev, "Failed to stop remote core\n"); + else + imx_rproc_free_mbox(rproc); return ret; } @@ -584,7 +593,7 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid) static int imx_rproc_attach(struct rproc *rproc) { - return 0; + return imx_rproc_xtr_mbox_init(rproc); } static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) @@ -712,6 +721,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc) struct mbox_client *cl; int ret; + if (priv->tx_ch && priv->rx_ch) + return 0; + if (!of_get_property(dev->of_node, "mbox-names", NULL)) return 0; @@ -744,8 +756,15 @@ static void imx_rproc_free_mbox(struct rproc *rproc) { struct imx_rproc *priv = rproc->priv; - mbox_free_channel(priv->tx_ch); - mbox_free_channel(priv->rx_ch); + if (priv->tx_ch) { + mbox_free_channel(priv->tx_ch); + priv->tx_ch = NULL; + } + + if (priv->rx_ch) { + mbox_free_channel(priv->rx_ch); + priv->rx_ch = NULL; + } } static int imx_rproc_partition_notify(struct notifier_block *nb, @@ -757,6 +776,8 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED))) return 0; + imx_rproc_free_mbox(priv->rproc); + rproc_report_crash(priv->rproc, RPROC_WATCHDOG); pr_info("Partition%d reset!\n", priv->rproc_pt); @@ -1026,7 +1047,6 @@ static int imx_rproc_remove(struct platform_device *pdev) clk_disable_unprepare(priv->clk); rproc_del(rproc); - imx_rproc_free_mbox(rproc); destroy_workqueue(priv->workqueue); rproc_free(rproc);