From patchwork Wed Jan 3 18:32:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882164 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 4T4yzP4QG8z1yQ5 for ; Thu, 4 Jan 2024 05:33:53 +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 1rL63h-0002wr-25; Wed, 03 Jan 2024 18:33:41 +0000 Received: from mail-bn7nam10on2057.outbound.protection.outlook.com ([40.107.92.57] helo=NAM10-BN7-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 1rL63I-0002q2-St for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 18:33:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ErY8xsqeJ9Tw5tH8cfhmoJkpPAIBaSNYkcxulm6SgZ0AY08OVcO4LV824xxf+ThrBAx/qYgcFrMW0C8lFqS5dBdVEl9FpgHRFauQCgzbRVCKlqfX4Y3g/tv5BqAECUyZnvGDqpQbgW6LGZIZp05GxW6Xrog23CUOCQCKFQ2f8XsxNfKmn/zrzNHbzNTO9IvNIKObqgPRjH+/RNf/p134jDyxevl6M/htuSgbXvErm8OyNX3ZanQXxyj0tjIQNBJa4/GwoUpxOKlqSaTSicp3r+uCsjKL7rdjg1mMPnf1rgjWlOBam/nsGHr04zZmhwWCF4uqW3dLHx70QrKNDJHnzA== 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=SVsUWDecY0JTxbQYIo57UGbXCpSEZmTsmCR8aM8kqwY=; b=DIvjNSa9OJEQIB/vkQ+toiDUXRMpzPj7s+rCt4J1FSyZC4sEAYB8RDXtCFBt85rmWeBp8qY99Ea+4E3yXmXlTEUXns8P0yPT3rLhhnZvPmCMFqfXij4g+fjPJ8LREhfWBBv+4cOqjfCKkxoXuzjJnJJjgkmWAAh8jwp8MNIXtXZ55qWYUb0QyVveHrEyUHOfM8ikJYCDxLc1YmzVL5Tt8Aszf05VtixF7h88eTg66wVupUty/WfLNQ2eIVgRDWl0OeLVPPWUq9YGbiogSHvTJvOPhVvFnE4r7atM1sJRcuZEEDMXrzPKqwGVrAOVNIiYAAeEVuvgk4LAdILoQHsamg== 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 DM6PR02CA0128.namprd02.prod.outlook.com (2603:10b6:5:1b4::30) by MW6PR12MB8661.namprd12.prod.outlook.com (2603:10b6:303:23f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13; Wed, 3 Jan 2024 18:33:13 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:5:1b4:cafe::5b) by DM6PR02CA0128.outlook.office365.com (2603:10b6:5:1b4::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13 via Frontend Transport; Wed, 3 Jan 2024 18:33:13 +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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) 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:12 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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:32:59 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) 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:32:59 -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:32:59 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 1/7] Revert UBUNTU: SAUCE: mmc: sdhci-of-dwcmshc: Add runtime PM operations for BlueField-3 Date: Wed, 3 Jan 2024 13:32:44 -0500 Message-ID: <20240103183250.215811-2-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: DS3PEPF000099E0:EE_|MW6PR12MB8661:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c18c032-ddff-43e0-2b98-08dc0c8a7190 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lk/uU2saAbo3UY5CDqsdBuW5VQq8bZNRAZfFw6MXTLqW3/z3hDuETrDx4cf8yLROIjch5sEuM5SyXUaY+h95vRqHVbYW2j6gLi9l3rTtDbVE7PmM5TQfJG8A/kNX2eKvuEaL8uWzMfZBS1oZY10PucS6pSsBbfvOq3dFpFHg7oZEzM/yaV4pt6h6jNmf4OOl+BchaQcBEmDuLgwktby/09EJDx/q+Q99g11R6FR1gSgL7yZRS+WbDMSgWmPkiWxRUGm3NeMbgfhBhJd8EFhpcZGx7MRYpbsY4olftGO3ZTaZBYW+7bUHNawu6athMjZp/kXeXGYRjdH6lWb1D1HC6h6QAA40bqOcccByn/pgGAr+ifMIINUCBZWqvCUrAUTCM0ePHgsOkCGHELFoSyMp40S0EP4YtsVxO29HaPykhJGUI2cPEzRTWMDzCpUacaC2Dgt6MwakF32hDopd/S+3NyAMUtD7Z8hU48pNTRmb0TiBWLx7DMllok9ZQqr2HTK8QWEQ8/Ge5FjjLmzd83yLkJa+cFx2t98JPxyE2xMEg9yrRtsqSn9IAPcuVXA5Ff16/1yonWUTQoLoLcwFvBkalWoQSEfqHjGU+FywnYimAdZjfSVHNAFs9F9NYB7OvUSKQoZpqWtvGZXygRwdt1MZKUerX7Tz8ohr9u6z9iNbnRgb3aJmZf4dAdKKqKkzDvcEw5az22fSaylOw2F4IcCKV5JNLfFCYKZ9M5JZSmec4A0lAH1ZlW/5pcOgActnMCzMoR4rF9a4wWzwmVtrXYfp//lqagrAoVc6qzs6gHxXffqm1CunccVWPU8yFfB1xA+C 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)(376002)(346002)(396003)(39860400002)(136003)(230922051799003)(82310400011)(186009)(451199024)(1800799012)(64100799003)(46966006)(36840700001)(40470700004)(5660300002)(4326008)(2906002)(8676002)(8936002)(70206006)(6916009)(70586007)(316002)(54906003)(336012)(426003)(2616005)(1076003)(26005)(107886003)(83380400001)(40480700001)(40460700003)(47076005)(41300700001)(36860700001)(82740400003)(7636003)(356005)(86362001)(36756003)(7696005)(6666004)(478600001)(966005)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:12.8499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c18c032-ddff-43e0-2b98-08dc0c8a7190 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8661 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 , David Thompson Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2046657 This reverts commit 3ec050f4050f804ad65d051796c95c49feb15efa. Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 103 +--------------------------- 1 file changed, 1 insertion(+), 102 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 188c5ae7efc5..87a831a752fd 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -75,22 +74,6 @@ struct dwcmshc_priv { void *priv; /* pointer to SoC private stuff */ }; -/* Last jiffies when entering idle state */ -static uint64_t idle_last_jiffies; - -/* Total jiffies in idle state */ -static uint64_t idle_total_jiffies; - -/* Total idle time */ -static int idle_time; -module_param(idle_time, int, 0444); -MODULE_PARM_DESC(idle_time, "idle time (seconds)"); - -/* The current idle state */ -static int idle_state; -module_param(idle_state, int, 0444); -MODULE_PARM_DESC(idle_state, "idle state (0: not idle, 1: idle)"); - /* * If DMA addr spans 128MB boundary, we split the DMA transfer into two * so that each DMA transfer doesn't exceed the boundary. @@ -474,7 +457,6 @@ static int dwcmshc_probe(struct platform_device *pdev) #ifdef CONFIG_ACPI if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) { sdhci_enable_v4_mode(host); - pm_runtime_enable(dev); } #endif @@ -569,90 +551,7 @@ static int dwcmshc_resume(struct device *dev) } #endif -#ifdef CONFIG_PM - -#ifdef CONFIG_ACPI -static void dwcmshc_enable_card_clk(struct sdhci_host *host) -{ - u16 ctrl; - - ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - ctrl |= SDHCI_CLOCK_CARD_EN; - sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); -} - -static void dwcmshc_disable_card_clk(struct sdhci_host *host) -{ - u16 ctrl; - - ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); - ctrl &= ~SDHCI_CLOCK_CARD_EN; - sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); -} -#endif - -static int dwcmshc_runtime_suspend(struct device *dev) -{ - struct sdhci_host *host = dev_get_drvdata(dev); - const struct sdhci_pltfm_data *pltfm_data; - int ret = 0; - - pltfm_data = device_get_match_data(dev); - if (!pltfm_data) - return -ENODEV; - -#ifdef CONFIG_ACPI - if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) { - ret = sdhci_runtime_suspend_host(host); - if (!ret) { - dwcmshc_disable_card_clk(host); - - if (!idle_state) { - idle_state = 1; - idle_last_jiffies = jiffies; - } - } - } -#endif - - return ret; -} - -static int dwcmshc_runtime_resume(struct device *dev) -{ - struct sdhci_host *host = dev_get_drvdata(dev); - const struct sdhci_pltfm_data *pltfm_data; - int ret = 0; - - pltfm_data = device_get_match_data(dev); - if (!pltfm_data) - return -ENODEV; - -#ifdef CONFIG_ACPI - if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) { - dwcmshc_enable_card_clk(host); - - if (idle_state) { - idle_state = 0; - idle_total_jiffies = jiffies - idle_last_jiffies; - idle_time += jiffies_to_msecs( - idle_total_jiffies) / 1000; - } - - ret = sdhci_runtime_resume_host(host, 0); - } -#endif - - return ret; -} - -#endif - -static const struct dev_pm_ops dwcmshc_pmops = { - SET_SYSTEM_SLEEP_PM_OPS(dwcmshc_suspend, dwcmshc_resume) - SET_RUNTIME_PM_OPS(dwcmshc_runtime_suspend, - dwcmshc_runtime_resume, NULL) -}; +static SIMPLE_DEV_PM_OPS(dwcmshc_pmops, dwcmshc_suspend, dwcmshc_resume); static struct platform_driver sdhci_dwcmshc_driver = { .driver = { From patchwork Wed Jan 3 18:32:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882165 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 4T4yzY5H5Tz1yQ5 for ; Thu, 4 Jan 2024 05:34:01 +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 1rL63s-0002ze-Nm; Wed, 03 Jan 2024 18:33:53 +0000 Received: from mail-dm6nam10on2060.outbound.protection.outlook.com ([40.107.93.60] 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 ) id 1rL63L-0002qC-KL for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 18:33:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZ8DLbCe0J2lfzr+OkR7EmribxRq99SfiZyQT+WOeqwAlj96gYUKEDvvP8uK1zDLkfVjbD+BM0ewrHXVVdCYcf9kIat2AMHUQZvKCV39UC983mkz1CaQYBhTymVOw8l4kTA/fxdQXhjmsUAtjkDzIEbm/yQaElnyWePPnyh9jep65bcWdwD+ddGlaVAy0Py+Cxh4CumW/BX0WTv7B4fxazywNA4dfgytFrMRmOV4o5l1PULLMftj/kb8sqxZelFkwVKH4aD2bIKvNK2flx+02dZFlkhsFNAvFwVVqEJHsnIsL9d5QfZNAgqzdH9zkyLNvgG2gc9syq+uw3eKXJbMTA== 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=cYOdBoXgLpaMitVszXNhQFK/wLE+Hjs3PR7krEPzXXY=; b=TY+jh160a2/dWED/zTTCoWjCtTWGOZW//NzO0Ts835BcN+7unS9uAt4mbMjkYxcEdkcMbM8ZssL5reyZuVRIvg/HPKtCNk103kFleiAEJdpqheUeyFBS4jI+qJdSsON1SvAIjY21/B34NNssbvV8rD+UQo/PHnk47e9aVMUm3XzY+0JM8C5FOB2Hf+nwEmGhSCIaOBvd4F+DpCXqFNLCZQmi2x0r23NCNtnHIv4BNzMWEcG3Q0j4CTZwEz0/SkAzy5J0o7DHJgQEY8WKOuVuTpK9IkoYTPC7SLgCJn6oDRgBHIgJ6Ptp0S8uUEnkLPclzBi5uy8hdWvtVtgAerrphg== 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 DM6PR13CA0029.namprd13.prod.outlook.com (2603:10b6:5:bc::42) by MN0PR12MB6246.namprd12.prod.outlook.com (2603:10b6:208:3c2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13; Wed, 3 Jan 2024 18:33:14 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:5:bc:cafe::a5) by DM6PR13CA0029.outlook.office365.com (2603:10b6:5:bc::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13 via Frontend Transport; Wed, 3 Jan 2024 18:33:14 +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 DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) 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:14 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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:01 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) 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:01 -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:00 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 2/7] Revert UBUNTU: SAUCE: mmc: sdhci-of-dwcmshc: add the missing device table IDs for acpi Date: Wed, 3 Jan 2024 13:32:45 -0500 Message-ID: <20240103183250.215811-3-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: DS3PEPF000099DD:EE_|MN0PR12MB6246:EE_ X-MS-Office365-Filtering-Correlation-Id: 98539999-0f53-4fd0-b22f-08dc0c8a729d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FscmDK7fyVEfwoWf5RaG3Ef7bo1SEsd25OPAnU64Q/W8YpWkoxIMZx5q+jOn3hMBUgynlX4dhAlovkRJCUAVDILp3mio8dcZ6Z94g/893um2SbBKTA4C+6O4o3ZMTWkg7vJRTrlZFWI/MIEZX9DxCay2zouriY5MWSykRHCeFsdnXKZuaK6jvtw3E2m6fXMXDyGXjo90AqF/7k16uoxo0ESNCRIzAtQBsKyMLraXUHEqteiJh/T+HVNKwYUarYi897r6UXb6/98+WqAgEwDIJ+u15J4pTr4TnRWO1ejmPJ3hO0ZpKRZWlBZVcYfr5bKAcb38BZ2FqcUTuGy9+j5N9UszK1SnNDx5TbTJJP9/f412VYB2JK0siP3ilfRi4BI3gvc01xWhQ68SGqZsamjQi6g7QpiC0S4AtTNkN8dJraikwYwU+xXNEW0+tDKobLrFE4ynCsRSfh8HA5IKzBfckIeiLP0/ZHpgOJTCllCRvxDA92P0p7r6ZDCFOZJylP90N2KZ8+dRwDa84izfuSwIFd0BiiC5QeYPBfzCGxhYwHFwOqgboZZbJzk73guZ9EMbcofZehXlejyg2CHL+EchqoWhVELai1MDHf9FjYj4yHg15l/WX8q0sjx+D0nh9UkHt1r3FKhys9KuL3BTD26LGhwET7J68albmDIzIsarC8HUPhCyDbCbfAA6lhgFv4kWe/ClovXMK/Vjxt4cLUZB80jpSXiStyIAfa9DQ3M/KZStnfPkQ63rX/Fp+FXHhE0hqECWaevzNkvZ8ZYRNNfEw6m3WrLwReM+d2TjV9VPLbspfTFfnza5wYHmV6XpFz7d 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)(136003)(396003)(376002)(346002)(39860400002)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(46966006)(40470700004)(36840700001)(40480700001)(40460700003)(83380400001)(70206006)(41300700001)(86362001)(82740400003)(70586007)(7636003)(356005)(36756003)(47076005)(36860700001)(966005)(426003)(336012)(2616005)(107886003)(1076003)(26005)(6666004)(5660300002)(2906002)(6916009)(478600001)(54906003)(316002)(7696005)(8676002)(4744005)(8936002)(4326008)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:14.6319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98539999-0f53-4fd0-b22f-08dc0c8a729d 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: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6246 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 , David Thompson Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2046657 This reverts commit 9c34ae931985c2ab152755503caa5610c1277439. Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 87a831a752fd..b272846a91b7 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -376,7 +376,6 @@ static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = { }, {} }; -MODULE_DEVICE_TABLE(acpi, sdhci_dwcmshc_acpi_ids); #endif static int dwcmshc_probe(struct platform_device *pdev) From patchwork Wed Jan 3 18:32:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882167 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 4T4z000vVGz1yQ5 for ; Thu, 4 Jan 2024 05:34:24 +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 1rL64B-0003B8-2t; Wed, 03 Jan 2024 18:34:11 +0000 Received: from mail-dm3nam02on2053.outbound.protection.outlook.com ([40.107.95.53] helo=NAM02-DM3-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 1rL63Q-0002s3-RQ for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 18:33:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iDi2OCzjpNCWtX6TkGfmHqf99b6rz7WRmMtwENkX09ygamv9Rvxb2T+xvGdu/zn/x9VLikWlKstI4OTnsp/KafZFIkS4p2sVmWodJbpcBEqcM675PVUHZ7EwowmmiJoZ68ltF6hEWR406tlTv/8Y/DoOhgiUYxB9rG4XZMimluGJdUKDQ2M4hIoNf4ZMa7TdOVXch64Pt6n/aiEiWLKq8FWhtbaOzp04ih5ZgwemkYuWtNZdwKYe+ywqvMwtpcucopSGvzZdC7le1N/nKXQs7dX9NUklmMy2WBaIzVavecuYids+jB6W1VZbRxdIHfCgVXiDW1WGdrZD18iyf7Pl0A== 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=1egvL/dOb6yUHpNsLyV4DwxbwNaIyEaEWqAKJJ49fi0=; b=Ou0vmW/ic17oWAdGris2A8dnyAM+XCdH0Lr4LISMyI75uoAWzBmI0s/GREDfsT4L4t4Sff/2hDkqO50efOdQcxxdJlzKudHUTwBuAJ0tWxo64fZhX0RQMCYnRa0Vg1+xcpNOsaEveol1Kg+N2tXkh+PEvRWpr+DQ3OOKElA7/yPqTpwZNWDuqlQgGJq2e3Vc3UP9sku5t6JCgMt9UL7Mi3avV33JCZY6Fz5+ZEgqesbLFthSFeywFWMenJIHLkwYo2JrwvxrtLApBbh26pwte0+9eayfb23Vku0LsWQLJjIXapjD1v41jWEN0vLHINd7xEyH6VkLRWbz4Mgj9KywLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 CY5PR19CA0127.namprd19.prod.outlook.com (2603:10b6:930:64::14) by DS7PR12MB6096.namprd12.prod.outlook.com (2603:10b6:8:9b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 18:33:17 +0000 Received: from CY4PEPF0000E9D0.namprd03.prod.outlook.com (2603:10b6:930:64:cafe::ee) by CY5PR19CA0127.outlook.office365.com (2603:10b6:930:64::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13 via Frontend Transport; Wed, 3 Jan 2024 18:33:17 +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 CY4PEPF0000E9D0.mail.protection.outlook.com (10.167.241.143) 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:17 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.986.41; Wed, 3 Jan 2024 10:33:03 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) 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:02 -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:02 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 3/7] Revert UBUNTU: SAUCE: sdhci-of-dwcmshc: Enable host V4 support for BlueField-3 SoC Date: Wed, 3 Jan 2024 13:32:46 -0500 Message-ID: <20240103183250.215811-4-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: CY4PEPF0000E9D0:EE_|DS7PR12MB6096:EE_ X-MS-Office365-Filtering-Correlation-Id: e3f04e4d-f431-4f1a-c3c4-08dc0c8a741c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KF+f8zFl1EW43qJkyZQkuj9zztHZvQ1q0mf0uARPuUzeDzOpy8Dr9NYKTBs2LKnYAn0dmY45n1LOjKCNE93n5csQgdNaWn4MvT4tF8sc34eyaG2cCxVmz/z1cmcLSY67lLPnqm8SoxX4SuIpvt0PJ6cry0Vaa9FRfly73COAp0nTpNFjH2FqiO5zwPOjnQ8e+p+DYr/p7fefMQ3QfYbneugRvdo3rn0WIMJAXmps+7Vvhf1mL3IYPsfTZnm1t0Q0rykagMe7VigDO/EKz5nnz84H8w6godQoC3qx7kqolgOnumH1Q0fosY6grxlho/1BM+WpjvXtH8HB/IxWVHD0TNSah+Gkl7QI713qctL8xk+X2runvSNO1jf4n2ApQpD8cfdT31/g0BOlOua23gebR8wyDrGPMlj7zREvHL6KZ8gj3n6it8roGFz+xXn7OPWWer9SvjvRUEjjCidrf2IXQ3mptb+pGA+dbPIB1jwHJ4WcMMt834lh8KEHjQSLo7zXm2mA7vTF345H2szEShIEcmFInCqiNekj85brVQzGV6r14rwF6k8suClniDn9AG5OUaKKMt4VeZ5Ln9o/MYtIeseARhTe3t+vCPgu3rDQQ+Og5sCzhJeuwt9LMneasKevuKCGV4eIhkOnNc7r35ZY1BE1vyKC3AT9A3eOqjkU9EUADH+WSHApF8ae53hJvQRsLNBvZVTo4GVR+0YGyjaYeaV/NseNvW4iOLLTjBsbglo8+tIQsgHNrcpcuP7ZxX0lBs+sxWpmZk3YiIfvMhGEy9K4KwXjxpHv/AywNIoOrDZQcxAvb1kThBGFxeIU8VOB 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:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(1800799012)(451199024)(82310400011)(64100799003)(186009)(36840700001)(46966006)(40470700004)(426003)(26005)(83380400001)(1076003)(478600001)(107886003)(2616005)(47076005)(8676002)(8936002)(336012)(6916009)(36860700001)(41300700001)(2906002)(966005)(6666004)(5660300002)(4744005)(7696005)(4326008)(54906003)(316002)(86362001)(70206006)(70586007)(7636003)(356005)(36756003)(82740400003)(40480700001)(40460700003)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:17.1423 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3f04e4d-f431-4f1a-c3c4-08dc0c8a741c 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: CY4PEPF0000E9D0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6096 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 , David Thompson Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2046657 This reverts commit a1aa43d62f5c39070040ba1949c4019d0c176675. Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index b272846a91b7..c31daf3628fb 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -453,12 +453,6 @@ static int dwcmshc_probe(struct platform_device *pdev) goto err_clk; } -#ifdef CONFIG_ACPI - if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) { - sdhci_enable_v4_mode(host); - } -#endif - host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY; err = sdhci_add_host(host); From patchwork Wed Jan 3 18:32:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882166 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 4T4yzl5sgkz1yQ5 for ; Thu, 4 Jan 2024 05:34:11 +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 1rL640-00033x-4z; Wed, 03 Jan 2024 18:34:00 +0000 Received: from mail-bn8nam11on2041.outbound.protection.outlook.com ([40.107.236.41] helo=NAM11-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 1rL63O-0002r9-Uz for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 18:33:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bv/OGyVTyfbVkSXzai2ipQw8dcPmr7Umfjm/fzG/5U2+d3z/n+hPiVBI3ESBtavBBoYBjZl+iAD9EadftSVtKFO4S+Wwn5cjjpFRpbcP5EYV2r8fBD6Ng3ETqeeZLNz0GmE2KnOcabpSjvu9kTYqgvRMA2iccEuNAbda2HFIygmTcP0YqoJJnZW3NECYuVlAUVieTbBWJY/LHAMyW+OGYtw6QaYb02uIWcUetwwtfM2AS6CEQIatId5u5aw3/nWfbFgZzA+YM7LsW0MK2dskK1JUWSRtcHlPjJKoAhc4L5hoMZRkUGoA65gFGIHdJC/0No4V+Setq97WWuhqxXPT6Q== 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=FJCkqPKv4szYY/KVmB29P3/Ew7B1Cc60AxGEamYwxkU=; b=S7Q60c+QV5Y3UhyL6Bo4ZLwex3mxpkB6ESwNXWBwj4fjo5LBgBnARsgO3vprPSOODdy91fknAMrMk48sgt7R0a84KPLFomQPA2SruyH+WOSoPKpeZGu1LZoaFvGW9P9Eyf0ZNHez1wJ0WhkgKue0hMGOU+jCmIYtA+NZZwcTJcOQzoC7cu854ws/Fjqzv33cT8XWHfzIrLPOeChEFZE/T3nUV0iJNwdxq+4d47l8gumLc6gdNoH07HT33fzMnuGg+0Eyp/NMhrdnpCL1SHki9QlfdRxa+vEl8mK4yNWl24IYMFc0s1GMNNQhI/YjgO1XjC2+HCzFc9yFBE+F+iCu8Q== 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 DM6PR13CA0028.namprd13.prod.outlook.com (2603:10b6:5:bc::41) by CH3PR12MB9455.namprd12.prod.outlook.com (2603:10b6:610:1c1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13; Wed, 3 Jan 2024 18:33:19 +0000 Received: from DS3PEPF000099DD.namprd04.prod.outlook.com (2603:10b6:5:bc:cafe::12) by DM6PR13CA0028.outlook.office365.com (2603:10b6:5:bc::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.11 via Frontend Transport; Wed, 3 Jan 2024 18:33:19 +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 DS3PEPF000099DD.mail.protection.outlook.com (10.167.17.199) 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:19 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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:05 -0800 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.986.41; Wed, 3 Jan 2024 10:33:04 -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:04 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 4/7] mmc: sdhci-of-dwcmshc: enable host V4 support for BlueField-3 SoC Date: Wed, 3 Jan 2024 13:32:47 -0500 Message-ID: <20240103183250.215811-5-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: DS3PEPF000099DD:EE_|CH3PR12MB9455:EE_ X-MS-Office365-Filtering-Correlation-Id: 563693b5-1fbf-4f3f-1a22-08dc0c8a7551 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vqketd4f0QzwuTQEqpQsEHElNumQVR8ra25uX9/xRgf7PYvwtQLkis4Q5GsZbKQT/1RsiVrVde2dQMbAQC1iTmsMxXOQ94F+vLpyJVr85IJV4DdTEaiJVHDb8CECXBrskZvYdlCib80dLft3sgGNYB7rmKBxBk8wlD1GQRpNhgT8MDRrNFSdpDF1gid7PYrVKdihuQqlSYqf3xUXgcjJn0s2dQuZnfS/jRgWKiiH0IrFYs37gDktGCVKeIZnJQScd5OZeajzazE0jVkWVZ+56uAzcgzyCzrRGF1TxW0/T+UkzhwDSlPVS/C3VICDipqxD+J/iq3lH+Zgp9YGuUmN1MZaYNC/gjosbUjuyR2ModY09+BqsNrNhwVhfthF8jIvN+J1ErfRECGSEOINwvAmUm4m/BXBi3amHth4sQxJ8juDMBwg/zNN3O5OGQ7JeuJ8kgLZvOWbYqYxwQa4G16H8MsnNOAvpdqhFDPJVUjQyJulUSYwp1Jy/617dBrxdZqMLcsXQags+KTkwzc58FhNQBnGV6kZ1l+SByFeRICrN26RSc9V+sDoUenPsSpeWR352TxGoYWsDr1G8E8sppIFs7izaWHAS+YpAHmXrnc+BQx/lln5lCsi1AIgHPquhhDXoPhhiJCvXpXAlXeYIHIB3NKybSL1TI2RdftpBQc6P4vbN86z1thmmSWiVYMuLJDohasl9L8nQrD8RCnmLJa5mXmQ1nqYDsw+cJwcuiEMC/lNdnFVkn3yFJjY9skH49IGhL5B2JDEznlMb8XFkF/qHitEaLG/3DZ2ql3CzD45l6SdLjsoKK8Oq0fXPLIVLisC 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)(396003)(136003)(376002)(346002)(39860400002)(230922051799003)(64100799003)(1800799012)(82310400011)(186009)(451199024)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(36756003)(6916009)(7696005)(70586007)(70206006)(86362001)(966005)(2616005)(7636003)(356005)(336012)(1076003)(26005)(47076005)(41300700001)(2906002)(426003)(478600001)(4326008)(6666004)(5660300002)(82740400003)(36860700001)(8676002)(54906003)(316002)(8936002)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:19.1631 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 563693b5-1fbf-4f3f-1a22-08dc0c8a7551 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: DS3PEPF000099DD.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9455 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: David Woods , Liming Sun , Ulf Hansson , David Thompson , Adrian Hunter Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2046657 This commit enables SDHCI Host V4 support on Bluefield-3 SoC to be consistent with the default setting in firmware(UEFI). Reviewed-by: David Woods Signed-off-by: Liming Sun Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/990885f566c32ac8e6888ad6b434fb70d1a5d7af.1673460632.git.limings@nvidia.com Signed-off-by: Ulf Hansson (cherry picked from commit 95921151e04335e9e2ddf4f294405e64be4ea947) Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index c31daf3628fb..0adebc46eb46 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -453,6 +453,11 @@ static int dwcmshc_probe(struct platform_device *pdev) goto err_clk; } +#ifdef CONFIG_ACPI + if (pltfm_data == &sdhci_dwcmshc_bf3_pdata) + sdhci_enable_v4_mode(host); +#endif + host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY; err = sdhci_add_host(host); From patchwork Wed Jan 3 18:32:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882169 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 4T4z0P74r3z1yQ5 for ; Thu, 4 Jan 2024 05:34:45 +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 1rL64Z-0003d9-9N; Wed, 03 Jan 2024 18:34:35 +0000 Received: from mail-sn1nam02on2042.outbound.protection.outlook.com ([40.107.96.42] helo=NAM02-SN1-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 1rL63S-0002sg-Ow 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=XJtRipV00xUG6PT2FhTxPqTVUKRAulHU3Ln15VW69TcJgZFm6yEkZZJ+f/E7yVwxjrX+19h2FugEhcKvJeIXHqyiN/eAzawkNZHV0uFhTgQaPzoMDdB6OU6rTP/C2QMPAFo73w2claBVfIkj682ESMDcG99FHC/APiMbiq7kjp44UUfjU8GoHioayruY5RrjKf1wzjt32RpShbASX4718Dwm6aqzACniGhZWL0DcmW7sBrDGWVATx2C6j2087XVSyfQAzS+laOGJ3jT2qZHLqscFGvVtIFMtpn9GLh4iBAa476pxOMZAcIRfUP618agrLK5Z6K6uKVS6hPxMpiomNA== 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=iT/NgJNWdO2RJ7Q1dPyUFQY2vAT9lrdlNzBGVNNVygE=; b=Xjl40HvkjJN59/JxfRkn9++iEosUWiNcLvXG3d0UsUmJe4opbxvlRsxKHBe+OKUQJlPb76IuRLpzVkGuRTIvtmdSbZIvj8Zs0nEmlEi/Y76RGtuzQgNyfTqF2ymHJKxMqrlXXVif0kutE/YfxS9mElzktLrZK2uIJT6sXm9HhUlp28ppNpDHTLc3HcsyqpzM5YGsIj2ttys8gvnUStTSg42g1eMrzp8VOg34uy6BE/PvUPCbcWmM+KFqt15cQ2qv6IJarwOfPi75UySpJ0YNxWU/t3xJrhuSuBBQUMkAyydP3WQwluE9OxeM1q6xGMr+4OLxDHhk35DyAxnmlMkF/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 CYXPR02CA0035.namprd02.prod.outlook.com (2603:10b6:930:cc::7) by CH3PR12MB8709.namprd12.prod.outlook.com (2603:10b6:610:17c::20) 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:21 +0000 Received: from CY4PEPF0000E9D1.namprd03.prod.outlook.com (2603:10b6:930:cc:cafe::e3) by CYXPR02CA0035.outlook.office365.com (2603:10b6:930:cc::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13 via Frontend Transport; Wed, 3 Jan 2024 18:33:21 +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 CY4PEPF0000E9D1.mail.protection.outlook.com (10.167.241.144) 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:20 +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.986.41; Wed, 3 Jan 2024 10:33:07 -0800 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.986.41; Wed, 3 Jan 2024 10:33:07 -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:06 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 5/7] mmc: sdhci-of-dwcmshc: add the missing device table IDs for acpi Date: Wed, 3 Jan 2024 13:32:48 -0500 Message-ID: <20240103183250.215811-6-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: CY4PEPF0000E9D1:EE_|CH3PR12MB8709:EE_ X-MS-Office365-Filtering-Correlation-Id: 40e85ffa-0f9d-4d79-bc81-08dc0c8a765e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4HP/4jrj8Ok3S+jp0N+AIejuWqB10lWjA9RHHjeDCb3BMSTsiGazOVlcc66TGJK6L5OZMWlHmLsrrNAKTWWxJFG2OnsHDiiL62oEo4jdAkAQJd1di2mzIqq8WAbXZLhY7QtS+U+tKltU7kXW/4nvL9gCd9obDxDSgwUCm7mcRSJooW/sgYIzQ6ivkS34pQ8CoWHFyipp2OFHEfUfBJB5zue4+i2CBzKBs6EITyqyt0HlcPA6LATVbEDcFRPgkBo6OnUE6DFC6qndpC7TMVhVFmfGhxStpnCC4x2XgCodBTMQkgapLYgtqtSEpZHu8d8G3E4YTPNh/5+uf/fOx3p1zE+CTehYerBwIKi36Sfj1tBoWXz833dajkJiPWpQl1Ik4naZmbIZ9AVOTubIXlbl3UM+GiufoBRwyjihiiHbf2AoT6HvN6Xaqb3Cp61L6oLBGYfZ9cYYgiW9ikCWsDrM/Gg95OuXtGyQxAlZbgltTS4kbk8XNKXebZjwNxmSchys1sZnz3nJk2aduw5evlXJ6YKVVgDA3jpB3kHzLPolSbU361B4qsINNaAatqVlQCJ8MQUgzaDzvXWEEZAirg17ZvXrCzThYVnKHasF8TBXrrFgE+cjM++9njzUYhXcY2Vq9Z+LQhEEt+3mPdca15dOWEjAciKPGQTBRKSp0Tewbg5xvBvWjqDgSv2Cy9LBsDeWIGOPmj8K0knfKHZB3z2xvlGqJQ8zUk9IV0G9TBQUrQuG7XQ2jvZfCEtH2Gcy63mGprtBG9ULcYtw7rSinHCPn/wuIz8ZvHJmCgChWfrYD+174Zruq+WBTOynS2MOO+OG 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:(13230031)(4636009)(376002)(136003)(396003)(39860400002)(346002)(230922051799003)(82310400011)(186009)(64100799003)(1800799012)(451199024)(36840700001)(46966006)(40470700004)(5660300002)(2906002)(4326008)(316002)(8676002)(8936002)(54906003)(6916009)(70586007)(70206006)(426003)(2616005)(336012)(1076003)(26005)(40480700001)(40460700003)(47076005)(41300700001)(36860700001)(82740400003)(7636003)(356005)(36756003)(86362001)(7696005)(478600001)(6666004)(966005)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:20.9301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40e85ffa-0f9d-4d79-bc81-08dc0c8a765e 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: CY4PEPF0000E9D1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8709 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 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2046657 This commit adds the missing MODULE_DEVICE_TABLE for acpi, or else it won't be loaded automatically when compiled as a kernel module. Reviewed-by: David Thompson Signed-off-by: Liming Sun Link: https://lore.kernel.org/r/f57ad0f8fdf663465bca74467c344dfa305a3199.1675305696.git.limings@nvidia.com Signed-off-by: Ulf Hansson (cherry picked from commit cfd4ea4815d16f7426723a5cb80ee5db811ea1f2) Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 0adebc46eb46..1e78c1e33325 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -376,6 +376,7 @@ static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = { }, {} }; +MODULE_DEVICE_TABLE(acpi, sdhci_dwcmshc_acpi_ids); #endif static int dwcmshc_probe(struct platform_device *pdev) From patchwork Wed Jan 3 18:32:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882168 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 4T4z0B2W7nz1yQ5 for ; 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 ) 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 ) 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 To: 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 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" BugLink: https://bugs.launchpad.net/bugs/2046657 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 (cherry picked from commit a11937b3cff5449871f428e46e202481dc61a9de) Signed-off-by: Liming Sun --- 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 From patchwork Wed Jan 3 18:32:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882170 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 4T4z0Y5j2Qz1yQ5 for ; Thu, 4 Jan 2024 05:34:53 +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 1rL64j-0003j3-WE; Wed, 03 Jan 2024 18:34:46 +0000 Received: from mail-bn7nam10on2043.outbound.protection.outlook.com ([40.107.92.43] helo=NAM10-BN7-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 1rL63W-0002tD-JR 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=Le+33312erUzvW/LdEyfHVA276A+hdzZmkCTJQ1qTBRvdIRijM6Zwz0yEiILoxlNrec9VsL2luaexJtkCidt0OcP8oc62sZWn+xwzKtsPDj+VTYU6iXDKsdjNw7alxU3YcCw7nKhdZQvAE4rrLjwUBLhOuOgSA1hX2dqaJtxUhWHymh90dnM2WbBRVtcZc23YtUmgB1ZiMZFwTP+U38kN35kjp63iMw4SAC255wk4D1bDPV1ucUHb92tKc8UTGr+jtOWMMfqhkjpb4n7rTBn4rNJ2HV1ofm0Ayx8jPROOmGxWCUsy4ME2MqFasqCR6vxg51Rh6f/30c8vnXguKMiYA== 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=6Vei0exMdG1pgxtJgQQGI5Ldrc6EiSEkeNFEunlLGS0=; b=LedYNmrQOVpIP21zwR1rgZii/Wc98+05DPjBtBKMexghePdN+S+7rtpSljOHg07cRtWlMwgFvEZK/2kc9nGs2uBlBwwGKD+Mer0qlx4bz0VKRva/65e6gZrOKHvwDbt5TOxxwfJRoAV/0nowHpJzTx2bnfpzWJo5MdBwUrzYfUeAi5yT+ltvvYSgNgF+c95tIJmOvY+cYUVO6YAr7cabyaPJBHvempXy7eIHDeiTOp24UoRp8OiURarBZI71ezW3ftaHQElVFEhNlfH7ynVk6g0OeIJvRVNyoY7iY9yiQVzMpwwtK3ygf3Ifak7CjwHyGYcKaVxMLdaA379T14txGg== 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 BYAPR06CA0038.namprd06.prod.outlook.com (2603:10b6:a03:14b::15) by IA0PR12MB7580.namprd12.prod.outlook.com (2603:10b6:208:43b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 18:33:26 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:a03:14b:cafe::d1) by BYAPR06CA0038.outlook.office365.com (2603:10b6:a03:14b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.20 via Frontend Transport; Wed, 3 Jan 2024 18:33:26 +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:26 +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:11 -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:10 -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:10 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v4 7/7] mmc: sdhci-of-dwcmshc: Add runtime PM operations Date: Wed, 3 Jan 2024 13:32:50 -0500 Message-ID: <20240103183250.215811-8-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_|IA0PR12MB7580:EE_ X-MS-Office365-Filtering-Correlation-Id: 297456b0-c0bc-440a-1c09-08dc0c8a7983 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7H7c2oxqrIl8ZKeAxk130+VsE3pmF5gtPW7Lthft6WobdLyyH1QpMaw32VvVfZdGrNuQ1mxhTDfq9A7Mp1atR+aF2Yw3TyyXd8fGrD1KV/Htb4tgzZ7DLKOM00p5G5+cyzo55ALNFQebCYBLaF9qlKP5C1TiAw63ZiqjxkeHJSs7HMs++HHl8HBCa9i2h3l+9586AvGZl8+4m0BIinqOqUc8A1n8bopOG3veNkgIXSC2EXKEJZ8RU5jSWqz9zj9MO7Foo8pwRks617Wc0YxEhTxnPIxvkIsdOapS6BDLo/hmRF0RTgrmtD4HKYm8fl2NSm05SofUkQY4FfidRCvwaaomRCO9xUWWyknrxdzYXd/hSjJ4C3RE/TJmjHqRIeopY2Um+L9eOuaxEvQ83tlfnlRZlfxsnALrsfi+sAJ2ETSXF9JGI+2iautYlpPvpUSedBZ5lKxuilklvi7OZM0FSIvYbW2WMEJVpIAv4gu6KCoINftM5jhSlrcwnpzM+450LW1TMnnttxaKVk93NYazce1vvpi7LID5HfIUdYrYv8BOLKGuDJ4c5AhEZraJqwoDp5LGCZoY7tnOAIRNB7KhWfFhM9ssRcN+VT7quGBkBN1xqCnmV7S/DFahO7yjD7sgk/1fxcRCzrNFMDMcOV4/VWI/zwZAD0JGk4TVHi3cYGmON4vwgqtL+al/MjOoiPhMzVymAQnRuMEpyWrxAUbj5A9I+PuI1FlY+9jdRKjjmOv6RHJh80UN53hLDuQFjmPgzDi3jniApPVz5O4VQSj/h5iRtNDp9jW9Y/jvyQi9cOQ= 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)(136003)(39860400002)(376002)(396003)(346002)(230922051799003)(1800799012)(64100799003)(82310400011)(186009)(451199024)(40470700004)(46966006)(36840700001)(40460700003)(40480700001)(426003)(336012)(83380400001)(1076003)(26005)(36756003)(86362001)(6666004)(7636003)(82740400003)(356005)(8676002)(4326008)(41300700001)(47076005)(8936002)(5660300002)(54906003)(2616005)(7696005)(36860700001)(70586007)(70206006)(316002)(6916009)(478600001)(966005)(2906002)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 18:33:26.1860 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 297456b0-c0bc-440a-1c09-08dc0c8a7983 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: IA0PR12MB7580 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" BugLink: https://bugs.launchpad.net/bugs/2046657 This commit implements the runtime PM operations to disable eMMC card clock when idle. Reviewed-by: David Thompson Signed-off-by: Liming Sun Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20230822195929.168552-2-limings@nvidia.com Signed-off-by: Ulf Hansson (cherry picked from commit 48fe8fadbe5e03edfd83315c331b171a9ae245a4) Signed-off-by: Liming Sun --- drivers/mmc/host/sdhci-of-dwcmshc.c | 73 +++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index bb0fe18be5dc..689a297c10ca 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -461,12 +463,27 @@ static int dwcmshc_probe(struct platform_device *pdev) host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY; - err = sdhci_add_host(host); + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + err = sdhci_setup_host(host); if (err) - goto err_clk; + goto err_rpm; + + err = __sdhci_add_host(host); + if (err) + goto err_setup_host; + + pm_runtime_put(dev); return 0; +err_setup_host: + sdhci_cleanup_host(host); +err_rpm: + pm_runtime_disable(dev); + pm_runtime_put_noidle(dev); err_clk: clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(priv->bus_clk); @@ -506,6 +523,8 @@ static int dwcmshc_suspend(struct device *dev) struct rk35xx_priv *rk_priv = priv->priv; int ret; + pm_runtime_resume(dev); + ret = sdhci_suspend_host(host); if (ret) return ret; @@ -565,7 +584,55 @@ static int dwcmshc_resume(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(dwcmshc_pmops, dwcmshc_suspend, dwcmshc_resume); +#ifdef CONFIG_PM + +static void dwcmshc_enable_card_clk(struct sdhci_host *host) +{ + u16 ctrl; + + ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if ((ctrl & SDHCI_CLOCK_INT_EN) && !(ctrl & SDHCI_CLOCK_CARD_EN)) { + ctrl |= SDHCI_CLOCK_CARD_EN; + sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); + } +} + +static void dwcmshc_disable_card_clk(struct sdhci_host *host) +{ + u16 ctrl; + + ctrl = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + if (ctrl & SDHCI_CLOCK_CARD_EN) { + ctrl &= ~SDHCI_CLOCK_CARD_EN; + sdhci_writew(host, ctrl, SDHCI_CLOCK_CONTROL); + } +} + +static int dwcmshc_runtime_suspend(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + + dwcmshc_disable_card_clk(host); + + return 0; +} + +static int dwcmshc_runtime_resume(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + + dwcmshc_enable_card_clk(host); + + return 0; +} + +#endif + +static const struct dev_pm_ops dwcmshc_pmops = { + SET_SYSTEM_SLEEP_PM_OPS(dwcmshc_suspend, dwcmshc_resume) + SET_RUNTIME_PM_OPS(dwcmshc_runtime_suspend, + dwcmshc_runtime_resume, NULL) +}; static struct platform_driver sdhci_dwcmshc_driver = { .driver = {