linux-stable.git/drivers/mmc, branch v3.19

mmc: sdhci: Set SDHCI_POWER_ON with external vmmc

2015-01-14T08:47:19+00:00

Host controllers lacking the required internal vmmc regulator may still
follow the spec with regard to the LSB of SDHCI_POWER_CONTROL.  Set the
SDHCI_POWER_ON bit when vmmc is enabled to encourage the controller to
to drive CMD, DAT, SDCLK.

This fixes a regression observed on some Qualcomm and Nvidia boards
caused by 5222161 mmc: sdhci: Improve external VDD regulator support.

Fixes: 52221610dd84 (mmc: sdhci: Improve external VDD regulator support)
Signed-off-by: Tim Kryger 
Tested-by: Bjorn Andersson 
Signed-off-by: Ulf Hansson

mmc: sdhci-pci: Add support for Intel SPT

2015-01-12T09:14:58+00:00

Add PCI IDs for SPT eMMC, SDIO and SD card.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: sdhci-acpi: Add ACPI HID INT344D

2015-01-12T09:14:57+00:00

Add ACPI HID INT344D for an Intel SDIO host controller.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: sdhci: Fix sleep in atomic after inserting SD card

2015-01-12T09:14:57+00:00

Sleep in atomic context happened on Trats2 board after inserting or
removing SD card because mmc_gpio_get_cd() was called under spin lock.

Fix this by moving card detection earlier, before acquiring spin lock.
The mmc_gpio_get_cd() call does not have to be protected by spin lock
because it does not access any sdhci internal data.
The sdhci_do_get_cd() call access host flags (SDHCI_DEVICE_DEAD). After
moving it out side of spin lock it could theoretically race with driver
removal but still there is no actual protection against manual card
eject.

Dmesg after inserting SD card:
[   41.663414] BUG: sleeping function called from invalid context at drivers/gpio/gpiolib.c:1511
[   41.670469] in_atomic(): 1, irqs_disabled(): 128, pid: 30, name: kworker/u8:1
[   41.677580] INFO: lockdep is turned off.
[   41.681486] irq event stamp: 61972
[   41.684872] hardirqs last  enabled at (61971): [] _raw_spin_unlock_irq+0x24/0x5c
[   41.693118] hardirqs last disabled at (61972): [] _raw_spin_lock_irq+0x18/0x54
[   41.701190] softirqs last  enabled at (61648): [] __do_softirq+0x234/0x2c8
[   41.708914] softirqs last disabled at (61631): [] irq_exit+0xd0/0x114
[   41.716206] Preemption disabled at:[<  (null)>]   (null)
[   41.721500]
[   41.722985] CPU: 3 PID: 30 Comm: kworker/u8:1 Tainted: G        W      3.18.0-rc5-next-20141121 #883
[   41.732111] Workqueue: kmmcd mmc_rescan
[   41.735945] [] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[   41.743661] [] (show_stack) from [] (dump_stack+0x70/0xbc)
[   41.750867] [] (dump_stack) from [] (gpiod_get_raw_value_cansleep+0x18/0x30)
[   41.759628] [] (gpiod_get_raw_value_cansleep) from [] (mmc_gpio_get_cd+0x38/0x58)
[   41.768821] [] (mmc_gpio_get_cd) from [] (sdhci_request+0x50/0x1a4)
[   41.776808] [] (sdhci_request) from [] (mmc_start_request+0x138/0x268)
[   41.785051] [] (mmc_start_request) from [] (mmc_wait_for_req+0x58/0x1a0)
[   41.793469] [] (mmc_wait_for_req) from [] (mmc_wait_for_cmd+0x58/0x78)
[   41.801714] [] (mmc_wait_for_cmd) from [] (mmc_io_rw_direct_host+0x98/0x124)
[   41.810480] [] (mmc_io_rw_direct_host) from [] (sdio_reset+0x2c/0x64)
[   41.818641] [] (sdio_reset) from [] (mmc_rescan+0x254/0x2e4)
[   41.826028] [] (mmc_rescan) from [] (process_one_work+0x180/0x3f4)
[   41.833920] [] (process_one_work) from [] (worker_thread+0x34/0x4b0)
[   41.841991] [] (worker_thread) from [] (kthread+0xe4/0x104)
[   41.849285] [] (kthread) from [] (ret_from_fork+0x14/0x2c)
[   42.038276] mmc0: new high speed SDHC card at address 1234

Signed-off-by: Krzysztof Kozlowski 
Fixes: 94144a465dd0 ("mmc: sdhci: add get_cd() implementation")
Cc: 
Signed-off-by: Ulf Hansson

