From nobody Sat Jun 13 00:34:28 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010055.outbound.protection.outlook.com [52.101.61.55]) (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 302194D8D97; Mon, 11 May 2026 21:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534332; cv=fail; b=lVibs+wJiHTQRX3eD/qX3wD4wBU1WPvKOlqHz7seiQZ1MGUew7hBvJpuQTqNI5jDt3jO9B5PxlIxHrkfvFEzePdQwyTzzrtMPry27ljmPwZIAk0Lyt3d7Wxo8W3oagVLYDz6ezHOZLrrgROAXKBOditNF4DU8x68I+odvu/NZaQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534332; c=relaxed/simple; bh=lFwp04Nz+9J0igI1aATVyNx4Qa3PcGsusqaBTAvm98g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E/efK3iTTOYbuOreBd+KtYsCNPcvI3k0f3asXc390z9Osqz1w2WJioWHHHy67zkMsk6IwQgX51wBE8wcsfrsZVbVbBkEi1Hsn6BPfDjVOjsLSBFjsNWikHYDP2hV6mu5/evxXI6zu90qkOHX9wFeNHnaOhBcWjCTs7E3x9HAlho= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ZapK+lun; arc=fail smtp.client-ip=52.101.61.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ZapK+lun" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lSz7p/9QgzZ8vjrdKuqRAbVd43mTWlSvEtbvMWnexdYcEELSPbhgTBaqOW5xzJiG6XEDGlvZmDx1yKzcJOZhzvinshgyqkGl5JArdzEhhg/T0uKFpc26QVCE5Y7C6rkBX6fR1jsY/G4W0AL68xYa8RUgnLiui+izYD6Yj2LVC/7PmV6xON+pVOcd5lZAdsh+uyNfDR+oSeR84eQq/7a2hKu8gNq962pusSM8VsEjA/5bwsmduu6InOIeNgzi6jDnLHCiT/QaNfayT4VZmCGagU+h741li7z8tvgS5mPTLgBFhcZ/dXEY4znX8SFwuGxVFysTupR/9h3xlmCxFn2ktw== 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=5D8QcQ2CFAE+h5a9tLotUgMYH26FH223QTRqGXKAQ2s=; b=qaAJHk/OvT6sNkgVakeaYZFVl7xOSZDBuUfjpHwSWACm6N0hqa280zCJ+Cidd+YEiJeG6AJXbHLOg0Tp8c57tbQDA3y142+f/OT1CFyuinm8JNTZF91smaN9ZUaDQGA7sG9J75gzSP5PsXqZM+nsQ1lBwOGdOtlJkmibfDENiPUHp0K3EYIj9tzVV3+TbmK+00k3XnnUE905dyior1qAwx/Ab84Rkq3XGhXRDSSt4X5Huy/ItNU+OSWzK2A/GO/gAfML81848at2orl5re+lAZ8a8MFMxhL7F5JfqKc3zkjWEV4DxweuKMxDxYnn+I9sdcVSP3ZMgMfucr2Md7l0ZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5D8QcQ2CFAE+h5a9tLotUgMYH26FH223QTRqGXKAQ2s=; b=ZapK+luntPJVTvb8trebvHw1OsWRM5V77n8ihGrJf4vmqu/fnZUSvlKpLx4vrAJYA0y6Nqgm8EdxgUBkxii1LzwEoWEDD0Vt21t1cUY8jLs31YunlbaI1+l+iUn7AYQdsrTy5rQ0jDGQhdo5Ky+h3913mIGWJ/6IFcYK1kKYaPc= Received: from PH7P220CA0147.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::21) by IA0PR12MB7673.namprd12.prod.outlook.com (2603:10b6:208:435::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.23; Mon, 11 May 2026 21:18:44 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::ff) by PH7P220CA0147.outlook.office365.com (2603:10b6:510:327::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.23 via Frontend Transport; Mon, 11 May 2026 21:18:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.13 via Frontend Transport; Mon, 11 May 2026 21:18:44 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.41; Mon, 11 May 2026 16:18:43 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 11 May 2026 16:18:43 -0500 Received: from xsjblevinsk51.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 11 May 2026 16:18:42 -0500 From: Ben Levinsky To: Bjorn Andersson , Mathieu Poirier , CC: Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Geert Uytterhoeven , "Magnus Damm" , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , , , , , , Subject: [PATCH 1/4] remoteproc: add common wc-ioremap carveout callbacks Date: Mon, 11 May 2026 14:18:38 -0700 Message-ID: <20260511211841.284809-2-ben.levinsky@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260511211841.284809-1-ben.levinsky@amd.com> References: <20260511211841.284809-1-ben.levinsky@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: ben.levinsky@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|IA0PR12MB7673:EE_ X-MS-Office365-Filtering-Correlation-Id: 70dffdab-199a-4559-aac6-08deafa2e1dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|36860700016|376014|82310400026|56012099003|18002099003|22082099003|11063799003; X-Microsoft-Antispam-Message-Info: FCAf9HbgiRj3akBMVvL62ZwuWcujpyIVUA4bxe9ncpqM5WfcSymexKVxUqpQ7AC6NBY0nxop0YfZMgSZkpmRQiqFAIoTFAzFyhJOCyw9ZD+E8UxLTbExpKReD559uexJdceEtOAm/IZp4IQ8di1Zq+1MgeXrViRIpVgezUVihG/pMEsasU1kPncG4MC4hBe2CTq/NTtnZzIG3prTodHjhWtRjO6R+fXKzibb3D7jtRnE+TAEz1M6NbUJKDxSYcaTuyFp+pMq7Aj37AoESDKfA0V2gl1FCR3qZntR4wvht7UzPebJUDUudWE2m+Lxz4OiWq0w6jWtAba9Li45cti+Ad+ve4LBP67RWhjOiOX+sAgd0eOid+ru/Irero5iUReeLIDqTNPPWMMHBjNaa5xXRIxoz72CaqRZ34anX/fhwhs0Xp/mxWgbWdhe8CVimmoi0wdjz5lyQBC/NcSr86kzIGuU/iMIJB/YN0DDKNmxx0nXaYMaxWK8uz6KSA1c7TC+j7l+G3cS0wuI/88SP0ybBKJRIjKHrURgs6FJspkGYK0KzzfOdOBeV79Q3aRwK/Pud/pFxfwBVXB85yY4XraCTYGe91ei+hXMeC9ZxhqqoD85RRf4vmzXuFC60bcpt5sm587f4kBQ8K/3wQsu+1XwT451mPR4GWW/0y6mLY+nK43tiv+XOi9qcAsvh2SxRfxtgBGbwVka3Gw8ynFPIpOs7u62M8yz35RM3kNE8X8PSh0= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(36860700016)(376014)(82310400026)(56012099003)(18002099003)(22082099003)(11063799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h/O8M5BMQdGXJ8NjqbLooOppX1SUftYfl5rUouVlAvsjXlHXDayHppEAVA3mNxHHiJIedTRvXk3htphukPiuhdHlfP2Hiua57zjEE/NXidvxqKiu006yFsDkjKPhRXeg+wqiDP75lw58YfLzflbpJjbxGuiyc47DluYJuoibZ6dwgqCPCCHmDuTalIkA97bz+SGN9FSVbizfD+/pgajKGbTxJgBaY/3MLi1GLGsKX89r/fhvhIQpQJgMKjSI8Fwibl2DQ80tgSyG/XbNKadY1ZCIhAUo4bBaq3KoUAi6VDW+MMv58xSZ7++LdtH4e+nxO+I+NIjkD2gd+L0HJ7F+WkADeYMFLZWx+00r1V9HXKFdfAMihDn5te6zoFFLAIZm9QqqmmtRes+qRYrI/7wdKuIVuDhUZWjq8qieop/F2eVCXzpHuIGgSf2Hprx65jFb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2026 21:18:44.1197 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70dffdab-199a-4559-aac6-08deafa2e1dc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7673 Content-Type: text/plain; charset="utf-8" Several remoteproc drivers open-code the same ioremap_wc() and iounmap() callbacks for carveout mappings. Add subsystem-private helpers in remoteproc_internal.h so those drivers can share the same implementation. Signed-off-by: Ben Levinsky --- drivers/remoteproc/remoteproc_internal.h | 26 +++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/= remoteproc_internal.h index 0a5e15744b1d..3724a47a9748 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h @@ -12,8 +12,9 @@ #ifndef REMOTEPROC_INTERNAL_H #define REMOTEPROC_INTERNAL_H =20 -#include #include +#include +#include =20 struct rproc; =20 @@ -122,6 +123,29 @@ rproc_find_carveout_by_name(struct rproc *rproc, const= char *name, ...); void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev); void rproc_remove_rvdev(struct rproc_vdev *rvdev); =20 +static inline int rproc_mem_entry_ioremap_wc(struct rproc *rproc, + struct rproc_mem_entry *mem) +{ + void __iomem *va; + + va =3D ioremap_wc(mem->dma, mem->len); + if (!va) + return -ENOMEM; + + mem->va =3D (__force void *)va; + mem->is_iomem =3D true; + + return 0; +} + +static inline int rproc_mem_entry_iounmap(struct rproc *rproc, + struct rproc_mem_entry *mem) +{ + iounmap((__force __iomem void *)mem->va); + + return 0; +} + static inline int rproc_prepare_device(struct rproc *rproc) { if (rproc->ops->prepare) --=20 2.34.1 From nobody Sat Jun 13 00:34:28 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013068.outbound.protection.outlook.com [40.93.201.68]) (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 5B7DA4D8D99; Mon, 11 May 2026 21:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534333; cv=fail; b=LTGZFRZ47S68CoDVDJCvg29nfTwA0y4ka/puGj4t1W4nHiprYifmSq/xh6PmzRqF2Ot4M9hSeXBu6WKxCcfiYDBjoo2um70FIyXUpQSgOAnq+2AEy5pRB4S5Fdir3Y/qSWXmpeVxI8eL6/NnNaepThq9ExS3sXyX4y6pXa4xbdQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534333; c=relaxed/simple; bh=lKtWS7wT7/faj1f9329oHG+2l6JGcCgx3qBhbmdk0T4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZMGKe45WCIFpqqyo9ykj1hv/Y0jauAyvUgjsMAMuNMBmLVcEiWoPKJH5+BpLyi69pRkayj1Uu6z0onTZxPHV2t1+6z4uZOaiqFAWVHoz7g5oZCwHPIwFXTehbYI5Eu29ORWAfGBmgQWupw6TjLxO6G1Z5WjXB0steeYhhdSzGng= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=My2CufKp; arc=fail smtp.client-ip=40.93.201.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="My2CufKp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tYN+lUSQhxfZfjBlC/2Rr7MNv5Yy8FewDA3MKRK8rblfu9Z20oENv6v6kYnNHehV4mKQ+tEL9IaYNRf2ZtIoUzjUZzSCrwRiCD/bqv0rM4iPwQJyp3+OtQwixAvkJVIAzu18MTPsNjIzWJWaXp5vR5CzheZ8nj5i+oZvWKsLtT/vyr+5T5crEKDeGA+svdUrMC732uCYrY6Ve4R2TJ1GIpbRXmmqu8V8Kuo0ONz4hzeHjnXs1VKsvU9BmNI8o7NiExWrhGnMF/UMeQ/Wif3wk2dC4dgOhrxqqv4B5BXLLphVGiyKBkxulGghnYF4wJycqXVyN+HVCghEjoVpvSAYCA== 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=pSBeNyxP/ruAZGXXJ4WWjx7AmL+RBdOwtT84bYwU3U8=; b=gMoFIX3IyJcnNQpFq+t01ipLAHdy8XXSCqRKFB7eonaiWXz+VbSRVTmpZd4oiw6kJd/tN6GZH6P1ZMSzaCDRjlMpT/xNpqo7p1DcK696BOcGT44gckNUNuDHZI5AcUeunRHmaE2PZ2887/4B6Z3/EkUZIZn1WsZ1c7Bz/kipxBYSKAIfbhY7Zi1ueDTpIRr8o5anZknSeOsAJ7FItxeemZpq4cmOu4iwu9Le7vNxZRlo40gkZzHD1YHnTefG+AHlQ7G+yvQ59FBDAO7poIqjBqcl2vzHsMFPn+2Mf8rJ23SazhWCUsgi7yQLuzBwEGGka7jCX8c/WVSRv/Sw3HTSXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pSBeNyxP/ruAZGXXJ4WWjx7AmL+RBdOwtT84bYwU3U8=; b=My2CufKpZfm5WOQNorbAFuKXR1Wavg2vfAeLq85iqV9JHoM4NhzUHk4GkHbcx/Y0G6SCyOv454qkyhlPyKAPQlfaqLUPqPPT/NPTSwddIh9Y+TXrU293+judvi/aOvd3wUu9WDjoG6OERop7xMpTSlWxlwQB9CfQir3jvnIKdmA= Received: from SA1P222CA0045.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::22) by LV8PR12MB9264.namprd12.prod.outlook.com (2603:10b6:408:1e8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.22; Mon, 11 May 2026 21:18:45 +0000 Received: from SN1PEPF0002529F.namprd05.prod.outlook.com (2603:10b6:806:2d0:cafe::cb) by SA1P222CA0045.outlook.office365.com (2603:10b6:806:2d0::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.23 via Frontend Transport; Mon, 11 May 2026 21:18:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF0002529F.mail.protection.outlook.com (10.167.242.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.13 via Frontend Transport; Mon, 11 May 2026 21:18:45 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.41; Mon, 11 May 2026 16:18:44 -0500 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 11 May 2026 16:18:44 -0500 Received: from xsjblevinsk51.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 11 May 2026 16:18:43 -0500 From: Ben Levinsky To: Bjorn Andersson , Mathieu Poirier , CC: Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Geert Uytterhoeven , "Magnus Damm" , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , , , , , , Subject: [PATCH 2/4] remoteproc: switch exact-match drivers to wc-ioremap callbacks Date: Mon, 11 May 2026 14:18:39 -0700 Message-ID: <20260511211841.284809-3-ben.levinsky@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260511211841.284809-1-ben.levinsky@amd.com> References: <20260511211841.284809-1-ben.levinsky@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB03.amd.com: ben.levinsky@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002529F:EE_|LV8PR12MB9264:EE_ X-MS-Office365-Filtering-Correlation-Id: 9be63173-43ce-4da9-1a68-08deafa2e26e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|36860700016|376014|82310400026|56012099003|18002099003|22082099003|11063799003; X-Microsoft-Antispam-Message-Info: rHAUq8Gi/G4zTNADbajA/aQoAlriMRdEw52rNV5kHvpD4ICCIBcU4th4iHHZZ1bVmrdE7DEEWueEVwKJ/PLjJOcw8H66ulqR+ddIAegZt/FaHfhtvXrU6rqkvDyeMf1eDWqcb94jDz0B36n+oKVkgPiQfNZXFVyF3g3U7pTB4et/YrIx5CpKjIpPMM5VMbXUobd7nRjsNDBQEZHfQZSBXLXLeC2CX43Om0cq/iNvXF1OvICiqp7x2Q/sN36VBhN3pmogfr1A3putZfyB5VxmJj0qSkEiJ0p4l8706YYbb9Z3DUHbd/LxMN4gtqhOMgfilSxI3XPDfRNQPLODsvmimQAm2LWV7tjRHkid9PzCGieRg35EHyCFlaZW1BEeZyFyZiofn3c1w9VfizKU7Q1RFXBom3z5Za4ccvIEixgRRrIqj9RCoTxe08vOd9eEudLI8HLlkeu4Z08y4ElqfQXcUaEbc2DmCJZJEmdJ/ilhPyIlfjGlt1T+ZWL7xh6yC5sHM4c2M0kitUjuCQsJPLh1U1waUcyBdRrqsxHKNrLK7jK/kOxDHdSOTBq3Hnt+lnte+whWt3fxzhPT1AjbvdXVmJnTzyui+Q1Ry4c5OuYpb8D7aSAoIfwzSst3zwQKR2WaxVArp7+nGeNaAtJ1ehla/BHIXWcKEJmZ/yi1Trjsti5vRtZ2NF4I3m+OcJ0h3a3n+d6BLr1k2ZJyBz4WqFpmXmnI7Jf9qgYolY9mlC7zPxU= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(36860700016)(376014)(82310400026)(56012099003)(18002099003)(22082099003)(11063799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ujqNltU4Imk8NgKwuPxeCXo4u8rqncPn8udQzONPsgyxCbHoSHGuUvYAXJgRjD1RAFuwJq+z/jqgZfQ7B4wJiwW4VT7cNcm17MBN1vGO2pyA4FM8Cl3yAG56tr7jZqwVA3SWdjo3su2EzZGZUoYDN/OQ0fbqXHjWiN+U5JmD2xK/idg3+2PUfsmnslEelCDJFmwzCjgBWoZ7M7BldTTCA/QqcSI7JI0TbP4KzRln4f30CFAmr0yF947A4I1NUtjBoI4LvYoz2zuDiLNh/bqZmB1JUgVBG4S5h87vl5sbX8dxMWygV0tzWKDUZFOssODFP6XmTBUlzkIoxGjMS7alkTHKqg+1AgqhIfIKruuzSy0GfNjHY9upnSw4s003HhaRUZ97IwhZ2fzOKhTbklO0b15aENSLtYQOQdmhW+8WQ0tNqlquXPLs/yjawoPgUdkx X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2026 21:18:45.1247 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9be63173-43ce-4da9-1a68-08deafa2e26e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002529F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9264 Content-Type: text/plain; charset="utf-8" Replace the exact-match carveout map and unmap callbacks in the existing remoteproc drivers with the common wc-ioremap helpers. Leave the zynqmp R5 TCM callbacks alone because they also clear the mapped memory and are not exact matches. Signed-off-by: Ben Levinsky Reviewed-by: Geert Uytterhoeven # renesas --- drivers/remoteproc/imx_dsp_rproc.c | 36 ++++--------------- drivers/remoteproc/imx_rproc.c | 32 ++--------------- drivers/remoteproc/rcar_rproc.c | 33 ++--------------- drivers/remoteproc/st_remoteproc.c | 31 ++-------------- drivers/remoteproc/stm32_rproc.c | 34 ++---------------- drivers/remoteproc/xlnx_r5_remoteproc.c | 47 +++---------------------- 6 files changed, 18 insertions(+), 195 deletions(-) diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_ds= p_rproc.c index 008741af9f11..2d9f14fbef1d 100644 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@ -644,32 +644,6 @@ static void imx_dsp_rproc_free_mbox(struct imx_dsp_rpr= oc *priv) mbox_free_channel(priv->rxdb_ch); } =20 -static int imx_dsp_rproc_mem_alloc(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - struct device *dev =3D rproc->dev.parent; - void *va; - - va =3D ioremap_wc(mem->dma, mem->len); - if (!va) { - dev_err(dev, "Unable to map memory region: %pa+%zx\n", - &mem->dma, mem->len); - return -ENOMEM; - } - - mem->va =3D va; - - return 0; -} - -static int imx_dsp_rproc_mem_release(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - iounmap(mem->va); - - return 0; -} - /** * imx_dsp_rproc_add_carveout() - request mailbox channels * @priv: private data pointer @@ -700,8 +674,10 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_r= proc *priv) =20 /* Register memory region */ mem =3D rproc_mem_entry_init(dev, NULL, (dma_addr_t)att->sa, - att->size, da, imx_dsp_rproc_mem_alloc, - imx_dsp_rproc_mem_release, "dsp_mem"); + att->size, da, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, + "dsp_mem"); =20 if (mem) rproc_coredump_add_segment(rproc, da, att->size); @@ -732,8 +708,8 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rp= roc *priv) /* Register memory region */ mem =3D rproc_mem_entry_init(dev, NULL, (dma_addr_t)res.start, resource_size(&res), da, - imx_dsp_rproc_mem_alloc, - imx_dsp_rproc_mem_release, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, "%.*s", strchrnul(res.name, '@') - res.name, res.name); if (!mem) return -ENOMEM; diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 7f54322244ac..6249815b54d8 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -600,35 +600,6 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u= 64 da, size_t len, bool *i return va; } =20 -static int imx_rproc_mem_alloc(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - struct device *dev =3D rproc->dev.parent; - void *va; - - dev_dbg(dev, "map memory: %p+%zx\n", &mem->dma, mem->len); - va =3D ioremap_wc(mem->dma, mem->len); - if (IS_ERR_OR_NULL(va)) { - dev_err(dev, "Unable to map memory region: %p+%zx\n", - &mem->dma, mem->len); - return -ENOMEM; - } - - /* Update memory entry va */ - mem->va =3D va; - - return 0; -} - -static int imx_rproc_mem_release(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma); - iounmap(mem->va); - - return 0; -} - static int imx_rproc_sm_lmm_prepare(struct rproc *rproc) { struct imx_rproc *priv =3D rproc->priv; @@ -692,7 +663,8 @@ static int imx_rproc_prepare(struct rproc *rproc) /* Register memory region */ mem =3D rproc_mem_entry_init(priv->dev, NULL, (dma_addr_t)res.start, resource_size(&res), da, - imx_rproc_mem_alloc, imx_rproc_mem_release, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, "%.*s", strchrnul(res.name, '@') - res.name, res.name); if (!mem) diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rpro= c.c index 3c25625f966d..e3121fadd292 100644 --- a/drivers/remoteproc/rcar_rproc.c +++ b/drivers/remoteproc/rcar_rproc.c @@ -19,35 +19,6 @@ struct rcar_rproc { struct reset_control *rst; }; =20 -static int rcar_rproc_mem_alloc(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - struct device *dev =3D &rproc->dev; - void *va; - - dev_dbg(dev, "map memory: %pa+%zx\n", &mem->dma, mem->len); - va =3D ioremap_wc(mem->dma, mem->len); - if (!va) { - dev_err(dev, "Unable to map memory region: %pa+%zx\n", - &mem->dma, mem->len); - return -ENOMEM; - } - - /* Update memory entry va */ - mem->va =3D va; - - return 0; -} - -static int rcar_rproc_mem_release(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - dev_dbg(&rproc->dev, "unmap memory: %pa\n", &mem->dma); - iounmap(mem->va); - - return 0; -} - static int rcar_rproc_prepare(struct rproc *rproc) { struct device *dev =3D rproc->dev.parent; @@ -73,8 +44,8 @@ static int rcar_rproc_prepare(struct rproc *rproc) mem =3D rproc_mem_entry_init(dev, NULL, res.start, resource_size(&res), da, - rcar_rproc_mem_alloc, - rcar_rproc_mem_release, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, res.name); =20 if (!mem) diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_rem= oteproc.c index a07edf7217d2..486180cdccb4 100644 --- a/drivers/remoteproc/st_remoteproc.c +++ b/drivers/remoteproc/st_remoteproc.c @@ -88,33 +88,6 @@ static void st_rproc_kick(struct rproc *rproc, int vqid) dev_err(dev, "failed to send message via mbox: %d\n", ret); } =20 -static int st_rproc_mem_alloc(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - struct device *dev =3D rproc->dev.parent; - void *va; - - va =3D ioremap_wc(mem->dma, mem->len); - if (!va) { - dev_err(dev, "Unable to map memory region: %pa+%zx\n", - &mem->dma, mem->len); - return -ENOMEM; - } - - /* Update memory entry va */ - mem->va =3D va; - - return 0; -} - -static int st_rproc_mem_release(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - iounmap(mem->va); - - return 0; -} - static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *f= w) { struct device *dev =3D rproc->dev.parent; @@ -138,8 +111,8 @@ static int st_rproc_parse_fw(struct rproc *rproc, const= struct firmware *fw) mem =3D rproc_mem_entry_init(dev, NULL, (dma_addr_t)res.start, resource_size(&res), res.start, - st_rproc_mem_alloc, - st_rproc_mem_release, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, "%.*s", strchrnul(res.name, '@') - res.name, res.name); diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rp= roc.c index 632614013dc6..7ac8265b60ac 100644 --- a/drivers/remoteproc/stm32_rproc.c +++ b/drivers/remoteproc/stm32_rproc.c @@ -113,35 +113,6 @@ static int stm32_rproc_pa_to_da(struct rproc *rproc, p= hys_addr_t pa, u64 *da) return -EINVAL; } =20 -static int stm32_rproc_mem_alloc(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - struct device *dev =3D rproc->dev.parent; - void *va; - - dev_dbg(dev, "map memory: %pad+%zx\n", &mem->dma, mem->len); - va =3D (__force void *)ioremap_wc(mem->dma, mem->len); - if (IS_ERR_OR_NULL(va)) { - dev_err(dev, "Unable to map memory region: %pad+0x%zx\n", - &mem->dma, mem->len); - return -ENOMEM; - } - - /* Update memory entry va */ - mem->va =3D va; - - return 0; -} - -static int stm32_rproc_mem_release(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma); - iounmap((__force __iomem void *)mem->va); - - return 0; -} - static int stm32_rproc_of_memory_translations(struct platform_device *pdev, struct stm32_rproc *ddata) { @@ -237,8 +208,8 @@ static int stm32_rproc_prepare(struct rproc *rproc) mem =3D rproc_mem_entry_init(dev, NULL, (dma_addr_t)res.start, resource_size(&res), da, - stm32_rproc_mem_alloc, - stm32_rproc_mem_release, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, "%.*s", strchrnul(res.name, '@') - res.name, res.name); if (mem) @@ -957,4 +928,3 @@ MODULE_DESCRIPTION("STM32 Remote Processor Control Driv= er"); MODULE_AUTHOR("Ludovic Barre "); MODULE_AUTHOR("Fabien Dessenne "); MODULE_LICENSE("GPL v2"); - diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/x= lnx_r5_remoteproc.c index 45a62cb98072..e5d1903c9636 100644 --- a/drivers/remoteproc/xlnx_r5_remoteproc.c +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c @@ -447,45 +447,6 @@ static int zynqmp_r5_rproc_stop(struct rproc *rproc) return ret; } =20 -/* - * zynqmp_r5_mem_region_map() - * @rproc: single R5 core's corresponding rproc instance - * @mem: mem descriptor to map reserved memory-regions - * - * Callback to map va for memory-region's carveout. - * - * return 0 on success, otherwise non-zero value on failure - */ -static int zynqmp_r5_mem_region_map(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - void __iomem *va; - - va =3D ioremap_wc(mem->dma, mem->len); - if (IS_ERR_OR_NULL(va)) - return -ENOMEM; - - mem->va =3D (void *)va; - - return 0; -} - -/* - * zynqmp_r5_rproc_mem_unmap - * @rproc: single R5 core's corresponding rproc instance - * @mem: mem entry to unmap - * - * Unmap memory-region carveout - * - * return: always returns 0 - */ -static int zynqmp_r5_mem_region_unmap(struct rproc *rproc, - struct rproc_mem_entry *mem) -{ - iounmap((void __iomem *)mem->va); - return 0; -} - /* * add_mem_regions_carveout() * @rproc: single R5 core's corresponding rproc instance @@ -522,8 +483,8 @@ static int add_mem_regions_carveout(struct rproc *rproc) rproc_mem =3D rproc_mem_entry_init(&rproc->dev, NULL, (dma_addr_t)res.start, resource_size(&res), res.start, - zynqmp_r5_mem_region_map, - zynqmp_r5_mem_region_unmap, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, "%.*s", strchrnul(res.name, '@') - res.name, res.name); @@ -560,8 +521,8 @@ static int add_sram_carveouts(struct rproc *rproc) rproc_mem =3D rproc_mem_entry_init(&rproc->dev, NULL, dma_addr, len, da, - zynqmp_r5_mem_region_map, - zynqmp_r5_mem_region_unmap, + rproc_mem_entry_ioremap_wc, + rproc_mem_entry_iounmap, sram->sram_res.name); if (!rproc_mem) { dev_err(&rproc->dev, "failed to add sram %s da=3D0x%x, size=3D0x%lx", --=20 2.34.1 From nobody Sat Jun 13 00:34:28 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010030.outbound.protection.outlook.com [40.93.198.30]) (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 5783C4D8DAE; Mon, 11 May 2026 21:18:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.30 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534334; cv=fail; b=con+zLo1tVxyIqZfsTAt/jiyfjOwR/7/YWBMGvLyqxFIcfTsqrmiufka+UxG+HWd5Cp8oTC7AuLwsJWBExffx4v63UVMWbSBrgat/9lBJp4y2iD1hgxPJtMYA++oDAk5RvbhSJmVO01mnCSIwZVIFNHTsqH4GhjQkd/8ieLjiXc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534334; c=relaxed/simple; bh=yHJ+rxXQAW5q4k45Q4lMTjUEAuEy5HklpBfPJr0FfsI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RoMcdBEHrjJ4AfPf/coVjQVirr+ul6zw8RQOkdMNrH16CEBRwKM8NrsCJCGnBg4l93SB0o1X9d/x/82v8b6n8sEP6OZi+CVRo0MjStP0HwX8AjyqhZZkVXVObxTKQOrBTNduZWqRHS474gA7fxfEuFCSQWl++TsqBK4vycpUso4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=hFvVd9bW; arc=fail smtp.client-ip=40.93.198.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="hFvVd9bW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l/VoHgU/Yae/qiBnUPzMlgw6RwUU47gcjeuA6LTK5WGY9mZYGZ7L30Y5iWIRcZR8Fne5yBcwCvI3/2lQvG0HgqfVe0RyK52NkSjiuCuTQyLnzR2fUO9mSimNVXO0ZWF3WhMeShoaCePsYwbO3gRLknfu62CijHkwVDS5BLmyjDC8XL4DP05JSjO9PgqAXJTJBeQPFuPmz3SPPY3iJQaBRNwUuVeWJTnk6iTi9Q+IOTuy/9G4VljueGt0fEmlOjkIiQTVkMJXcLhtR53Bzb4eg3IHKQOF4TQLV1e9MILF1O24YYTvyGdqsmGiGFidPUVzbxUWBHd7qMwd3UfQs3izQA== 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=eNhbZWAkgil4ZGNUckgm3UwUpHeOrexLpsmh/WgnsKo=; b=CDg15/U6e8Q/Qt/JeG4uB0UUundu/kKx9njYGOC8GPSfK7Aq5mZKg655n48eYPpHSrh7Tu6BPpdvWfcL27s+8EN2qlkfLtblGGNsAXU7noN1Z59YR4fyPKg1nLTIsnb0nKvfspWFDcZgD/C0AMj0oaE8VqSfUkBXiHImTbYIH0yUUl9+H/KM5ve53A6Ga8dg/2zBWkERaAXHAUCmO1k1Ku3KIfaM//KSznbDzLrQIFoRyZsjSBzz745Ji1N23kk5JshFxvFjTmJMyq2/g71+EW4N3PVLb4LAX8TNzyOgSMhla2fjrZgu3Zl65fW9T3pmw4lEdfRrASfxItVyNH7zPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eNhbZWAkgil4ZGNUckgm3UwUpHeOrexLpsmh/WgnsKo=; b=hFvVd9bWsvdqkUZMkJtOPyZlJq6qjxaBVHMksNUOTCEGmhsIHOojCWRdjdrEt3HH2f4+CMSvS5NlpA5qysPgjCMCjgmjoaqI5cdx4fon2J9snDwWez3d3MX2nRrAwjwZe7vS13BD4EFc6zus0eGB6db+PjF9v+UnIFZD1F+kweY= Received: from PH7P220CA0132.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::24) by CY1PR12MB9560.namprd12.prod.outlook.com (2603:10b6:930:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.23; Mon, 11 May 2026 21:18:47 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::19) by PH7P220CA0132.outlook.office365.com (2603:10b6:510:327::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.23 via Frontend Transport; Mon, 11 May 2026 21:18:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.13 via Frontend Transport; Mon, 11 May 2026 21:18:46 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 11 May 2026 16:18:45 -0500 Received: from xsjblevinsk51.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 11 May 2026 16:18:44 -0500 From: Ben Levinsky To: Bjorn Andersson , Mathieu Poirier , CC: Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Geert Uytterhoeven , "Magnus Damm" , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , , , , , , Subject: [PATCH 3/4] remoteproc: add helper for optional ELF resource tables Date: Mon, 11 May 2026 14:18:40 -0700 Message-ID: <20260511211841.284809-4-ben.levinsky@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260511211841.284809-1-ben.levinsky@amd.com> References: <20260511211841.284809-1-ben.levinsky@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|CY1PR12MB9560:EE_ X-MS-Office365-Filtering-Correlation-Id: fe901cc1-217a-4720-233d-08deafa2e33e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|36860700016|82310400026|56012099003|18002099003|22082099003|11063799003; X-Microsoft-Antispam-Message-Info: K8uLiGXZVmmbda/xbDFcE0A2l70yyuIAE3hojCTw8CYLJvem+HPicGAXNYkoKvXKfCfWsfZd6ePTIHwFBP7huKb1Pr7mU+g4Vc0+mJvlBrmHigEdfWoLzC0Vwqr3uwCb8zy6+lkSOH95BXpVHJ/8jYTPdE0DNrbIwiJj0U1azvDpTySsRehO0fDItpH8bfbse/4AD1Bc1grNHP9jG8Kcg5k8fkDZ6U1vB1A5IYrITTuG/ekcpScZKVnSBADt8YrccsJTey+K8DZW8Tz404jBmzV5J2ELLd8VRnvjU9qnvFx+peMnx6rwBQFc2DdgdN3zaAEcY21HT6+3eJiNYLuSp8leU3LyUYxrp/tyWRw6xqPKhvUrbDN+r2wYYk2rNyh5k+0jy6UreFeQkZp/O3PsB8T3ecm9ESb2Gjr1pVIJZw2UEzNJ3JnKJlPqJ22D2noF9/PfR29p3Pr/hHhFgVz2TfkhDi4pMcjnWtrA3eTdxk0NT0fQbNcuR4K5DMMpo644pvqAEAh2wgtZN4sDoVEe0RN4Vu9Vfv2CKD/2Ni7nBoqD4kCEZi+xaBnkBYUhk+TidJjhZ3rHOTkoTdd2/DJOjyWD5N756ULy+HW+Wzqi8hUNWOfJTp7jVJf2FsBUaiFN7Lrfiwfk3aeIhozttWjG0V2qyCcgQhbk+0Bo2TCqyRDhO3flzEjHUqxBX5uv0SKwKahrh20Ae48eXCNDyFlaOZPSpkG+vJSfAZhGOpPwjIQ= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(36860700016)(82310400026)(56012099003)(18002099003)(22082099003)(11063799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rjQi7OAU8vP6EhCRNIFp5DLrsgeYVAKkelpcksDjFvz+p7C9PEP2B5+7fh9GsO5K4cFpWh6oB6+NShHCROG5Q+qrig9PMM9XAsWmlePIhne4zcalr9QxtyzMLMZW2VqeerKoBfk5xesbTI02i+7OLgLtn9wJDVkg55ehDm/sSBXWmLRht/ZLH7nXafe7an9JkDAQg9j7TUovRSy99AbVADdSab9SRHmMSMNBtSy2m4NsGTlZyeWQfIGZST7pG9zaAVQBRB82KBAnhD+Y2qi5Vts586+U0u0dY3PhMG0pYRqliXYrp/366Aivw44qUJZK70r7Y9QEMi1rhztcga/9p+uXE4nw1IuqsTo/A5hxjuO4G1GnvCf8zMyXuorI3CebKNGqUqtoWGO7wKW0Co7cAzV7/7fYbuNRz1FD7vjSG8dgX8s/KIhiQga5BHYSHN/C X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2026 21:18:46.4348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe901cc1-217a-4720-233d-08deafa2e33e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB9560 Content-Type: text/plain; charset="utf-8" Add a small helper around rproc_elf_load_rsc_table() for remoteproc drivers that treat a missing ELF resource table as optional. The helper returns success on -EINVAL and propagates other failures unchanged. Signed-off-by: Ben Levinsky --- drivers/remoteproc/remoteproc_internal.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/= remoteproc_internal.h index 3724a47a9748..dff87e468837 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h @@ -146,6 +146,18 @@ static inline int rproc_mem_entry_iounmap(struct rproc= *rproc, return 0; } =20 +static inline int rproc_elf_load_rsc_table_optional(struct rproc *rproc, + const struct firmware *fw) +{ + int ret; + + ret =3D rproc_elf_load_rsc_table(rproc, fw); + if (ret =3D=3D -EINVAL) + dev_dbg(&rproc->dev, "no resource table found\n"); + + return ret =3D=3D -EINVAL ? 0 : ret; +} + static inline int rproc_prepare_device(struct rproc *rproc) { if (rproc->ops->prepare) --=20 2.34.1 From nobody Sat Jun 13 00:34:28 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010011.outbound.protection.outlook.com [52.101.193.11]) (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 4AA5C4D8DA2; Mon, 11 May 2026 21:18:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534334; cv=fail; b=rVPfYD8XxH2hohCXtwSWSWvTaPrJ/RTQgtt3d8dIDLcb1poTqW9NnsMg39xs/+D9GK63aD7LzePVXwg1uH3IuMeFUhFJHmAXmzCt4B2Uq+zzTOHVUaKFIBR3vgRJWJVGB+ZOTwtgtm5HJgPZwyxgXfP+4deQHUb1L2BOgLYT8L0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778534334; c=relaxed/simple; bh=p/mA4phiWvbU/0vF1YcxsVK9wK3noKqa+IyyYLZKCT0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Vtw8EzW1/xtVbymhhMARbfYvoeYB8SuZKF7L6wTZtkPTMm3x+UH/T2WVotNE/qh7m+3y1uq1mFYINqQGoORKZq3Hyi3ewIJcoD8Fg+Q8oQ8WlBl1Lbi2xdRA6ifIylS8CBUjXbCEpgC7Nje4hpOzhUxx8GfpgF+5v9PCHvu3zf0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=aRYgsQXr; arc=fail smtp.client-ip=52.101.193.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="aRYgsQXr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Fwcq5nx/Qcnd5lep+py62O7h3cp2JaLTzsjEnxew6Aos4u49riaymfLuStmd/g/FPBGchdPHgEtBkRIwmvTdwXIzu7SCcnMLz+f0d2h7HRyIoluRdfd+bQpKt3JcpiO/hhI8PBknFj+MEJsOrfJ6XEectiVpx7cq6KFvjwqe0IyPSreOvTDNh6QE4QJiAHT/ySQftfdMg9jXfrJ1FvAvj33EOiUCT8XZZ9/Iv49Ae0a9s47vGhXdfYz6vM1MWsT/awopzlMXB1KYAWa1h5oepDmjmNo6mwIyeFFDU+agBXV44qjfPeDjuOK3LLaUtG0QE1Xqrdqy9JYbzvDkL5p5SA== 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=woeT7VU8Hjkb7K57SLCyIj0RlWrZOv5LgSO4QQP10cs=; b=M0xVtsGfqGeFIDjdKGqWwQH0GVDSJo8cbz3ND0A5IZh3MLRGwlJWc2nVdHgacLSPFN5D/uSht47amvypa5AYv4I1U9dUGIL6e0ZCfmUPA8InmMzcOMoa7gZbYsDfl92zz5/dY0D/dLSKJ5aded51SNVd7u0QBYVJu2KeN5gUVBbjm5lVp4ptE69Baa+Zbmb1HdBPD4DKuopF+fc0bAXswNo14gwCQD2S69ZnAvHqMvU8diuNQ/VYCmGvsYPS3JZSr/7q6jUJ5+cG3p9lVqCLeMvehZXLY51x96UgL+xFKn/EqFP0MbbppzbSf8UMmNnPGFP9z3qhWaFGZqpQAP3AbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=woeT7VU8Hjkb7K57SLCyIj0RlWrZOv5LgSO4QQP10cs=; b=aRYgsQXrqA/by08gv/DsidmubamWQSM3Jfxmr6f118LJmXma9QHGYU6g5uDXVx4GEC00z9Wrrjw2Wa+6CKlnbG3zD6MpDw+Eu+/46AX72suPBmmyLP2sRHsE/Z5qUqqPkeCD9tzRgYbHJa06QAxABoXn9vKZVDBw0eYMsTG4ibc= Received: from PH7P220CA0146.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:327::32) by MW4PR12MB7142.namprd12.prod.outlook.com (2603:10b6:303:220::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.23; Mon, 11 May 2026 21:18:48 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:510:327:cafe::cd) by PH7P220CA0146.outlook.office365.com (2603:10b6:510:327::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.23 via Frontend Transport; Mon, 11 May 2026 21:18:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.25.13 via Frontend Transport; Mon, 11 May 2026 21:18:47 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 11 May 2026 16:18:47 -0500 Received: from xsjblevinsk51.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 11 May 2026 16:18:46 -0500 From: Ben Levinsky To: Bjorn Andersson , Mathieu Poirier , CC: Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Geert Uytterhoeven , "Magnus Damm" , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , , , , , , Subject: [PATCH 4/4] remoteproc: switch drivers to optional resource-table helper Date: Mon, 11 May 2026 14:18:41 -0700 Message-ID: <20260511211841.284809-5-ben.levinsky@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260511211841.284809-1-ben.levinsky@amd.com> References: <20260511211841.284809-1-ben.levinsky@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|MW4PR12MB7142:EE_ X-MS-Office365-Filtering-Correlation-Id: 48faee58-e905-4689-fde9-08deafa2e40a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|36860700016|82310400026|18002099003|56012099003|22082099003|11063799003; X-Microsoft-Antispam-Message-Info: gRAtMP5vcLp0y4xyzIzNFqsULmkolI9p3M4TlYTsg2cQXaKZW9e/sIuB5WcGRmi4GqF7ky4oJS7UK2hflvQo0WVTyyluKTlOajjyUPuO/cHloshD+7F372BhlK9CYMFhLLXWfIpaCc287bUSsbtaAdAEG5rQo/jlaKB8j9iyysrJpUJVpqBRXm1zlQk3LEjnBYlQt+knBOxg8Jip2zQ2NytplufgugxIJdp9E4Zo2ooxubFUFO2MBIlM5NK3Cp7C8l8ccW/7xzef8iR4VIOgZdQolMGNOCvKNpD+yLpxOvpIanbFt/ab9XxrB/nCoyDttbAmfiiTw6MlvwEGh5dqd7MhL+hhFJfGdIg/F0ElNSmTwaCgwg73sPv/9be3VkTUj0DjNxCA3qlI8m8pmCXlAAM32Gul19Nd0Ucs5AnZaz9Ryla650xYEZVtWAXzSGFujKYA+IRoa8gZehSbvF/hrNOlOmzNvQqxRBuqTaLX9upd57iskKDom7RzhyGNHVaN/sjyl/z74jM9CiRjXHd8PVeb4TxQhBjX4EGlOjqp3+mCggkrVw+RV37bFUtX8RTduQsu5KUv0f/l1t13vVZUw7EiCxmGUwS1kf6+UaPPjBskB+dIpLUPMyrGDq+FKRLlJP5u0uxmd5uIXKDk5/SM7xyeG7kCfguxLKM6QjvbztoLHO7Xnduh6BUm4Ld13TGIWwuvB8k+abztubWxYSqf/Za4y+sL/pzas9u4iP6TbIw= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(36860700016)(82310400026)(18002099003)(56012099003)(22082099003)(11063799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A7pd9nnxIAUzo19PEwmsAStbum6d/dF4YGVT9J794k5bcen7zSbCyBa0eHQrNTBQMeJbe+bSkDDrXDLVNLmISMYSgJ6nzU+IupOvQf9iMk2puQXwA0OnobEnOlla826G1x+sXT9kqtmM4zTFQFN0zZyo0Ofp12tEPLK3MbBCWtL+jAtKjGonVF7Z+Rt/xTsyGDZLyvv84kLNFZTXjgdAJ/yHyUpS+vf1V81aKM5yrMaXvJfU39b7tm4N7dRifjAVFhLfS0BIkZoC+vgSWTabsNZAyo09OZiPQJXpRBoLtqZhQqn69Hyzvvw9bM6kml9P1EJeNK3LtYGyDDdzUOKJUvMXcCVddYQ6xiDvWq7nsaDX9a8rW6cJQ9X73goJ3h8Ore+/7P86HqahjewO8Qgl0KaZr1jkIcztsh86uMG1W/wyqk0S18TXh56vmPouxKPd X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2026 21:18:47.7788 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48faee58-e905-4689-fde9-08deafa2e40a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7142 Content-Type: text/plain; charset="utf-8" Use the shared optional resource-table helper in the remoteproc drivers that currently ignore a missing table. This keeps the missing resource-table case non-fatal while letting other parsing failures propagate to the caller. Signed-off-by: Ben Levinsky Reviewed-by: Geert Uytterhoeven # rcar --- drivers/remoteproc/imx_dsp_rproc.c | 10 +-------- drivers/remoteproc/imx_rproc.c | 13 +---------- drivers/remoteproc/rcar_rproc.c | 13 +---------- drivers/remoteproc/stm32_rproc.c | 10 +-------- drivers/remoteproc/xlnx_r5_remoteproc.c | 29 +------------------------ 5 files changed, 5 insertions(+), 70 deletions(-) diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_ds= p_rproc.c index 2d9f14fbef1d..3e96e7978cd2 100644 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@ -954,14 +954,6 @@ static int imx_dsp_rproc_elf_load_segments(struct rpro= c *rproc, const struct fir return ret; } =20 -static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmwa= re *fw) -{ - if (rproc_elf_load_rsc_table(rproc, fw)) - dev_warn(&rproc->dev, "no resource table found for this firmware\n"); - - return 0; -} - static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *= fw) { struct imx_dsp_rproc *priv =3D rproc->priv; @@ -997,7 +989,7 @@ static const struct rproc_ops imx_dsp_rproc_ops =3D { .stop =3D imx_dsp_rproc_stop, .kick =3D imx_dsp_rproc_kick, .load =3D imx_dsp_rproc_load, - .parse_fw =3D imx_dsp_rproc_parse_fw, + .parse_fw =3D rproc_elf_load_rsc_table_optional, .handle_rsc =3D imx_dsp_rproc_handle_rsc, .find_loaded_rsc_table =3D rproc_elf_find_loaded_rsc_table, .sanity_check =3D rproc_elf_sanity_check, diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 6249815b54d8..5509048f7e19 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -680,17 +680,6 @@ static int imx_rproc_prepare(struct rproc *rproc) return 0; } =20 -static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *= fw) -{ - int ret; - - ret =3D rproc_elf_load_rsc_table(rproc, fw); - if (ret) - dev_info(&rproc->dev, "No resource table in elf\n"); - - return 0; -} - static void imx_rproc_kick(struct rproc *rproc, int vqid) { struct imx_rproc *priv =3D rproc->priv; @@ -777,7 +766,7 @@ static const struct rproc_ops imx_rproc_ops =3D { .kick =3D imx_rproc_kick, .da_to_va =3D imx_rproc_da_to_va, .load =3D rproc_elf_load_segments, - .parse_fw =3D imx_rproc_parse_fw, + .parse_fw =3D rproc_elf_load_rsc_table_optional, .find_loaded_rsc_table =3D imx_rproc_elf_find_loaded_rsc_table, .get_loaded_rsc_table =3D imx_rproc_get_loaded_rsc_table, .sanity_check =3D rproc_elf_sanity_check, diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rpro= c.c index e3121fadd292..7adaa6d37b82 100644 --- a/drivers/remoteproc/rcar_rproc.c +++ b/drivers/remoteproc/rcar_rproc.c @@ -55,17 +55,6 @@ static int rcar_rproc_prepare(struct rproc *rproc) } } =20 -static int rcar_rproc_parse_fw(struct rproc *rproc, const struct firmware = *fw) -{ - int ret; - - ret =3D rproc_elf_load_rsc_table(rproc, fw); - if (ret) - dev_info(&rproc->dev, "No resource table in elf\n"); - - return 0; -} - static int rcar_rproc_start(struct rproc *rproc) { struct rcar_rproc *priv =3D rproc->priv; @@ -104,7 +93,7 @@ static struct rproc_ops rcar_rproc_ops =3D { .start =3D rcar_rproc_start, .stop =3D rcar_rproc_stop, .load =3D rproc_elf_load_segments, - .parse_fw =3D rcar_rproc_parse_fw, + .parse_fw =3D rproc_elf_load_rsc_table_optional, .find_loaded_rsc_table =3D rproc_elf_find_loaded_rsc_table, .sanity_check =3D rproc_elf_sanity_check, .get_boot_addr =3D rproc_elf_get_boot_addr, diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rp= roc.c index 7ac8265b60ac..007175dcd7af 100644 --- a/drivers/remoteproc/stm32_rproc.c +++ b/drivers/remoteproc/stm32_rproc.c @@ -232,14 +232,6 @@ static int stm32_rproc_prepare(struct rproc *rproc) } } =20 -static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware= *fw) -{ - if (rproc_elf_load_rsc_table(rproc, fw)) - dev_warn(&rproc->dev, "no resource table found for this firmware\n"); - - return 0; -} - static irqreturn_t stm32_rproc_wdg(int irq, void *data) { struct platform_device *pdev =3D data; @@ -631,7 +623,7 @@ static const struct rproc_ops st_rproc_ops =3D { .detach =3D stm32_rproc_detach, .kick =3D stm32_rproc_kick, .load =3D rproc_elf_load_segments, - .parse_fw =3D stm32_rproc_parse_fw, + .parse_fw =3D rproc_elf_load_rsc_table_optional, .find_loaded_rsc_table =3D rproc_elf_find_loaded_rsc_table, .get_loaded_rsc_table =3D stm32_rproc_get_loaded_rsc_table, .sanity_check =3D rproc_elf_sanity_check, diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/x= lnx_r5_remoteproc.c index e5d1903c9636..92c1f8972551 100644 --- a/drivers/remoteproc/xlnx_r5_remoteproc.c +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c @@ -664,33 +664,6 @@ static int add_tcm_banks(struct rproc *rproc) return ret; } =20 -/* - * zynqmp_r5_parse_fw() - * @rproc: single R5 core's corresponding rproc instance - * @fw: ptr to firmware to be loaded onto r5 core - * - * get resource table if available - * - * return 0 on success, otherwise non-zero value on failure - */ -static int zynqmp_r5_parse_fw(struct rproc *rproc, const struct firmware *= fw) -{ - int ret; - - ret =3D rproc_elf_load_rsc_table(rproc, fw); - if (ret =3D=3D -EINVAL) { - /* - * resource table only required for IPC. - * if not present, this is not necessarily an error; - * for example, loading r5 hello world application - * so simply inform user and keep going. - */ - dev_info(&rproc->dev, "no resource table found.\n"); - ret =3D 0; - } - return ret; -} - /** * zynqmp_r5_rproc_prepare() - prepare core to boot/attach * adds carveouts for TCM bank and reserved memory regions @@ -849,7 +822,7 @@ static const struct rproc_ops zynqmp_r5_rproc_ops =3D { .start =3D zynqmp_r5_rproc_start, .stop =3D zynqmp_r5_rproc_stop, .load =3D rproc_elf_load_segments, - .parse_fw =3D zynqmp_r5_parse_fw, + .parse_fw =3D rproc_elf_load_rsc_table_optional, .find_loaded_rsc_table =3D rproc_elf_find_loaded_rsc_table, .sanity_check =3D rproc_elf_sanity_check, .get_boot_addr =3D rproc_elf_get_boot_addr, --=20 2.34.1