linux.git/drivers/mmc, branch v3.1-rc2

mmc: dw_mmc: Fix DDR mode support.

2011-08-13T18:50:32+00:00

Host driver can't get a hint of DDR mode through ios->ddr flag anymore.
ios->timing is currently used to inform DDR mode as a substitute.
And capability of MMC_CAP_MMC_HIGHSPEED is added for DDR support.

Signed-off-by: Seungwon Jeon 
Acked-by: Will Newton 
Signed-off-by: Chris Ball

mmc: core: use defined R1_STATE_PRG macro for card status

2011-08-13T18:50:31+00:00

Signed-off-by: Jaehoon Chung 
Signed-off-by: Kyungmin Park 
Signed-off-by: Chris Ball

mmc: sdhci: use f_max instead of host->clock for timeouts

2011-08-13T18:50:30+00:00

When timeout_clk is calculated the host->clock could be zero.
So, instead of host->clock the calculation now uses mmc->f_max.

Signed-off-by: Andy Shevchenko 
Cc: Mark Brown 
Signed-off-by: Chris Ball

mmc: sdhci: move timeout_clk calculation farther down

2011-08-13T18:50:29+00:00

This moves the calculation below the assignment of mmc->f_max, which
we need for calculating timeout_clk in the next patch in this series.

Signed-off-by: Andy Shevchenko 
Signed-off-by: Chris Ball

mmc: sdhci: check host->clock before using it as a denominator

2011-08-13T18:50:28+00:00

Sometimes host->clock could be zero which is a legal situation. This
patch checks host->clock before usage as a denominator when timeout is
calculated. A similar patch is applied for mmc core (see commit e9b8684,
"mmc: fix division by zero in MMC core").

Without this patch, the execution of the sdhci_calc_timeout could end up
with a backtrace:

<0>[    4.014319] divide error: 0000 [#1] PREEMPT SMP
<4>[    4.014352] Modules linked in: g_ether
<4>[    4.014376]
<4>[    4.014393] Pid: 33, comm: kworker/u:2 Not tainted 3.0.0+ #646
<4>[    4.014421] EIP: 0060:[] EFLAGS: 00010046 CPU: 1
<4>[    4.014449] EIP is at sdhci_calc_timeout+0x2e/0x100
<4>[    4.014468] EAX: 00000000 EBX: f5930fc8 ECX: 00000000 EDX: 00000000
<4>[    4.014488] ESI: f5291de8 EDI: f5291db8 EBP: f5291c6c ESP: f5291c50
<4>[    4.014508]  DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
<0>[    4.014529] Process kworker/u:2 (pid: 33, ti=f5290000 task=f53065a0 task.ti=f5290000)
<0>[    4.014546] Stack:
<4>[    4.014557]  00000082 c1054fdd f5291c78 04000000 f5930fc8 f5291de8 f5291db8 f5291cac
<4>[    4.014611]  c12fab7c c107a98b f5291c88 c13b6d3f f593109c f5882000 f5291cac c1054fdd
<4>[    4.014663]  00000000 00000000 f5882000 00000082 f5930fc8 f5291db8 0000000a f5291ccc
<0>[    4.014716] Call Trace:
<4>[    4.014743]  [] ? mod_timer+0x11d/0x380
<4>[    4.014770]  [] sdhci_prepare_data+0x2c/0x3a0
<4>[    4.014798]  [] ? trace_hardirqs_off+0xb/0x10
<4>[    4.014827]  [] ? _raw_spin_unlock_irqrestore+0x2f/0x60
<4>[    4.014854]  [] ? mod_timer+0x11d/0x380
<4>[    4.014880]  [] sdhci_send_command+0xdb/0x210
<4>[    4.014906]  [] sdhci_request+0xc3/0x150
<4>[    4.014932]  [] mmc_start_request+0xda/0x200
<4>[    4.014960]  [] ? __raw_spin_lock_init+0x32/0x60
<4>[    4.014989]  [] ? __init_waitqueue_head+0x35/0x50
<4>[    4.015015]  [] mmc_wait_for_req+0x7b/0x90
<4>[    4.015045]  [] mmc_send_cxd_data+0xf7/0x130
<4>[    4.015076]  [] ? mmc_erase+0x140/0x140
<4>[    4.015102]  [] mmc_send_ext_csd+0x1d/0x20
<4>[    4.015125]  [] mmc_get_ext_csd+0x70/0x140
<4>[    4.015151]  [] mmc_compare_ext_csds+0x28/0x190
<4>[    4.015176]  [] mmc_init_card+0x24f/0x650
<4>[    4.015201]  [] ? _raw_spin_unlock_irqrestore+0x4d/0x60
<4>[    4.015226]  [] ? trace_hardirqs_on_caller+0x11c/0x160
<4>[    4.015255]  [] mmc_attach_mmc+0xa4/0x190
<4>[    4.015282]  [] mmc_rescan+0x210/0x240
<4>[    4.015311]  [] process_one_work+0x176/0x550
<4>[    4.015336]  [] ? process_one_work+0xfa/0x550
<4>[    4.015360]  [] ? mmc_init_erase+0x140/0x140
<4>[    4.015385]  [] worker_thread+0x12a/0x2c0
<4>[    4.015410]  [] ? manage_workers.clone.18+0x100/0x100
<4>[    4.015437]  [] kthread+0x74/0x80
<4>[    4.015463]  [] ? __init_kthread_worker+0x60/0x60
<4>[    4.015490]  [] kernel_thread_helper+0x6/0xd
<0>[    4.015507] Code: 57 89 d7 56 53 89 c3 83 ec 10 8b 40 04 8b 72 28 f6 c4 10 89 45 f0 0f 85 91 00 00 00 85 f6 0f 84 c1 00 00 00 8b 4e 04 31 d2 89 c8  73 58 ba d3 4d 62 10 89 c1 8b 06 f7 e2 c1 ea 06 01 d1 f7 45
<0>[    4.015829] EIP: [] sdhci_calc_timeout+0x2e/0x100 SS:ESP 0068:f5291c50

Reported-by: Alexander Shishkin 
Signed-off-by: Andy Shevchenko 
Signed-off-by: Chris Ball

mmc: Revert "mmc: sdhci: Fix SDHCI_QUIRK_TIMEOUT_USES_SDCLK"

2011-08-13T18:50:27+00:00

This reverts commit 4b01681c7764, which introduced a new potential
divide by zero in the process of fixing one.  The subsequent commits
attempt to fix the issue properly.

Signed-off-by: Chris Ball

mmc: tmio: eliminate unused variable 'mmc' warning

2011-08-13T18:50:27+00:00

Fix below compile warning:
  CC      drivers/mmc/host/tmio_mmc.o
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_suspend':
drivers/mmc/host/tmio_mmc.c:30: warning: unused variable 'mmc'
drivers/mmc/host/tmio_mmc.c: In function 'tmio_mmc_resume':
drivers/mmc/host/tmio_mmc.c:45: warning: unused variable 'mmc'

Signed-off-by: Axel Lin 
Acked-by: Guennadi Liakhovetski 
Signed-off-by: Chris Ball

mmc: esdhc-imx: fix card interrupt loss on freescale eSDHC

2011-08-13T18:50:26+00:00

Apply a workaround for the imx eSDHC controller to avoid missing
card interrupts.  This makes SDIO work.

Signed-off-by: Tony Lin 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: Fix build for header change

2011-08-13T18:50:25+00:00

A header change has removed an implicit inclusion of module.h, breaking
the build due to the use of THIS_MODULE. Fix that.

Signed-off-by: Mark Brown 
Signed-off-by: Chris Ball

mmc: dw_mmc: Fix mask in IDMAC_SET_BUFFER1_SIZE macro

2011-08-13T18:50:24+00:00

The mask used inside this macro was assuming Buffer_Size1's [BS1's]
width to be 14 bits, it is actually 13 bits.  Modify masks used in
IDMAC_SET_BUFFER1_SIZE such that they use only 13 bits instead of
current 14.

Signed-off-by: Shashidhar Hiremath 
Acked-by: Will Newton 
Signed-off-by: Chris Ball