Message ID | 20240103183250.215811-7-limings@nvidia.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T4z0B2W7nz1yQ5 for <incoming@patchwork.ozlabs.org>; Thu, 4 Jan 2024 05:34:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1rL64N-0003MZ-Jl; Wed, 03 Jan 2024 18:34:24 +0000 Received: from mail-dm6nam10on2052.outbound.protection.outlook.com ([40.107.93.52] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <limings@nvidia.com>) id 1rL63U-0002t7-41 for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 18:33:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKocfjemRqaOotsDi07Foz8HYSPuCPKcoWgzmDjjIb0ZpmTdMoqw4HstYNyqjiazbcozR+a5Jl9/xbUwmaSzieslpFSJ77tJ5uhpy0jiRmi/txMg3t+AjiQh83/9zGNtjUYXlZ86Vh1y5ARv3eIOMHzFJmfoL7kIcOR0h90fczziuaY2+29SzKOhhloO5XZWLE6cCOL6RlZhJEQfXTP3SzV9AwLX1nK7WdFyPIzDzfyaPUzWIGd1PIJ73tuQ2oe8OXK7hoeCf0OWDFQ7601HooW8Z40NZ9Qi9AaxzY5+jMHYIeUk1WsU+nzfiSmSMnv+H2kRlnr2XdVRv2yPS2U5bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4NoDOym8W1BSjRmR82uC3DEC7d5HEUOCgtySiDLR5jk=; b=XDaiMs3uAvtCe3q98jSQSvo+3lZw1LEIhjt4SK06ZDt+xDxIIvfl1UugkESQhUVjtTIAYfRfXtD2JW4TYMVfoWkllf/PXE/RPHD8ex24rGForN/Nn9oGl0tbfotSfW2e9Mneh0cLgBbpUP2zEm7uKkQjYdXWnqY3edBL2PCeKUlF4BcLTmJUxfZ+tm3qv3990hw/ows+nXITZ6Lrj0r3oIvRuZ04v5NRc/yLWVpNWYTMAB/PoztprASX2lb7PjIHrtqCFa9PYsdy8ArcvzRDZpuAqDn3PBlAsWEtkjEMJsLTlRsRkh83mOqeQX5c+PnJfDZ/pEh9WnYuFkM3hj+7eA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=lists.ubuntu.com 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) Received: from BYAPR06CA0059.namprd06.prod.outlook.com (2603:10b6:a03:14b::36) by PH8PR12MB6961.namprd12.prod.outlook.com (2603:10b6:510:1bc::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.14; Wed, 3 Jan 2024 18:33:24 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:a03:14b:cafe::e3) by BYAPR06CA0059.outlook.office365.com (2603:10b6:a03:14b::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25 via Frontend Transport; Wed, 3 Jan 2024 18:33:24 +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 DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.9 via Frontend Transport; Wed, 3 Jan 2024 18:33:24 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.986.41; Wed, 3 Jan 2024 10:33:09 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 3 Jan 2024 10:33:08 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Wed, 3 Jan 2024 10:33:08 -0800 From: Liming Sun <limings@nvidia.com> To: <kernel-team@lists.ubuntu.com> Subject: [SRU][J:linux-bluefield][PATCH v4 6/7] mmc: sdhci-of-dwcmshc: Add error handling in dwcmshc_resume Date: Wed, 3 Jan 2024 13:32:49 -0500 Message-ID: <20240103183250.215811-7-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <7315e47661ea7ae98ccffaee3c4d921c8de7ef07.1702924774.git.limings@nvidia.com> References: <7315e47661ea7ae98ccffaee3c4d921c8de7ef07.1702924774.git.limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E2:EE_|PH8PR12MB6961:EE_ X-MS-Office365-Filtering-Correlation-Id: 81369056-4736-46bf-50c4-08dc0c8a7854 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qg84RVyNmx1Hh5rPojEaToJrU2Rn60yP/iQ+0MZ/RAhJP3RwJilnjt4GMjAYWdU1zIPOOhU03QqGrp79iY/AUpZ120stQJPvPQnDgQax2FXEEK2WNcT2Ffgf1ctYUdLYfEivSv7bTmmWpu9/g1MSKfd3hVTtz4C257Bezedo8rtpm+YmAfsQ+pIzr0/rtBm2AbEZk6CvpHIfa3L6X6GaGWt3rDIls4fAB/J4aiPrUtl9NWhgkk3doqeYRVESBjAxK+ABNpmAzF/G/SuzsNn2pNOEkATQblCfTuQmsmJ9AeIccAc3ut5DXhL1Biqn4zG+Ay46+l9Uyi/n0NpqjtoUxIOxYQFP8VLSlZs+kShCWPrtI79M39ZpNDmYD5IYD47j5JPjewxJE447xPKXrUCzpvluGpIHYimRZGzaD4vM+LANs66hu/o9/4Dv3iPeADOk9jFcq/tP/EDahv2iZb26YEzpd3F3W7gdSO/czg1XvIV3vXWrcVhzM16RXqbQOYnUYwu05NzidvYHpw61ws4w60SJExYuX+aar1feKXYD1m60SGXbH3wdSq2UyiFUBvsKwdlurKcstssCRjU0V+WtboanKqMR73inlx5BG8V21YNzGQwwxH0het2a4oP4qKd8cxKLPuCFS//RB0SbzUC4TIFCZc0wWSCAKS7MSWAnBnoLzYkKcELg+TJ8mRYuyGRazsRmOk7W2uhgqymV9I88vqvsbr3TnsiG+lMpqLmi5JZ7YXudrTSKArmgk9hT1D5u4pdWzrhUx3p7WK5HJBeJ4JSr21yxSv9X9F75cQfM0Sn4eREz47dLsDbtu1GVk0UP 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:(13230031)(4636009)(39860400002)(396003)(136003)(346002)(376002)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(82310400011)(36840700001)(40470700004)(46966006)(36756003)(478600001)(966005)(356005)(7636003)(8936002)(70206006)(70586007)(8676002)(316002)(41300700001)(54906003)(6916009)(47076005)(26005)(1076003)(336012)(426003)(83380400001)(86362001)(6666004)(82740400003)(7696005)(36860700001)(2616005)(4326008)(40460700003)(5660300002)(40480700001)(2906002)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:24.2017 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81369056-4736-46bf-50c4-08dc0c8a7854 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6961 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: Liming Sun <limings@nvidia.com>, Ulf Hansson <ulf.hansson@linaro.org>, David Thompson <davthompson@nvidia.com>, Adrian Hunter <adrian.hunter@intel.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
[SRU,J:linux-bluefield,v4,1/7] Revert UBUNTU: SAUCE: mmc: sdhci-of-dwcmshc: Add runtime PM operations for BlueField-3
|
expand
|
diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 1e78c1e33325..bb0fe18be5dc 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -536,17 +536,32 @@ static int dwcmshc_resume(struct device *dev) if (!IS_ERR(priv->bus_clk)) { ret = clk_prepare_enable(priv->bus_clk); if (ret) - return ret; + goto disable_clk; } if (rk_priv) { ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS, rk_priv->rockchip_clks); if (ret) - return ret; + goto disable_bus_clk; } - return sdhci_resume_host(host); + ret = sdhci_resume_host(host); + if (ret) + goto disable_rockchip_clks; + + return 0; + +disable_rockchip_clks: + if (rk_priv) + clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, + rk_priv->rockchip_clks); +disable_bus_clk: + if (!IS_ERR(priv->bus_clk)) + clk_disable_unprepare(priv->bus_clk); +disable_clk: + clk_disable_unprepare(pltfm_host->clk); + return ret; } #endif