From patchwork Wed Nov 8 07:40:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinbo Zhu X-Patchwork-Id: 10047937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 309396032D for ; Wed, 8 Nov 2017 07:58:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 223F82A4FB for ; Wed, 8 Nov 2017 07:58:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16B222A500; Wed, 8 Nov 2017 07:58:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 962142A4FB for ; Wed, 8 Nov 2017 07:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751306AbdKHH6a (ORCPT ); Wed, 8 Nov 2017 02:58:30 -0500 Received: from mail-sn1nam01on0060.outbound.protection.outlook.com ([104.47.32.60]:43424 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751318AbdKHH61 (ORCPT ); Wed, 8 Nov 2017 02:58:27 -0500 Received: from CY4PR03CA0095.namprd03.prod.outlook.com (10.171.242.164) by BN6PR03MB2692.namprd03.prod.outlook.com (10.173.144.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 07:58:26 +0000 Received: from BN1AFFO11FD038.protection.gbl (2a01:111:f400:7c10::188) by CY4PR03CA0095.outlook.office365.com (2603:10b6:910:4d::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 07:58:26 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD038.mail.protection.outlook.com (10.58.52.242) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.178.5 via Frontend Transport; Wed, 8 Nov 2017 07:58:25 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vA87wMDK002729; Wed, 8 Nov 2017 00:58:23 -0700 From: To: , Adrian Hunter CC: , Subject: [PATCH v1] mmc: sdhci-of-esdhc: fix eMMC couldn't work after kexec Date: Wed, 8 Nov 2017 15:40:09 +0800 Message-ID: <20171108074009.28914-1-yinbo.zhu@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131546015058651407; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(346002)(39860400002)(39380400002)(376002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(68736007)(105606002)(48376002)(106466001)(81156014)(8936002)(50466002)(50226002)(2906002)(189998001)(6666003)(53936002)(5660300001)(2876002)(230783001)(33646002)(498600001)(1076002)(86152003)(305945005)(104016004)(77096006)(8656006)(4326008)(5003940100001)(356003)(97736004)(85426001)(50986999)(8676002)(36756003)(81166006)(86362001)(110136005)(16586007)(47776003)(316002)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2692; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD038; 1:0/8JYfnfSF0TmbNsGfU/iD/KvXexVMpolJ6gGLIyaJZwLOYjFlSi7zxy/YkG+CYYehnhzAGFMvWzAEmZWl4YywZmojkr0LrOtj9vf/s7qbPHivYnwzbSResNHrFFk43P MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac800c76-eae5-421b-5e07-08d5267e7d94 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603249); SRVR:BN6PR03MB2692; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 3:t9YjHy9PwCs+XYBGf178D2gnJuzkZwRs81b5+HkkO+hasirerGyaeO9+TpG15s2UO76kYJageF82OIkFFGcNFXwYnDfsx0W41clzBKAB93/ZgDLPXvxiGHf60b01fHuJB9c2POkNYvhpUbbUTFnZrD6uvqihKX2OPpt5/k+3IZacnzVyV1PVmRq7Gb5kuHQL3yVK2T9ruT3K5Jl5oVX07G8EK0FFIMz2U6mG38u609INC69f+G1SbqEykUtvNV3Zm0fgpQLrz4hpfiS0NpX2ZCTZCcMaSuDzpFdrwAJI2mnHfWH7amrMQcYJYhRh7EHpOFiWn7sqOlEtEsc9TTh2R0MfYkKpJvwwl9GMXOWP+BA=; 25:TqKiGQIjNyJJK8cRWcfSQNNVOQUtHxYGibw4MP6vPunjqL2rZt24Op3Eir1I+hMCXGBtrJoNCp6BB7lliFYWTg6yZVISrtawDfRl5WS1umLWrqjJLIIkEQCSGMgvXRcoPIkEMgSjDtKwgI9VxErLWT/NCR6MRTrKExyye7O8jER2do2MF2rzl2EQE/yz3XveXSULjxu9J0zXQdVqbAlLAUycPH8XOmMJ7CmwWV3ouzVFtZUfEnPgDhfCqyYlzt1SCN/bGWfYfX7za2m+jxqu4/UZCYmuawUu8y+u+mU5tf/0YceHyRgtcdMOCmcRPWMklsXnI/bmudK+XBfpS8uX9w== X-MS-TrafficTypeDiagnostic: BN6PR03MB2692: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 31:ErylcjcWxw5aE+pdqmO7zAN4xu7ZCqiKliM6My1u9duoidsGYRqWYUbyCeyArlHg/5a+A1dOtWm2VUDCWs+A/zLQCeHUuDMLLT1SnBRnLQKfv/xTAasOuDRNaZgKzjK/Or3TVAymGFzm+Yz5PD4NiVYyamTA9hBAJBfmlZUxNRqaNw2xSBJUFYC+ApaAbB5nK2iM4/qP5i5tMYNVpPBImVteQLq7nD9aCsjbLr+Em2U=; 4:xkfhm+GswmNxB4UF8tLKOYAWZWC2p70AwaAYnAImAbWeq+xRTZ2M8qw1Vz9sM6CAIf+H0E27u9E4b0Wf47cuW11/a5t2lCRYyzI0AAiacoJkkjiHq/wZT/ZNVInsQRigUoVoAKtqw+PwQieO9NOoZh7hBzVQR47ve7Z1ZLOEQDqqNfPqBJLCBl6TChq/vLn88OpVBuLdb5EywGnGEftslZrQRIntmolNGDvkaWHfgKJLibNIwa7EcPPIcUsEdRWPV1bWnKK4W6hFwkBTaDcLOEBGmyfRueZVLlqQ/NBwTUIM9soTvytfZmrspveXyRru X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231021)(10201501046)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123556025)(20161123565025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2692; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2692; X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2692; 23:vBq7spvni+YPs7Y3DJ5LfjQOLBSyiMTLjPMmT5Ah5?= =?us-ascii?Q?3MdH4gG49MNzwWkTK6bqvcq0dG477mtcwIlY2g6wChr3/cIu4V5BCZUWAOlb?= =?us-ascii?Q?6FKumWs7oYU4/Skkq7UJjQZURHjQeyzlMMMkDGmio0LB5iUZg859hZfCm+m2?= =?us-ascii?Q?2Ef8RiU77+7z7S4xlOFcxFTkX51pXdrq5DRhLGVJ5583qMhY/oyl5F20JEnr?= =?us-ascii?Q?imYRfUyddqt090k+Fi+NvWUzH1OtHh/+hOGTgqqAgzLgS3zp6tknrQpN56MH?= =?us-ascii?Q?WX3jHjA6GSZPrvpUVwsy2mH1Yryi+bip4L2CfcEKMC6oU006UUy3KTNPAdHs?= =?us-ascii?Q?qKE7n39GhIvKgyOg/LxKCd4FsEAXKOS9ZWN/31OyyBEzdlGz4HbUel3eIsF7?= =?us-ascii?Q?KuYyxRsISvDmUAYi7gs97hTngVNj4Fi4omzQVOfe91sNCiBJKniPu06Q7Iel?= =?us-ascii?Q?k19kN0tcdkcsAJHMiAOu8X9OveNgTPwtpd0HkZ16+TVGSRzBlFHExYKbEP9V?= =?us-ascii?Q?8wCiTLrD/EpgJrXDHZxNxz8a9KD1fker+nVBy2OFTIshCaAMDtWmEKk6gDgN?= =?us-ascii?Q?j02bBGWDLv06ri2BOysZvuIUlYsokGOdYXq4fNbwP1OTMYIvrsgwfcXgf7CI?= =?us-ascii?Q?Fq323f5SXoENxjPeeHJmEWlGe13rFkAs31GrBuZhbndIYLC0l3LSTXFDhwMj?= =?us-ascii?Q?e5DOMOy9AB6bdvAJ0ho3B6fc50byFSHNfPSsepvA36wk3jXUt75QcAYsA6h4?= =?us-ascii?Q?yYxT/6xxxkBvUrOBZdcpe7HXH+oUO/rdprV/q5O6Z7VTe/MkSlQn9L4qB8Ey?= =?us-ascii?Q?uit26sel18LZEp7VrSwZRxc5ecx+2Owu8Yv1NtrhxHkcw55aGb+l3gO/ruit?= =?us-ascii?Q?v/N6jKP0080YKciXAocEz/L13df36C4RhE/RZ/YDrGmGzSRBsa+DlCIZHZkW?= =?us-ascii?Q?cROEJ0c/GaldB/pbV1NtbyabVSb2AgOLBENDPD15ZHnB7LFciu1hljc+ly00?= =?us-ascii?Q?z5JxTe5NMnynhEHPaSWsAW31zjnTADK8eC3ZpjJaGdwJCZpSJvjmYXrTNCXn?= =?us-ascii?Q?ySEeDAJf0vbjPSNQQCgjAa0pH/sB1dzEogOtU3/fZMEXeoR70Bp6ZMUpIF8j?= =?us-ascii?Q?DMHH3l4g+oQpCZc3DhR1FuDEfW0n5CkjnM7bMDPStRHhmZ748KvV6TGxmzk+?= =?us-ascii?Q?5hajI5yxTTOnttcTeAnElb2pJMGAKEUrqq0?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2692; 6:fBRI7aKL7wxIB7oDCTbFqH2EZYYX7jf5UxhNzjf5n4ajjja0dkZc9KIg7XL4mx7vEXnMqTBzR3AHPa+aTGl21j44Fgh1U81vK9aCVg1W7EHitK7ASGfJ+ggX849LQFB8y0HGW3lbBnp+3bgKLClvvGB+qoQFePnIAcX+/FULn2WsSAl+QCQZcEy/S8xS0dqshJbltwr/u1ev5H6TkFb28HunpDeAGPBK2nGKUJmYL0lbzrz32ZULnJ3cr7VTk79MAmOisM9wXjqLZs+4vbtNbKk2d3wB0KTByeG6I57PhCRyPG+tXHfQg3qZ43FQ8ARYdPi7M97pc0WRDo2FXuycRLXtSUtLzhlU0UMYq5XdICs=; 5:89BZUbF+MY0YqSfhWLhP4kyKl55e6Nqn4HIiLv1j788ZrQICoYJs+Id6l9+BBeoYX2DQRvOtQi1v47XI8eZwVxGc+DrBe0EIbL26oqPme164+vl540T0GieD5UnEdjMiJK7l1kLLWZ1pbuJiRA8aIifDRxmG41dUTUTFm0pJMk8=; 24:S2LPSQJIy8Vfcaavh/MrYWvjtuGQp5RzGgvcP4wnktge1lffViv6Lr41weC0EJAivRRUfHNf/KlFbFRAEWq76QtKnod9IlfzEyUVtcWzS0c=; 7:oAN8TQRdi+POT9ldrFAKGpMSFy+TSWAqlKPPPwV290zm+x1tS/adA2D+8fDEJ8xo+ZDEm6qIyC60APjpAg3FZoYIWjmGcl+4YDtPt9GHP36TaZJzZkYZdbeqwViKQldB6l6xOZzFZQnf3BvVAhImsaznJJbTp741eEMF7SFxJ07lP8NqoQJYe1h3L6PRW5PxxU+0nXBNsr9K9nTbhnr0o31xt57bpv0HWIoXidX7oG0nP2ou93F763nPyQ0NZihx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 07:58:25.5843 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac800c76-eae5-421b-5e07-08d5267e7d94 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2692 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "yinbo.zhu" The bit eSDHC_TBCTL[TB_EN] couldn't be reset by eSDHC_SYSCTL[RSTA] which is used to reset for all. The driver should make sure it's cleared before card initialization, otherwise the initialization would fail. Signed-off-by: yinbo.zhu --- drivers/mmc/host/sdhci-esdhc.h | 1 + drivers/mmc/host/sdhci-of-esdhc.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h index dfa58f8b8dfa..74b42dbc1ef6 100644 --- a/drivers/mmc/host/sdhci-esdhc.h +++ b/drivers/mmc/host/sdhci-esdhc.h @@ -60,6 +60,7 @@ /* Tuning Block Control Register */ #define ESDHC_TBCTL 0x120 #define ESDHC_TB_EN 0x00000004 +#define ESDHC_TB_DIS (0x1 << 2) /* Control Register for DMA transfer */ #define ESDHC_DMA_SYSCTL 0x40c diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index d96a057a7db8..b89de8e55330 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -783,6 +783,9 @@ static void esdhc_init(struct platform_device *pdev, struct sdhci_host *host) pltfm_host = sdhci_priv(host); esdhc = sdhci_pltfm_priv(pltfm_host); + val = sdhci_readl(host, ESDHC_TBCTL); + val &= ~ESDHC_TB_DIS; + sdhci_writel(host, val, ESDHC_TBCTL); host_ver = sdhci_readw(host, SDHCI_HOST_VERSION); esdhc->vendor_ver = (host_ver & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT;