From patchwork Thu Jul 11 18:20:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13731011 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013038.outbound.protection.outlook.com [52.101.67.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E18F316F826 for ; Thu, 11 Jul 2024 18:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720722039; cv=fail; b=mTcZxTPIBZjsM/NR/TmR2ZH2NrO24EU0MEI/QxP6BuUfg0MUmO7OJaBv0aybcvJ+S8eEn9HWrqjT3la224vIECZAcvdmC4SjpfO8e4/01C/m8xlkj0+usNM14AhNUNfn3eQgrZwVuEE7S2hvLYRsvW2CeONKNIeFW/Yx43z+FoE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720722039; c=relaxed/simple; bh=wV6jeLzg3g3yedL24p0+Z/VLhNR2E9IdG2mdphSZULM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=YczJegaFKPwPm/O8r7j2OAucgfoCe8BaZ5CFuwsUXS20Jlxn5O2A25iYh2GWizqTBtIkOCiiyKML0wtH+5hYO6LuY70N+KMIHgqJKbzsZhf3Yn94hd+YdrwkuNzQyMPwRWnKET0djIXeP9zyTEBbcJl6w7wr4J2IpM6dudXsICA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b=Li+gK0FC; arc=fail smtp.client-ip=52.101.67.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Li+gK0FC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v//+/jBXw93W5qJ3AQi5/VcIoteGJii6AzOXSyG9jLL8eInvHQmXAI/QQodPMIwToahJIUenmPRK8ko0ZWxivqXcVjqAUrQrEujUOTkLK8/rfVzSQspuCzz7LGxFHJ47rzAFdRBh5grm1jvrX4/S9QvsRwLquEATcFgsCKQ/vDDVmBY0BHL3aOUKoUl32lW8XqvyXAu3SUDgZkQ+uLUHkrftjPOChG/zjY8fJwXBddQAvT8f9fzsQUAZ/3DyzugWouvFDpW8C1vI0M1YAa2fwKMYq4DvRmeOHna5oP0+EJ6Xbw0Lb6IZ65LZz1PRJTYts3go77KRQCw8vI/YFHO+WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qf4R1w+IFfREDDFzcckD+cSjnRzgbLiQXklZJaK0WWY=; b=J1tytqAa1SUoEt0Tq5dsqMLxc84iu9Jc91wW13xTs4S7oTq+EEFVGq1HVGqOb0hkNoFysw36EUq7dfnu5jTOLyu3NX0wp+bqvS+YBEBoOcmmjT6CVOV5lVRNX295tybj3IuDqiTEA6zGKFb9+srN8rPmc0sqRbZITraQyD7yE42DV5JeSfDHx+EDo2hmaYGpsxiQ44QMBeDeHvY9Ty541bCLu7IIDppzgO+KgDvKssP/QflLJrAmzfWi98VaexTrt5htN9CG8o5DR+QGNwuDR/3cb0MnQCEOUqGIW6hMParXATHwPTLs7OfwZweF1OBKgKyXzpneDxchZvFNGsYWeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qf4R1w+IFfREDDFzcckD+cSjnRzgbLiQXklZJaK0WWY=; b=Li+gK0FCsDIDbqV08Rufn95yofDlGtqX2IUZ5+G8vJZJYBIQEbEgH6ThJ5RvlNl5cbpwqUas+VhgL+05N58lSAx/RjgM2jirj8OjQnvJTCx6014CpCBe4d+M4vscTaztwOmcr44+g+3zu6mdNQUx+BGaCvMsxrA6ukmtLUfD7Ag= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DBBPR04MB7514.eurprd04.prod.outlook.com (2603:10a6:10:1f7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Thu, 11 Jul 2024 18:20:35 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%2]) with mapi id 15.20.7741.033; Thu, 11 Jul 2024 18:20:35 +0000 From: Frank Li Date: Thu, 11 Jul 2024 14:20:03 -0400 Subject: [PATCH 4/4] can: flexcan: add wakeup support for imx95 Message-Id: <20240711-flexcan-v1-4-d5210ec0a34b@nxp.com> References: <20240711-flexcan-v1-0-d5210ec0a34b@nxp.com> In-Reply-To: <20240711-flexcan-v1-0-d5210ec0a34b@nxp.com> To: Marc Kleine-Budde , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, haibo.chen@nxp.com, imx@lists.linux.dev, han.xu@nxp.com, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1720722012; l=6386; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=laFLVimb0DeJWbLI/AkKxnSps+vsZInKqjqapoJfi58=; b=2e4qM6H54zsC1usa6wNIsJtCGafFUQWK9SYPoJR2p1OaaClFEOMPW6TBBgdKEm2Vymhn4E/jX Q7v5Dm7pHT8BmzCQ4f8OPBqyNeczJUyAeKlxa1mRnkSUTvlrhCtKAkm X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR05CA0134.namprd05.prod.outlook.com (2603:10b6:a03:33d::19) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DBBPR04MB7514:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b426703-d4b1-42c4-30ee-08dca1d62829 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?5o7vVBOcUC9DA1aKx0N6GShyHDFrGnu?= =?utf-8?q?8cV2aeVbOx4od1lvcJWx8Ki/uui+L5cihdK9FgVv7GLZe9FOK7+JbeFy0+ilVF5p2?= =?utf-8?q?QOaMmnNhSxO3mIkvf407WQ38MUwDmjc55Bvqh+ezgLFTbDvY73qjFg9CmJ+cBIoR/?= =?utf-8?q?pzxeesf1dRwlPmWCbH+XMYLSpW4lwK/L8cvD9V5BoP9K7xtpmUdo1ldF+EMoHv2Ok?= =?utf-8?q?1eUu6nZgRl3lcLG2e7/0dP7VkkpjyiIDsdaWCemx3Hz0/8EemOyg6Jz3xxZdDWdsW?= =?utf-8?q?X2z9R+bc87S/UR9OwvUHzaUWewhJY4hUKEJW3KuJVDMiEeV01UP6jXpcfQ9iU4EX8?= =?utf-8?q?j0+VoTjjNT584JfN5Ll+fKZnWPx4KbZ5L4T9/ZxnFM/BM/cXw1B9rrV+wae/Djk+u?= =?utf-8?q?he67DmSeR3HyEWxECmXhvFEfctYcZb80wFn6j03bft9NKZ/HE1cx6HE6W0qhec7bG?= =?utf-8?q?B7600xCsCuqD6MHVUJ0//6nr/wLOxDFsD7sqFXpfdhBxBMTWrvGlUD75xeoF8gb9x?= =?utf-8?q?7iuRkH5vN1efydKnI0ODAbGP5rOjU5dk0IwT6Va7mPG6vRxcHk65LLhqvBkcqYdVs?= =?utf-8?q?1BAMy8P1d+Wbu2uk43MlTEU/dxBwnvJ7XtNg9Y1UE7DtUl3DgRFBHZT7z3mgTlukr?= =?utf-8?q?V+49rcjXb0imuw5xmTBy8tqRdV2b8x8wjnB8s6mtFztKnuqTJ6DpswmNUqXbJP8fu?= =?utf-8?q?pqDgEzHodTS7uV3euGGc7RQV9aPq3unm2lN3gb/BqYaNKhUkiY7RTcaBXtYvKAj5w?= =?utf-8?q?lo/lhTu0QgT2evh1kOV6rsK2cN8Lqxs2GcxI499wLZ2n2DZYoM0toObXsCjd4rZus?= =?utf-8?q?bNOduA+1XFc9VVHBVdfZ9DxcJedygkAyP5buw40yfVkOsolt0FGBKRs19/QAdJGhF?= =?utf-8?q?g23T/pE73nEgbp2oBYvFkktPCAcgVr0xVNkD0C7kV6s42ng1KtT9GbxaGlMP/2ktg?= =?utf-8?q?I05LP9/MaM67IRUVR9Op80VcUdDbxw+3JeBXV1wDWJK03aD1l+yhT7gRbEjOUH/zL?= =?utf-8?q?yh5XseVzFA66qR7GdXygHL+u4kTLxLLW4R8kaW84f1wmoXmNkY/Xbn+cekc3T+2z3?= =?utf-8?q?7pLDYmKT69/Q34Nx/XihBWp2gwfwHT2pnBd5URGBT0Ls2zJmnPw95w2WacoR2zC9f?= =?utf-8?q?h0UlxeDWBheJsDRAud7Gh7yIhr4HCKk9Y+DTIpUCWy1SGqwW4ya/chWBWm4f4Hus/?= =?utf-8?q?RU+6yXRtAh9oBTHsaO+0nMS3pgM98kqJH75veFj9dKUDt7A9pqDG1xD/Pv1E4kDp8?= =?utf-8?q?NmS7K136sgDtgXtSf43Aqb+Yhlp/92Aq3aC05WKrZe59i21w/Z/sV4lMXqW95v9NO?= =?utf-8?q?oCs6/2yFKW+hvY/8sIJ3cr+DE2ZjFoIuWA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MbOJA3VRxi3GV/5MdM9vggx2yolF?= =?utf-8?q?FbN/RkHVnZMRrP8MvKjayu4GPw2eQX/1kQdHpxN8aYg1qCothf4XWU0caLW0pLjfZ?= =?utf-8?q?ePscVjM+rkezGY1Qq9GxuXVeRENXk2I+8mZSR+UraBQtDkjcGfno1T6PYaMzkk2Tp?= =?utf-8?q?//gJGTtKgxnd9G9E0zsC/1Pn2od+y9XJmHjXGCHLCQhqj3vp4mMEctmzip3wntESv?= =?utf-8?q?fDFKCMawiFx97EytbsibemKrauSaMTwEtPAXETOhhw651DTAbNYpaMTyBaH7MLXEX?= =?utf-8?q?v0PRffbxwc+jtKzI5Z13fKbeH+dfrQL+TyUdEqAGFlhsdRI708BsN/4GTGc5ltDzl?= =?utf-8?q?AIDiSRGFD+ViT8bUWV/N4dQ4Iq326SeLD9DIoOTPE4z1PTt7XGmZGIyPWCegc2iOe?= =?utf-8?q?hblqvQhg9zfBdb6mhASIJdrj5FN/cCm435SXagfr1ZCm5rRw88ivFuMw8rDntwTSH?= =?utf-8?q?cV0mVC/2Qz9Svcr4CDWQxp5LZGVQSNzdH7y0dsnyfy9WqqVavwmaXA0kWGvUNRdAR?= =?utf-8?q?Ii5ota1X9D15oGK2EoLQcUe7Ob50GkYNkMOsUapQycSGTPXCKOgaVguYG+36l5d3U?= =?utf-8?q?tSeCWnGx+kfFYlMd+OhR21JoXsflOXMWX64KQJvjETUWnkLMN58ABgFNavnh63RQC?= =?utf-8?q?e5DgRVlvFImqqSPIzZUBIDzicawZV2VVX6sNsYUFI1hfvwQ+I2CxJDbzj32OrEq44?= =?utf-8?q?d97RMpYCKeVUlod0h9zXDbYoaowlx79NrMgkcW+fAdkos5XuLfxAuwB4uea0xxLQc?= =?utf-8?q?6u71Mws0uezvtUKkXspSuP2pvturESPjH4BlTdf/1Ii9TccjbFONrQGg+U290Aeqt?= =?utf-8?q?2rbEzCSiHZozVbw2Z7vcjGkwCDNX2jyoXLdSn57Ftw6e7z4pDARzV00D/bpbh3Fv7?= =?utf-8?q?B5P/dNBGtPEoV2ygTjSGtfmD05hC3mV0eBkXoP2/axL8kofa764tHrvQMAVTTk32u?= =?utf-8?q?QQM+tQulXA6et56Jm5nHsp/GRCxAE1FKYkP0l1nhTLjSrZvcsUmNauRbVuCM3Yk5r?= =?utf-8?q?iI5JfR5sAcB5cBc8bvHJp7mlStbrx+9ESJjwMk6/HsJskfOrzEOhDqr0gFw1kF1bQ?= =?utf-8?q?dNpC0y7QQZVHs6Z2+Wt2SV+KX/fkTUvmiuGoAfvZUiRIDf7N6U9wRFrc6cJxWi/ai?= =?utf-8?q?QVdeFHWn9kLIU7O0sy921HnQyymM7qugSMlikMR7B+U4qucSk+QH+4jefLdSAQi7+?= =?utf-8?q?7WyZH40m8UUIqvKfT6FhYWvjieFRXfJZeXC9d/yo7CbGu/EaUXpZ+KGfc1YmWiu8X?= =?utf-8?q?rwLiNZosv8Wo0fhKwq/17R6jvbtzdIwVxfVfHmHM7JPbizo/tLG5/x+yggApWGdMV?= =?utf-8?q?HZDRtV8jRE7sJ2fXI5sqC0fqEyzq43GNux+tVcZ68GakywRN8twQGM3mJxheWQFcA?= =?utf-8?q?IQP6OPsBMwvlu3gQLYf2+8IzC73SyJK8jvIdbjs21Ch/wv0dhbpwZzcczEKmmTCPm?= =?utf-8?q?hxF7bA91vMa/EtycUHKpw4ebtsilVh/4GsB3uvu7EQMWwPypuixyET2q6mkLFVZfb?= =?utf-8?q?FZ0ajoD+jv1u?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b426703-d4b1-42c4-30ee-08dca1d62829 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 18:20:34.9467 (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: TPQRGiGU3RORLam5sJbzKpIuFoZ20rG0W4DU/4nKvakObkXsbUTo1HeO8TXg0VtrdFrjI0CxLo/sQQGi80XJeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7514 From: Haibo Chen iMX95 define a bit in GPR that assert/desert IPG_STOP signal to Flex CAN module. It control flexcan enter STOP mode. Wakeup should work even FlexCAN is in STOP mode. Due to iMX95 architecture design, A-Core can't access GPR. Only the system manager (SM) can config GPR. To support the wakeup feature, follow below steps: For suspend: 1) linux suspend, when CAN suspend, do nothing for GPR, and keep CAN related clock on. 2) In ATF, check whether the CAN need to support wakeup, if yes, send a request to SM through SCMI protocol. 3) In SM, config the GPR and assert IPG_STOP. 4) A-Core suspend. For wakeup and resume: 1) A-core wakeup event arrive. 2) In SM, deassert IPG_STOP. 3) Linux resume. Add a new fsl_imx95_devtype_data and FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI to reflect this. Reviewed-by: Han Xu Signed-off-by: Haibo Chen Signed-off-by: Frank Li Reviewed-by: Vincent Mailhol --- drivers/net/can/flexcan/flexcan-core.c | 49 ++++++++++++++++++++++++++++++---- drivers/net/can/flexcan/flexcan.h | 2 ++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index f6e609c388d55..ad3240e7e6ab4 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -354,6 +354,14 @@ static struct flexcan_devtype_data fsl_imx93_devtype_data = { FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR, }; +static struct flexcan_devtype_data fsl_imx95_devtype_data = { + .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | + FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX | + FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI | + FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SUPPORT_ECC | + FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX | + FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR, +}; static const struct flexcan_devtype_data fsl_vf610_devtype_data = { .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX | @@ -548,6 +556,13 @@ static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) } else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) { regmap_update_bits(priv->stm.gpr, priv->stm.req_gpr, 1 << priv->stm.req_bit, 1 << priv->stm.req_bit); + } else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI) { + /* For the SCMI mode, driver do nothing, ATF will send request to + * SM(system manager, M33 core) through SCMI protocol after linux + * suspend. Once SM get this request, it will send IPG_STOP signal + * to Flex_CAN, let CAN in STOP mode. + */ + return 0; } return flexcan_low_power_enter_ack(priv); @@ -559,7 +574,11 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) u32 reg_mcr; int ret; - /* remove stop request */ + /* Remove stop request, for FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI, + * do nothing here, because ATF already send request to SM before + * linux resume. Once SM get this request, it will deassert the + * IPG_STOP signal to Flex_CAN. + */ if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) { ret = flexcan_stop_mode_enable_scfw(priv, false); if (ret < 0) @@ -1987,6 +2006,9 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) ret = flexcan_setup_stop_mode_scfw(pdev); else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) ret = flexcan_setup_stop_mode_gpr(pdev); + else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI) + /* ATF will handle all STOP_IPG related work */ + ret = 0; else /* return 0 directly if doesn't support stop mode feature */ return 0; @@ -2013,6 +2035,7 @@ static const struct of_device_id flexcan_of_match[] = { { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, }, { .compatible = "fsl,imx8mp-flexcan", .data = &fsl_imx8mp_devtype_data, }, { .compatible = "fsl,imx93-flexcan", .data = &fsl_imx93_devtype_data, }, + { .compatible = "fsl,imx95-flexcan", .data = &fsl_imx95_devtype_data, }, { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, { .compatible = "fsl,imx53-flexcan", .data = &fsl_imx25_devtype_data, }, @@ -2311,9 +2334,22 @@ static int __maybe_unused flexcan_noirq_suspend(struct device *device) if (netif_running(dev)) { int err; - if (device_may_wakeup(device)) + if (device_may_wakeup(device)) { flexcan_enable_wakeup_irq(priv, true); + /* For FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI, it need + * ATF to send request to SM through SCMI protocol, + * SM will assert the IPG_STOP signal. But all this + * works need the CAN clocks keep on. + * After the CAN module get the IPG_STOP mode, and + * switch to STOP mode, whether still keep the CAN + * clocks on or gate them off depend on the Hardware + * design. + */ + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI) + return 0; + } + err = pm_runtime_force_suspend(device); if (err) return err; @@ -2330,9 +2366,12 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device) if (netif_running(dev)) { int err; - err = pm_runtime_force_resume(device); - if (err) - return err; + if (!(device_may_wakeup(device) && + priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI)) { + err = pm_runtime_force_resume(device); + if (err) + return err; + } if (device_may_wakeup(device)) flexcan_enable_wakeup_irq(priv, false); diff --git a/drivers/net/can/flexcan/flexcan.h b/drivers/net/can/flexcan/flexcan.h index 025c3417031f4..4933d8c7439e6 100644 --- a/drivers/net/can/flexcan/flexcan.h +++ b/drivers/net/can/flexcan/flexcan.h @@ -68,6 +68,8 @@ #define FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR BIT(15) /* Device supports RX via FIFO */ #define FLEXCAN_QUIRK_SUPPORT_RX_FIFO BIT(16) +/* Setup stop mode with ATF SCMI protocol to support wakeup */ +#define FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI BIT(17) struct flexcan_devtype_data { u32 quirks; /* quirks needed for different IP cores */