linux.git/drivers/mmc, branch v4.5-rc5

Revert "mmc: block: don't use parameter prefix if built as module"

2016-02-11T15:49:35+00:00

This reverts commit 829b6962f7e3cfc06f7c5c26269fd47ad48cf503.

Revert this change as it causes a sysfs path to change and therefore
introduces and ABI regression. More precisely Android's vold is not being
able to access /sys/module/mmcblk/parameters/perdev_minors any more, since
the path becomes changed to: "/sys/module/mmc_block/..."

Fixes: 829b6962f7e3 ("mmc: block: don't use parameter prefix if built as
module")
Reported-by: John Stultz 
Cc: Andy Shevchenko 
Signed-off-by: Ulf Hansson

mmc: sdhci-acpi: Fix card detect race for Intel BXT/APL

2016-02-11T10:39:56+00:00

Intel BXT/APL use a card detect GPIO however the host controller
will not enable bus power unless it's card detect also reflects
the presence of a card.  Unfortunately those 2 things race which
can result in commands not starting, after which the controller
does nothing and there is a 10 second wait for the driver's
10-second timer to timeout.

That is fixed by having the driver look also at the present state
register to determine if the card is present.  Consequently, provide
a 'get_cd' mmc host operation for BXT/APL that does that.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Ulf Hansson

mmc: sdhci-pci: Fix card detect race for Intel BXT/APL

2016-02-11T10:39:56+00:00

Intel BXT/APL use a card detect GPIO however the host controller
will not enable bus power unless it's card detect also reflects
the presence of a card.  Unfortunately those 2 things race which
can result in commands not starting, after which the controller
does nothing and there is a 10 second wait for the driver's
10-second timer to timeout.

That is fixed by having the driver look also at the present state
register to determine if the card is present.  Consequently, provide
a 'get_cd' mmc host operation for BXT/APL that does that.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Ulf Hansson

mmc: sdhci: Allow override of get_cd() called from sdhci_request()

2016-02-11T10:39:56+00:00

Drivers may need to provide their own get_cd() mmc host op, but
currently the internals of the current op (sdhci_get_cd()) are
provided by sdhci_do_get_cd() which is also called from
sdhci_request().

To allow override of the get_cd functionality, change sdhci_request()
to call ->get_cd() instead of sdhci_do_get_cd().

Note, in the future the call to ->get_cd() will likely be removed
from sdhci_request() since most drivers don't need actually it.
However this change is being done now to facilitate a subsequent
bug fix.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Ulf Hansson

mmc: sdhci: Allow override of mmc host operations

2016-02-11T10:39:56+00:00

In the past, fixes for specific hardware devices were implemented
in sdhci using quirks.  That approach is no longer accepted because
the growing number of quirks was starting to make the code difficult
to understand and maintain.

One alternative to quirks, is to allow drivers to override the default
mmc host operations.  This patch makes it easy to do that, and it is
needed for a subsequent bug fix, for which separate patches are
provided.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Ulf Hansson

mmc: sh_mmcif: Correct TX DMA channel allocation

2016-02-10T16:02:25+00:00

Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
introduced a typo causing the TX DMA channel allocation to be overwritten
by the requested RX DMA channel.

Fixes: 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling")
Signed-off-by: Chris Paterson 
Acked-by: Laurent Pinchart 
Acked-by: Arnd Bergmann 
Signed-off-by: Ulf Hansson

mmc: block: return error on failed mmc_blk_get()

2016-02-10T08:12:34+00:00

This used to return -EFAULT, but the function above returns -EINVAL on
the same condition so let's stick to that.

The removal of error return on this path was introduced with b093410c9aef
('mmc: block: copy resp[] data on err for MMC_IOC_MULTI_CMD').

Fixes: b093410c9aef ('mmc: block: copy resp[] data on err for MMC_IOC_MULTI_CMD').
Signed-off-by: Olof Johansson 
Cc: Grant Grundler 
Signed-off-by: Ulf Hansson

mmc: pxamci: fix the device-tree probe deferral path

2016-02-08T14:25:43+00:00

When the gpio driver is probed after the mmc one, the read/write gpio
and card detection one return -EPROBE_DEFER. Unfortunately, the memory
region remains requested, and upon the next probe, the probe will fail
anyway with -EBUSY.

Fix this by releasing the memory resource upon probe failure.

More broadly, this patch uses devm_*() primitives whenever possible in
the probe function.

Signed-off-by: Robert Jarzmik 
Signed-off-by: Ulf Hansson

mmc: mmc_spi: add checks for dma mapping error

2016-02-08T14:22:04+00:00

There is no checks for dma mapping errors in mmc_spi.
Tha patch fixes that and by the way it adds dma_unmap_single(ones_dma)
that was left on a failure path mmc_spi_probe().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Signed-off-by: Ulf Hansson

mmc: sdhci-of-at91: fix pm runtime unbalanced issue in error path

2016-02-02T13:09:14+00:00

The device power usage counter is increased by pm_runtime_get_noresume
but isn't decreased in err_add_host error path.

Fix this issue by calling pm_runtime_put_noidle() in the error path to
restore the device's power usage counter.

Signed-off-by: Jisheng Zhang 
Acked-by: Ludovic Desroches 
Fixes: f5f17813ae9b ("mmc: sdhci-of-at91: add PM support)
Signed-off-by: Ulf Hansson