From patchwork Thu Sep 29 06:16:58 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: 12993542 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 8FB7FC04A95 for ; Thu, 29 Sep 2022 06:15:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234930AbiI2GP5 (ORCPT ); Thu, 29 Sep 2022 02:15:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234932AbiI2GPw (ORCPT ); Thu, 29 Sep 2022 02:15:52 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E760C128A38; Wed, 28 Sep 2022 23:15:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oUpa2nyukiKleDJo8bQ8HTNpoxtywxvCB8ezW89eJAanQ8Q0WqnYfPaRu9T0/9rv/M99CVoVzMYyi0aCg9kgRAXfKqm3ii2lP8T/y4cctGRV+xSdp7wdqRHV2VT3RUCNsS61ZltLBfH5vWjr5jcCLmX0YyBnHVB4rq2aD6RCAV6sKK00aoX0116B0p/C+gs2iFkWxCuvpV4jljpu0IAkUpwstxSMVEgpCIU6QHzA6RXIiJDWe/66NrnDcD1emYQSJbWIQW3QrADSraTLtqmXPYD7qfqAa+hlTOPnG1PzyP5tYXNHfIJOfFPs7VA2ba39phAQIo4APw+deMAUQOuseg== 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=05Sxwp2qiuQnWOyN46jehy6hs5jPcBhHTOijKpW514o=; b=NGvtZqG8LNAO5+dC2Z8xz4GK+QTrEC5LmwDHcYftNbiUxzSIuMSHiqB2CHgdkuEQLNiHYOpI7QD3+J+0xAriwC0+AUnJbLjZBax0wooKQyVbwFfmI6nExda5QhZtbUv6gX0RbT/d2BYLCOjTuzs27g3NNGUoQ4G9qjVTTDhE3RClD5If67KsEb4cjurUT2p3N8nKCHHAINuSKSPEgaE0pkic01khaCtrdokBQEydpKp+cYjm/I6/jduTKM25K1oVtTO0xHgtiBAB0Yf7eXDcsZnlWEEKtLA8SrV48vULlTHERsPBUXJ76jNn4+Ac9nbwi5bGYwfUpcTLF9Evk7WSqw== 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=05Sxwp2qiuQnWOyN46jehy6hs5jPcBhHTOijKpW514o=; b=icH6CYdRix+3TjrN4scjI2FWj4E6wIEjMtg5TqpTbw9edY74j9Hu5RVTYjwCsCEpEaLqNaWcLanUnSDkv7veOC9vN2Gw3rEGfScbTFMbsAf8VSwhzR+xMytCTJhlw+m6IyLoGHAsiaAMvsQ9/sZfKPoXdaIagI/7+qErVukDjtw= 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 DU2PR04MB8648.eurprd04.prod.outlook.com (2603:10a6:10:2df::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Thu, 29 Sep 2022 06:15:41 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:15:41 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan , Rob Herring Subject: [PATCH V6 1/7] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Date: Thu, 29 Sep 2022 14:16:58 +0800 Message-Id: <20220929061704.1571746-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8648:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bbaf077-77a3-4bbc-335d-08daa1e208bf X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VfNBNHYwNl5/WkpDASe7hON0eb8TnY2+Y2QfvNnRhUb0rAO4qD4zuaDI8AVCj3QvtV/JuNn96ukL+UA82m6T4U/cdcb9E/Y+fe9xle5dLsGSKLTxP1uxHGMgdl5Vi0Hfl2GTyOvNA64xW8vouOhgIX0z9Hf6+d4AbgrEXcjiXa0ZB5q7ePW7yM+TTT/jSNsRxsd0vKHEoBWdQBJ4MnB0YbF94k4/PpyEjUPhWTBgVuNbp879TIDqlJWN4wloxrZTtI6iN0+au3xl7kS46Yk4CnpCeS7jJPh0iOsHuxv/qQrLIfSMSHHb5pSfUQrCjfezbKCkf22rkHexcO19AMZQ4No5tOyPnjelIDuZrfTztxy7mZbTPT69qz//Wdjj2DXW0QEcXfe4S4Nk09MBQV1s/RUBisO26VS48H5ptpZozymAHf6uml/+XPDtfDILcdmeXA9PfZCg0r7fE/82XzVnGv9VR7BWR4ZkfW/YKPvwc0INcP5ltv6Bi6DGYeFauwyOdAubE3a77PaKXt6gDy8HPSsv7ue59G/zSJwB3mog6spygBg0glI4/3Ghx262SOmEUXVC5QMSretRQGR2l8CfGV5UEo3iRf646yPMgihWbquiL2Py0G15ef0U+lwtkGratmxEExnHJWoTHAxUdlihNL5jvq+ZqS35s3dv83sJh7n/MCwzqdFMALedU2k0C+1QFuRAPnCostHKhw9cjrCDm1umP56wByIEwnWjeK/lqAJQpu9sVIcwCY0ZIDNK9cMAoJKs8bObOlw7Qq3jtahRvQ== 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:(13230022)(4636009)(39860400002)(346002)(136003)(396003)(366004)(376002)(451199015)(4326008)(316002)(86362001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(66946007)(54906003)(1076003)(478600001)(6486002)(41300700001)(2906002)(5660300002)(7416002)(6666004)(8936002)(186003)(2616005)(52116002)(6506007)(6512007)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ylTUGOIjILr+ya1F6TZXUvPoyTycRSf2e8bmW57yfKTH2DC2YQCP7q7+LALCBGImuCmCjACLRFA2msRozh/0yjUXFconAaAu7DqtRe8QtQ2Lzu68fiqj81Qga7UXOtgy+fT2DK5I4D4GM01AISq3Bz24NuwrVd8C/ROsCfz+3jl0CsUb5eGB/lu8t4gq4S8zWZTEHMZWm5ZCkDjlxEYXb5Rz9Zppqvy/Ew0XT5EWqyZEGu/IUpGG7RAacMMSR/lzBb8Rr8Z3dzgoG5Uc/UPbPemhxz2uGcltgV8SFJ++DLwfJax9mreiwF7VL1Dc02qjCOE3rm7R7Ncem7aCpH5zjFNiUV0CKGlyl/AMSPRrzZSrdZ7BebzUOpgTiZ5bnAzYUgu7L6V1bhVbUzHlZNR+AnKG42Y4PBxk2lLG7eWsNvxXL7DfMB9E1/f7z8Zq0PUpJLUu69zhiEqps+C7TAJLnTa74Qj26+GfXsvdQOdfibFfDPve2Dgjavr0//OaMr5yQ8ErlZ1twcU0y285JRk18mwu3+biI7pMM+ltub4ote4e4rbneedOiCnVYzLoyLcfc/JUzxsfX2Ill4Wmjgea2IBJKSwbp1Mf9aaW2uIIpjHMDFZ/6vRxuYbGbuxuihD1qS8p5Qm8LxUyXxG4Ba3wjMKMhLHGHtnu1Z5VnOpU3Fozpg/+7YlsYi46v8wFq1U2TNHzxxwW/2o8xZdqEdIjmob3GUCg2nOymBkOJwANNjsiIpy4Xjin5i4/EMyrjNqAUorEmuEkzFh53d14Kvyv4bnCxADO22dkaN2xuvKmGyORQ5nOFYdVV4HG2PBsRqcOPndiL62sRljQrEdJb2v3LNzmUwSCQVJk+zrb66rodOG55Af0rKvg67W7ikrgIetS1Sea7e0hnS1IomigyTc2J0ARnP9WtoDrmWw8qJxXtpE83QhPg2ljzkAemfekuwO4JKMd58KXEB4GbBTqA56ZvEaveN2tvO3zhl/TnE6RtLhtVS+CPp/RbzRFfjzFrBVRsilxZcl0N54meAJfKsQ+oxHVd1e7/+OSy+zF7Hnb8K+C3pyu5mVIC3jcJY7Xe/2bmaUXaz5GdhzT/aCPXFbhQVRcRsBhN8AytvNvkihQ+cS1+XW6N0Iz+TR0377/Zg+RZPxu5CDimkX5gjTvfxcCQrdMEfXdABVxF/djVKBDawHTHbAB0Hn8f3VQRzfuwjZ0QvlJANmbDA/39l9nHmXgGADCuIAnOZqyOXY7n+ySDzI75VBYZrynod5xHtkE2p+sbloampMYmrOAPaPbWnrdIXVBO1j3S6YgCDrx9d2ur7d0PGz6wxs2lTAYc9xhE5WvCe6/Sugh8U3W1qFPBYanC1b45eAMN/Ba3bT1J8B6ZVpXc7GEPMBgjbrrWZ4wKfP+6P6A8ZtD8gM0ozcjF3kRWjotTO9xBcLA0l2jOrV1psGKZ+MRsGkBDP9wEeyOpQME6I9FjGS14VJJoNQ9Is+6X+AbBOKiVMrJOdQzUVljZqXmIYpBK+fK4vDZzG6MV5ZeezOC/Tt/w0N5hS/qKh4nul0kSKfBIrUu8oeoRwj2fPM85SK0qZdLL5fyLz2fOTMQ X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bbaf077-77a3-4bbc-335d-08daa1e208bf X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:15:40.9650 (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: DsOcvxYLghc6KdMxaGgGS+tUf2uB/qxONUjVngLRnlC3TUbMI8IFJ6tDg42ujc2sbcm3IA+vPXoF75a6j7TmrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8648 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 Reviewed-by: Rob Herring Signed-off-by: Peng Fan --- .../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 Thu Sep 29 06:16:59 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: 12993543 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 356A3C6FA83 for ; Thu, 29 Sep 2022 06:15:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234542AbiI2GP6 (ORCPT ); Thu, 29 Sep 2022 02:15:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234938AbiI2GPx (ORCPT ); Thu, 29 Sep 2022 02:15:53 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24E3512579F; Wed, 28 Sep 2022 23:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jEfHmwuqoJ1s0poR2d85881cZBPqWl+vRCgrPO15qRUxvJI1wbIzD/rgCEndLo3d8l3WroMkn4mab5tr4DZ5Pcyir1T1MIjNOcaFEFUVeqGEAvvB4pU9rXk9Tc8sb6A8sZqhtZeJLXavTppciqYct4TqGrWF0pp16F82teHB2IOvpDBNpn1/MubsshDnGEfqwr+u/x3rSzj+1mHPVr74z2mzztrfxFE5Fep5m5HKJCcqFD6bSA1V4z8ePsw4GoXFrWjabAKKWuihc+xiIGLH9aRen/pgJCzqeff3YWqKNdWt2OiIa50Qjcw0sbaiczsZVGgfg6CxL0V18ETNs3JxPg== 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=YYRBLRGVmW0aYEp0yM/gTOlzfxHZDMvloKUpivAqNLM=; b=e14EUs4Mu49POyIKWShoBNAToFsw9ZBs0vnmtdvJjmEMRMtvK2YtnJKtkE1tvQu37yhpHpQiIz9P/2XD+xqLfOrf7kZVhe5gVXVrAtekKBDL2H0L3kgXNAskHEa1a7BgRM86LTK5EnRBvLfG9+/HaYF1CKdhog/l/54uxads7QYHDn+JlfwxkmeuPkWdAFc36kiQyGO/eo8Oug1UOzezXm5qD7z8lOYQbGD/sd3tOtR9xKkIdcO7ROkQnaFIB68oc0ur9KwswfzSEF+jec0JjjSPSTf3+zkhKHBvy34UPjy3qTx7lNbtRJazzVFILnwA1xYn3P22gaSyYK1BIM1bmw== 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=YYRBLRGVmW0aYEp0yM/gTOlzfxHZDMvloKUpivAqNLM=; b=H8lRtMBQkl1pdFrks6WJoXd4ZGLg/wBzutlQ8bSVo/nrVBYE+PWG7QS8tRXqA0BFUt3T+9a0ulQU7lDXWs3CMlY55e5FduCjyOk91zXfCo8d9UygypMRLoaXEy9kLwN9Dq/BAGw30XPB4oGsiGuWb17F0BJHEV1mVyjKsTUTNmE= 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 DU2PR04MB8648.eurprd04.prod.outlook.com (2603:10a6:10:2df::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Thu, 29 Sep 2022 06:15:45 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:15:45 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan , Rob Herring Subject: [PATCH V6 2/7] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Date: Thu, 29 Sep 2022 14:16:59 +0800 Message-Id: <20220929061704.1571746-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8648:EE_ X-MS-Office365-Filtering-Correlation-Id: 36e8a3eb-3158-4907-8aeb-08daa1e20b70 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qZJRrTGuxu/MN9cTpJF7S4yEA/5YJSIckG3CSfP5NM6u8pN2cIXDasF4UD8DJWPn6CQPg/C5oANTOEohRuYdCfSSO/0q1k96kQCvVCp00T4G3aAbBhjdr+9GXyNHgPkd/r6HkZ8DhM8NPKSck70SWw/MFLaCRklrLtZ6YTJY4d9u6jXeh5glehS86lkFIByPnX0kp7PJRD3sZLNRfq62T3One50+Jib4BSJ+d4tzqwv3lQQg0YkjhCSrC1/lGfaPsmSTwph9/zHbaUAAUSG0b/epzp7fA/yMyJbxFMmXnTPho23BPeupwSTi1gLCtNqlcumOzu3PLVHL7zov3G8DVOXhknpDkAfcGzQPidANRk5YyF3kegWfq/Kv7w8iNba3egyHKN6xHlfpG8HslS8NwFA0ABNG/I/317GdbY5rFXR/tGVrWtWs3hYxTI9H1s7zx3X571NAHb7WcyXD0gXy2VrNYmuYzNZnHKG27TkxrKvvImz/4e0Fq9oo1NWAeUkLh1B95WTSNZccbyHmRNoh+BcT8vVD4c+kV9xph0RBmh9U/Oo+BAfCa8DLvCxlRvsYPvQpsbBuQNY2h7FJClzP06SBD8c2XwdDhLpLm+fVt4aChFkB0zT7D3VoVJ2meIQD7ziQRl72lZ2iFnVUBD8B8JcuhTjZWu6b+6GVv+6s5JmR0yXF2RzvoXXOwOqg/DkGq69CbHg4MLc10dF5ASqZmp6wnO5QAiRo4LoGau80pYcT0QxUOT+V2yEky/KFMocxByUT7+Ag8t1gTWJyrP1AhQ== 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:(13230022)(4636009)(39860400002)(346002)(136003)(396003)(366004)(376002)(451199015)(4326008)(316002)(86362001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(66946007)(54906003)(1076003)(478600001)(4744005)(6486002)(41300700001)(2906002)(5660300002)(7416002)(6666004)(8936002)(186003)(2616005)(52116002)(6506007)(6512007)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XXqYWfg7nX8q9cr4pL9vU4NFbuhFgZC2wacRaJoFfx68i0DUun2TXczMc6FdCIEs1+BuZhkQd5DiNi17bA+m41WhNLB7IhpLgSdM6sSiw6Bee0XmN8vjXVMIpZUGVdgaI0I76YkAQAFbyd8SChUrzsfl9Nixf/q9LXCMLLU6B04Zg/5fufhCOuuk2y5a2X+0b8U7veAybxvpouAQNOq5Zii6FzfCn9c7fAyD3UELnuW6Zs/4LXUrvocfg4bZCw2pvmJDnbhB3F2ovmAzTjLIdYV0vJR/q6kQsAfGHW0mSUZbx62WHs5xKQMZtcg+M3uz9GJouGbea05XQyp1BBZhz+AwKkur5cvcWpBLZyyi+Bna2FebCLWDJVL/4cExlItgJHLD0u4x0Menk1/l2WGa3AVtcfIxNBI+rMZimuTT68QWMuksG7yjxRN22QlvmBm1vEDqrm+tWl0p74fnnYCyrl8OKgZ7SisiT/Jt7nvD9FxTqcfeD0/ewS/BYhDTc4i7xu0EvIPjXYWPW422u7vD1Hg5obpu3Q37xQ9DnPJi2Zlqn76yMPxqpD+o7OF3bPbumX3a1oY+bpuxK1tQ1rkk0gEXdaY3qnsDQCKuzv6oeAk8AsPRW/MkkaCercR9W+0ged7uh1XA7o7bI5+xAT5ezUR/tX2TVca3d0gyqyMTJm/GyA1iDK6lidZ0lsCUSvXu7FRNWGuZSOAaS0ZwoMaHkm9Xe1G0mg/8Avf9Cob7SDYB+xEXclhX0EZVtdt+LlacHc/hqqwaaOlxt496FKkP5XOHLIPn/hzkToGOs/ZZzXqO8xdl02dpiM9/CG1ciJXNlQ9t+2bMXap7BSHjQTsMv7oGwpEI8MgZ4bCbn+dO1bYa2Ayp8yzUqZFyj+wJ/yhCsGE9P2T7domqQx9Iv+u6s8T692WOnFnAr150NS7pnwJfyrqi68QL7YyNnBeaysu1+yr5TgjSgIJ+T5NeCcVvYvqu5ZcJfVMUq92x6i6UD0dsJIyHrRixOu4MuLGWxdrgSaF+GY3JdDJLgq9OeIt5/pds5Qf+NQLHePqD9W1tAVI/b2m6LjEGW6tYtulaoR2IwuNj+aQ3Bf7dVDFWWPHnlcvOeF9uRe/qGDc8FiGpQQ3CNy2NOFB48WEftF4eJwdqF0djLA0D5qVbMVTq5i4cMr+ylMlJzCagw7tFf+5qLzo5Yi/P8KiZc1+TE7fVlRv2Emwu9xOH1F5pkUwwh4siN4g1jQI1hzByVbUlqz7K+EchArZRQx42pqS7HYLl7K+dls3T+k/A4FMZi+fK2a6Ib16beVqaye4xcYL5uwmW6tmSup8WNPyp1fxlZYiHKgfO+AOJ3LU38tbKhYZOpDOp+J8l9Xn0K37TZRHVSXr6/b8aosUM/7aLa/+mrGOoEU2Rhryt/a77S2Gk9LAieFUpPAJIHzuD8fLdPa3cJEYMoNsRkhlPoECHKJPqe6fkdRNpZTezJ7dpyUCOZTaFU5tAr83xXcuuDDMSPbTk6ak8qaktNf2d8RHrnHe8E40ps9McVW+2MNBOvgZuoVNnrgpDYoxPkm+9hcl1I5UfJjF97TN1Ti5nbyIp1kdeJKUK43I1 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36e8a3eb-3158-4907-8aeb-08daa1e20b70 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:15:45.5920 (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: 7W/VSSjKWqkoYaBoyBB/ieCDpWDPdIQkAkahhtNwGyHNNWYFFaD2GvQaIvHoY9TayL5MBOMrgMPBvktFoZeo6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8648 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan Add i.MX8QM compatible Reviewed-by: Rob Herring Signed-off-by: Peng Fan --- 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 Thu Sep 29 06:17:00 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: 12993544 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 3BA84C04A95 for ; Thu, 29 Sep 2022 06:16:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234969AbiI2GQF (ORCPT ); Thu, 29 Sep 2022 02:16:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234947AbiI2GPz (ORCPT ); Thu, 29 Sep 2022 02:15:55 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F91012DE95; Wed, 28 Sep 2022 23:15:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXaR55PnTpWRDnGMgKmS/+YyfTVQPuXPEG7JVjtmleWieD3SIlTMTqu8Ws9IHP46IVAqxn/le5MrTfe87zFZCStiUV9IczNHwAE39x+MQGj4kQ3zsSk9LsINBXCdLlKpHetvsKX1YTj2sOds/rd32bRIsiFLl8VxzuH4ANTBrDA0qW3Zlh8D5q/gJOgV7dbt+Pi9Rzu5CMUoHPP2IJabATD5CIrzwPpRMBGQdEDA5y4EE0WoD0dmhEv6XKz0gvAO1JNeG66u3dUn5SThTZ7Z93GXzxLYW/mKEHe3aKYVUssCWrxnyUCJnMpSSnDNLgSIodhu4mOsON1xs1FX0jq3Qw== 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=siiLfzFIYgN9GPKXpBepWlBMiKgb/ZY2FqqXi2MTDRE=; b=LA0f56TsSV1w62CT/Asd9yP0rSd83+DTQ/oaVmavekvK4EGVoNloAz0MPM9Qj7x3VhRAbaWDpUmW5uKpy+Q7jr7PVhikmPL6wFWjpWzbkGEmGFy7DkxFKZz1rjXkcZhiqLUNXF1BRSN7dP3/TjJBmTRkW+UJVMck5PBVScx9k4E79bxFPZo/KK/tYAGFtvezrYgfPRKH1aCQU7dTWcBRwHtG6Bc4sjtxHvN16Go3fp3z1/NO68uxaztwuBOrQMCOrhb0RcCVklRnOnDKBj7hloqobB6d42/4fcGZlvTs34ZtTsOkLP/P26oRN5ESzQTvBd5l+ac6aj81g2QTSCPjUg== 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=siiLfzFIYgN9GPKXpBepWlBMiKgb/ZY2FqqXi2MTDRE=; b=KG+Ij0foUlcB3nJD/D+LCg2cMU7Mxy9UmaupsPKweKgNrs90gqvURNTKVQx8N14zYRPZFVNKcl0GQ0cDpIkDSN/9QkTxJGdEF4gvQJhZJgOuaVR1QPD8ht+QXA4GGFFdJjiUV8dVfni3XVMjDqQnmpBbAsX+mnfnhEgJeHeg9+Q= 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 DU2PR04MB8648.eurprd04.prod.outlook.com (2603:10a6:10:2df::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Thu, 29 Sep 2022 06:15:50 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:15:50 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 3/7] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Date: Thu, 29 Sep 2022 14:17:00 +0800 Message-Id: <20220929061704.1571746-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8648:EE_ X-MS-Office365-Filtering-Correlation-Id: 73bfed66-8dde-4a42-de96-08daa1e20e0e X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BBepvTqXoqlthU69onaXbFZO/nlj/y1bWKtOB6C1XmRMdb+WqLq71AVfi4nHfcrxr2+bNR695bYQP9o7/tFZibcuSrldC1J0+vlan/dxNgiAHUJs3OgBjaLRlf0QUG4m86zDyBUqZCEbrgo7NDzV4yGhmk5dL4lmMWKbWkTMFSXfa1sVeZt8HJdH9uMxdoRABFXsHYT/ZB3H3cJcKuYOJY4R5Ha0ofK03vz9/dg2PHQzmmHNE+GWjFbP1Ss1jx11OzdpQC9YXSbH9O25YkEtrgukAkPFLhlac5BLjikk736xYueIB1q2iXq1yoI5cz8AO3QE56HRft0Vh3OrVFBXVt7K8YoY9Tt7uNVHoqkME7uLySOrQlVEQ4Asnw31REoOAef2szNfz2Cnchg83jmvAqUCxEKo1f6SQSDkSAp8lwoYq4RT4N5mBWpWxBslQ6+Bp80xSZgj4NmE31cuotSy2H542a0uoK9xgMDgCiEI+thXv5M3f9QuXZSf23VpP03AYCCl3A4XVl/TPo39nfkN1kpEHq47XJSFN7h8+Gv3Or+aDqgY+N/D/8fR0B9eQ5aQl/Y6eINhQ8+r3OS0RxGNDdTBxtmHzoDSbZypm57sYNYN0t/ZKasWVqz7g22ooncJfMWFZR3TXFfHq33m1a2WbLfCBgCBS4IimKedUI4o4hS5cAoSpJkScpF4yi5E/JV0vusxpqJ74Lh2KUjDG1GMJCjU765/yhBj3cucZjNZLgHJVZxJYO2dHcFYQ4twcFZIp+gwSTq9kMM2aCNMmM+o6A== 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:(13230022)(4636009)(39860400002)(346002)(136003)(396003)(366004)(376002)(451199015)(4326008)(316002)(86362001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(66946007)(1076003)(478600001)(6486002)(41300700001)(2906002)(5660300002)(83380400001)(7416002)(6666004)(8936002)(186003)(2616005)(52116002)(6506007)(6512007)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qq6ZWrrwO3z9UuJBoe/VusCVRa/jDynNA6UuiOt/alwyAnjcf7s189ubQF/6cBavFphI/Mkc/iSU5rLauJ1SMyIHkdyNWuomDy1LAPT9B48HZ9KXQZZFQsQ3N9odDgqoAHtIPhlE+6/BvYEn3xR7LARQuxqtFTpCYUr7IR31sKrrn4VFKbNk+X/ziAd2OlPYVHpGZpy4UeuMcnIt/zB3yKD4SOknQKiFD9s0Y+6Xcdnr4iMO6FL/3k34l8gYkZi0rEUoGBkw8a52vbLG/Dwy7PH1bbj9425Tc1yQO6IFS2O+FJ80NatSQuLxdNN/9OpCq1odFICm4d2op8CqCEVt4OjFkOpcwaZNJRlsMr0yewiwl95UwSl51Lul/LYQLPptcc9CdOLEKL/ZtuD8J9Q8LA2knDYpFzObT3qa38wg4Msn08V3aYpltazI2zFfY3pu5nSjQYZjMmDMy0Qfz5dNwoTJXj9wb33ZqM6O71qaJtJhD+hAwydf4amzo2ekE6yEegsYICUDueWmnkITfzkWfgclwFr3p4zudy3ZoRD53gODoKIc4Yrc7xcrkJ5nB7BydtLRcEPIUHdtFJfXgnaQYap7Dg/tjRVv0kRAxKnA2Xpezb5QyPkeOg8TzGomrSiho/+taiAmgs8kg9Ol9XDnl41ylrRXe3/zpMQqyiz57lZViLHmiyutIrqyS66UCXW9+I1IOeiNWfH6LFO+zo6SACf8RIDEcIpGR1PEu1/D3U/XrneFBSM0DQhd+xErCN0L9Pq+7vXvKWVfsN1eL4ejTSM00xmYlf4RGsPYjKFdNZDzdlQUzSDmPrg9elp0viPnugy2yF1tmYKaOE/bRU2T/ewMpN9um8enj9hCEjjwR2ATxXqBHBcSeBNRZWgDHCIn55xPZPAn9ZxhtLgJY9eQ6BSsvKwTzDEQ4jTMkPnJTGmm8w7O8IvkARwswH9dY9Ea5cNq0DDjFukY+n5UThNF9OYhKoeB1yBll6kdbtbCdjxJkKXVrPVW3rfyyhljl36l1fos8JuO13YLuT5lJxVUU0cpGFcOyumGjxSCeUbAuXdSZDMQN3/HAKFrUKKJvNN4Asoj97dQeM9cH/GeywBepBgGn6FJhfqvzcUC9ca2UfRB7sM39pOQR0fzH1jPRkSsXINWN5vXP5r9GpUrDNWrGUAw04Rvm4Hqc0JPx5UL85r+kvebSBRAi+vSyX+5xEh+aFx8S281Heutcb6x1h3K93jbQocdhkhw+ROdiKDS4h3/evJu9q+qLzsD8Jk4aaTUigDrTZGOvAxijUi6psxNsHDQgc12bFVAsny2GOSNAO1dRKIIIK2dmNmjRwiqJgQ2T7dlK1p5KO5+mVSKUnV+ACqpWzYMvuy3OJJ3hAv8mJEQXqihwcXAf+rneVUTtnqJU6jIagNEneftIq5aHBE6NtACE0NkPHGPLzpZCJgQOjQqNsxeByy36raG4DxmVx/3A2vrXrS7TltrwFfwh7OoXwwM8/vdPeGjP9hmnLH6WcL24TvveYOsrcPMnjue4V9OdHX7aGG4K0CFco2i0lwDPFnEaklXGwgalrVsRYR3QbkyVHtyeiep6vxE7QFwro5D X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73bfed66-8dde-4a42-de96-08daa1e20e0e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:15:49.8913 (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: IBTJV3jmTFkeZoQra0O6hfXCD86Hte522fXHcEdh0gBvrn/UZzz/DMhG6KeUJebJRbcWXhRWLGsU8ol0Yn5ANw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8648 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 Reviewed-by: Mathieu Poirier --- drivers/remoteproc/imx_rproc.c | 108 ++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 7cc4fd207e2d..a56aecae00c6 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), @@ -680,6 +705,37 @@ static void imx_rproc_free_mbox(struct rproc *rproc) mbox_free_channel(priv->rx_ch); } +static void imx_rproc_put_scu(struct rproc *rproc) +{ + struct imx_rproc *priv = rproc->priv; + const struct imx_rproc_dcfg *dcfg = priv->dcfg; + + if (dcfg->method != IMX_RPROC_SCU_API) + return; + + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) + return; + + imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false); + imx_scu_irq_unregister_notifier(&priv->rproc_nb); +} + +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" }; @@ -689,6 +745,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: @@ -699,6 +756,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; } @@ -803,7 +905,7 @@ static int imx_rproc_probe(struct platform_device *pdev) ret = imx_rproc_clk_enable(priv); if (ret) - goto err_put_mbox; + goto err_put_scu; INIT_WORK(&priv->rproc_work, imx_rproc_vq_work); @@ -820,6 +922,8 @@ static int imx_rproc_probe(struct platform_device *pdev) err_put_clk: clk_disable_unprepare(priv->clk); +err_put_scu: + imx_rproc_put_scu(rproc); err_put_mbox: imx_rproc_free_mbox(rproc); err_put_wkq: @@ -837,6 +941,7 @@ static int imx_rproc_remove(struct platform_device *pdev) clk_disable_unprepare(priv->clk); rproc_del(rproc); + imx_rproc_put_scu(rproc); imx_rproc_free_mbox(rproc); destroy_workqueue(priv->workqueue); rproc_free(rproc); @@ -852,6 +957,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 Thu Sep 29 06:17:01 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: 12993545 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 302E5C04A95 for ; Thu, 29 Sep 2022 06:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234988AbiI2GQS (ORCPT ); Thu, 29 Sep 2022 02:16:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234959AbiI2GQA (ORCPT ); Thu, 29 Sep 2022 02:16:00 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2050.outbound.protection.outlook.com [40.107.21.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3999E128A39; Wed, 28 Sep 2022 23:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sw2CNTgotcMBsfS2NSpgtdYJzTklEYBdDlQeJ7fxt08arrbCPGrAqsqOVR+NcOgrfNCIEE+rYuYvbje0YFKf/zaDxCv6AKuo81jMLG7SB/NWJ6eTTEn0EsxdFTnu5tI+nLjv86v29cJVvpCKErc+ZJg0CeaYumMuIOJZqOMFc8nVrLDWkaSiA04KaPW5bkgGrms4iHQCMaItoJ4ppcRlsamfodftYsvvlt2lm0Pi+Al+7aeW4wpp5z9JPTBUziFvnRj0fsDIRw9RBGVvzJYunzJKF96lwxhGjc3+K/kGdf4E7mZVmJkVZNEvi3FHr03QUe1FXrA0fOVlfLeGAppqQA== 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=ldGGpIspbke4mwqjGHf37eUjpoFCJqh6a4WohoIZ9YU=; b=efErvu7ZXn1z8bef80l3bS81O2dhkn9L/+O33vg11aqs7VV7WUSFXYaQ0Lq4n/vf7X6LIRMNidFaWMJDlmfx4LI12cqIh9O5w2B49vgRxFg2ku5xdk+yDNdTfi1UhRvL2BceJ0/MDczcqpYbGTjKkg7qc8GvsiCi9qliSDLINuwqtcllZS4PDUHshCG2XU/CtvaI/01JxueUCbRRNq3bo6g7P6aa654uwBFOkhKhzo6fq/mmhNnVU5glmjyrzT9VhDUPnYUOjBInT4O6VvIr4GNxicRQsbO8xufTlTvYH/ZJoz1PA0tnkbAAxhFFI+Dzu/CVeHDDIJYOjVeFC7xRyg== 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=ldGGpIspbke4mwqjGHf37eUjpoFCJqh6a4WohoIZ9YU=; b=lloPvCU3QdKq4DB3EiJUpE6MecbOeCtwDYqgHZ3Phu7/LSYB95x24MHd5pcaa1XphWuCm34I6F2CUYCEZMm3TYYXczqqnAhfJ7OTYwKHaZnslGieo8JyGACW8VZA0tQQ+Jz3yLYebcBhulZxMSl5Yx3iqH5zlGj9MAyrA0FiqPw= 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 DU2PR04MB8648.eurprd04.prod.outlook.com (2603:10a6:10:2df::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Thu, 29 Sep 2022 06:15:54 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:15:54 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 4/7] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP Date: Thu, 29 Sep 2022 14:17:01 +0800 Message-Id: <20220929061704.1571746-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|DU2PR04MB8648:EE_ X-MS-Office365-Filtering-Correlation-Id: a4109050-be61-40a4-9a40-08daa1e210bd X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6sSUFV9xa3gM383KPrCnuhWgCUGSYPRzkgaLyWJNz9yR44HutorcopdDTJHL0w0T0Z8W4RoF7gsGcOjaoj9H85S/lYgeuJH2o3yFdOLctIBLkpKYUfj6/hV2PC+Q1V/3LbKTZklp2fDcX99wZNAWF7PWowV1An318Osy1cew4lAo9xTmbfeqGBW1m+yMe93XiDjwd6Gbzf1grRvmO6ZXWT4F25/J6MgrKeel+aeFvjkCt+9jmVwUJrOxmAWp6sb9TlFuKSeTkhXd6YXQwBwbEZiycNUzsw3t5K+rhZ/Bc/38o6yCrzw1Tt0xzdpSoang2hVBklvuEyR6I2dQc1+Q5T52I5sqq7mBQEbSWp/ChAf5mbh7sjwcaUHsO1PqDkZuRdBE7a26pCuu85/S8zvwTLFSIwtTmautLWv9MIF+bB8q78rwIBUxwBlAXIV8LMww7uUewl7ZUfQVJXhP3vtvL/+zSPkKiew6gwxchlktcRhZRBra5fdcIEhvkhhfd4c6JveQ/UUMseKaefzRTqxh+AD6Hxo5HiwFURHFBPot6tmeD+Ng73Na4Ke+2BN4PGTM4joch4CSnr5gMwjuYboHbtqSI+uFpJl+nZmJZQsBRIDFiDuuoyNyHpkOKk241VVixijlUkUOaT7QLOBFs+/ujihRogoADJ4kI7XjTPW/8EFbVE6MKq+L3eMdJMBeaXuzPeFc1bsHw+WhszMoJtMd0nCK6LPE35P8BYhG8RwO3YLR8J5HQi6E4lqd1IIlFie0EM4TnzJp+xifyOcAR6+gHA== 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:(13230022)(4636009)(39860400002)(346002)(136003)(396003)(366004)(376002)(451199015)(4326008)(316002)(86362001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(66946007)(1076003)(478600001)(6486002)(41300700001)(2906002)(5660300002)(83380400001)(7416002)(6666004)(8936002)(186003)(2616005)(52116002)(6506007)(6512007)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CtDvBxxbpNRRPMHvI/cX4eIWI5mno70VQmoIOhZoCopFZ50gWeg7OGdCZPms3BpkdrzRHWBVegJg9cpcuSEq1S+47eJV0UJrnNpMW4DqMlFJPgN99sN1q8lbdJvbTtBPbf482VVqlti4kxaKmoDuAcYkLSZkkGfr9M8m7jNKvqiIwFN9iX+T1Kaz/nEcox1khBvLqHC/UR5b5Kyq13q3l7BfVIxC2p6CSkPQIQULebNv+ghv5zTLj+fg/gRp/RpS8CM1QL27VwfO948JsRThUdaPbtgKsTEFGTbryQEhd469J9o79JJlMqXtbanSkcOVcyCNVIit/UI0Y/yUWvElW9dwlp65eyh64AbjSO6nIcJ0+gj9keMy6cqEhpwSF6YBz0QhSqw+LfJSrvLCUzRrHtiATk8itA3MYY6Ov0GJrlJFKJSLPcoaY3LjtGeQJUk9YdaERfRNr9PsuGxW3Kv/Xa35oWPae5+6J/UxvjZ0HJ+TGDI2sQ5IJ5uYOk/KpRzCj02NA/9+0Q3E92x0ailkyS2Gy/3jp8L0y6OA3OjFnailD3YjxFy/9N6UAd0wSr6juU/r2gjqssQlIhj0zPz/T6PM9q+lG9wKu/vlbxi7eQ5yUAIA61X3hT0HjFfP3u3T4K3dcXt9M4d7v8F4wIdzooQLbOfoSL+CWrQ3mPxO5baqDoYduIxTlwDhAmQuW8+vjkRp0A2Gyk1/+X0B8fhcrm7MguRm6PXWXMPHVly9RpqJw1Rk2C6z5a3XARo6yhtfHk37rPbIBn+bwthx3UJEY96PTUsTNkgAlfJjuxiG1X/TueUvy3G7RkqMUXA6IC/BlZmq7E6d0YRVlY/m42WL8KnBIbT9Ruh2zYsPMVUPwLn9hSesUvVns5bA3xzFA29pxonr3iYp49a/gZVfpNUnR2klStvDrblPOL7hM6RRmq3mmvPrPiQkpuAPiMd1PdfF+wBrmfqym1qLmn02//lPyscTdct3YWvM2r+gV7RmCv+oDSkreg4JoW4zurFAm/O0eaTpgwFSY3Htm8V55ozsQ8bdqLewN52+jHi9TG4mg5BvRk8kh171YlkT7GDunpf4UwlViqoswHfNPgiWyt83RnNDIjLc7KoWUvKmHmUXD9Kg5+yB78ibNOzXAijNfOesuU1fg6MM1H56/NuQXq5JSesET08ResNyll4KzgebFVyuQL6Z0TpTTbAvQuPV9IFCFrtMMT32tPESMj4Pf1uv7q4FLshsJmqlbWkC6pe3C0MpCd1vws6b/8FGAgKJSoO+pLe2ijSBsAZHpfXhPdSx0U8mCVwd3CGzLd6WIcyVbnzU04e/uNhyj0srd3h259+oWbLufW3iinzjK7weqOWaGIlMFwKMIWUkFKtXLHfyi+4w3IzInEkwE7rdMvUM+kLyxPC14Xj9BcUjTVYqByASBVgdRyQAx+uuuh0b9H9BAJtDA2bismD1m9nkgW5pRwOFPY+nkYwFIdR8q8iwD9k+/JJSVFf3RrQaYLQaWOr4qOtm49Q2tESMYJvtbz11whRTiSl0a7tx9GPff4tktqT6vaZUr2UZnBxO03q1VNt7BI7rUqsp6uemz9+CxA1LknM8 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4109050-be61-40a4-9a40-08daa1e210bd X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:15:54.3138 (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: ca6OVb+8o9s6d135dkKKYVhvFRIfF74GqZgMGGNQDT5GE62+SZ9p9mQ3jcQDz97TikwR8PMqYXrLvDUFXRPiCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8648 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 Reviewed-by: Mathieu Poirier --- drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index a56aecae00c6..7d2e11aed0aa 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -79,6 +80,8 @@ struct imx_rproc_mem { #define ATT_OWN BIT(1) #define ATT_IOMEM BIT(2) +static int imx_rproc_detach_pd(struct rproc *rproc); + struct imx_rproc { struct device *dev; struct regmap *regmap; @@ -96,6 +99,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 +342,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 +374,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; } @@ -713,8 +726,10 @@ static void imx_rproc_put_scu(struct rproc *rproc) if (dcfg->method != IMX_RPROC_SCU_API) return; - if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { + imx_rproc_detach_pd(rproc); return; + } imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), false); imx_scu_irq_unregister_notifier(&priv->rproc_nb); @@ -736,6 +751,69 @@ 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 <= 1) + 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_detach_pd(struct rproc *rproc) +{ + struct imx_rproc *priv = rproc->priv; + int i; + + if (priv->num_pd <= 1) + return 0; + + for (i = 0; i < priv->num_pd; i++) { + device_link_del(priv->pd_dev_link[i]); + dev_pm_domain_detach(priv->pd_dev[i], false); + } + + return 0; +} + static int imx_rproc_detect_mode(struct imx_rproc *priv) { struct regmap_config config = { .name = "imx-rproc" }; @@ -770,8 +848,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 Thu Sep 29 06:17:02 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: 12993546 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 BD346C07E9D for ; Thu, 29 Sep 2022 06:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233252AbiI2GQV (ORCPT ); Thu, 29 Sep 2022 02:16:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234973AbiI2GQG (ORCPT ); Thu, 29 Sep 2022 02:16:06 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50077.outbound.protection.outlook.com [40.107.5.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6744112DEB7; Wed, 28 Sep 2022 23:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H/9HFats6ZAre2Mc2geqptKFvU4wL0YGIyEv2lL/YDaIHI9wU/nfuVhXMNsESIgkHGOpdSNJt7kBF+Za2S6zML4hVK4pswdD6eTzEBHGyURgio4Sm8vFinyiebOuoc3ArhKEIqeo13lRR382zZqaKfYbWGvg6Wj8n5IYOL/NiLsp3C9kp+HWXeg8HG0omVFkjeVsJXRMzEzWDfVXiLrqcOu6UzWuqKS6Qn8/sFs2qNZ/e3n+pgKv/MQSzqhtfjzuHG7DnKixurtDUrcQTi27Ak5g7p9rk+ItOfSO0z8XCKe1Z8GCa2ZE9jEv/U2ZArgWtOHztcfxRjupCQa/PW8Ysw== 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=lCd02oQAg3c5RDm4dNUiBlHsyeWswp35ia489iHLRhM=; b=BayZ9mHUfl4ShI9S1x6lZ4UW1AzhHpXjDWbtHZc9W81t+uL1dPZm+pbKFdudT2oAf2SBWvDx64RwrXqs6zadW2Fe7qLhjCs8TJDoz8L5vPwUY+spqh2byJfLYR3bcZBNkd4xHf2vEFRtp44r31lLnxeiPz1nqNLFH1zvY6ZAeWRjweAmsJHSUAUSDoGd1+FIuPgp+3lCr6PHC9s/g472qyeWWFxCbIFAXRJsEef4Ve9F7D0bXEtfZAebs0RCS7qOq5pwR4ko9ztuDkjAlR5/JhejX3JXeyoKmzMz7ahxiu8yT7jAPtA4+8bGXc/2pMKCmzn0CbhBwXPIxFCBaS87OA== 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=lCd02oQAg3c5RDm4dNUiBlHsyeWswp35ia489iHLRhM=; b=TKqugqgwnQHb6SjADLY5w1e9CH1Mzk1z9nKZZMXp3wvSjfUbVjwjNhT+cNzNuqUb6ASDeUW1HBv7XNQON7S2bGc+4+RwAmFr4V8dGoFdvn1E+TMG8C9Qm2/pQ0dxlgP8mM7DGzyVWGS4lVB/2V92RRBiC6esAD2AYYGJLFd5fjU= 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 PAXPR04MB8221.eurprd04.prod.outlook.com (2603:10a6:102:1cd::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Thu, 29 Sep 2022 06:15:58 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:15:58 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 5/7] remoteproc: imx_rproc: support i.MX8QM Date: Thu, 29 Sep 2022 14:17:02 +0800 Message-Id: <20220929061704.1571746-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB8221:EE_ X-MS-Office365-Filtering-Correlation-Id: a15b5d5c-3568-444e-a385-08daa1e21341 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ECvVhqLnaDlBs2rLjrSY9jINRTjHKvsOVih8dIpUe1HuZzEIiBtxl0iOLYJIpfeQvMLffIubidqPcUQPAJpwfVpb/XkXE146dQ32SiYLCf932ph2JdIlHkMpPi4dhpdTsodimDVzWrEPnLipp3tdQ29aZMweMadNivUTW0/YDWoHfnAsUcaKfaHHWUkgtrMVhME0G5NYCnf6nnAsCwzRtjy83dDomRuxLvl+cF8nZ8ly999FjU47/BnLo+H0Lm64/K1rJtnAStJ5HYjYq+cfmtFmdQCVDZocOB0afX/Nnebhs4gplDOEVHL/PUAxQsrIRsE2hlUhKs//rer6O0yJ0GdygpCNiceZN+q5vqt1orkmKbkB+NMDFGWoHUGaMicKQER+i9nDzqlHFhMPpn+yJ/d28Y5cuT7kktBs2gSXdoyPY3r1ACpHJb7s9mRy3miOnKeTV6RnIB903xNJS06xVypGYsUtc31hbpfCGIUG/iOFIwabdPDYfRGJ13KT4Smp4q1VX1uZiMwZn7douVXSQnaVinJP0yV58/OGqDSnB6r/hMuXsx3/zEMEMzFlYRTdd8TSxctmLelvRFUfmX6704f8LR8O6gjDrZ2XUoAQ8IU5mYW/MJ9JTuXEgRvalxVNA4GWaI8uiSQzRBPc1fz12Kj4BvFfooMtYymL7fSwiBdOkhbd6BDPQb4dysHwvEZzMx7Ofwos9Jmj0viB+fjaxW+xxfUYgqayEKdHoTkPqQPke7xrOgOJwp5WmHdUGrNwZPmM34MysN8cYQhZSiMLRg== 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:(13230022)(4636009)(346002)(39860400002)(396003)(366004)(136003)(376002)(451199015)(26005)(7416002)(5660300002)(66556008)(66476007)(6506007)(6666004)(41300700001)(8676002)(4326008)(86362001)(38100700002)(38350700002)(2906002)(2616005)(1076003)(186003)(83380400001)(6486002)(478600001)(52116002)(6512007)(8936002)(316002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eGXGyLLjRiXXb8Pc0IFILxwiiPOj4R345pBiHaCHM3/CvbVKoVqx9hVLco3ovNtTw2nrX23BWXX2nERyDXJoGFpOHfaRDTThvkVhzgiLTD+jKsexK/AAE2h3hg9U/YmfP4/f/71uQUlk78NL9H5u/2DFaokjyZFGZMTsj8JpZgtbhVRN1Nmn/BVWQElqUnKXXmzSWk3gDbblNbEaR/xok1omh50IePzFqAvvJIrCfHhvYxEbc5SLG5j1j8x3N8tbupdi5r3qMrUenVkr7asxpXWIvQ2SXnh3/N7rNHiy6+gk8u6FJ5VklevvqaorEiChPjUiQwyEBlBRtNEDwFuKpCSgXOxcu2uv7fqEjlYdDsL5Mi2OVusGgsa3La3Wdna6AR2Xhac/cmKeQwBcicoi7DxjQ/o+4PXNQ4qmusJcko6spVFbB+CU6q1wkOrF6Gi4SR2bDBwmy6jmfJwLmm9ItgBsphsQPnIMuBFxvin2MAD9tShyJ6dOP44RvNOb+07xv7Mo/vXAisBOcNfmajly5HcSXPuKOnW2mc1yRWuIbc7iWL4zYIZmvsMU0c3YktipOf9q5DSd1kM3ReLnOk9xg47ZXLgGdhnH40bwspSHGqPVZG1MkFsblnc82oJ7WbNz5Q9UwpG4cWyeGn1Fh6msH4RNBpTCxGloqPhIUPk6UmfXLz8B5an6iFPipfHPWFpGF0wkvkcZOnf3Q42VIJbNtFUznwF2BHPitxWf3kQyysYNW3vrV/2ybRewxs4G+zZQzHB6NEDbKkx1zJhAbY+YRLit7LAkjP8d7ApRysZNC85w1IamyVXSqR+iBKtgcNCCLE7RKV7oYrG3O42eixdiDHm3FavW6s4Cz6wsKzpg447VuuZb9mKjh/4MaVX9bS22o+Az2lNszlGxx/u/4udeIoZL0fLyDjVBpFVeYy6sUvPjm/1QT4TdGSawtGFbH8WNiabXnTtSNhXXOYu5p+T68IvnbHrUv96K00ZPb3FRCd6q8Sqknd71M/H02Fh6bKwFTPllIN+sqhcOadLdT/V+nPZla1JNrhNgrVCJ8qU0ZPjglzEMjc8w3TtPJX4NlTfOADeb0Q12ApicP9TCbF9AZ7uKj12pA8XXgSHIz1OXVS6nB5vLxCIgDcRghyqzdJV/LNKC5WP3gcfrDZibkfQ4ksZvwI3mt/Xl30jQg8Q2tCAykT6pqFsgzA91BZiA2bOf+KRY/Z5oHkr4+lNQoBsNbA/TyVp7vxaGWcJaRICpUwO5JMhMY6Wd8AM7wxHl/V5fnrRA/LtXlJ6G80d/kN8XHiVTPcyzBHEOO8igRfZ9BDPnnKGinfN1lQd0HioXp0I6IaQo12xQayv8jo11I9fBjlChnXtPfu2tDw+/IZY1p19ClK8Zwnb0qfEmaQKjv/QtZQleDjE/I5uD6PZsgqEmcY0TcWSZmJdtoMZ4WE3upWmA12Ajyb5EPwfrFRejAmsd3GIKYMqqXenLyxfqJhBTjj9fIixTeew91cngNfl42koITpxVWWFZp3LfljP8Tf21RgMQXIK7uj7O7uWTSLZQFBv8oAYinPLJv27l3xbikAgTR45KLbvoDHnuSQiAG8rq X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a15b5d5c-3568-444e-a385-08daa1e21341 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:15:58.6921 (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: tOsTdDh8M2ldiZKzYXyphoxl6rnj9PjH4r0JSP7vuAmHrxJR3L8uLtx5V3EzI6F4B/xxywMhLl3+dCIEQTjG3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8221 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 Reviewed-by: Mathieu Poirier --- drivers/remoteproc/imx_rproc.c | 47 +++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 7d2e11aed0aa..8175c4c9aa22 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)) static int imx_rproc_detach_pd(struct rproc *rproc); @@ -101,6 +105,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; }; @@ -131,6 +136,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 */ @@ -281,6 +299,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), @@ -397,6 +421,17 @@ 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]; + /* + * Ignore entries not belong to current core: + * i.MX8QM has dual general M4_[0,1] cores, M4_0's own entries + * has "ATT_CORE(0) & BIT(0)" true, M4_1's own entries has + * "ATT_CORE(1) & BIT(1)" true. + */ + 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; @@ -844,6 +879,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. @@ -1040,6 +1080,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 Thu Sep 29 06:17:03 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: 12993547 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 CE48FC04A95 for ; Thu, 29 Sep 2022 06:16:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234034AbiI2GQj (ORCPT ); Thu, 29 Sep 2022 02:16:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234953AbiI2GQQ (ORCPT ); Thu, 29 Sep 2022 02:16:16 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50077.outbound.protection.outlook.com [40.107.5.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0725412DED1; Wed, 28 Sep 2022 23:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=azb1E0RDSCiKQYMIXm66o1wVyO3EEQvJrzWWQccCNO7AOkZj7LllPx21XFtFCIb4WueUQHBuURbRWvtdIIczeMMVd72a72SG9FkooTP2AlEy9hktA/B0Rb17Sm2BcBPDWm5plN2igaX9kmUkD+jbvJ+zyP+FAp1lr5yEN9nUtMsLHrtBam/+DzMFJS4Xqj4J+jLqFbSaAkK8qNkJWI7qvTbSBsSTx23tTqoY1d3Mkt+4AXkTSOnXMtt1/Gt7nBJPaCkOxBkMoI8KuqFw6B7PWJ7WD5G1RFt5wqdAT9tzPJ1G0cj1Bhm28GloHJLqmx8cyRn/h39Dm1w0DVlIlB2LbA== 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=Hrmc8GrQff+nlFWkrupevpR1x9RJfRLdngEobZCbVmk=; b=Q7VxGICBDjh9A5ZLn7MLNOpB6kPQ3aNcCLwW/Z+JXgnYZ03uBr8ZkzE2Cf+abbMydze4TAcNX+vZPzLxOwlCof0RusM/vL62SZWU6IFmGTpS+DII8/hy4l0FqCwqt6G/BOVOmfrpZHV0Yeu+3Nuxr4AAdDr6z4rCX/6zoyD3LFj0vKZH6KnTqg/ePFNJkYDdcOjFh3YVvCyUTX/YGQN0VTaFVHPXYCpz04xNeJMstBo9L464liLvFFSyZJLsEUCQxS6Z4W2m5Fhj848sEy4M1Wm/UJYSwSch3z+mJeEDS56Z6WMnUdpyPTc/s/JXELANXVmxQvdN8MFMthC0CrDFWQ== 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=Hrmc8GrQff+nlFWkrupevpR1x9RJfRLdngEobZCbVmk=; b=LR5yfa2h+WmZFNkL2b4RlP0o4aPFsEvymlxtuF0bDH5yqisSsW1Cvzto8U4nhSgRqEYaSYR7OnYnFAt413hfHa6JgUJFo2nCtl4ckknopngPps41AxRxO3W93CV41dX9yS2SsIkVOREfwpRLZSWhBigidjcNqAJ2G64rAWq2jsc= 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 PAXPR04MB8221.eurprd04.prod.outlook.com (2603:10a6:102:1cd::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Thu, 29 Sep 2022 06:16:03 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:16:03 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 6/7] remoteproc: imx_rproc: request mbox channel later Date: Thu, 29 Sep 2022 14:17:03 +0800 Message-Id: <20220929061704.1571746-7-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB8221:EE_ X-MS-Office365-Filtering-Correlation-Id: 442c83e6-2cba-4ee4-bd82-08daa1e215d8 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aWAZXchNaMnUYY3wMJ9PHyEFfgOsSYO8G5yweD96VR8cMpSd2/MvqZWy7dWjuP9+2IY6Oec486aNqiXkR/DvrgnELnI3BiY/2aqUbZv8R2k/xs3Nbvv36xwCqXGfStXB81WgqWS9xyC/NFyBD0c8zMeX/aeB+mRvIu4nDM010agrk+KW3Ot9LNF8c6wqBOryqebWhuHYDZZC/bRJ/ricCVA4AtnkQeollm2yPRP4QvWfmq9HcmJaHvR31zgLGFGKUPIhyGfjuLCYXlJRGCOSXNc/ugM2D7vJOigRN5kNUVuIuzhTP8PbwI+bJEMDdBWhLLh2TjPCx0a9gSZfUCjw0Cdfj7Ridrw9fqPNiscfGXcFPPL7fJG1nHtkKJ2y5DsM/xZ6ileCvp5Uz1Cd/nEJIRHejpAoTgjC48+4YoFBwatFJcg9/J+C1QcYKYdtL29BG743C63OFemQ9bCxwzPBXu80dfx1E8LBEctQf6UsNPT/j7Gt7p+teFjB6wwvo4U3BY2w/Hf48uf/qwlwzXuakGHjHKLRYwU56ZRhYJDCb+UpI1Do1LQC1VxP2f/aFY0Go1r+tu6srv8b+XjTrK5vLPNuTZWaohjn08qhfU7UAhQZcvvYyTa5XR3ztpO+P9JmEzmdR4xftcTlUFqJV6aQM8/EO6Q0j38ppoUoMI0mjmMGdeytrPssYkN2a3/jjoXkgGsqkaMJeiNRiaLVx9ghBccmOY9Ly3BW6SErgzKbqzCmYwkh2VD2n3c+aPu4V7b3gZURVq+UqFlVAt4w+O72OQ== 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:(13230022)(4636009)(346002)(39860400002)(396003)(366004)(136003)(376002)(451199015)(26005)(7416002)(5660300002)(66556008)(66476007)(6506007)(41300700001)(8676002)(4326008)(86362001)(38100700002)(38350700002)(2906002)(2616005)(1076003)(186003)(83380400001)(6486002)(478600001)(52116002)(6512007)(8936002)(316002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 70miz2TnQUjbSt+I+xX9o/uJ4WNh5x5pV1OzQOZmB1Sm99CMhHwlBBDgxBLBtW7kvw1w5Vbd2rzDdiOgzFBBzCJGsjOKi5QcXeZD7GYfVFizXYy/SbspkceZ340xghEWFAK1CFiTAY1IajUyIcH6Qns/Rl/kYPMm5z5fIWyr0YfQjrW0cbP9YEkhtqudMzdhIsvalC6JhbeOkVypOc41vNFMFLPK6Kbz9LGT0zauF2JBrJ1vTQHxD/BDKOZXlzIwQ4BcDNk9DSYXPCnij9N6qC9AFW6hGuLASxmP763VdMxYsboCl1Vwb4HhBrWeQkp/9Qk9i5WT2Q+IQZTedf+BG5co/dNYjiVWIlFRAXNdaaq+CYyrHEzGE33Gewr0C3cQIB6v/wJ87zpxDBdw39PNTGi9WBFbZM0HIVBlpjEF0y1++Zz/TKPOCyQOg4NDtJoR4ikdaVpSudLQv0nKau2Ohsu/NhtUz5A67ZcZ+pIUNXucJeKxsnLIFjihqsaw1QZvOCxrTxfpGd2U/1ayFaRTLoII3bep168aaBCw+iLgthw9Nye/O4xvp5ukTkXniU2ss9Uh7yeoD93XIHF7W0Mqrc6T6ARvi0byFSxc6447OLdRSX2MGLcZ6f0eYAps/P8QC9VH3S2fcmVMNoiH+Q9mDgu0wzJ3iDx3wQxr+3GZueVtqQsVtbERahMm0QciWOw7gF01IF3qXvwjOUg4wYYhZJmvzA0C1RE3YXez7VKlleqPqP1CwdTpL/RpKK1t+RfECEHoQkCD/9tlIPhzSv4rbd7zzAxa/VcbH0t7BJdUdZ+JN/MNVI8jBZVCr+muO7zDJ0wHyTURMCTia8kPe6oabgzxnWnBzfYQRt48tr2i0k/6KwW40HE8aBqtcXskhi5dnLHL0JWzFWfazFWcW36h32e4Gt0No1WRiuqOFiEqtZg4IXEorRuK+4WtZ1qQQk35w6oGrn+fTz6xIJtW4TwvlFSDw7aEQh6mRmEuIgDFkVpOkiGV2SiBYOYBDEsbQir5zOZqMUpm2huOmDlKyGIvnIhIOSZIIM6sn2sOLYapuQo1dHGpCbEOwq/8BnWF67ZwOM+xXhIyGyu33Rqqvt5MR4gqyhahM5hyinZXqZPXzfzpzQLuWUiuQAgym4iJXQjFSD6yaRkq/7wtA0Iec5T2+F/UxiiIju0seS+3uK5R4oi45zA07zoDffKQslaw/7nI/gXCAdNlSu5qT6e/pYJETAQXbzyJn9nVjaEkByrOEiyHuh5tJzK2dxI1BpeGW2hRtwTjQhV+F0ogx3FigWXkkg0FH7nhEOR3VTD8J84ysir5ydFUPPl89Y8uF7dJzkBecnQxxgpXJd6WQJWEkasKZu2t8aFItd3IgE3tsYQMBsLTjCiDMJimIsQhxV1RMVmokxTMgjQeOr7vKBm3/mfFgO2JWkRWmiHOJXhETxG/1iOuDBGQfHIVRDJNyMVrKAGXEXUi29Z5Dl4PMLIQWhUDiNGBD9N2uo7XWo3bEHcK++sBeyoqBTrqeKLJzLoQW2eedxhGzulpjr44RH0CFwNVIIiAcYsrEdjzysdJjIMV50t30ACurnINKfl7zAjGT2AM X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 442c83e6-2cba-4ee4-bd82-08daa1e215d8 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:16:02.9739 (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: NvYwh3PSSOYtRJYHyWXMO2LpP8A+6P6As7H4OnyTTXaUfvoQOJ+mTYYjEYPzMSFuUoxNlDcjoy1j9bz4hYuRmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8221 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 | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 8175c4c9aa22..bece44b46719 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -84,6 +84,8 @@ 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); static int imx_rproc_detach_pd(struct rproc *rproc); struct imx_rproc { @@ -357,6 +359,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, @@ -407,6 +413,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; } @@ -592,7 +600,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) @@ -720,6 +728,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc) struct device *dev = priv->dev; struct mbox_client *cl; + if (priv->tx_ch && priv->rx_ch) + return 0; + if (!of_get_property(dev->of_node, "mbox-names", NULL)) return 0; @@ -749,8 +760,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 void imx_rproc_put_scu(struct rproc *rproc) @@ -779,6 +797,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); From patchwork Thu Sep 29 06:17:04 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: 12993548 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 21877C04A95 for ; Thu, 29 Sep 2022 06:16:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234996AbiI2GQp (ORCPT ); Thu, 29 Sep 2022 02:16:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234997AbiI2GQS (ORCPT ); Thu, 29 Sep 2022 02:16:18 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50077.outbound.protection.outlook.com [40.107.5.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E03F12DEEF; Wed, 28 Sep 2022 23:16:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QzAfp7Vn1oB8bk0GlDMT2JVe9lj29UKKvcQnZT8AGm3xfkyqdUlLxgmgu+QsiE2jdmfXo1HXFEm79aNhIE4WDlTk4N344REkwb7P7XftgzGQ0puf4hB3zfGXc5SL1nZqwlHzAVUsOFbrlxrIeD9LnR+XE9OWfAX+FDkVniY7jkMyP1NbWTZeXs4LXPZ/+eveZiLObdClwDZpGdyfNxUdziuqpQ1hKJrL3Kc8tYbH1VEVxe+1cjtBbFAwZf0ha5x25hDiAkwKN4fB4Qf/F3EenaDjCvyQxQZxrsnci0N9/Frkh1kMqjWYVTaJtqn6m+e8+q5fr5tDX0wV82lbMb0Asw== 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=01Yg2aj2QKUmt/sWL3qT8uDmAQ61PD0nN1eXHFbFUJ4=; b=ZbBlPWhxVe35KN6IEhgW36s8lruPE0pCnKYk1MTN541EhledIa1Zz9WZ3czInP2JaI0cMXcjME2dQFnARSJFxi5b2qUeWIQ6nemmxUv9+B1NB9mGz/dqm8AoXo5VLlDyt6hyqhvnOq2rqYEQcgBCWXK4LpbQYqPhhBxWnjBIKMqoZy2eWCBjxF0uG8GaZwufXeHaQVcZx37sUxa7KpLPW3B/QMCbrKApvRqghPrchi8kmVj/qYy8GkoNPspqC0CTVfrKCZUwfu2mD7gGDfS+t3FANn1d8UxjhKC3trXeilevqvrvUYK4ndDDUwlpD69sFlBi0ogoojRNNHsdyIbZFQ== 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=01Yg2aj2QKUmt/sWL3qT8uDmAQ61PD0nN1eXHFbFUJ4=; b=ccRZ7wBrZVuXxsZKQ4BBIrkj89gwRry8+Aoo4GHqHKJWXd6qa0+TglcbYTCLbqJuUczihEqfVjTFVDwqOCqcwiDcMXeD0+VH9vyfXXdZlhwuR3HEGjCKgRWO98sb09JhEaT+bciaV4+brXbwLGWcpS2LWJ1dCm+DEgTFMiuM5vY= 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 PAXPR04MB8221.eurprd04.prod.outlook.com (2603:10a6:102:1cd::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Thu, 29 Sep 2022 06:16:07 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::1eb:dcf:8fd7:867%7]) with mapi id 15.20.5676.019; Thu, 29 Sep 2022 06:16:07 +0000 From: "Peng Fan (OSS)" To: andersson@kernel.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: [PATCH V6 7/7] remoteproc: imx_rproc: Enable attach recovery for i.MX8QM/QXP Date: Thu, 29 Sep 2022 14:17:04 +0800 Message-Id: <20220929061704.1571746-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220929061704.1571746-1-peng.fan@oss.nxp.com> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI1PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:1f4::7) 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-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|PAXPR04MB8221:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e2ad5ef-3fcd-4fb2-edb7-08daa1e2186a X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: euxtdeM27NHtAJmH4O9Pqa9As0r4/rQWm0tF1fvHol8GCypJM2PA4G3NvFCQqjsWjaHJse55tkhMAVv/SQZWxwYBQ+DhmYqDpQIUbYvBly0MEulQTmIscm6fye6h5jT2kWMRCFxEb8ssLPKk8k4qY0S/lYR7yxSyvZA0+iEyFPPanZqfcSOs+TSmHpzGaUFLXVL7vis5w9J9Gm/ooniN2bXHuwoZSunikKLg1yCnC+UTZw/PMluiz/JwIGLIUYQUnd2pDvDTLhGWTG6LltpZNxYrlI+Wl6p6eN1TZzMLB49pZ5/S3ogeeVAeag5qyZNuu+RH0vbecXJNTm/bRKeNhXfV6Hwsffy1Kg4Lvh8ELSm9z0/TRad/GTKtk+42ZBSAjs/DjBc8/wPMO5KQTyosbQxHzylkjzitIcq58LDQkuS/xiLwAUbtGnBrdiuXl0UbLGDEwHWludJTI4H+ZGP5QcnydHnk4uSinUqgZVIv+74uTSr0paxgL9fJhv2NswcIwA90/rn76lwclRhPdraK1xNpEXPmpPCIY3K8B4NwgoLym6Y6fc7ktIhuy52ALjpZ26HpXZrkCmeuKRKyTr1Zzut/jABQ1N2rO0TY73BdNBeWd6sGEAlvwFt+Js7Q1x4KCh3krde6mBp9EgDgp+LMXHr5CmsLd1BEozbM7djfQaP1Xg6kmGAhNhoy21tdomUETM4t0qAN1L8f53238w82wKTiUskjugkHDATNxAiZgoTgd2BFN6Zz9kK8dIgRqlMUsSvI5vwt1NuZfVwMtNYcVA== 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:(13230022)(4636009)(346002)(39860400002)(396003)(366004)(136003)(376002)(451199015)(26005)(7416002)(5660300002)(66556008)(66476007)(6506007)(6666004)(41300700001)(8676002)(4326008)(86362001)(38100700002)(38350700002)(2906002)(2616005)(1076003)(186003)(83380400001)(6486002)(478600001)(52116002)(6512007)(8936002)(316002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bpzP8EeGU02CFYVlYBHua/Kf5LEKeb0A5jDDbq0rDKM0a7mU0Y5neF1tLNh8xk6Bf7qus4sE8L2yShMOr0xwQkEwCIluwcXpTBu4pRxFsBsPee8NvInMRas+mly9Mhqw/NSCxG6MRPTKU2AQdSp8eMRB+ryJmfeKVueiF35oRZdWGAaaYR3qCnyyEYBkUBFEIXOWd1sZO0JsN8RCkOkbj6VNxwB/9n3ktM2Hh2RAvrsWVoeQYxNwrwztrgYOqvCu4ePSk6l2QPE4kFLQzEUL57pUzMksSDexpXtThMc8sbgqTdvkImVg781yVl+r85lVw7rnpI1mCAOQM4SIsBeXUYK/jNi7PKHaXW9GfcDeR+vXeH7y9tXxtpNTNmHpnzUJ6nE0L3bzTkn+3a5R1uuMXgVjpA9tM3xbfc2Bs7Y9DZH4qb2riC3M0QKxkVqj93mdNWpKNoHNSJheJx7w/vOWuwIZx2dAweXpc9AtZ15Y5/n28J1rGRIL9X/bs+tV6K9HNtdwzgdRRQdLFX0sVsqz/LZcR9UzRqYju6GGi0zb8Skm0IlcE/mN194M2fy1p/clwB5GxVWPESw9gknWtdLCyLwQYvsIn6k/MI7VU8UB9q3eHQbhKcwvGL8d+6Gls01VEkidd2AFm0xnNv4PTZsU6BAUqIjaq41tTbvyfSoZQ46PBksmhnv8Efxo/rXKo8OU9BfXe966N0bQ3pmp7JYhB1HbP5tv2Vo4qurOkTPoSm0lNfBpPl2nEq/lk3hKfwUrbdQEAvmhUNd+DbErQ7yR2jUJ66q9TbKAwkkY7VtoxoZJswJE1r8GVv8gBNhs9t6gIKLAr7Rn+EDvlo6Xh2X7fLQ/Tp0QN2x2swB6+v6/jFzlqRgQAL3Gzn7y7v9l4jg/OR4CzG1h9retg2QkA2xsMAvsjMpyaRWABjsmsDVe1U4fZKOKbdO4ALHfM4jffFNfu5oBaZkVerxhS4L3LGkUrV0kSrDjTciDlQ/YtW7kwVT0CT9EgWB0mrrcX2JKwAfTLzYOnQs0ajvO+0cDE1NQu/WbuHe/5hzjdB06Lix7BMRIttkpO0ezMc4yz8rsSxQgRJnycXTfmUfV1UDx25EnBIqfRdJ2rB4Hmry9o6HDz4eu9V3N07XSWvumxsP3jDAU83DsmrFkP9j7agX5StMU7ZGxWrv7/HzVGH3tN8CfRvGiZYy1SLMUPUFaIzXjuiGlgNE7c8TBPUg1pH0wkC++FecA34QK0NEw/h2pD3Dq6tTcDCLStC4FVOC/6JT2bdFX693D7VaC8I6lBDMll1PcpXj5SnVqDVGXWsg8FcKLkU400k4uue8DH4INEns7dtamB8p1zteNuP4bK6hA0gDsgk5iA0khF9zHxc8KTZ3hyWrHb2GgGZJpNAdquwgQb8aNDaqJnpOXjEws9wdDAuBiEQZfD+VTQai1y5c+EOdx5A9vCYzAnkpb7sk7uIRbKVbVCXXfIMTG98tyQFc9JheOUtnRn9Jf95ucE9spyCse+DHAZnVy1PKt034wyw3+YgUgVKEkFT2qMPyRwvHmOESRmeLmJzZ+gpaLdZtKSwYUN55qDiMmKGnXb2jbK4eM1noS X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e2ad5ef-3fcd-4fb2-edb7-08daa1e2186a X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 06:16:07.3200 (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: mGV2ZH0hr+l2ObDHbKO8jmuEl3LEFPhBvj6eBkJXqqbJFvG+PzaCCTvwkY0rCp6EpLSrzpk8nYOtsL0pXxIOXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8221 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Peng Fan i.MX8QM/QXP M4 could recover without help from Linux, so to support it: - enable feature RPROC_FEAT_ATTACH_ON_RECOVERY - add detach hook - Since we have detach callback, we could move the free mbox operation from partition reset notify to detach callback. Signed-off-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index bece44b46719..4057d6f33813 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -603,6 +603,22 @@ static int imx_rproc_attach(struct rproc *rproc) return imx_rproc_xtr_mbox_init(rproc); } +static int imx_rproc_detach(struct rproc *rproc) +{ + struct imx_rproc *priv = rproc->priv; + const struct imx_rproc_dcfg *dcfg = priv->dcfg; + + if (dcfg->method != IMX_RPROC_SCU_API) + return -EOPNOTSUPP; + + if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) + return -EOPNOTSUPP; + + imx_rproc_free_mbox(rproc); + + return 0; +} + static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) { struct imx_rproc *priv = rproc->priv; @@ -618,6 +634,7 @@ static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc static const struct rproc_ops imx_rproc_ops = { .prepare = imx_rproc_prepare, .attach = imx_rproc_attach, + .detach = imx_rproc_detach, .start = imx_rproc_start, .stop = imx_rproc_stop, .kick = imx_rproc_kick, @@ -797,8 +814,6 @@ 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); @@ -916,7 +931,8 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) } priv->rproc->state = RPROC_DETACHED; - priv->rproc->recovery_disabled = true; + priv->rproc->recovery_disabled = false; + rproc_set_feature(priv->rproc, RPROC_FEAT_ATTACH_ON_RECOVERY); /* Get partition id and enable irq in SCFW */ ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt);