From patchwork Fri Jan 11 15:08:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Majewski?= X-Patchwork-Id: 211362 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1AA9E2C007E for ; Sat, 12 Jan 2013 02:09:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 106544A1BB; Fri, 11 Jan 2013 16:09:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d+rC2Z33Otq7; Fri, 11 Jan 2013 16:09:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A80CD4A1B3; Fri, 11 Jan 2013 16:09:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76AAC4A1B3 for ; Fri, 11 Jan 2013 16:09:13 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pm1CpQ87wGHp for ; Fri, 11 Jan 2013 16:09:12 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id D84224A1B1 for ; Fri, 11 Jan 2013 16:09:10 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MGG00E0RVF5GY00@mailout3.samsung.com> for u-boot@lists.denx.de; Sat, 12 Jan 2013 00:09:05 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-96-50f02b112f5b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B4.BC.12699.11B20F05; Sat, 12 Jan 2013 00:09:05 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MGG00D4AVEX03C0@mmp2.samsung.com> for u-boot@lists.denx.de; Sat, 12 Jan 2013 00:09:05 +0900 (KST) From: Lukasz Majewski To: u-boot@lists.denx.de Date: Fri, 11 Jan 2013 16:08:54 +0100 Message-id: <1357916934-11340-1-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNJMWRmVeSWpSXmKPExsVy+t9jQV1B7Q8BBp97VS3e7u1kd2D0OHtn B2MAYxSXTUpqTmZZapG+XQJXxq2ep8wFMwQqZnU9Zmlg3MnbxcjJISFgInF94RU2CFtM4sK9 9UA2F4eQwHRGiU3tr6CcxUwSl17OYQapYhPQk/h89ykTiC0iICHxq/8qI0gRs8AZJomVG4+y dDFycAgLREvcn5QCUsMioCqxfNocFhCbV8BNYvnh+1Db5CWe3u9jm8DIvYCRYRWjaGpBckFx UnqukV5xYm5xaV66XnJ+7iZGsBefSe9gXNVgcYhRgINRiYe3UvN9gBBrYllxZe4hRgkOZiUR Xi/GDwFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeRlPPQkQEkhPLEnNTk0tSC2CyTJxcEo1MDJP yhQvPBq9fb70tesL76w/LJZZOOXs9Qv/qx1qbwluOhC1X4oru31CYknZjJdC7deL6yMK7909 fG5R3Y4JTeJ5v6J0LkyQVn8cLdRy65q82s/YjNV8Cws85LYsrX+RKXvZd3ftzMWn+hy3CVb8 v7JLYpdO1qfu2W0T7zXlTc1IMjRe+ajuwGYlluKMREMt5qLiRACmJVWr3gEAAA== Cc: Lei Wen , Lukasz Majewski , Jaehoon Chung , Kyungmin Park , Andy Fleming , Tom Rini , Andy Fleming Subject: [U-Boot] [PATCH] mmc:sdhci:fix: Change default interrupts enabled at SDHCI initialization X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch changes sdhci_init()'s behavior to NOT enable all interrupt sources by default. Moreover interrupt signaling has been disabled. This patch do not enable interrupts which aren't served in u-boot (they are defined at sdhci.h but NOT used elsewhere): - SDHCI_INT_CARD_INSERT, SDHCI_INT_CARD_REMOVE, SDHCI_BUS_POWER, SDHCI_INT_CARD_REMOVE, SDHCI_INT_CARD_INT Special care shall be put on SDHCI_INT_CARD_INT, which indicates interrupt generated by SD card. According to "SD Host Controller Simplified Spec. ver 3.00" when bit 8 (Card Interrupt Status Enable) at "Normal Interrupt Status Enable Register" (offset 0x34) is set, the card interrupt detection is started. Then eMMC card may cause the SD controller to set this bit and then this interrupt is passed to booted OS and might cause kernel crash. To sum up: - Only enable interrupts, which are served at u-boot - This cleanup as a side effect fixes SDHCI's CARD INTERRUPT problem at Linux kernel (versions 3.6+, sdhci controller) - Keep masked bits at "Normal Interrupt Signal Enable Register" (0x38h) Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park Cc: Lei Wen Cc: Andy Fleming Acked-by: Jaehoon Chung --- drivers/mmc/sdhci.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 0fd1337..76c14fb 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -412,9 +412,11 @@ int sdhci_init(struct mmc *mmc) status = sdhci_readl(host, SDHCI_PRESENT_STATE); } - /* Eable all state */ - sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_INT_ENABLE); - sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_SIGNAL_ENABLE); + /* Enable only interrupts served by the SD controller */ + sdhci_writel(host, SDHCI_INT_DATA_MASK | SDHCI_INT_CMD_MASK + , SDHCI_INT_ENABLE); + /* Mask all sdhci interrupt sources */ + sdhci_writel(host, 0x0, SDHCI_SIGNAL_ENABLE); return 0; }