From patchwork Mon Jan 27 13:35:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josua Mayer X-Patchwork-Id: 13951389 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2128.outbound.protection.outlook.com [40.107.20.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFA0B1FDA84; Mon, 27 Jan 2025 13:35:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.128 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737984942; cv=fail; b=dfajotVU8zf8SB/e3YgHPB7T+swd9akVTCDqCpqKnTRC0je7fR/sYZ6is9jI85rxoadK3m5oNi2BSyxegZuML5WHDWoD4UuwxyniUaC8lS/0ykbJo+VDJ05/iAC84eZC0Zf3kQgVoKlZ6u+ozBzpyzXbjjOzQ34ZM+mCFOleqV0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737984942; c=relaxed/simple; bh=CIZuFnehYOqChR1IgJvy1xH8BLYRKGRvpgEMzBrF3bI=; h=From:Date:Subject:Content-Type:Message-Id:To:Cc:MIME-Version; b=p9pIjIIm81NZ6+4F0toM8DrnbFpb6Qn6iL/iL/pSUJj4MONpN9yHqOJCoVl2hu/QnY+xZrSxFXN09Nl1BoMVwWZzKMAi/uZ4P7mstP7EpYi5jk7H0xnHgqQy9ja9V0r142RL1InCYtjVY1qFt+eGEZXMwgRov5AMUJD5rLPXKck= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=solid-run.com; spf=pass smtp.mailfrom=solid-run.com; dkim=pass (1024-bit key) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b=gWidrWci; arc=fail smtp.client-ip=40.107.20.128 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=solid-run.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=solid-run.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="gWidrWci" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=anF/ywKce+rqF+Vxnw3NUgJw1oelnq3llU8o1f+DlPb2xkfCW5ZQeLCs4JQcqhDPFlwFnjxd/EoAyLkITetZFgYKrkwryt87nHgHIjm2TRHszmrDJcqQrzMKi2cTEAvW5NKAFGCI2QtwBNCrnhBfOFZwmT4OKUcC3rL/U/ZfZFnnWhCuo6EtxALe5SRQGBE2AU0PrB2iT+sSGqeX7syrLcJDFaASJfGmXD2CflujImdOMiW6zBVrINrsA9SfEaq0VBDFB52DYgSBk8+dU3C19fLyPmWKFYBVoLQweD3q5iEF9ZLwsUNbhQtmkSKMfDR4DJySxxcDMmXau9Pz6HWfPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qK8zG9Iy+mjMl8ATqSS0KTgG4fe98TzKZddkEyXt9FM=; b=hbcOFBmf2AZdKTVvz/cameVOkc3TuYwCRQznpABor9ViKNQNFPElhlC1JKpmS8uWB9me4fySTdsLu+q4vjyM2imjOWSw8wHREpZtKy3TEOwKnYXuiuxbAzU+NXZlASJHGdXxiWmLnv7u6EJ8lDS2Xrr0lmIbC5K+LTlrMVEnhX5h+qyB34IEcQIu5GELPoNNntKP6WUsFSgcAKl1Q3RbmGoTNmc0zbsibzcycIB5AwZdigkYpA6k7FG4U4MReXw24+DdZJavIKFI9dpJOofWxXJYX3vBMX1kszQFtnFVQXnEuzsekT2H7KshrJnqwrIyhyUhKTroCJE5KMImQlrNqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qK8zG9Iy+mjMl8ATqSS0KTgG4fe98TzKZddkEyXt9FM=; b=gWidrWcibDdKFkTFvaS0WHCJWA6XXr4x5vJ6zv5+xflPaHcNVOnKn+wUgB8Ojodp9IS/sgvxwhdOOknzRqeW+PknNTrsDJY1BNtnM8yzGz+QTHaauXLgrI6mprShl6uyig58ccSR9rBYe01b9bUKF1gKZxfmlOu+C5AN6ULLEOU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) by PR3PR04MB7385.eurprd04.prod.outlook.com (2603:10a6:102:89::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.16; Mon, 27 Jan 2025 13:35:37 +0000 Received: from AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529]) by AM9PR04MB7586.eurprd04.prod.outlook.com ([fe80::c04e:8a97:516c:5529%4]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 13:35:37 +0000 From: Josua Mayer Date: Mon, 27 Jan 2025 14:35:29 +0100 Subject: [PATCH] Revert "mmc: sdhci_am654: Add sdhci_am654_start_signal_voltage_switch" Message-Id: <20250127-am654-mmc-regression-v1-1-d831f9a13ae9@solid-run.com> X-B4-Tracking: v=1; b=H4sIAKGLl2cC/x3MPQqAMAxA4atIZgMabP25ijhITTVDVVIQoXh3q +MbvpcgsgpHGIoEypdEOfYcdVmA2+Z9ZZQlN1BFpqqpxTlY02AIDpVX5fgB5IW63ne9bR1Bpqe yl/vfjtPzvPD86ktmAAAA X-Change-ID: 20250127-am654-mmc-regression-ed289f8967c2 To: Adrian Hunter , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, rabeeh@solid-run.com, jon@solid-run.com, stable@vger.kernel.org, Josua Mayer X-Mailer: b4 0.14.2 X-ClientProxiedBy: FR2P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::11) To AM9PR04MB7586.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::17) Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB7586:EE_|PR3PR04MB7385:EE_ X-MS-Office365-Filtering-Correlation-Id: fa043044-ffc2-48ea-a9b0-08dd3ed77b9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?2cq/mf+7XrFAwzIsLxmghZwUqQnuGGu?= =?utf-8?q?QpwjKZAYEE+7CpbwHdXbeMF/JdT0UxU3zwqrcGp7I7eYGoKWo7f+BCUMBt3UU02cU?= =?utf-8?q?ZbM4yfCAY0xNc/35i77p86EFy7hwLwplA3AD67eKam705jzNRiHO8/yXuJwaUKddj?= =?utf-8?q?KEN50sSCsKWRGpKlbJoT+WBTRKw2SL+CSyDBexwI4jXZ+tvjsddsuvEBbOt2kv3Mg?= =?utf-8?q?xnfPlATqup7NUa3XzcXwxC9P2X0+KFbC+YLex/6pdUG31GeapnYb3ja0dCEkrDRqT?= =?utf-8?q?R/8gxsuTNmynb2Mzgf4zjg6TytvQeTNVQbBI+7qojV0rrIjjtdhUS0xQeYFvfUTeo?= =?utf-8?q?evmmxD+QkWPWZv1NnNkTtkY9DaUljUVYZ3m5KJLZDwrA3FwEubuWd7ELCNuHGKPq9?= =?utf-8?q?DSjJScJMoPpfBttxPNOa86dirZhZbS9gZzJDTH5NBijVFXMIGTmEYaEKcc0wp6N+F?= =?utf-8?q?9wTFQ2z/ew8BqfcrC2lUCXSgZr9gLQF9u3zKDdqCv8XK5a27TVS68sqw8fOdGajKv?= =?utf-8?q?LnKcfQvqfLOLFBfp5LSIlauXaknVhwWSE8+5orVw75ERqcEQTaIhiGPZ3BDty48Hn?= =?utf-8?q?Dwz0K/YPHZvC0VrR0itDlmqfixHAoMir/FY/TPGQxaxIg3svFx093DFWJabCEnBRT?= =?utf-8?q?U7FYn/xelnwLtwMvtmWn/+++tKetwWymH4e269Pbt456+FS4cd7SZF0Xaz3jlHGpx?= =?utf-8?q?H1ODTQsW9I7n8WdZqh/smWxOHLPpAYEA9DFrMsg7oi98G7hc/OnqvC5eIMtboguVu?= =?utf-8?q?ISx2HRbhhLJdPXHa/SexmOeJ870VBWg1t9N3fLTLADZy/Nb9sBaAkqJVARAzVby6X?= =?utf-8?q?CqyeuxmYg8+FT0QZr8yVwyKww1q0lnsozRQLrHOh9S6ZxVLt/H92ltf8GHde+bveK?= =?utf-8?q?GTzyRjfCYqe3quzy2/8nivqJx1sVJEtquzFPf2Q4ZlGizdA40xMPPR8vnd4mQKE1w?= =?utf-8?q?Fky7oysHi2xINOj8BePhUTPOazcuQ18+V+/sm4DMB0oBcLarh94VkiPyB0IPXEHLA?= =?utf-8?q?BoExRZ/7f/p2TAgwpq8lRO97X73z2P3sOrva8OOhPPzv3UdHoECRAiKUhsy4Hn7jY?= =?utf-8?q?RvQQTjAlwBRn5rTLZG1nzixPAje2aAxmcpAa+/nDZ+95wyJ05xoh8BU8jRktG1uam?= =?utf-8?q?wv2BI1Dxkwl/XjlyxIgG5FinNf0dm9rne1oO9vT2YOWye9l9BjtUYAmJPpuf7VOua?= =?utf-8?q?ZaNAgpoQNWZHqwYdnRvxEidaXjtOfpQylNGIZvKPY48ZwSm6Gg0tvjsSrLm7NP+NE?= =?utf-8?q?Q15/UczNT/3wOjPen3tSLXuRZ+QOM+flAQIkXG8nye3Ebaujl8eoinRrPAliG+Kmr?= =?utf-8?q?Fop1lsu0UNpryoF7jdjjlqt/j/l2IqFy4Z9AmhS13lWDiMILm+uOuwSQdpQ0OKqPr?= =?utf-8?q?IxH/vYAFUQk?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB7586.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?rMEUPzyQA3sdGn3iSyEiYe4JA213?= =?utf-8?q?YZ+ylRs4k9kvHSuczYYdthgrif++jiusvjlNRvaJxSQ03I5ZT+wkl1v1Ie1inMPQr?= =?utf-8?q?c1CMoFOuZOhvuwaBhLzVkgYI6QNHiGKCEhzsXlNYeRuDOrvhSTXaUWO6qr+9ZKNXK?= =?utf-8?q?jBtl5rQr+PUvM1NDGUZDM8tlMinf6UNjB0AUqlWVUYSTAk3pMa6yrRjOIjzgIuvDH?= =?utf-8?q?my9Yz1Z2B9olCjm4MgSdDFXm4cyhVbCiV114JegkX/Goad3MiB8YlTdleJPVGsgqJ?= =?utf-8?q?6AWq/jzr+lVjgst99nUirgWmNjOTJlOnpY41DKm9au4R4bFwUXRmk4e5ZH7M/B4tN?= =?utf-8?q?tWMfLCrqbWYNZetUt2Qo69cdkx0czihcvK5DiTkAd0VAww0QChT/Cnd+lpIBSIWz1?= =?utf-8?q?/aLt6srQCZXlkFcDoXRzy3NGULfIArXlosSfQkp2dXeXa00XuYwWBseB84br1eeP3?= =?utf-8?q?FdD+aMMyb7b9ZvEyP6L8YhxUJxXUEgLgWQcvn0qCT/FbuOw1eBllwW95hhc4c82B5?= =?utf-8?q?Cv7f+CxiwqjQQcZJCgXiQxYPcp1i4uTTGd76Ounb8kELvd19p3e3pUR9DvPRlS8MY?= =?utf-8?q?ApXH8FPlCaUxWH1W7VXxzItMGC/6TFvLfG/uGwl4khXkEnx2Q2uEqaqeAfMwxhV7+?= =?utf-8?q?e0WVL9hNksYWk5jCSAX3Azkm85E7cwMhwXqKCX3lKiB5gO5PatuXC/E62Gh1+PPzD?= =?utf-8?q?hOLMpXbyrJVw4GVZ/SP+z2XnS99UnhIeLXWOhnuelLWTbp7C1zicQ1Ug0wVJI/n1i?= =?utf-8?q?XscFwyB+/VdGpL2OApyILaogNe4tSK2sIqC/nvmeviizTnOdkc0HBQFQJih157mwY?= =?utf-8?q?LnrHFepItpXe/RGZfDnOW+TTy7cBRyXfYVLrWriy4n+txLThxbtDp0fOhwA3gfH+F?= =?utf-8?q?y0FwpgBnSw/AZEMc8GMg798HKiv6+WQadnhOEQUVd/ivrMybrAY/1gBaSEsBNFlxA?= =?utf-8?q?kOTLMxHg3asJUZ22N+9+/cuzNlIf2FAz+rW8ZncGkbZcw4w2KzvaqN7LMKvWWP5q8?= =?utf-8?q?n6OQo/KOAJIyrGfO0p6EF7ZBJMb9eGA2TBE+TPz0ebbcYL0fdkKBuzYXkQ4xgfvyN?= =?utf-8?q?DTY5VkmPZ1wqFkKf13QIsR0QTE8I/15VLl6WskeOWg91BUfUWNHCA6VoS68Qo2J41?= =?utf-8?q?ofavNoo8Kmu/U7mU8Yui991Ldl8u3IOWzWi5X9lt+pBKFSkFcXerJa1HkKfsQ20B6?= =?utf-8?q?lK7oe26LKLXqwxbln18L06DMkiFwJ2TKEDfDRcZpucqmw9aAjYmDN3lEUhneTiXjQ?= =?utf-8?q?yXTq0pcJWZwjB3XPIXGI2BuscT9D2upagj5StVw2NTYIepunJDVwD9TSJIHkD1O2A?= =?utf-8?q?lRcaRHrfAGoodxwR6ZyJLfZaEFWOF9137hadRYaLUBjC6jfKmfDkDgb/+2wS8Khf+?= =?utf-8?q?zXWUjzCljqfIdp+gK6sy2d2A2gxhIlZdh6STyQw9tvlojsip/xAj8XDBuCLhG8H0G?= =?utf-8?q?0CbUDKGX0YxNoLh8Qwr7MOdbBvnAWnah+LbC4gysLjCGvZvL4Z+hknzfjPkC07zzx?= =?utf-8?q?GKONdWeJZ0iX?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa043044-ffc2-48ea-a9b0-08dd3ed77b9b X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB7586.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 13:35:37.1169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S9s7l/kvCrYWAVVQvmwrSmeCBqMx4xtzGISjhnly7xePnlyORUz0dcgcwoAsuxXpc2+WKwLLDfHDzzGE+ArLzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7385 This reverts commit 941a7abd4666912b84ab209396fdb54b0dae685d. This commit uses presence of device-tree properties vmmc-supply and vqmmc-supply for deciding whether to enable a quirk affecting timing of clock and data. The intention was to address issues observed with eMMC and SD on AM62 platforms. This new quirk is however also enabled for AM64 breaking microSD access on the SolidRun HimmingBoard-T which is supported in-tree since v6.11, causing a regression. During boot microSD initialization now fails with the error below: [ 2.008520] mmc1: SDHCI controller on fa00000.mmc [fa00000.mmc] using ADMA 64-bit [ 2.115348] mmc1: error -110 whilst initialising SD card The heuristics for enabling the quirk are clearly not correct as they break at least one but potentially many existing boards. Revert the change and restore original behaviour until a more appropriate method of selecting the quirk is derived. Fixes: <941a7abd4666> ("mtd: spi-nor: core: replace dummy buswidth from addr to data") Closes: https://lore.kernel.org/linux-mmc/a70fc9fc-186f-4165-a652-3de50733763a@solid-run.com/ Cc: stable@vger.kernel.org # 6.13 Signed-off-by: Josua Mayer Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci_am654.c | 30 ------------------------------ 1 file changed, 30 deletions(-) --- base-commit: ffd294d346d185b70e28b1a28abe367bbfe53c04 change-id: 20250127-am654-mmc-regression-ed289f8967c2 Best regards, diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c index b73f673db92bbc042392995e715815e15ace6005..f75c31815ab00d17b5757063521f56ba5643babe 100644 --- a/drivers/mmc/host/sdhci_am654.c +++ b/drivers/mmc/host/sdhci_am654.c @@ -155,7 +155,6 @@ struct sdhci_am654_data { u32 tuning_loop; #define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0) -#define SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA BIT(1) }; struct window { @@ -357,29 +356,6 @@ static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host, sdhci_set_clock(host, clock); } -static int sdhci_am654_start_signal_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) -{ - struct sdhci_host *host = mmc_priv(mmc); - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct sdhci_am654_data *sdhci_am654 = sdhci_pltfm_priv(pltfm_host); - int ret; - - if ((sdhci_am654->quirks & SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA) && - ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { - if (!IS_ERR(mmc->supply.vqmmc)) { - ret = mmc_regulator_set_vqmmc(mmc, ios); - if (ret < 0) { - pr_err("%s: Switching to 1.8V signalling voltage failed,\n", - mmc_hostname(mmc)); - return -EIO; - } - } - return 0; - } - - return sdhci_start_signal_voltage_switch(mmc, ios); -} - static u8 sdhci_am654_write_power_on(struct sdhci_host *host, u8 val, int reg) { writeb(val, host->ioaddr + reg); @@ -868,11 +844,6 @@ static int sdhci_am654_get_of_property(struct platform_device *pdev, if (device_property_read_bool(dev, "ti,fails-without-test-cd")) sdhci_am654->quirks |= SDHCI_AM654_QUIRK_FORCE_CDTEST; - /* Suppress v1p8 ena for eMMC and SD with vqmmc supply */ - if (!!of_parse_phandle(dev->of_node, "vmmc-supply", 0) == - !!of_parse_phandle(dev->of_node, "vqmmc-supply", 0)) - sdhci_am654->quirks |= SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA; - sdhci_get_of_property(pdev); return 0; @@ -969,7 +940,6 @@ static int sdhci_am654_probe(struct platform_device *pdev) goto err_pltfm_free; } - host->mmc_host_ops.start_signal_voltage_switch = sdhci_am654_start_signal_voltage_switch; host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning; pm_runtime_get_noresume(dev);