From nobody Tue Jun 16 17:01:46 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010034.outbound.protection.outlook.com [52.101.85.34]) (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 6E76339B49D; Thu, 30 Apr 2026 09:52:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.34 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542753; cv=fail; b=jL3/apkA2UWp8ahbs7rOidVqZI/hJCK+50kc7VtJGPX0K6+ucSadgK3bCsWaoVnT4LW2K7gJSs2jsPp69DkhFyAtsxXH+FJw5EB83YSUbNiZMZFHf4wW6+HAsj7PYdyXZ+wO6BJ1R4+dxEoZH6RkdP+a28cM1GqcZ+8ip19BjIs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542753; c=relaxed/simple; bh=jnTQdfTFLp2JmWn10ZJ78Ute+eShkAa8ihBDKw7zKv4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eyxPnNAN2/2ifZfK5OE43oYSkYrKaxF2MODGC4+VHh77b9damn5uKZQvt2OQgvor6NuixEdjJVCzV3w9BvkbtGQ2M0SBVpnvz09JGSsR0ot1VekUePOInKwFo8ny32SaRiHTAzAZ/blpbh9YlnN3Yp6rzL7kW52/079J2cJqB28= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=ksh04nt5; arc=fail smtp.client-ip=52.101.85.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="ksh04nt5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=slCmzWXI6x0B/oKNhZwHE81obtWmzKp3HBAHGUyk0r4jyN5x7ZzChW3MeNudikdeeYZ56hECn4uh/eWaE2FWUaxVkcMnGxP/9CCKo4J6ddZ4FKX6ZuoJfgxHi+kkF/hpiScRtkqjyfAe++k8sS0Zc5anApBnFolVBaNuFrR/ii+fZnyhvc6olkTxsEuEmCLFFF8TECd6JF4Fyh/khm2IaOQZsQBKKMs34ZEJ8UlD0eHssCkE3eA29Zmv9+zmSk9lIusPPUuyUUgLjfXhHcKGhUDwrooL6Ty/zwp4M/R/NVf/9Gg5DA7Q7YVXXdtZlGXTxKAciQh3A6N+yC2ozdyxGg== 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=l0oDnElCUWEvCuXVfmocWj+g4HkevS3k9gC8jpU9Txk=; b=IqpNDILn5Sn//CUbuS0IYeykRpjmU9E1lf6mgo12ThjsoN+WskNCJyxmhVGiDdPF8dvp7kiYFUMY3q01P9bwKitZWvXv61vGoYqVvntzqhs+kQPYFU0Tvg1iR+wUx6Z6+vfIRywId/WDTLdRbs3dPAB+ITPoqscj++QoaoiDLoFBD4PdYmCmtKs8S7orr2HbBr1+nyHBGuwjlqFML0pd3xB1zJMrzre5SXL9kfWEz4fEvYv2xAlcmfvewtgWUzjiZuzbfgDh6gPr1InxUUpaaCAbn7gpixmZaMimwTycJh6HSk87kUP2ZLC15stOW1Oor/o6ogFiaKem0Vm34ad6uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l0oDnElCUWEvCuXVfmocWj+g4HkevS3k9gC8jpU9Txk=; b=ksh04nt5bUh/K6Ln6xO8o4mppGewaCTjKRE1Vb+Zf2YvGAmial1x+LcCirFjo8aBhhLXVjmXjsegMjz7Vt5E0A1JRsj5+f3G5I1S+qXs3oanl6hU7gLTZQJ6Fz7wBFzNGapE2TqFT8VoYfUi0FvY54qJzrKNyKeqEaHjji8RkD8M+GwKGEtnWrQDp2lyhv/IeTBPE2P81qZrfch+ZkVM3lHpkllKFYbHYSaYnsDPKN5sA8blAlB3ScOz9hRAd65dXha5e+iHObckYLTKqDgXZGgzliVN8/Jw7H7u/6nvK7dkP4IEgF4Bu2wNoMi9YeZZmbON4GNV14RTFiWgtMQ1sw== Received: from SA1P222CA0150.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::20) by MW4PR12MB7286.namprd12.prod.outlook.com (2603:10b6:303:22f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.20; Thu, 30 Apr 2026 09:52:27 +0000 Received: from SA2PEPF00003AE9.namprd02.prod.outlook.com (2603:10b6:806:3c2:cafe::8f) by SA1P222CA0150.outlook.office365.com (2603:10b6:806:3c2::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9846.30 via Frontend Transport; Thu, 30 Apr 2026 09:52:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003AE9.mail.protection.outlook.com (10.167.248.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 30 Apr 2026 09:52:26 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:16 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:15 -0700 Received: from build-amhetre-focal-20250829.internal (10.127.8.12) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 30 Apr 2026 02:52:15 -0700 From: Ashish Mhetre To: , , CC: , , , Ashish Mhetre Subject: [PATCH V3 1/3] memory: tegra: Make ->resume() callback return void Date: Thu, 30 Apr 2026 09:52:00 +0000 Message-ID: <20260430095202.1167651-2-amhetre@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260430095202.1167651-1-amhetre@nvidia.com> References: <20260430095202.1167651-1-amhetre@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE9:EE_|MW4PR12MB7286:EE_ X-MS-Office365-Filtering-Correlation-Id: faf42476-c216-4657-0d12-08dea69e2fd7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|82310400026|1800799024|22082099003|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: wfYa9oFtpd/wWTH7FUXw4LVqWy2pHjS5JNgwXiikvtScnAqanGTqnNr/f1rvbnWGPv/bq7UYRbz9kEZUmVWNcvODkwbeP28sPp6awXdZ2syJ/XlYRwJ2gy1hFzs0qFpVX+6W1B+GlCa+1nlibmIiLplck1Q0OLlVyi03PoDwyzbevruRAN4fIZhjihNtr9rL65cWJBuCNNBGuGffhmUK1ICw//Vy6R2AKjEjAe4ttkIXL7RbDwWDtQ6QZYYOkgkzaJ6dXOXWO2YBnFfUP2H11GMR8fRqtHyPTnoSDuraB6cfsvjT2qc91mH5jK8U9hfudWCe2sZOMY65u4Q8SfdHvWHFqhCD2T+eeJq9H11ge85Wy87XQdDq2GdvnaKLjqP5eLEIxQ7eTNXr3OxIcXlIHfS7tgrxXTK3w7GFm+POS6aRyH0dWvCtVLnUreKfQeSOcvzOrfhMw8fheLnONjhnkeSq75mVFFmCjUpH4yqs417QbLwcvsjZsGU6OG0XG7vfnYwzMsmfo1z3Nuzdsi0WP8dT1e3qWS/E/isEX9mERvRodGlPGQ7HaKD5/bHRKiP1+PPPAc7No/+IFyajuUmrthAYhDIfKfuQjfUvmPUuL+T3f7zrcvpk1TxN416ju77Z5HEbIVREV4DzdOpovtZlnczfPTy3dOowKIa6/D8pOoPVpRDobnyDVtmq/qEzwYmJQJMfezHV32HhS5+RTVtJHk2aiU3HuRmajHL5uxg7GAJKTLYwo6KjQ6ljAYyYjNf1EF3gdZfOt7kBLMicao4SBQ== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700016)(376014)(82310400026)(1800799024)(22082099003)(56012099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vUmXbW7VRb2o+6lRabPaJpDL0fzD6tic/mJSqfMnTAsyEQ/e3eq1kYkqQ85yjU5qxowbnbLtJgSeX609ggkZbIBeSUPklF2KZQ3iRd+bpoiZa5KcUrgIoSTktgjWY77YGror6f5D9g+O0csEHVVq5FbTlkLdQaHHhQC30KIAy6bb4fiJCfCc7WgB3op9SSNByGj66YjXl5bYqzjNj9NQ3l/100hzWYZJ1l6RB9flmUsarDC9WWiK1YMUgIcDp0qkupsgU8/k7mEw3l3bjuOf4bYDGJQgPIcwnDSWRda9wTf8VxP+pYLhhbqOxgFtTu0e3Nh4s411WsmKNS7ja4mj76nO3lE3FkAu3V8erhEy56WQXycccMgULLjn4ij7LPcZ0xGYVKCVU05B8Jxv20BP0ULJdogF8P9tZK+oFPGrjDzFOpR9xuPMgKcvec0pNYYm X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 09:52:26.9895 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: faf42476-c216-4657-0d12-08dea69e2fd7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003AE9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7286 Content-Type: text/plain; charset="utf-8" tegra186_mc_resume() is the only implementation of the SoC ->resume() op in struct tegra_mc_ops, and it can never fail as the SID override loop has no error path. The int return value is therefore not used. Change the prototype to return void so callers do not need to deal with a value that is always 0. If a future SoC needs to report failure from resume, an int return type can be reintroduced then. Signed-off-by: Ashish Mhetre Reviewed-by: Jon Hunter --- drivers/memory/tegra/tegra186.c | 4 +--- include/soc/tegra/mc.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/memory/tegra/tegra186.c b/drivers/memory/tegra/tegra18= 6.c index 91d56165605f..579d058da220 100644 --- a/drivers/memory/tegra/tegra186.c +++ b/drivers/memory/tegra/tegra186.c @@ -154,7 +154,7 @@ static int tegra186_mc_probe_device(struct tegra_mc *mc= , struct device *dev) return 0; } =20 -static int tegra186_mc_resume(struct tegra_mc *mc) +static void tegra186_mc_resume(struct tegra_mc *mc) { #if IS_ENABLED(CONFIG_IOMMU_API) unsigned int i; @@ -165,8 +165,6 @@ static int tegra186_mc_resume(struct tegra_mc *mc) tegra186_mc_client_sid_override(mc, client, client->sid); } #endif - - return 0; } =20 const struct tegra_mc_ops tegra186_mc_ops =3D { diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index e6da035d1306..25d465d70493 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -164,7 +164,7 @@ struct tegra_mc_ops { */ int (*probe)(struct tegra_mc *mc); void (*remove)(struct tegra_mc *mc); - int (*resume)(struct tegra_mc *mc); + void (*resume)(struct tegra_mc *mc); int (*probe_device)(struct tegra_mc *mc, struct device *dev); }; =20 --=20 2.50.1 From nobody Tue Jun 16 17:01:46 2026 Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011043.outbound.protection.outlook.com [40.107.208.43]) (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 587343FB074; Thu, 30 Apr 2026 09:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.208.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542766; cv=fail; b=aTTTfZdAle7mzHejIFiP9mGYvpp8vD6FQM+OsOMCTAOhVTuJ5e55beWSHY7M5GOayWiQ2d5S/0UMTvmRfJBGMIaGqFPy39EpAzljs/EO9+t9HJP8aqiIC5CC6uQQv3pA8bQfWoX3kLETehn0KdS+8c5WuZ7HJiA3EBkH7X98R3s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542766; c=relaxed/simple; bh=OK29qeKDXhp41USjvcROyQJq4rbYg7w27Phu2mGTByU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u3QLMgkHfGdRFd21g5tAyuV7FzU8+OpRs7D8fpTRQBuqUrdFiqEAmtB7Taga5PPGc5DrZjtUPhxXPoILGSyUjqT9T8NJoZQJl5KJSG9g65zm1w1d6G2v1Gv0wDF9WRxhkLNnj1xxblmHizhpsD+B48h+vQD2zJGAY2IzGeCiW0Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=ZWAlNLm5; arc=fail smtp.client-ip=40.107.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="ZWAlNLm5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PqcfG+91bqL+H216iHUr49j40EYUUPURxvQjUEWrO+nJdbUbVVcH0TWrwCtP3IbYyZ571b27aiDr7G1lVR0qx5FkbbRFS17FyKtBd/jizdI49N5rCYggIkUcYi85mnoL0bBUiBbgcq94Jdy5EzPnRqosFjgOFmcOq+tFsHDRPnht4TsFHl1UhwZLCyWIlG9eTGbhxbl46zOGhU3duJysghZUfDejK4TxKbfe0X4W63AtmgA+92DsonSDUKgq4SoIR+9E8PKz5HpKuzqd72Be28O74h9WXz9xK81DrPsMxlkg0mhR1zVqBZC+iv80RXrZJdhC6Q47d9J053NmL4Qe+w== 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=ne75q34Vggmxaw/AS0oNNKW5lDqIDl1NbdAkcDyePoY=; b=ooL4oLvdH/zwzXpT4psvgH3z/g8UDGfnHH7fyIaaNXAXNGN8wlXIAjX+qFhg58bTp3UywRvPh6EkSvf2Tt1Bt9I50fCn1vK5tCwFaPJb6Jc9bYjiVc3540A584VybT3hPwVnejhvlI76Unsi/oQ9QLz13+OGGp3Dfwq1szzxU1WF6S/SiwwOxcCOagLpzeaIq0wDOeo3ZFMQGvfmJElniXgYU0lIxrFRRVLmg0QWSmSF0M+ihXpAvU7Q5yjlrVnQfQVyVMFWCOl2LWz6rzgeqv10aaPTQjzp6qJK2PFyIC55o660WShqTAUvdbx10X80uUen+dLCql8OgJGWZY87TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ne75q34Vggmxaw/AS0oNNKW5lDqIDl1NbdAkcDyePoY=; b=ZWAlNLm5zqA+ATOuSpXnYJZK32e8E0bmnqu5q0kFLKIcPL2pkXMLNntcL8AYSFaB4A+h4UEsLT7E1hKrrx2O0r6HbowC5lcPo1xdbpvGfmvPqssNDuBcR01reai+ZqD45N/eX1bLNY+5N2v3ry8CZTobWhKCzwbTzb3ma298DEDs8oBbnWy79bTOC052Lk0TTDMhNRnmtVNC+/n6wmXScszsk+Yi+C7w90FIfUgQBzx7NUz3MWgt9J2BBBVh+7R9CndztAS4jCpJbCkSBkH0Vh0fcx16n/krJDkxGP8JCMT7KxXnDInU1+e9359qvQSI5N5UYBsUjERyN7iczD/5PQ== Received: from CH5P221CA0015.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:1f2::9) by CH1PPF2C6B99E0C.namprd12.prod.outlook.com (2603:10b6:61f:fc00::609) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.15; Thu, 30 Apr 2026 09:52:38 +0000 Received: from CH1PEPF0000A348.namprd04.prod.outlook.com (2603:10b6:610:1f2:cafe::12) by CH5P221CA0015.outlook.office365.com (2603:10b6:610:1f2::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.21 via Frontend Transport; Thu, 30 Apr 2026 09:52:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH1PEPF0000A348.mail.protection.outlook.com (10.167.244.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 30 Apr 2026 09:52:37 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:19 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:19 -0700 Received: from build-amhetre-focal-20250829.internal (10.127.8.12) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 30 Apr 2026 02:52:18 -0700 From: Ashish Mhetre To: , , CC: , , , Ashish Mhetre Subject: [PATCH V3 2/3] memory: tegra: Wire up system sleep PM ops Date: Thu, 30 Apr 2026 09:52:01 +0000 Message-ID: <20260430095202.1167651-3-amhetre@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260430095202.1167651-1-amhetre@nvidia.com> References: <20260430095202.1167651-1-amhetre@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A348:EE_|CH1PPF2C6B99E0C:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b30edf5-43ad-43a6-1fa4-08dea69e3667 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700016|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: JLIoAJuqxNpN8jqCxZyQsFO7e/1zv8+PLBxJbsXAGxMvBImzmfOBbdoC50qh67nTNCD7zeQi3qCW7kAY3hzrC1S7GUF06dz9Db828F2q+Xl2ZMPSMsfuDHgw78OvvgItIBZeKHPIOIZiicraN3NYpzqIeQVGaun5vvEORUzxYJxiMvmxDQI6Y0QYa7vPpq3+8O3BMYwrzwujS4dtxF98UVJLaYM1jHGVkpn4MFOfSZIgnYZVjnGc1h3h2P169YBWPow8g0bQ2O2qGivdB/ejaQ5+k2HmrxUwCK3kv0Mk6dEp5TkdhSqYjreZbeMq23PJPLYv743W1qPPsMg3DAYNQj51qWVp8UXvz6aXRbMWNKv035Uh7uk4WPo2X72gNcmdf/BA+lBSvkQiArHnpBSCrOZKA1PLkyOOjmPRezIxkNHxg9ocXIh404YY7/7dtTZW+8E77R4lzE8WrPinAOnOfQFENnTxwCDBlhDAQlllGTQ2G0fXwmRbMMD2/UW2/GxCKpBFmOi/G3OIEwPvB0Pi13VGTJCRTUx8CjTR3CTaQhtNTjPvHbGrdnbKsY6b2pg//Hq9VW36g1RwyWcuQGD7FmajpAJAW8Usdbz8/e84BiiwZXTQcSBs9Sgdavx16ZBcFFq6BpDql7wca965aLLYZ5Cd7XlGkMbDMgKpYHVfpClP2BIyi/VDuALm2FL36caNp3Mn3o8xcw2rAZtz+UKUV5D2/Z9mbbNrjkeY4/mgpzTV4HQWbhGWGHmuV3dKzb1DkbItBPS6QN8CpCJ6B7oadQ== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700016)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gI/aLRME8VufWqKSsNoE217NGZpIveWhxj0TWpLLDMj4RHxJLtRauonCERDDXcxUzUbJoEjP3zat4DN/m0nYr1pCHTt2uH0y7+41xTJEzpryt/OATHvyxgUzatFSneJjvUyX1buDhdGvpCN76+kow1Fdk8rJq+oCYF1VWKOqr+jQwPVF8SINle8FTpunqF+mZiwZkkeqL+A34aTezAt+OsSV+E9yeJ9lkTS3teH/66LfrYUv3XYbkcQlxcxA2S/CqCZRjjgaYf+WQqaF4esd6YLLyY3lUFd1WmgGZ5INmAzR5w/Qi5GkJ+8jMlZvM2mPnGqkGiZNCMVBJOIExZRbEX2WL0/MxpMFaN534ZvwS+GCAOtxZutmk0Nz9+TV9+2tn607Srzb0LkbzaKp+IAPEmtIduZ6dmbkGtMcuJnT2bPthAH0V04FJZZcszpQLQyO X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 09:52:37.9361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b30edf5-43ad-43a6-1fa4-08dea69e3667 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A348.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PPF2C6B99E0C Content-Type: text/plain; charset="utf-8" The tegra-mc platform driver does not register any dev_pm_ops, so the SoC-specific ->resume() is never invoked (e.g. tegra186_mc_resume) on system wake. On Tegra186 and later this means MC client Stream-ID override registers are not reprogrammed, and clients behind the ARM SMMU fault on the first DMA after resume. Register a dev_pm_ops on the tegra-mc driver and route the system resume callback into mc->soc->ops->resume() so the existing SID restore path runs again on wake. No suspend callback is needed as the resume path reprograms all MC state from the static SoC tables, so there is nothing to save. Fixes: fe3b082a6eb8 ("memory: tegra: Add SID override programming for MC cl= ients") Signed-off-by: Ashish Mhetre Reviewed-by: Jon Hunter --- drivers/memory/tegra/mc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index d620660da331..64e41338cdf2 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1010,10 +1011,23 @@ static void tegra_mc_sync_state(struct device *dev) icc_sync_state(dev); } =20 +static int tegra_mc_resume(struct device *dev) +{ + struct tegra_mc *mc =3D dev_get_drvdata(dev); + + if (mc->soc->ops && mc->soc->ops->resume) + mc->soc->ops->resume(mc); + + return 0; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(tegra_mc_pm_ops, NULL, tegra_mc_resume); + static struct platform_driver tegra_mc_driver =3D { .driver =3D { .name =3D "tegra-mc", .of_match_table =3D tegra_mc_of_match, + .pm =3D pm_sleep_ptr(&tegra_mc_pm_ops), .suppress_bind_attrs =3D true, .sync_state =3D tegra_mc_sync_state, }, --=20 2.50.1 From nobody Tue Jun 16 17:01:46 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012021.outbound.protection.outlook.com [52.101.48.21]) (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 7D1F83AA1BB; Thu, 30 Apr 2026 09:52:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542764; cv=fail; b=EXnNj+7jLNTEt+IBs5Ln8CivnW4W9DxYVoWz9nksgOzGkmY+J3Xw8l29U92gCEhX2F/RMos0s/cPhepUXdzCTCk/i6VzjURg5LNkR4lTSB//MWM+Gk663VBVo5wui0UESOxN7gJthqV7AqEbvljmj8lUZ8VJJ6Fk1FOWKqAHP0A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777542764; c=relaxed/simple; bh=gy1a9eQll6/T6BHX6Mv9v5OYzWZYb6L9oO2q9SFUxHU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=APleVNTbLnAPfuSGYI2ARTT7xM8LkMbMNzYfrtJOTFuvuwp6OkTarfTsZIVB4TIumyghge17nomgYvuup7ICALHGoYpyFk6HrFhA+tpSCTBh83EnWTDgiKGeYdnzk2MQdVNT9Qok9MwjODIzLq0c6EbElU/ZgLU9XBlpSZsvVc8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=jJPLrKi/; arc=fail smtp.client-ip=52.101.48.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="jJPLrKi/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qhiQXjIq2BsGny7A9OzPxcqeIFJMxi1LnOolrjeNb1BmSB5Ukle8aeej6w/5OWVU3PgbLrfcOYu3QufCSPBRQbkULi/rrpTs8TRSYKeFocj9p6jMBkHUewTS+OS7jW52PCo2vo8fH4gY7trpBv6DHlKl54V29ND7yIsCPywxzYvWePokKcOnPw6FnSQT7OpoC1d4BucHzdbisUY4+b4IxFs3BWcDN1Trt4tqhZ9k9wcVu/oiV001AXEvLf7Lypnvdc2165d0i3/ckMhsDIpOKVedd2DM0uso0lF4JqPhuwfQe1yMm4ojX+TVETrWNuWOwv+llwMkdG/kNpJDl++6lw== 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=SX1uK2u/biXtXjzl77wrhn1R/t2jzzHTZxyMJQF/5M0=; b=n6/uCgKJPLrlwppYQt5oIGcXKX0iCzlnt8Ehr9qhoY54gx8sKU5sZFlmWnhY1+43oHzCJwlc4xZJv1+Bu2WXHKM+VdXnBTyHpW4J2uUOFF8K0NOkY5cW64LUPm8diE0WBvQ7bIXF0xBNt5JXITv7z6olIcniMlVHzjSqrD5I3JGCaK6YlKfxMkWMl+CZzBIblOwTUfilEAG3FNAvCWpFtbAhV272yNrkBPhZZAAzsEVFjrx+nQTETnzZU5ZLqok+o7bCVvKMzPJxxa4jpG/NxfFUAdvyoG3zGjuyEwvb4om8nZ8tjrV0xWiQbZI4NhMpoPd4Fm3YR8NkohLRmtc3Og== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SX1uK2u/biXtXjzl77wrhn1R/t2jzzHTZxyMJQF/5M0=; b=jJPLrKi/43ktoWRN42KqGMTcBM+wDlE4XJaRnuwPiP6S3A80GowJhE3jGupCKNum05S9a5hZ4PWAgZjKPJpCQ9tWZvZEfdUehPfHyRArKYqoVNmjtgyzFDjuKT3za2kyI8Uyi2GZd6MuCtJjlXbSOyinuLG98HZOeR75QERQvd5iT/FT+cQ8NlsEu43s7VvYZjOLyQXVYn5j6AU7iN+O+4D+VOSuPQhspZLcNLfFikNhb0kn2Z9PrNN53mrWQYsgmURYngLzT8+C3+3L2dW8tBRT1E6G/PC00r4YPWvM6MyvXUX8o4PruluHHgHp0Tm6Iiw+BgoBF/vP5jVsC3GQUA== Received: from CH2PR07CA0065.namprd07.prod.outlook.com (2603:10b6:610:5b::39) by DS4PR12MB9633.namprd12.prod.outlook.com (2603:10b6:8:27f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.12; Thu, 30 Apr 2026 09:52:39 +0000 Received: from CH1PEPF0000A349.namprd04.prod.outlook.com (2603:10b6:610:5b:cafe::47) by CH2PR07CA0065.outlook.office365.com (2603:10b6:610:5b::39) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.21 via Frontend Transport; Thu, 30 Apr 2026 09:52:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH1PEPF0000A349.mail.protection.outlook.com (10.167.244.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.18 via Frontend Transport; Thu, 30 Apr 2026 09:52:38 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:22 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 30 Apr 2026 02:52:22 -0700 Received: from build-amhetre-focal-20250829.internal (10.127.8.12) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Thu, 30 Apr 2026 02:52:21 -0700 From: Ashish Mhetre To: , , CC: , , , Ashish Mhetre Subject: [PATCH V3 3/3] memory: tegra: Restore MC interrupt masks on resume Date: Thu, 30 Apr 2026 09:52:02 +0000 Message-ID: <20260430095202.1167651-4-amhetre@nvidia.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260430095202.1167651-1-amhetre@nvidia.com> References: <20260430095202.1167651-1-amhetre@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A349:EE_|DS4PR12MB9633:EE_ X-MS-Office365-Filtering-Correlation-Id: e648401a-e776-40e6-5a69-08dea69e3708 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700016|82310400026|1800799024|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: QtC/h2QI6JS/ryUNDOiBXMQcQFMzzqY9PiP4irXtyP4eQ8gP0MMNvONxhYTNyaG8OqLKZ+IYRZ/l5pZRHhQW1IzoMR1TovixBH3pcegfPAFSDpNvAli+DpAWjJ1dLucqV44VfwL10zcssBENIpqtCUJuQLha/gYKkyuP0o0nEkkJkp0YChBmVs4eoeAmCV7PrTljU/ZldS3GtJml6zxyyqgDg8KXP68Tt3eOhdwnfzXyXCpv+ZlngY5ZhXJThJ7X5/EyoVlU0iaL01booRwa2AmYwHSSzjrM8b0par2wqxEo4xgLnQzfs8B0USX/MeQb/fF1G7+YUeR9maAkdZVkRm1Y2dZu2iMQeTEICfwTBW2aCakPkBB4b9uoLBqjYvldoaK23W2JqZCToRaaYeeaN7fpNUuxqaaiWkrjeLMytTgBQ/bgQOvaG11kNqHrEq4seg/Oc4FEfp1RyPNAtR72j8tNLKYXt/ZYEmsacWkmrUcEDCOpiA4IyWrXxQO+VXG/Wlsd3pmb/w9XPBqHdvulKdR1d+1LXjVITLSjQOEkAr5H3b2c85cXzBMCqwwSHam+fKH9FFXaND38VbZVu2kiVFC7Q8Ftmxun05VJgz2TLJaQYcRdRDKQPIV+6J5rQQCtCgdqcmQyNtLCKKqpgZxpGrtJT8ZxowEMb0pzrKxt4AYFhXhdroCLRZaWQDFOH3qR/+N+VRjxRr/qrwTYhh8ds6BVwinvIevY9BJAynrMGdTHPdXLCvFLWVi8OXwtkTq25g6l3EKttNOAnt52ysXFhQ== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(36860700016)(82310400026)(1800799024)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kHjF+cKDC2qhjTuK3lGqvnrqfqZUfRDWMeCZLvPbxTrLvPRvbRWMTWoo1QXq5DVBLhx7tgpXwgGVjQ+sP/7TDCqXqBVWMWcPXYiV1nYE/1aJPrPQQEIz77V2jLYmBy97Yi3+TZYIEOE8RfBz9LE02al7zgy8mF6LUB3o+pudTEdr4O6QVWEg0vpFscp3sw+4qy0j2l59dd91BIljEHMvFBS/IXDWkDVfmJxGnHgtUWNb+MwHxjlqa9XI2+JQuw1Tha/OmlGlKMu46iync2DWq3K7qjlUbZTkU4QjNpq6nS5Q3mUVuCpQ+DStntMKpHW3TNkrF1KwPRnO7skeKOmZBjXKxVZ+H9GOm+qZdX0iRY/9AB4T4u103OIXyflR8ESdSn2TtJlCMxBQGQ0YJvJpiS7zmuqtdawbSfrnKflJpZTnn6Yh4EyWIJzpYe2VAUCD X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 09:52:38.9980 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e648401a-e776-40e6-5a69-08dea69e3708 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A349.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9633 Content-Type: text/plain; charset="utf-8" The MC interrupt mask registers lose their state across SC7. Without re-applying them on resume, MC interrupts that were enabled at probe remain masked after wake, so any post-resume MC error goes unreported. Factor the existing intmask programming out of tegra_mc_probe() into tegra_mc_setup_intmask() and reuse it from the system resume callback so the mask state is restored on wake. Signed-off-by: Ashish Mhetre Reviewed-by: Jon Hunter --- drivers/memory/tegra/mc.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index 64e41338cdf2..cfcfc7291106 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -911,6 +911,19 @@ static void tegra_mc_num_channel_enabled(struct tegra_= mc *mc) } } =20 +static void tegra_mc_setup_intmask(struct tegra_mc *mc) +{ + unsigned int i; + + for (i =3D 0; i < mc->soc->num_intmasks; i++) { + if (mc->soc->num_channels) + mc_ch_writel(mc, MC_BROADCAST_CHANNEL, mc->soc->intmasks[i].mask, + mc->soc->intmasks[i].reg); + else + mc_writel(mc, mc->soc->intmasks[i].mask, mc->soc->intmasks[i].reg); + } +} + static int tegra_mc_probe(struct platform_device *pdev) { struct tegra_mc *mc; @@ -971,13 +984,7 @@ static int tegra_mc_probe(struct platform_device *pdev) } } =20 - for (i =3D 0; i < mc->soc->num_intmasks; i++) { - if (mc->soc->num_channels) - mc_ch_writel(mc, MC_BROADCAST_CHANNEL, mc->soc->intmasks[i].mask, - mc->soc->intmasks[i].reg); - else - mc_writel(mc, mc->soc->intmasks[i].mask, mc->soc->intmasks[i].reg); - } + tegra_mc_setup_intmask(mc); } =20 if (mc->soc->reset_ops) { @@ -1018,6 +1025,8 @@ static int tegra_mc_resume(struct device *dev) if (mc->soc->ops && mc->soc->ops->resume) mc->soc->ops->resume(mc); =20 + tegra_mc_setup_intmask(mc); + return 0; } =20 --=20 2.50.1