mmc: sdhci-pxav3: do the mbus window configuration after enabling clocks

2015-01-12T09:14:56+00:00

In commit 5491ce3f79ee ("mmc: sdhci-pxav3: add support for the Armada
38x SDHCI controller"), the sdhci-pxav3 driver was extended to include
support for the SDHCI controller found in the Armada 38x
processor. This mainly involved adding some MBus window related
configuration.

However, this configuration is currently done too early in ->probe():
it is done before clocks are enabled, while this configuration
involves touching the registers of the controller, which will hang the
SoC if the clock is disabled. It wasn't noticed until now because the
bootloader typically leaves gatable clocks enabled, but in situations
where we have a deferred probe (due to a CD GPIO that cannot be taken,
for example), then the probe will be re-tried later, after a clock
disable has been done in the exit path of the failed probe attempt of
the device. This second probe() will hang the system due to the clock
being disabled.

This can for example be produced on Armada 385 GP, which has a CD GPIO
connected to an I2C PCA9555. If the driver for the PCA9555 is not
compiled into the kernel, then we will have the following sequence of
events:

  1. The SDHCI probes
  2. It does the MBus configuration (which works, because the clock is
     left enabled by the bootloader)
  3. It enables the clock
  4. It tries to get the CD GPIO, which fails due to the driver being
     missing, so -EPROBE_DEFER is returned.
  5. Before returning -EPROBE_DEFER, the driver cleans up what was
     done, which includes disabling the clock.
  6. Later on, the SDHCI probe is tried again.
  7. It does the MBus configuration, which hangs because the clock is
     no longer enabled.

This commit does the obvious fix of doing the MBus configuration after
the clock has been enabled by the driver.

Fixes: 5491ce3f79ee ("mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller")
Cc:  # v3.15+
Signed-off-by: Thomas Petazzoni 
Signed-off-by: Ulf Hansson

mmc: sdhci: Disable re-tuning for HS400

2015-01-12T09:14:56+00:00

Re-tuning for HS400 mode must be done in HS200
mode. Currently there is no support for that.
That needs to be reflected in the code.
Specifically, if tuning is executed in HS400 mode
then return an error, and do not start the
tuning timer if HS200 tuning is being done prior
to switching to HS400.

Note that periodic re-tuning is not expected
to be needed for HS400 but re-tuning is still
needed after the host controller has lost power.
In the case of suspend/resume that is not necessary
because the card is fully re-initialised. That
just leaves runtime suspend/resume with no support
for HS400 re-tuning.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: sdhci: Simplify use of tuning timer

2015-01-12T09:14:56+00:00

The tuning timer is always used if the tuning mode
is 1 and there is a tuning count, irrespective of
whether this is the first call, or any subsequent
call. Consequently the logic to start the timer
can be simplified.

Signed-off-by: Adrian Hunter 
Reviewed-by: Aaron Lu 
Signed-off-by: Ulf Hansson

mmc: sdhci: Add out_unlock to sdhci_execute_tuning

2015-01-12T09:14:55+00:00

A 'goto' can be used to save duplicating unlocking
and returning.

Signed-off-by: Adrian Hunter 
Reviewed-by: Aaron Lu 
Signed-off-by: Ulf Hansson

mmc: sdhci: Tuning should not change max_blk_count

2015-01-12T09:14:55+00:00

Re-tuning requires that the maximum data length
is limited to 4MiB. The code currently changes
max_blk_count in an attempt to achieve that.
This is wrong because max_blk_count is a different
limit, but it is also un-necessary because
max_req_size is 512KiB anyway. Consequently, the
changes to max_blk_count are removed and the
comment for max_req_size adjusted accordingly.
The comment is also tweaked to show that the 512KiB
limit is a SDMA limit not an ADMA limit.

Signed-off-by: Adrian Hunter 
Reviewed-by: Aaron Lu 
Signed-off-by: Ulf Hansson

mmc: core: stop trying to switch width when only one bit is supported

2014-12-29T13:49:28+00:00

mmc_select_bus_width() will try to switch to MMC_BUS_WIDTH_4 even if
MMC_CAP_4_BIT_DATA and MMC_CAP_8_BIT_DATA are not set in host->caps.
Return as soon as possible when those flags are not set

Fixes: 577fb13199b1 (mmc: rework selection of bus speed mode)
Signed-off-by: Alexandre Belloni 
Cc:  # 3.17
Signed-off-by: Ulf Hansson