From patchwork Mon Dec 18 20:14:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1877639 Return-Path: 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 4Sv9zy1n2Zz20H4 for ; Tue, 19 Dec 2023 07:15:26 +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 ) id 1rFK1G-0002dn-1u; Mon, 18 Dec 2023 20:15:18 +0000 Received: from mail-bn8nam04on2049.outbound.protection.outlook.com ([40.107.100.49] helo=NAM04-BN8-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 ) id 1rFK1C-0002d7-8Z for kernel-team@lists.ubuntu.com; Mon, 18 Dec 2023 20:15:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q9Fctm4s2h5fTmQtvI9qvH8U6H4LU7bSJgHKo+sBdenTGD54nXrUAb2mUDtDPwbXT4gK0iO9msq0jQe3mtArIT3AfzjrZgU2yIzNMQrzQc99ZZT1o76KhV1zcPWJbQEQzq4IPS0n2EsnT9ohJtg/ZyoLIFal6EWu6Pw8Y03rjGx/PMZkVND3k0m6MuTmoijf1Mt1BMXzQM6zjO5sX8U+FtyrBn3AvIvLdN6HD/HDuki1gtCXegQK5I+MYZ1SKJcMbUrWaUauXnUCLPJZ42ssx0cBzugoWrrdyBrELEtd6MNvV2kW4bnY8AgOngQIMGpPoTQv2TZIjj5vmjbV/GwlMA== 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=MMEk7XssOIJiMqVRI7arq6lZhQmL4YQDaeOWI008uTI=; b=S3Nf5oNJCXzlyhsfTgbm5T9NfSA5aVqWULX/tLg3Gn32U92i85eTTy005WHKclYDB5uaiDbIstLPj3AYhxoMmJS22bE4x5FNzHDC2cFBVMomJe21NkE+Ig7UwKVqBe7I9lN0P+nKXM/oyiM8j/N0pxj1FCxnTsh3iV9EthwswOoZpqb352v9nc/DeGHoh1FHqvzGc0o7CSKMMaBIS+uadMGB9ZLmOXeFbDtpJrLT67ys/uDWgI4tldgh3FbvrRAkEdykF1h1WqRhof4QOADfwB1RbJTfHWy6Pg3cpodBTE1omJiyC985BuUTPmsZr745PCBO1rgceyUHIq90zwf4uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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 CY5PR03CA0014.namprd03.prod.outlook.com (2603:10b6:930:8::40) by SN7PR12MB7107.namprd12.prod.outlook.com (2603:10b6:806:2a2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37; Mon, 18 Dec 2023 20:15:08 +0000 Received: from CY4PEPF0000E9D2.namprd03.prod.outlook.com (2603:10b6:930:8:cafe::df) by CY5PR03CA0014.outlook.office365.com (2603:10b6:930:8::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37 via Frontend Transport; Mon, 18 Dec 2023 20:15:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CY4PEPF0000E9D2.mail.protection.outlook.com (10.167.241.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.14 via Frontend Transport; Mon, 18 Dec 2023 20:15:07 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 18 Dec 2023 12:14:59 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 18 Dec 2023 12:14:59 -0800 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Mon, 18 Dec 2023 12:14:58 -0800 From: Liming Sun To: Subject: [PATCH v1 6/7] mmc: sdhci-of-dwcmshc: Add error handling in dwcmshc_resume Date: Mon, 18 Dec 2023 15:14:56 -0500 Message-ID: <5f54bda2e6031da9c59ea2af674dae4a85b3599b.1702924774.git.limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D2:EE_|SN7PR12MB7107:EE_ X-MS-Office365-Filtering-Correlation-Id: a6753977-fffe-48c4-27da-08dc000607bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q2J2lYJTCifIr+0thwe2sbbn/ExU3rcRbeYnpQkaAexGFLuZb2oqD6FX4UhHQ1mNkF91F7EYMflf9RoB8E2QlpsOYuqMd4/U99qgcvfqUZTCBudjsGE4ZT1bQiiQ9CMBZjZwmB1f9VXbV4FqwPT1I98dQs7OonnCuFjcty9lyvzUXfhuxZd92jYt8COpK1qk36BCNcxf1GgBrRgT/T1AqsGoqfEOfExott0V0LcjO7SMLJ7MH+Ic1pTOiEIs5/AK1PLryfhDOAxkdYH7vMLYbPbLEhsjDKY8ST99UaxLzGjtpIEml9UCTkUqhzJS0qM6BSYgLXeWCrzOK45/fGgmFolqUsSLZquEuE1CfCiyazW+WGJiXJ1k63Sq8mjFVMxtp7pEnb2SMl4b2u4BQLFb0SixLM3pgwr0t2n47PFiTL1xaukzoPaERcERCL3xOdCOES4BtayNHcR1tumf45A7nrz1Kd6xQJ9kTh8ZiH8Q3A7W+1lkMFIkbwtR+Wp8a+woPTsflCVtO/nqNHthZyDkOk8l+JSG+pM5RATBRE752WWDf1DC81YfkY/XiAEovklyWdoFX90dXH69fr36EyuhOBn6GZmwLV8EhE9AK+6+aTHznZUd5uQKHSJFMv0iW3TWeCnuN94h0LBT7gwrnW5RIGhOusSFN6YpJmZFH5vusrEjdZOfOryzXe7G9FVJIHWkUsXrZVkVYupNjWWvqwVjrZ/plitaXKsZNXMG3bCtEkz20IHjIa7KoHNn4fWf7E2IHbqfreTwGWzyYv6RH5IWWpYFBYtzvBlTHbuYegTRuRBpQgvtwUAN3YiJz4m91c77 X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(39860400002)(346002)(136003)(396003)(230922051799003)(1800799012)(451199024)(186009)(82310400011)(64100799003)(40470700004)(46966006)(36840700001)(40460700003)(426003)(336012)(83380400001)(47076005)(2616005)(478600001)(26005)(8676002)(36860700001)(54906003)(5660300002)(2906002)(8936002)(316002)(4326008)(41300700001)(70206006)(966005)(6916009)(7696005)(70586007)(36756003)(7636003)(356005)(82740400003)(86362001)(40480700001)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2023 20:15:07.8602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6753977-fffe-48c4-27da-08dc000607bf X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D2.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7107 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Sun , Ulf Hansson , David Thompson , Adrian Hunter Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This commit adds handling in dwcmshc_resume() for different error cases. Signed-off-by: Liming Sun Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20230822195929.168552-1-limings@nvidia.com Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci-of-dwcmshc.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) 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