litmus-rt.git/drivers/mmc, branch wip-default-clustering

mmc: sdio: fix SDIO suspend/resume regression

2010-10-15T16:54:55+00:00

Fix SDIO suspend/resume regression introduced by 4c2ef25fe0b "mmc: fix
all hangs related to mmc/sd card insert/removal during suspend/resume":

  PM: Syncing filesystems ... done.
  Freezing user space processes ... (elapsed 0.01 seconds) done.
  Freezing remaining freezable tasks ... (elapsed 0.01 seconds) done.
  Suspending console(s) (use no_console_suspend to debug)
  pm_op(): platform_pm_suspend+0x0/0x5c returns -38
  PM: Device pxa2xx-mci.0 failed to suspend: error -38
  PM: Some devices failed to suspend

4c2ef25fe0b moved the card removal/insertion mechanism out of MMC's
suspend/resume path and into pm notifiers (mmc_pm_notify), and that
broke SDIO's expectation that mmc_suspend_host() will remove the card,
and squash the error, in case -ENOSYS is returned from the bus suspend
handler (mmc_sdio_suspend() in this case).

mmc_sdio_suspend() is using this whenever at least one of the card's SDIO
function drivers does not have suspend/resume handlers - in that case
it is agreed to force removal of the entire card.

This patch fixes this regression by trivially bringing back that part of
mmc_suspend_host(), which was removed by 4c2ef25fe0b.

Reported-and-tested-by: Sven Neumann 
Signed-off-by: Ohad Ben-Cohen 
Cc: Maxim Levitsky 
Cc: 
Acked-by: Nicolas Pitre 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove

2010-09-26T20:27:05+00:00

If not all clocks have been defined in platform data, the driver will
cause a null pointer dereference when it is removed. This patch fixes
this issue.

Signed-off-by: Marek Szyprowski 
Signed-off-by: Kyungmin Park 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: fix incorrect spinlock usage after merge

2010-09-26T20:27:02+00:00

In the commit f522886e202a34a2191dd5d471b3c4d46410a9a0 a merge conflict
in the sdhci-s3c driver been fixed. However the fix used incorrect
spinlock operation - it caused a race with sdhci interrupt service. The
correct way to solve it is to use spin_lock_irqsave/irqrestore() calls.

Signed-off-by: Marek Szyprowski 
Signed-off-by: Kyungmin Park 
Signed-off-by: Andrew Morton 
Signed-off-by: Chris Ball

drivers/mmc/host/imxmmc.c: adjust confusing if indentation

2010-09-10T01:57:23+00:00

Move the second if (reg & ...) test into the branch indicated by its
indentation.  The test was previously always executed after the if
containing that branch, but it was always false unless the if branch was
taken.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// 
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Chris Ball 
Cc: Pavel Pisa 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

omap hsmmc: fix a racing case between kmmcd and omap_hsmmc_suspend

2010-09-10T01:57:23+00:00

If suspend called when kmmcd is doing host->ops->disable, as kmmcd already
increased host->en_dis_recurs to 1, the mmc_host_enable in suspend
function will return directly without increase the nesting_cnt, which will
cause the followed register access carried out to the disabled host.

mmc_suspend_host will enable host itself.  No need to enable host before
it.  Also works on kmmcd will get flushed in mmc_suspend_host, enable host
after it will be safe.  So make the mmc_host_enable after it.

[cjb: rebase against current Linus]
Signed-off-by: Ethan 
Signed-off-by: Chris Ball 
Acked-by: Adrian Hunter 
Acked-by: Madhusudhan Chikkature 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: at91_mci: add missing linux/highmem.h include

2010-09-10T01:57:23+00:00

Fix the following error:

at91_mci.c: In function 'at91_mci_sg_to_dma':
at91_mci.c:236: error: implicit declaration of function 'kmap_atomic'
at91_mci.c:236: error: 'KM_BIO_SRC_IRQ' undeclared (first use in this function)
at91_mci.c:236: error: (Each undeclared identifier is reported only once
at91_mci.c:236: error: for each function it appears in.)
at91_mci.c:236: warning: assignment makes pointer from integer without a cast
at91_mci.c:252: error: implicit declaration of function 'kunmap_atomic'
at91_mci.c: In function 'at91_mci_post_dma_read':
at91_mci.c:302: error: 'KM_BIO_SRC_IRQ' undeclared (first use in this function)
at91_mci.c:302: warning: assignment makes pointer from integer without a cast
at91_mci.c:317: error: implicit declaration of function 'flush_kernel_dcache_page'

Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Chris Ball 
Cc: Nicolas Ferre 
Cc: Andrew Victor 
Cc: Wolfgang Muees 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

omap_hsmmc: remove unused local `state'

2010-09-10T01:57:23+00:00

This fixes the following warning:

drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
drivers/mmc/host/omap_hsmmc.c:2275: warning: unused variable 'state'

Introduced by commit ID:

  commit 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e
  Author: Matt Fleming 
  Date:   Wed May 26 14:42:08 2010 -0700

      mmc: remove the "state" argument to mmc_suspend_host()

The unique usage of this var was removed there, and missed
removing the respective declaration aswell.

Signed-off-by: Sergio Aguirre 
Signed-off-by: Chris Ball 
Acked-by: Matt Fleming 
Cc: Madhusudhan Chikkature 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected

2010-09-10T01:57:23+00:00

[cjb: fix line-wrapped patch]
Signed-off-by: Jiri Pinkava 
Signed-off-by: Chris Ball 
Cc: Matt Fleming 
Cc: Russell King 
Cc: Ben Dooks 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: fix the use of kunmap_atomic() in tmio_mmc.h

2010-09-10T01:57:23+00:00

kunmap_atomic() takes the cookie, returned by the kmap_atomic() as its
argument and not the page address, used as an argument to kmap_atomic().
This patch fixes the compile error:

In file included from drivers/mmc/host/tmio_mmc.c:37:
drivers/mmc/host/tmio_mmc.h: In function 'tmio_mmc_kunmap_atomic':
drivers/mmc/host/tmio_mmc.h:192: error: negative width in bit-field ''

Signed-off-by: Guennadi Liakhovetski 
Acked-by: Eric Miao 
Tested-by: Magnus Damm 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

tmio_mmc: don't clear unhandled pending interrupts

2010-09-10T01:57:23+00:00

Previously, it was possible for ack_mmc_irqs() to clear pending interrupt
bits in the CTL_STATUS register, even though the interrupt handler had not
been called.  This was because of a race that existed when doing a
read-modify-write sequence on CTL_STATUS.  After the read step in this
sequence, if an interrupt occurred (causing one of the bits in CTL_STATUS
to be set) the write step would inadvertently clear it.

Observed with the TMIO_STAT_RXRDY bit together with CMD53 on AR6002 and
BCM4318 SDIO cards in polled mode.

This patch eliminates this race by only writing to CTL_STATUS and clearing
the interrupts that were passed as an argument to ack_mmc_irqs()."

[matt@console-pimps.org: rewrote changelog]
Signed-off-by: Yusuke Goda 
Acked-by: Magnus Damm "
Tested-by: Arnd Hannemann "
Acked-by: Ian Molton 
Cc: Matt Fleming 
Cc: Samuel Ortiz 
Cc: Paul Mundt 
Cc: 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds