mmc: mxcmmc: Fix bug when card is present during boot
Subsystems (2)
PATCH 1/1 mmc: mxcmmc: Fix bug when card is present during boot
This patch fixes bug when card is present during boot. Bug was introduced due commit "mmc: mxcmmc: fix bug that may block a data transfer forever". When a card is present "mxcmci_setup_data" function is executed, but the timer is not initialized.
...
i.MX SDHC driver
mmc0: SD Status: Invalid Allocation Unit size.
mmc0: new SD card at address b368
mmcblk0: mmc0:b368 SDC 1.91 GiB
------------[ cut here ]------------ kernel BUG at kernel/timer.c:729! Internal error: Oops - BUG: 0 [#1] PREEMPT ARM CPU: 0 Not tainted (3.9.0-rc5-next-20130404 #2) PC is at mod_timer+0x168/0x198 LR is at mxcmci_request+0x21c/0x328 pc : [<c0026d28>] lr : [<c0261928>] psr: 60000013
sp : c7933df0 ip : 00001000 fp : 00000001
r10: c0012edc r9 : c7920400 r8 : c014f92c
r7 : c7920600 r6 : ffff8f8f r5 : ffff8f8f r4 : c79206a4 r3 : 00000000 r2 : 00000000 r1 : ffff8f8f r0 : c79206a4
Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
Control: 0005317f Table: a0004000 DAC: 00000017 Process mmcqd/0 (pid: 450, stack limit = 0xc79321b8)
Stack: (0xc7933df0 to 0xc7934000)
3de0: c78260f8 00000000 00000001 c78dcce0
3e00: c78dcc2c 00000200 c7920600 c014f92c c0012edc c0261928 00000003 00000000 3e20: 00000000 c7874210 c78dc800 00000002 c790f720 c78dcc2c c7920400 00000001 3e40: c78dcd20 00000001 c7933ee4 00000000 c78dcc2c c02504f0 00000000 c7920400 3e60: 00000000 c0251588 c7a60138 c7920000 c78dcc2c c78dcc04 c78dcc00 00000000 3e80: 00000000 c025de34 c78dcc04 c7a60138 c78dcc28 c78dcc04 c7920000 c7a60138 3ea0: c7920400 c78dcc00 c78dcc2c c025ed3c c7933f44 00000000 c78dcc00 00000000 3ec0: 00000000 c0037af0 00000000 c7932000 40000013 c0250d50 c7933f6c 00000000 3ee0: c78cb6c0 c003f6b8 00100100 c7920000 c7a60138 c78dcc04 c78dcc00 120d0000 3f00: c7920400 c78dcc00 c78dcc0c c025f918 c7847d34 00000001 c7847d40 00000000 3f20: c7933f54 c78dcc04 c7a60138 c7932000 00000000 120d0000 c7996b80 00000001 3f40: c78dcc0c c0260410 00000000 c7847d2c 00000000 c78dcc04 c0260358 00000000 3f60: 00000000 00000000 00000000 c0037094 00000000 00000000 2d656761 c78dcc04 3f80: 00000000 c7933f84 c7933f84 00000000 c7933f90 c7933f90 c7933fac c7847d2c 3fa0: c0036ff0 00000000 00000000 c000e210 00000000 00000000 00000000 00000000 3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 3fe0: 00000000 00000000 00000000 00000000 00000013 00000000 7ffff1e5 ef7b8ff9 [<c0026d28>] (mod_timer+0x168/0x198) from [<c0261928>] (mxcmci_request+0x21c/0x328) [<c0261928>] (mxcmci_request+0x21c/0x328) from [<c02504f0>] (mmc_start_request+0xc4/0xe8) [<c02504f0>] (mmc_start_request+0xc4/0xe8) from [<c0251588>] (mmc_start_req+0x2d0/0x380) [<c0251588>] (mmc_start_req+0x2d0/0x380) from [<c025ed3c>] (mmc_blk_issue_rw_rq+0xb4/0xaf0) [<c025ed3c>] (mmc_blk_issue_rw_rq+0xb4/0xaf0) from [<c025f918>] (mmc_blk_issue_rq+0x1a0/0x4ec) [<c025f918>] (mmc_blk_issue_rq+0x1a0/0x4ec) from [<c0260410>] (mmc_queue_thread+0xb8/0x150) [<c0260410>] (mmc_queue_thread+0xb8/0x150) from [<c0037094>] (kthread+0xa4/0xb0) [<c0037094>] (kthread+0xa4/0xb0) from [<c000e210>] (ret_from_fork+0x14/0x24)
Code: e0065015 eaffffb3 e3a0a001 eaffffea (e7f001f2) ---[ end trace 29f2f8ea54d9d99e ]---
--- drivers/mmc/host/mxcmmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/mxcmmc.c +2 -2
@@ -1052,12 +1052,12 @@ static int mxcmci_probe(struct platform_device *pdev) goto out_free_irq; } -mmc_add_host (mmc); -init_timer (&host->watchdog); host->watchdog.function = &mxcmci_watchdog; host->watchdog.data = (unsigned long )mmc; +mmc_add_host (mmc); +return 0 ; out_free_irq:
Signature · 1 line
1.8.1.5
Sascha Hauer
maintainerPATCH 1/1 mmc: mxcmmc: Fix bug when card is present during boot
Quoted 4 lines · Alexander Shiyan
This patch fixes bug when card is present during boot. Bug was introduced due commit "mmc: mxcmmc: fix bug that may block a data transfer forever". When a card is present "
mxcmci_setup_data" function is executed, but the timer is not initialized.
Sascha
Quoted 77 lines
...
i.MX SDHC driver
mmc0: SD Status: Invalid Allocation Unit size.
mmc0: new SD card at address b368
mmcblk0: mmc0:b368 SDC 1.91 GiB------------[ cut here ]------------ kernel BUG at kernel/timer.c:729! Internal error: Oops - BUG: 0 [#1] PREEMPT ARM CPU: 0 Not tainted (3.9.0-rc5-next-20130404 #2) PC is at mod_timer+0x168/0x198 LR is at mxcmci_request+0x21c/0x328 pc : [<c0026d28>] lr : [<c0261928>] psr: 60000013sp :
c7933df0ip : 00001000 fp : 00000001
r10:c0012edcr9 :c7920400r8 :c014f92c
r7 :c7920600r6 :ffff8f8fr5 :ffff8f8fr4 :c79206a4r3 : 00000000 r2 : 00000000 r1 :ffff8f8fr0 :c79206a4
Flags: nZCv IRQs on FIQs on ModeSVC_32ISA ARM Segment kernel
Control:0005317fTable:a0004000DAC: 00000017 Process mmcqd/0 (pid: 450, stack limit =0xc79321b8)Stack: (0xc7933df0 to 0xc7934000)3de0:
c78260f800000000 00000001c78dcce0
3e00:c78dcc2c00000200c7920600c014f92cc0012edcc026192800000003 00000000 3e20: 00000000c7874210c78dc80000000002c790f720c78dcc2cc792040000000001 3e40:c78dcd2000000001c7933ee400000000c78dcc2cc02504f000000000c79204003e60: 00000000c0251588c7a60138c7920000c78dcc2cc78dcc04c78dcc0000000000 3e80: 00000000c025de34c78dcc04c7a60138c78dcc28c78dcc04c7920000c7a601383ea0:c7920400c78dcc00c78dcc2cc025ed3cc7933f4400000000c78dcc0000000000 3ec0: 00000000c0037af000000000c793200040000013c0250d50c7933f6c00000000 3ee0:c78cb6c0c003f6b800100100c7920000c7a60138c78dcc04c78dcc00120d00003f00:c7920400c78dcc00c78dcc0cc025f918c7847d3400000001c7847d4000000000 3f20:c7933f54c78dcc04c7a60138c793200000000000120d0000c7996b8000000001 3f40:c78dcc0cc026041000000000c7847d2c00000000c78dcc04c026035800000000 3f60: 00000000 00000000 00000000c003709400000000 000000002d656761c78dcc043f80: 00000000c7933f84c7933f8400000000c7933f90c7933f90c7933facc7847d2c3fa0:c0036ff000000000 00000000c000e21000000000 00000000 00000000 00000000 3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 3fe0: 00000000 00000000 00000000 00000000 00000013 000000007ffff1e5ef7b8ff9[<c0026d28>] (mod_timer+0x168/0x198) from [<c0261928>] (mxcmci_request+0x21c/0x328) [<c0261928>] (mxcmci_request+0x21c/0x328) from [<c02504f0>] (mmc_start_request+0xc4/0xe8) [<c02504f0>] (mmc_start_request+0xc4/0xe8) from [<c0251588>] (mmc_start_req+0x2d0/0x380) [<c0251588>] (mmc_start_req+0x2d0/0x380) from [<c025ed3c>] (mmc_blk_issue_rw_rq+0xb4/0xaf0) [<c025ed3c>] (mmc_blk_issue_rw_rq+0xb4/0xaf0) from [<c025f918>] (mmc_blk_issue_rq+0x1a0/0x4ec) [<c025f918>] (mmc_blk_issue_rq+0x1a0/0x4ec) from [<c0260410>] (mmc_queue_thread+0xb8/0x150) [<c0260410>] (mmc_queue_thread+0xb8/0x150) from [<c0037094>] (kthread+0xa4/0xb0) [<c0037094>] (kthread+0xa4/0xb0) from [<c000e210>] (ret_from_fork+0x14/0x24)Code: e0065015 eaffffb3 e3a0a001 eaffffea (e7f001f2) ---[ end trace 29f2f8ea54d9d99e ]---Signed-off-by Alexander Shiyan <[email protected]>--- drivers/mmc/host/mxcmmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/mmc/host/mxcmmc.c +2
-2@@ -1052,12 +1052,12 @@ static int mxcmci_probe(struct platform_device *pdev) goto out_free_irq; } -mmc_add_host (mmc); -init_timer (&host->watchdog); host->watchdog.function = &mxcmci_watchdog; host->watchdog.data = (unsigned long )mmc; +mmc_add_host (mmc); +return 0 ; out_free_irq:Signature · 1 line
1.8.1.5
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 1/1 mmc: mxcmmc: Fix bug when card is present during boot
Hi,
Quoted 7 lines · Sascha Hauer
Quoted 4 lines · Alexander Shiyan
This patch fixes bug when card is present during boot. Bug was introduced due commit "mmc: mxcmmc: fix bug that may block a data transfer forever". When a card is present "
mxcmci_setup_data" function is executed, but the timer is not initialized.Acked-by Sascha Hauer <[email protected]>
Thanks, pushed to mmc-next for 3.10.
- Chris.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Quoted 4 lines
Hi,
Quoted 1 line · Sascha Hauer
On Sat, Apr 06, 2013 at 10:13:31AM +0400, Alexander Shiyan wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This patch fixes bug when card is present during boot. Bug was introduced due commit "mmc: mxcmmc: fix bug that may block a data transfer forever". When a card is present "
mxcmci_setup_data" function is executed, but the timer is not initialized.Acked-by Sascha Hauer <[email protected]>Thanks, pushed to mmc-next for 3.10.
OK. What about commit this patch in 3.8 stable?
---