From patchwork Wed Jan 3 19:27: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: 1882193 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 4T50Cw1B7Fz1ydb for ; Thu, 4 Jan 2024 06:29:47 +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 1rL6vd-0002cC-2k; Wed, 03 Jan 2024 19:29:26 +0000 Received: from mail-bn8nam12on2082.outbound.protection.outlook.com ([40.107.237.82] helo=NAM12-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 1rL6uk-0002Y1-EA for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=esY7gKguD4/4dZp3N6O5hl8unpu4n9ZLLnJsyA1roqtcbE4j7hF1aYxUkQNCFdjxDSsdCd57Gq2scfXxWNizy2QAwGWcLuRk5owy2bIvOJfw+qxuPLb0vJma32DeDpsMHtyF38bYFepHs/k/9wNh7MyWEPSGu7HHJvlaHMoMkuv+6QkIu7nhCdCnIyQdOrxlxyvqHk/W7EaMlxZJCxQvAMWSS00QR+IT7dshSrLgXCH61un8xXQvJ5mRdKkIPUTYSNFmIVnLMiHfPYtpsG0QSXphBsJKVt2QfrJUBEFfWG5laWNCn4CxkY2nIzMzqNkxB6XFxu2kINCTnj1Og6FbuA== 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=cTREbNFVYvhOFkiyCujOgyGCqAg62fQ9w82yE0EqoJHPIpqfJQmBVl9gyFv0GVAEawywwK1NeQmEebXwvhbfHl0tr7m3Kf+U5M03yZB3UYjOJn0IvyCG8Xpa+XmkwiCvF+yeLry50PGDzjoXOsZd5DOb2DOgv1Qd8KLnwy71KCSPHRUHRqkufDsPKgYBO6+eveV5jlwOrpuddoeypdQIZM7+fjBc9FZn56PeXPBt7t2dG3pYkJz/Kdz90zlY56EWOBNMK0b2RwYODO4EJYVJNT3aGHy/RlmyVcYgj717jU1ChZdXBdC+1KBODNkVu4WDGKh2U6m+Kjg08kVtPjVUFg== 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 MW4PR04CA0112.namprd04.prod.outlook.com (2603:10b6:303:83::27) by PH7PR12MB6419.namprd12.prod.outlook.com (2603:10b6:510:1fd::5) 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 19:28:27 +0000 Received: from CO1PEPF000042AE.namprd03.prod.outlook.com (2603:10b6:303:83:cafe::1a) by MW4PR04CA0112.outlook.office365.com (2603:10b6:303:83::27) 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 19:28:26 +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 CO1PEPF000042AE.mail.protection.outlook.com (10.167.243.43) 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 19:28:26 +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 11:28:14 -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 11:28:13 -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 11:28:13 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 1/7] Revert UBUNTU: SAUCE: mmc: sdhci-of-dwcmshc: Add runtime PM operations for BlueField-3 Date: Wed, 3 Jan 2024 14:27:49 -0500 Message-ID: <20240103192755.217183-2-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AE:EE_|PH7PR12MB6419:EE_ X-MS-Office365-Filtering-Correlation-Id: 3794489b-175e-42fd-3dee-08dc0c92289c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PIpqzuPny3Jezdi1BCBtbtMtaSKVEQOHhLn05z/ataOwctZ8Aa6PS6VorDcY8Zj50+Awth7X3KcmqZ1v9dTQVkYk7HUc4qkvQvmukJbF/1/cO9VkHKBWgY3Dc8MZvsGO/INA3auxHX1T17xHrfQ3KrrukHZRDTTXTlRnkKUL0anNdJmPZiFZurDuB3MqVoihy4khWILfbFsHbZGfEaZgIYU0vQToWiNM0ywGRLWQDSG5nJYAZnMUsYPR4PTFILbdXBmJEm/qODgj4dFkICT9sNUqW0ozWiPKgg+W9Vtfu7+praZU8mDyiYjUeEcS7VqmPfOIQYcXkGwD36g0W+7cyReXLwjvAJry8CzriyYHBRVp4DnZslPH6q6b+VXGDWuAbKuAxc+1MqmdqaBlgvUPuwHI2DR5cnfWjc4F/ZjMmS8poQyuK9OhymqBCbX5GeNvAVSXw05nLFmIy+nmRAJlysbXwCdKejXIj+zi9O5jU1QDCS0Y7epymMi9eAKb4M5g4Zt/Jwtq4OyEjdlsDmZytTo1xZ93K43f1n6zSj2VWm6+8cd3Vn8wb8Cw8Jg5axjSW5afqYck7jchO42pJGnl4p4pQU4QseNE0+BxGoBTwA9wiJurpbqw9Q/uSJMZWnx+KJ+qg3zU5b3GW6A4zxBiILlUlNoK4rodg7uW1tnehUnjNIwEeLR1HfrGuzbdvP4RnfSgeAd9gVCFgkRDjUVkuRRhd58sXBT2MhDkZSzm+gJ1Z3sJxhq3h21TqqEvglTBylEzWfCgmlH5kvgv6uFfEDfP1ri1DuXD6xYb2FqUFAul2O4E7LiNZR69ZosvzCyk 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)(346002)(136003)(39860400002)(396003)(376002)(230922051799003)(64100799003)(186009)(82310400011)(1800799012)(451199024)(36840700001)(40470700004)(46966006)(36756003)(40480700001)(40460700003)(70206006)(7696005)(86362001)(70586007)(336012)(426003)(82740400003)(7636003)(41300700001)(356005)(1076003)(47076005)(2616005)(26005)(107886003)(83380400001)(2906002)(4326008)(5660300002)(36860700001)(478600001)(6916009)(966005)(6666004)(8936002)(8676002)(54906003)(316002)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:26.4916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3794489b-175e-42fd-3dee-08dc0c92289c 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: CO1PEPF000042AE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6419 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 19:27: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: 1882194 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 4T50Dy2QXDz1yQ5 for ; Thu, 4 Jan 2024 06:30:42 +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 1rL6wW-0002mY-S9; Wed, 03 Jan 2024 19:30:23 +0000 Received: from mail-co1nam11on2067.outbound.protection.outlook.com ([40.107.220.67] helo=NAM11-CO1-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 1rL6ur-0002YH-6g for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HFa3H+USoBP5x98Q70HWSeRHy5nFbYuYv5DeT2CelF1Obb8D5R/s8qXEx9LdSChDAvAhda/FbUiPWzJhXkAh9Ln/kwQ7UsRNNjHLq+bsCstHmSGIbTvgnClwnlZHa7BcMBKmbDAyhyIB5Jdx/+JFq4GN5NgZo49hZnqPdEKXHC1pyVhcvO0gnRB30v8+a83/YEOUOTfVhBlVZDPDoMpXtHIdZQgNs3oMO82s2NwIEZMuOrWacK9Mx9/TGY43xYiWgErqpg+0/ar9+r0x3gKBmUQaVT8SjK3u0c/u2B6Ph308fIBupqqvWYJPWRghdBx2Xn50CPjiNGbDusqxqwgezQ== 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=X8RLADzuiih+KzLNaJRPhlFqqlcrfx0JHRdQ51X/Sg7tn1pv9462iKI2hjxRiKUH/pYYXTQWxtGSrh1FA22YefmOAmT0Q36gjTPQBCix9LNi7ngrqHE9/NBHfpcilPZ85frg54W7ztWX2hYnNWPrE/T9OGcgADv2EtYdSrWRRwj4panMwQftbkUwaVsOQ+BJ9bgttWMX32YvB2g6OoyFny2b0vQboet8k7iOXLql455zDDGmhz05MgRM8uT3R9uO95xLjb8S/zgkT792h8meCV8VRuC3eF0XWn9yO0k8hv/Y5kbdH0NIbyuqLtGk0LgUCcJzPzoJ6VneZIuxV7giYg== 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 DS7PR03CA0321.namprd03.prod.outlook.com (2603:10b6:8:2b::6) by SN7PR12MB7348.namprd12.prod.outlook.com (2603:10b6:806:29b::11) 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 19:28:33 +0000 Received: from CO1PEPF000042A7.namprd03.prod.outlook.com (2603:10b6:8:2b:cafe::60) by DS7PR03CA0321.outlook.office365.com (2603:10b6:8:2b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.23 via Frontend Transport; Wed, 3 Jan 2024 19:28:32 +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 CO1PEPF000042A7.mail.protection.outlook.com (10.167.243.36) 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 19:28:32 +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 11:28:18 -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 11:28:18 -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 11:28:17 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 2/7] Revert UBUNTU: SAUCE: mmc: sdhci-of-dwcmshc: add the missing device table IDs for acpi Date: Wed, 3 Jan 2024 14:27:50 -0500 Message-ID: <20240103192755.217183-3-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A7:EE_|SN7PR12MB7348:EE_ X-MS-Office365-Filtering-Correlation-Id: f6db5197-7e3a-4024-1a4f-08dc0c922c28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OhgHFx9AWv2AK1Qg15NYny3wJax74S9mlwpfvoxYZijUHVjkuSeGcXFzgWG7DF07eOeQlNUZNUuLX5IGcegJ/TOmamPkFwgeiwclYbbbDsPh33UA18hr58xnutX4MAVW6ZLUAE+JDqiEB96W/nKvRnHCsZw/9J22R3LeYPskgxaiXQINatpn+kRvO8fLlZsVm5ay8BT8REhPqiq+nc3L3ciRjFyFwdfEu6WegtVEXrqPuzQgbF0ELTRKoEfP92Qa5AZX8S7GWsrnVvLgM9tvifxax3S+6ex2yRe4/tnlBQGaZzZtS7Kv84wr03JgGwTacneSVdNtMfWZ+zxoBziw15dwRp4O9zRwO/DMtx+u9+8hWOMoUl+FxPPBnLrA31eKl1Ph3rs2XVPnkhVwQlc8PmGUu8q2b9LrsbTcefm7FEG0Tox86FsXpz4/K7FH9AR+YTploOtT71w4o5BFM3qco0N+wozfeEfJ3GFvVj4BrGfKMRcU/qXGp3LrZEqC0vs9wJMRAwCSW8bPilyNroUIO8wtaUdjl+oTfnlF5KirMRGDjRVJ2eVjgJHNK5D0LkS1pW/ZxtN9cpXp917ayed7VZ5fvyuCy/jJJb+LoP86cUuR+6QFS8WVu6+Ut+WKNHiEyhQ3nUKXzNsugHj0SfNjXtalU5PHpbEqVz7MEv1knbz8/pfaoxc6vJqVLrGm171oWxChJi6LVWmTL1fx7CSaUVGArAqGprB/rbGXQQBey9ni26zogvF5e7azb3vojg3sKrD83SFqc8KBtGbAkM7ghh0WAOY5HWqJCjTEFBPZL0c1DnYtBn/oyc/vKVmM14T1 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)(136003)(39860400002)(396003)(376002)(346002)(230922051799003)(186009)(82310400011)(64100799003)(1800799012)(451199024)(40470700004)(36840700001)(46966006)(36756003)(40480700001)(40460700003)(70586007)(70206006)(6916009)(86362001)(7696005)(7636003)(5660300002)(2906002)(356005)(2616005)(82740400003)(336012)(41300700001)(26005)(47076005)(107886003)(83380400001)(1076003)(426003)(4744005)(4326008)(966005)(6666004)(478600001)(54906003)(36860700001)(316002)(8936002)(8676002)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:32.4414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6db5197-7e3a-4024-1a4f-08dc0c922c28 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: CO1PEPF000042A7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7348 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 19:27:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882195 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 4T50FQ2Fgnz1yQ5 for ; Thu, 4 Jan 2024 06:31:06 +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 1rL6ww-00034F-7x; Wed, 03 Jan 2024 19:30:52 +0000 Received: from mail-mw2nam12on2056.outbound.protection.outlook.com ([40.107.244.56] helo=NAM12-MW2-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 1rL6uv-0002YX-US for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FAnZLZ4DUj8ir0WCpzCRKkMwGemcYYojbCLJ8Nz57a0DyyC823ZV7UwsXuVO8lTpXx5FqpdpGATis2FxXEhE9TlR+hRJbU69ZDiG5Xchx2TEsHzxYTQNpc2WY8abPyLwdPfcIUzJTPdHyhMakRb4xTp/Lixsx528VitPshOJibE4fqeM3Lmdctg7Z9VKDFXpPrd6+Dy91/AOJed2fR9W5R/rKerdBkKYsdW9OC8zZy7T1pkwC1UwkHVs+jPwkHtUIKuwYTONO5C/fl9IgG3SJOuWX8PrFH4z6+1mpJe/k8gWjuvpGXpyJT0Y8Hz4z+Gvl6cickZ+71AGZwZy15bWaQ== 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=SlTViISsUSwd5tZp2UX4y3XaM2saTuHOr5BvBUPVG1mK12WAr5Z9DNoRHfebp9AV91N2rLjOHEoX5/hXOseFCf5ON6EU2NWsCxsMrXlrSh4vhJn1ERnAdsCjW2pwWxL/8H6lBPlocdDFHzL4zHnqMpHuCxQmHH7fNiYpQXM+4nWa3Yn3xVq4/expzsd40RtBxiFiyebwjBca+AHRYReMXDewXs6W2e3NiOYwbgsA2hnmy0AIita8dj8VavX29C6bvyWAj9OuADX9/elYbIbC6SGFNxcg7MtwvHEfADsQSprBcjdjUyDog826setA4SrU9u2mSWY4yT8ef16vkTKfzg== 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 MN2PR13CA0005.namprd13.prod.outlook.com (2603:10b6:208:160::18) by CY5PR12MB6156.namprd12.prod.outlook.com (2603:10b6:930:24::15) 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 19:28:38 +0000 Received: from MN1PEPF0000F0E5.namprd04.prod.outlook.com (2603:10b6:208:160:cafe::83) by MN2PR13CA0005.outlook.office365.com (2603:10b6:208:160::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.7 via Frontend Transport; Wed, 3 Jan 2024 19:28: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 MN1PEPF0000F0E5.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.9 via Frontend Transport; Wed, 3 Jan 2024 19:28:37 +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 11:28:21 -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 11:28:21 -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 11:28:20 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 3/7] Revert UBUNTU: SAUCE: sdhci-of-dwcmshc: Enable host V4 support for BlueField-3 SoC Date: Wed, 3 Jan 2024 14:27:51 -0500 Message-ID: <20240103192755.217183-4-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E5:EE_|CY5PR12MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: ff0c3ce2-1eac-4014-78f9-08dc0c922f58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N5nUHMWQJpO3YulymlJ4xVt0mi7O0s/JHgysKOeiDDz5rSvWasYLxiPrYacGvDoiC/SyY2ZeVendQ3+8t+DWZMFLebTKsdqjeHr9pBt3D8VyogadbNN9EdQFGHvNulPwrxg8ung4mNKPL/STl1kbhF+8+jLKxwBiJZ/ZF3qXKXSQdhflM+I3blUUZTEz38+kZ/XKfS20sxCEHl7bIyYOint8tI0Q/k+sIbCnr6GCJEVka7sy5ia+jBL1OO5K2vbR1uSzGwWtB6Bp1xA9aj8PWfNKDGdxE+1ljkkL5a+0MODIwCqTW+OXDGjE1ZGxdOicIx0llRFxVbgMNA5DQBttA0Spa3tXfhbP1rWmbnhYl7ILSkQzc/6f6/DO538QgiHNQJjQGgj6WB/xvca78ZVc+wALVY3qpjN/hVSV+TW5CHtZ7BKEUD9uzu59qRmm8nL95gzACqOfIuR2WN5Jkc7Wj52dmRlF6fYBol326++fmdfj8R4Do1Q/lSIqjc4mIcnKogKq6gf6DvZPaYl3hq5ATmze9pcc9vDxZ3CqtyW9spFSC69c3/8EcejebNq2F2x/DA8zVT6/zRjemEu3eMiqjFUzyO0CKgf52JVO/DkXTrbg6xfStgagkXETbYWX0ZsPPWfB0sMD/CbU7bjd1QsneuSyU/0vu3ZJf8c7VLrZ3pHlguYd4zGqFdioJglS2iII+K07UFtz999fGVTR5SHAo/D1QyCWBVc5vnu6mE7il7xT2JYe83XPjY5cM2HfUVQz8teNaHj5iAcltWvpgl438F1ZBOS5l6f1cJ8/pJfx5wxtPbWGit+rQ97VmA9sK768 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)(346002)(396003)(376002)(230922051799003)(451199024)(1800799012)(64100799003)(82310400011)(186009)(36840700001)(40470700004)(46966006)(82740400003)(7636003)(356005)(36756003)(40460700003)(40480700001)(86362001)(336012)(6666004)(7696005)(426003)(83380400001)(966005)(47076005)(478600001)(8676002)(70206006)(36860700001)(6916009)(70586007)(1076003)(107886003)(54906003)(26005)(8936002)(316002)(4326008)(2616005)(2906002)(41300700001)(5660300002)(4744005)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:37.6978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff0c3ce2-1eac-4014-78f9-08dc0c922f58 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: MN1PEPF0000F0E5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6156 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 19:27:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882196 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 4T50Fj02nMz1yQ5 for ; Thu, 4 Jan 2024 06:31:20 +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 1rL6xH-0003BI-R9; Wed, 03 Jan 2024 19:31:08 +0000 Received: from mail-sn1nam02on2084.outbound.protection.outlook.com ([40.107.96.84] 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 1rL6v2-0002Yn-5o for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ha0vxrmPwI8HKB6yam4kVRtEUX8OGUP5gNwW1aqRf5w2zrzgQPJ4Su/BXyMm/y2Cftm1mM/52RVk/QZqnYFrcvQaJQeIxunVEvJbTfkV+cXPcqJ7eFi8Ulv6Oo2+qTUElSkY0tkGPjeGxDndwWy/d23bA1GvAeblMIpUCR2r1sENNofQsAwnFIzfEMzE4R07AhWt5fscJgRePPOMMQ2cY9pfStJuFq3dHBqXbq2582wuRCSZXcycSs42hHc1PcDtq4xnsy0NQ6IaxUmqONOhDqeEqZR296Esl7LGrdX9254nfR0cKFkcCWFoMzdnuWt0LXHY+StsI4fpv4ityOd1Ag== 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=m4Ue4xKYKblMAPlFjlvyNDqe2MAFFJDniWwxSdxAmqbUX2zcwRZeKG3ISFA+GQPREWaP4p2rEubctfR5Q4xE4aKQQzxklJ+pdgqNvIr2/KrqhjVQ6rdKJ/6tDTRXnZphbh01HHZJYU+n0l6VT5NzxvBVP+oo+7zD4y3Jx51cGJgXELSRBYlQ7ZePau1NSA46leaF6x9I/7za5jT2aUmyZ0iUkDb1ocd8jyM1NhkeIFSACk6WVuzZZFaxMROGIJ9Rqmf15aZuQh4DN3SKRYgCHRDwcUyZr2DP6mUVRBsnPG/WQH+GPEUmrYSy3g3Mm2EAWZiAugPb0Jrw3BCQ309MHQ== 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 BYAPR05CA0031.namprd05.prod.outlook.com (2603:10b6:a03:c0::44) by CY8PR12MB7612.namprd12.prod.outlook.com (2603:10b6:930:9c::6) 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 19:28:42 +0000 Received: from CO1PEPF000042A9.namprd03.prod.outlook.com (2603:10b6:a03:c0:cafe::3c) by BYAPR05CA0031.outlook.office365.com (2603:10b6:a03:c0::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.7 via Frontend Transport; Wed, 3 Jan 2024 19:28:41 +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 CO1PEPF000042A9.mail.protection.outlook.com (10.167.243.38) 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 19:28:41 +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 11:28:26 -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 11:28:26 -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 11:28:25 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 4/7] mmc: sdhci-of-dwcmshc: enable host V4 support for BlueField-3 SoC Date: Wed, 3 Jan 2024 14:27:52 -0500 Message-ID: <20240103192755.217183-5-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A9:EE_|CY8PR12MB7612:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b4dff4b-ff78-4255-de84-08dc0c92319f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iPqqUOgPalq5L70yHKTlgHREZmwi0+UiR9b4yMbeCoqoNEScOkw5SOQmnBtrFWTFWcUKUrhtnF6mh852uUFbshU7T7RvZ0iDMb8dDBYfUOkrwLRyTZ36Rhjr5puo1AoYxzqnBGWipJoYw6csRq+CGHEuuvdkzDUMBo75j3XGiP/xisNlmQHMzWlfKg+vGexvlzPGtY9nAiAvqod8PD22TmnovYuBG4YbuMThRbLEXzChRCaPj1ZZgBPdlj32ZAigIHw9/TqFCScelftUi5Bl0Su49BVLTkas6U7DK/tYwgtUsuzSXM6k//eAhowgEhnC6eJtpm6C6DjAesreUoTNVr38/umP9GYKZkwTjESybelSlXMjbTEhBgiAyDp7BlGw0aGRfLEWJGsv190uO75n7i4CfuNWs8GTtWhkupYrexKgC6iXCeiCElTyIrg1L+rpomJ2T5GqW7movUdiGqCwv+10Pja3VbPuuuhSGiX6MILVWEV8GY8ZjiV82PMz4hr9dy6m0cbQyZYXVyKYW1qHbHd5yiOSTjJe7W1Lxq4IJZCenVss2njFN95ieNdPFpxc3BX/BaupqAqPIMHoz1LFa2hJ6w02Y49dkuptkMLE0CZ+YCweccKl2cr/WXBTRQCCVPAsHmns3vQSnwgGjFzh78/37tlSCIqHrK4spxrPpMdcyDIArFRRlx2vF3q6YTHz1AldMyJT6b8Xvn0yzWwUPk8qlhw+ni2GUd4pgpPawAqY6MQAPL9ZFbqDKP94cFzYXs/wRvUJ+MXfmp0a655TMYMNaYAic7ltW1Y+/3e7dKpu+oE5I4TH/JDgRMt0osTW 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)(396003)(39860400002)(376002)(136003)(346002)(230922051799003)(1800799012)(451199024)(64100799003)(82310400011)(186009)(40470700004)(36840700001)(46966006)(86362001)(36756003)(7636003)(356005)(7696005)(478600001)(6666004)(966005)(70206006)(70586007)(6916009)(54906003)(336012)(26005)(1076003)(426003)(2616005)(2906002)(5660300002)(8936002)(8676002)(316002)(4326008)(36860700001)(82740400003)(40480700001)(40460700003)(47076005)(41300700001)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:41.6150 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4dff4b-ff78-4255-de84-08dc0c92319f 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: CO1PEPF000042A9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7612 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 19:27:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882197 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 4T50GD5LGbz1yQ5 for ; Thu, 4 Jan 2024 06:31:48 +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 1rL6xl-0003Xm-Pp; Wed, 03 Jan 2024 19:31:38 +0000 Received: from mail-co1nam11on2057.outbound.protection.outlook.com ([40.107.220.57] helo=NAM11-CO1-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 1rL6v3-0002Ys-5C for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/SkRoXVn8btLi2xlXyCfVB+0If25e0t7PJPzN+hvcGnFeInflH7kdwy7c0suHBh8FsFhqUP3q+ybWzaYy/NALZsMgUV0GHQEUtC4CXLYb8jzT8mxSW0bKCfrmQ8CuOoq8HnYpJuTMFDca7AaHSq+O/lQsTrEab6NKsdzX6hfegzINXxtt59xMvHY3JPe5drXMwTtd5TgbSKAfv+yBOMMZgjfNeDW1PfZA0sOUCpc4UmdPfV9zlM5z1ty5MwvewOJvYOLL61m6B50dcgOh2P1FMj5YDTZhvW9HXs43FLL1y5DeMl3NqjKODuqE4V9naBX27ZiEUSu9UJRZz/v44nmQ== 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=gPVBe3IEDRt2q3+gVO+/Oao529/H4m0M1RjXPdGs/qkfNOU2YLTU6n/Bwon4FjgudEkIbWyoZzCpKvqdmjzkBJHUQgL9yXyCQr9NsQOQ5RZ5J1BxHIJ6vGAHNKXBczHrsGRJ/GP8iyX4Y2gODl/3wz0w112mZwV69nEDvPaeCQI1ux8Kt0fR0fnVJQGEwhEJ+bfZcKMTcTQVW3nd63jDbaoifd0rzLKMBFPG8A34Tz1qSxXOKgxTDbLM3RGiKyEBdzWGlOsyehVs3UwU33OpoBfDTJjGch5QlosjOb5SMaiixyf1HNPwzOyL+MYEnIJeZaLumqVZDIRJHfIlp3a4tQ== 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 BYAPR07CA0099.namprd07.prod.outlook.com (2603:10b6:a03:12b::40) by MW3PR12MB4521.namprd12.prod.outlook.com (2603:10b6:303:53::13) 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 19:28:45 +0000 Received: from CO1PEPF000042A8.namprd03.prod.outlook.com (2603:10b6:a03:12b:cafe::eb) by BYAPR07CA0099.outlook.office365.com (2603:10b6:a03:12b::40) 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 19:28:45 +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 CO1PEPF000042A8.mail.protection.outlook.com (10.167.243.37) 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 19:28:45 +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 11:28:29 -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 11:28:29 -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 11:28:28 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 5/7] mmc: sdhci-of-dwcmshc: add the missing device table IDs for acpi Date: Wed, 3 Jan 2024 14:27:53 -0500 Message-ID: <20240103192755.217183-6-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A8:EE_|MW3PR12MB4521:EE_ X-MS-Office365-Filtering-Correlation-Id: 310cfeb5-c1c4-46f2-4045-08dc0c9233b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z6UQS5l59TUKf1wK8zHy+FGbTkxF9FXotJliS7chS+WW7oJRZg+SCuCVodUXmSr7diA/dK9VZmMhrEEhFFyYEEK2/81aNU5Q2B0BF6RgDN+8wpB9ML+SZCB4pTebe+tNy6v2q7ZPncESWC0tU8st+owKsrI25Gb/9mD99DI0r3NK8h08GPVxS8xufY5I7BTogdp0jQGQaIS5UdmN1oMEXezMjolIXi7t5Sugt7kO4rXN0LsnC4XSLFJ245bQv+DMAOfmA3cbqwGavRIRV36IhHh2914EqbCKtfvxYmr4pI12P/boGD9qr5LaK+NLUB8+0b+wylcbJKw1RiM6fQS00HeJH0vGAV0sKVHgqDQ8tISm7ogPGgsBJeG3DgpMvpHxRgcp79JtrkAeq23mLU5QxNksYz61pBsLTFUIwv9YFKI9ikVa2dD8hejgVPOLZwcYdW2YMa+gJW66yoN+ywIcMDfh8mKbo1vUYWs/iRGV4gczu/9MJ58o+XEInjpImvWKEjKYSM5q8MnFjM83WkL1xxzbjvricopsb5qLEVaD3S6scIrsr0zUsNKWwYIlLe8wyCeSwMwqYeir0QIPlZLl4UDoN93TZ05PNk5PpqyQyUmUUUCwWYWsITJd+6KJEdfyUI/F1KG/hXP1wiu3BkY1YZPKxoJwBJQVqxXo11VgEs7pDjNeoZ3QUp/xxaKCDiUPfE/d+F0VhqxpNk5RVnYFIMVv/dEp3yhBeTmODvaDp7YUgm3M2uky/a95ilYyd8mzq7YXDeq7etRy9aLjcTey5byrVRqNIwQN+Wc8IvolR3psq6aMWepV+sRIflRrEMKZ 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)(396003)(39860400002)(136003)(376002)(346002)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(82310400011)(36840700001)(40470700004)(46966006)(47076005)(26005)(82740400003)(2616005)(41300700001)(7636003)(356005)(426003)(4326008)(8676002)(1076003)(8936002)(54906003)(316002)(5660300002)(2906002)(966005)(36860700001)(6666004)(478600001)(70586007)(7696005)(6916009)(70206006)(336012)(86362001)(36756003)(40480700001)(40460700003)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:45.1392 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 310cfeb5-c1c4-46f2-4045-08dc0c9233b7 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: CO1PEPF000042A8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4521 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 19:27:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882199 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 4T50GM5VMPz23d9 for ; Thu, 4 Jan 2024 06:31:55 +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 1rL6xt-0003b6-Nr; Wed, 03 Jan 2024 19:31:45 +0000 Received: from mail-dm3nam02on2046.outbound.protection.outlook.com ([40.107.95.46] 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 1rL6v5-0002Z1-GV for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DnL3zbtutTQ2/pAYHetIp6IzqoShzb0nITwfW+t0ReeqNUo+lw0cV4WiepmT4MM8yJ+gxPtRtEcyHk1oFnJMj9Iz99YW8g6syzrWKgI24FqYzpnGPCweKSp9I8LWVVqRNbHTpS8vydSG6uRg91PY7D5/wPMw0Njof/jhHXx4lJuw1g/bvZ24uHxcGQSSSHf/74LQX8zC85VyHV838BZ9pFBh9W4eUKlkXbqdvgsKbHBM5d201/t3WjfOSIxihNdP9TXmsAIDPtnSzhSnJ15wFVxHksAUKibXLy6jrpS9WfJnbtKSFXWusBaAtw1BTPGdYsyJlNDCzdowv4qrD+o2AA== 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=JDgme3CqAhnNZeLe1xPmRUKrSTj26LYbScZI1q8+JvL8pEruH0Oba0tm5L+/3rMOa7Wg14gGolfrOd1fQjPG3B96rsr8FV1Vol4aWClQnaizf+HmC2dCd12v5YZhakeRmHkgxDq/B96iqzNunAs9pOYowHGvIqogYuf7zJE9PjsgYDCJUaiTv0+dEVlsezPzkq6gNx1U70u8kCAr8jjMW9Ot07LVWJ/HS5EYPVSGFJcYJFOxUjJf6qPehVdy0SzKqGEi+hdyElZYZgN9xCUrPkwBHRZKpLRYuAQWdMP8O7UijfN2Q75eqt8i2B8SaVqygOYTmYioRL0JErr/mP+goA== 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 MW4PR03CA0103.namprd03.prod.outlook.com (2603:10b6:303:b7::18) by CH3PR12MB9251.namprd12.prod.outlook.com (2603:10b6:610:1bd::19) 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 19:28:48 +0000 Received: from CO1PEPF000042A7.namprd03.prod.outlook.com (2603:10b6:303:b7:cafe::28) by MW4PR03CA0103.outlook.office365.com (2603:10b6:303:b7::18) 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 19:28:48 +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 CO1PEPF000042A7.mail.protection.outlook.com (10.167.243.36) 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 19:28:47 +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 11:28:32 -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 11:28:32 -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 11:28:31 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 6/7] mmc: sdhci-of-dwcmshc: Add error handling in dwcmshc_resume Date: Wed, 3 Jan 2024 14:27:54 -0500 Message-ID: <20240103192755.217183-7-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A7:EE_|CH3PR12MB9251:EE_ X-MS-Office365-Filtering-Correlation-Id: 63b6fcfd-7d6e-4dd5-0fbb-08dc0c92355e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7+P9tVW9bwKAyAoEIKePQJi5sQSuiG0oZ2OWb9Otw2bPhBwsjK/VYTUM/RgVrNAm394tD5wbfdrCGzkulLCSRzMUesBiU/c72tnj+LMtzIdsX2adxkHO36PYXpAAucTpDAXCXgGdN8jq0DZqHTkeNLwiaYSOWc9S+pLQNjuFLw0La1No0mp/DMxUJD8K4WDeW42+mGK/THK3ULUgNTNHmfTvlFBKYcB5SqUR5zucI7sCXTUv33dbHVpuIyrIxGew/28JU7DMs4EPngfGrumojtjfl0NKWUX3Ic+G3L6JX+rN83VclKjAmE2hDCX3qWQO/KTm/L1x0ucKok9yrjPdyYzTN0ERTF6QQdJybOMVqlHufbm4ijNrYLep7yDr1jXx504UUxNueYarPHUUONpKwe/9Noi+IRqLWn44vHU1LByGW0/N4m016/9aTmV9PBcGRqpzdjrJiihg2xSDkwXNya6D1zkPRW9iOytw4IePcxp07Ohvm13kUjHVsQTfGJqKXYUezQ0dcZZbkCwUHKq6q5AnvG4odTXw3g3NSEQhu1SnvTU66kPW91IWnebb5LI7h/TWgCp/56xYSSzi3b+Y0Jo5WMsQwQ5YajETNua9D867K9OjCK/0XrVVAq4w2mlQnXSl2vH2hoS902MzMGL5k7NRgQaRzp4K/ATEMezRu7SVRG4wOYyd7V/XbyhHMJVm0BW+JvUPkSz1jbtPMPYCs71UcB1bcfzlGTOrYi0q7eFpyeD/iqMxIQd62QtuxF56j6CSYACSuEEJar0ATlala1+GeFiaVlZT+VDAxYPmbWL4e0l6kB0scCVl2uFrwW8 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)(136003)(39860400002)(346002)(396003)(376002)(230922051799003)(82310400011)(64100799003)(1800799012)(186009)(451199024)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(426003)(1076003)(336012)(83380400001)(26005)(36756003)(86362001)(7636003)(82740400003)(356005)(6666004)(8676002)(47076005)(8936002)(4326008)(5660300002)(2616005)(54906003)(36860700001)(70586007)(316002)(6916009)(41300700001)(2906002)(966005)(70206006)(478600001)(7696005)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:47.8945 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63b6fcfd-7d6e-4dd5-0fbb-08dc0c92355e 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: CO1PEPF000042A7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9251 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 19:27:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liming Sun X-Patchwork-Id: 1882198 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 4T50GM4hR9z1yQ5 for ; Thu, 4 Jan 2024 06:31:55 +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 1rL6xu-0003dV-Le; Wed, 03 Jan 2024 19:31:46 +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 1rL6v9-0002ZO-E0 for kernel-team@lists.ubuntu.com; Wed, 03 Jan 2024 19:28:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CT2YyAk3rELfi98PDME209lj6VjfET4EOwPUMLs4bA9FUM3g/9rGIStcA1UM6btr2LXf1zK75QpsWtY7t84fEg5TyjQXCMyd5CKxtGnf8xvH/4rFRrNdhl0kZjRDd6xYhSqkaKhj3DKtn+STSz3BrOxS+rq71DbEYKx3qEvq2fM1wsNChBcnvPoz0k84Y0k3Jz5zOOf1/B/LvSIfzzmFbcFXzlEbBGxZovI29sVziUxn2ANMVMud7QHxHaUpSwLf0Bn5mxT44jbxZyh0DFRzuhvO25yqOuHm8+IU7DnbzQlBqnlZdl3OhmqzEclY4lMrwOr2irA+XCw5mukvxioonw== 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=daBy3VUW042ZbywshLCEwQAp+I23aUvQ3TaqFkBGm3QrciPzyrG8JTWQGFwN3Q2XfPBQ2rp7pKwOQkegRrCYF1HAZmdXq2+IGV1AJkvwNYoLyKmCWJL04j0Sk9KPhkjP9zqZ63ddNEXQi8v3udvZrVmWU2f/gJla/5z/2+f9OV7A1HGXQL6Mp+8XofDjsMmxEvy8cjXCH5qA/PXOHYK5GtVSl7Vdt9KpkOKGXkYpu7tS1phGSUfT9cpraaRb8FRYwqSIgtfB2DXkR3bJUjaLYo4odRawtswr6FpR033o48Vcj7iKbSmy8vEZsRqUrBrgug50IUVZuM0zZDsnVyXDvg== 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 MW4PR03CA0103.namprd03.prod.outlook.com (2603:10b6:303:b7::18) by SN7PR12MB6716.namprd12.prod.outlook.com (2603:10b6:806:270::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 19:28:52 +0000 Received: from CO1PEPF000042A7.namprd03.prod.outlook.com (2603:10b6:303:b7:cafe::a1) by MW4PR03CA0103.outlook.office365.com (2603:10b6:303:b7::18) 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 19:28:51 +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 CO1PEPF000042A7.mail.protection.outlook.com (10.167.243.36) 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 19:28:51 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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 11:28:34 -0800 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.986.41; Wed, 3 Jan 2024 11:28:34 -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 11:28:33 -0800 From: Liming Sun To: Subject: [SRU][J:linux-bluefield][PATCH v5 7/7] mmc: sdhci-of-dwcmshc: Add runtime PM operations Date: Wed, 3 Jan 2024 14:27:55 -0500 Message-ID: <20240103192755.217183-8-limings@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20240103192755.217183-1-limings@nvidia.com> References: <20240103192755.217183-1-limings@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A7:EE_|SN7PR12MB6716:EE_ X-MS-Office365-Filtering-Correlation-Id: d694446a-29f4-43b7-b93a-08dc0c9237af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n6HZveK+pLhu6jVhMiyV1XDvgezeVV7rAxQ+fwG9iEJsdwiBPUCMWYPaANfprlCEWF22i5GaljVL10HRfS7uzTHThy6Nvl5JmDHjhutpq98hEWYEC459qbQ4BRssWmSXvQgqfoK+0DVpEeGyejIBqJdeUiDI7zmXMJ9PH0oaNHJh6/qiD5glyPOCcoyOw/R8Gk8Yb26OC+4rCVnMIzjM+2NKhOM9aZ6Y+MXJDbVhRLiXZUfdsjlRjwj3ZHusGBhF1+GwQdhrL1GNqMh+6KK0FxoNOP+/Kkeut+w+0C8i6+EmIgWhX/uZczYJeXmuQSduXPOYs1NUD02Xf/DX9RhlPSnT9ZUpCcjeL4OlB44dt/9F/+sMoZEpF/z7xbsqQUDenW7iOwt5lWKn4G/+VGxsy6sS/d5R72ABAPOc1MdmJQjurog6mjb8UtwcPS/GxYrpZUnrEK05L/G5KkVau3Nz5CEBL8kkoGSPPoB+OABsGzA2q7dE1euoqwYDmtseKLSghqafJ3uNy1IP/L2wDPFVCDp9vVcId7TATrF3q2maGe1XpCNXp0hFfbrbeVcRSN/ylecqqYCmeJWx1o+si7y+RpAGXJQIcDPFWCd2dFOePiI979jSRMJwpV/H4A/I8fe7u7evklohhVga1q4XUND5x9FPN86NDr3pWqu+GUX4C0IaIlyiLO1/GBpv3Xu8ax5pSLDcGXOl3q0AkB4GWV7rfNzS8eX9muh5S9FMfRmlK1cNvsyKRpzPRfaoh2mh1QDA4t1AFSEpZ6kW7AUlMxB55K8cqJlBvX4LvI/FKEfyF2c= 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)(39860400002)(346002)(396003)(376002)(136003)(230922051799003)(186009)(64100799003)(82310400011)(451199024)(1800799012)(40470700004)(46966006)(36840700001)(40460700003)(478600001)(40480700001)(2616005)(1076003)(426003)(83380400001)(966005)(4326008)(70586007)(70206006)(47076005)(54906003)(6666004)(7696005)(26005)(336012)(5660300002)(6916009)(36860700001)(36756003)(86362001)(2906002)(316002)(41300700001)(8936002)(8676002)(356005)(7636003)(82740400003)(133343001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 19:28:51.7851 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d694446a-29f4-43b7-b93a-08dc0c9237af 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: CO1PEPF000042A7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6716 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 = {