26 Jun, 2011
10 commits
-
SCSI defines discard alignment as the offset to the first
optimal discard. In the case of SD/MMC, that is always zero
which is the default.SCSI defines discard granularity as a hint of a optimal
discard size. That is much better expressed by the MMC
"preferred erase size" (pref_erase) field.Signed-off-by: Adrian Hunter
Signed-off-by: Chris Ball -
For example, an eMMC with 2 boot partitions will have 3 threads.
The names change from:40 ? 00:00:00 mmcqd/0
41 ? 00:00:00 mmcqd/0
42 ? 00:00:00 mmcqd/0to:
40 ? 00:00:00 mmcqd/0
41 ? 00:00:00 mmcqd/0boot0
42 ? 00:00:00 mmcqd/0boot1Signed-off-by: Adrian Hunter
Cc: Andrei Warkentin
Signed-off-by: Chris Ball -
The erase timeout calculation may depend on clock rate
which is zero if the clock is gated, so use
mmc_host_clk_rate() which allows for that case.Signed-off-by: Adrian Hunter
Signed-off-by: Chris Ball -
The MMC block driver and other drivers (e.g. mmc-test) will expect
the card to be switched to the User Data Area eMMC partition when
they start. Hence the MMC block driver should ensure it is that
way when it is removed.Signed-off-by: Adrian Hunter
Cc: Andrei Warkentin
Signed-off-by: Chris Ball -
mmc_sdio_power_restore() skips some steps that are performed in other
power-related codepaths which are necessary to fully reset the card.
Without this, runtime PM fails for SD8686 SDIO wifi on OLPC XO-1.5.Signed-off-by: Daniel Drake
Signed-off-by: Chris Ball -
Don't try to allocate DMA resources if the platform didn't specify
positive DMA slave IDs.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Commit b6147490e6aac82 ("mmc: tmio: split core functionality, DMA and
MFD glue") broke handling of the TMIO_MMC_WRPROTECT_DISABLE flag by
the tmio-mmc driver. This patch restores the original behaviour.Signed-off-by: Guennadi Liakhovetski
Cc:
Signed-off-by: Chris Ball -
Don't use the returned sg_len from dma_map_sg() as inparameter
to dma_unmap_sg(). Use the original sg_len for both dma_map_sg
and dma_unmap_sg according to the documentation in DMA-API.txt.Signed-off-by: Per Forlin
Reviewed-by: Venkatraman S
Signed-off-by: Chris Ball -
The OMAP HSMMC driver uses an ocr_mask to determine the list of voltages
supported by the card. It populates this mask based on the list of
voltages supported by the regulator that supplies the voltage.Commit 64be97822b (omap4 hsmmc: Update ocr mask for MMC2 for regulator
to use) passed a fixed ocr_mask from the OMAP4 SDP board file to limit
the voltage to 2.9-3.0 Volts, and updated the driver to use this mask
if provided, instead of using the regulator's supported voltages.However the commit is buggy - the ocr_mask is overridden by the
regulator's capabilities anyway. Fix this.(The bug shows up when a system-wide suspend is attempted on the OMAP4
SDP/Blaze platforms. The eMMC card comes up at 3V, but drops to 1.65V
after the system resumes).Signed-off-by: Anand Gadiyar
Acked-by: Balaji T K
Acked-by: Venkatraman S
Tested-by: Kishore Kadiyala
Signed-off-by: Sourav Poddar
Signed-off-by: Chris Ball -
After commit e1866b3 "PM / Runtime: Rework runtime PM handling
during driver removal" was introduced, the driver core stopped
incrementing the runtime PM usage counter of the device during
the invocation of the ->remove() callback.This indirectly broke SDIO's runtime PM path during driver removal,
because no one calls _put_sync() anymore after ->remove() completes.This means that the power of runtime-PM-managed SDIO cards is kept
high after their driver is removed (even if it was powered down
beforehand).Fix that by directly calling _put_sync() when the last usage
counter is downref'ed by the SDIO bus.Reported-and-tested-by: Daniel Drake
Signed-off-by: Ohad Ben-Cohen
Signed-off-by: Chris Ball
19 Jun, 2011
3 commits
-
MMC host drivers must be able to process interrupts during
mmc_remove_host().Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Provide a dummy value of NO_IRQ for architectures that don't support
it (such as MIPS). Fixes the build error for MIPS.Signed-off-by: Wanlong Gao
Acked-by: Grant Likely
Signed-off-by: Chris Ball -
Reported-by: Dan Carpenter
Signed-off-by: Chris Ball
16 Jun, 2011
1 commit
-
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: footbridge: fix clock event support
ARM: footbridge: fix debug macros
ARM: initrd: disable initrds outside of memory
ARM: extend Code: line by one 16-bit quantity for Thumb instructions
ARM: 6955/1: cmpxchg syscall should data abort if page not write
ARM: 6954/1: zImage: fix Thumb2 breakage
ARM: 6953/1: DT: don't try to access physical address zero
ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors
Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks"
Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID"
davinci: make PCM platform devices static
arm: davinci: Fix fallout from generic irq chip conversion
ARM: 6894/1: mmci: trigger card detect IRQs on falling and rising edges
ARM: 6952/1: fix lockdep warning of "unannotated irqs-off"
ARM: 6951/1: include .bss in memory layout information
ARM: 6948/1: Fix .size directives for __arm{7,9}tdmi_proc_info
ARM: 6947/2: mach-u300: fix compilation error in timer
ARM: 6946/1: vexpress: move v2m clock init to init_early
ARM: mx51/sdma: Check the chip revision in run-time
arm: mxs: include asm/processor.h for cpu_relax()
06 Jun, 2011
1 commit
-
Right now the card detect IRQ for MMCI is requested without any
flags which will give some default machine-specified IRQ
behaviour. However on the U300 rising+falling edges (such as can
be expected from a simple GPIO to generate when inserting/removing
a card) need to be requested explicitly.Cc: Rabin Vincent
Cc: Ulf Hansson
Cc: Sebastian Rasmussen
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
01 Jun, 2011
1 commit
-
eMMC does not handle power off when not in sleep state,
Skip regulator disable during probe when eMMC is
not in known state - state left by bootloader.Resolves eMMC failure on OMAP4
mmc0: error -110 whilst initialising MMC cardSigned-off-by: Balaji T K
Tested-by: Kishore Kadiyala
Acked-by: Kishore Kadiyala
Signed-off-by: Tony Lindgren
28 May, 2011
1 commit
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
ARM: 6945/1: Add unwinding support for division functions
ARM: kill pmd_off()
ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
ARM: add sendmmsg syscall
ARM: 6863/1: allow hotplug on msm
ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
ARM: 6830/1: mach-ux500: force PrimeCell revisions
ARM: 6829/1: amba: make hardcoded periphid override hardware
ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
ARM: 6827/1: mach-netx: delete hardcoded periphid
ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
at91: drop at572d940hf support
at91rm9200: introduce at91rm9200_set_type to specficy cpu package
at91: drop boot_params and PLAT_PHYS_OFFSET
...
27 May, 2011
1 commit
-
With the addition of the platform device mfd_cell pointer, we can now
cleanly pass the sub device drivers platform data pointers through the
regular device platform_data one, and get rid of mfd_get_data()Cc: Ian Molton
Cc: Guennadi Liakhovetski
Cc: Philipp Zabel
Acked-by: Dmitry Eremin-Solenikov
Signed-off-by: Samuel Ortiz
26 May, 2011
8 commits
-
ST-Ericsson modified ARM PrimeCell PL180 block has not got
an updated corresponding amba-id, althought the IP block has
changed in db8500v2. The change was done to the datactrl register.
Using the overrided subversion ID, account for this.Signed-off-by: Philippe Langlais
Signed-off-by: Linus Walleij
Signed-off-by: Russell King -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (75 commits)
mmc: core: eMMC bus width may not work on all platforms
mmc: sdhci: Auto-CMD23 fixes.
mmc: sdhci: Auto-CMD23 support.
mmc: core: Block CMD23 support for UHS104/SDXC cards.
mmc: sdhci: Implement MMC_CAP_CMD23 for SDHCI.
mmc: core: Use CMD23 for multiblock transfers when we can.
mmc: quirks: Add/remove quirks conditional support.
mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver
mmc: sdhci-pxa: Add quirks for DMA/ADMA to match h/w
mmc: core: duplicated trial with same freq in mmc_rescan_try_freq()
mmc: core: add support for eMMC Dual Data Rate
mmc: core: eMMC signal voltage does not use CMD11
mmc: sdhci-pxa: add platform code for UHS signaling
mmc: sdhci: add hooks for setting UHS in platform specific code
mmc: core: clear MMC_PM_KEEP_POWER flag on resume
mmc: dw_mmc: fixed wrong regulator_enable in suspend/resume
mmc: sdhi: allow powering down controller with no card inserted
mmc: tmio: runtime suspend the controller, where possible
mmc: sdhi: support up to 3 interrupt sources
mmc: sdhi: print physical base address and clock rate
... -
CMD19 -- The offical way to validate bus widths from the JEDEC spec
does not work on all platforms. Some platforms that use PCI/PCIe
to connect their SD controllers are known to fail.If the quirk MMC_BUS_WIDTH_TEST is not defined we try to figure out
the bus width by reading the ext_csd at different bus widths and
compare this against the ext_csd read in 1 bit mode. If no ext_csd
is available we default to 1 bit operations.Code has been tested on mmp2 against 8 bit eMMC and Transcend 2GB
card that is known to not work in 4 bit mode. The physical pins
on the card are not present to support 4 bit operation.Signed-off-by: Philip Rakity
Signed-off-by: Chris Ball -
Fixes bugs in Auto-CMD23 feature enable decision. Auto-CMD23
should be enabled if host is >= v3, and SDMA is not in use.USE_ADMA | USE_SDMA | Auto-CMD23
---------+----------+-----------
0 | 0 | 1
---------+----------+-----------
0 | 1 | 0
---------+----------+-----------
1 | 0 | 1
---------+----------+-----------
1 | 1 | 1Signed-off-by: Andrei Warkentin
Signed-off-by: Chris Ball -
Enables Auto-CMD23 support where available (SDHCI 3.0 controllers)
Signed-off-by: Andrei Warkentin
Tested-by: Arindam Nath
Signed-off-by: Chris Ball -
SD cards operating at UHS104 or better support SET_BLOCK_COUNT.
Signed-off-by: Andrei Warkentin
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
Implements support for multiblock transfers bounded
by SET_BLOCK_COUNT (CMD23).Signed-off-by: Andrei Warkentin
Signed-off-by: Chris Ball -
CMD23-prefixed instead of open-ended multiblock transfers
have a performance advantage on some MMC cards.Signed-off-by: Andrei Warkentin
Signed-off-by: Chris Ball
25 May, 2011
14 commits
-
Add a driver for Elan Digital System's VUB300 chip which is a USB
connected SDIO/SDmem/MMC host controller. A VUB300 chip enables a USB 2.0
or USB 1.1 connected host computer to use SDIO/SD/MMC cards without the
need for a directly connected, for example via PCI, SDIO host controller.Signed-off-by: Anthony F Olech
[cjb: various punctuation and style fixes]
Tested-by: Chris Ball
Signed-off-by: Chris Ball -
32 Bit DMA/ADMA Access
32 Bit Size
Support ADMA End Descriptor in current chain
(no need for dummy entry)Signed-off-by: Philip Rakity
Tested-by: Chris Ball
Signed-off-by: Chris Ball -
mmc_rescan_try_freq() tries to init two times with the last frequency.
For example, if host->f_min is 400KHz, we see the message below:mmc1: mmc_rescan_try_freq: trying to init card at 400000 Hz
mmc1: mmc_rescan_try_freq: trying to init card at 400000 HzAndy Ross says that he didn't try this code on a board with an f_min
that exactly matches one of the table entries, which explains why the
bug wasn't detected.Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Cc: Andy Ross
Signed-off-by: Chris Ball -
eMMC voltage change not required for 1.8V. 3.3V and 1.8V vcc
are capable of doing DDR. vccq of 1.8v is not required.Signed-off-by: Philip Rakity
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
eMMC chips do not use CMD11 when changing voltage. Add extra
argument to call to indicate if CMD11 needs to be sent.Signed-off-by: Philip Rakity
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
Marvell controller requires 1.8V bit in UHS control register 2
be set when doing UHS. eMMC does not require 1.8V for DDR.
add platform code to handle this.Signed-off-by: Philip Rakity
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
Allow platform specific code to set UHS registers if
implementation requires speciial platform specific handlingSigned-off-by: Philip Rakity
Reviewed-by: Arindam Nath
Signed-off-by: Chris Ball -
Since the MMC_PM_KEEP_POWER flag should be set on each suspend,
it should also cleared on each resume.Upon resuming, we have to know if power was kept
(for re-initialization, etc.), so clear it just after resuming.Signed-off-by: Eliad Peller
Signed-off-by: Chris Ball -
regulator_enable() was incorrectly placed in the suspend function
instead of the resume function.Signed-off-by: Jaehoon Chung
Signed-off-by: Kyungmin Park
Acked-by: Will Newton
Signed-off-by: Chris Ball -
Supply a link to TMIO private data for platforms to implement their
own card detection.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
The TMIO MMC controller cannot be powered off to save power, when no
card is plugged in, because then it will not be able to detect a new
card-insertion event. On some implementations, however, it is
possible to switch to using another source to detect card insertion.
This patch adds support for such implementations.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Convert the SDHI code to support more than a single interrupt source.
Needed to support hardware that uses GIC instead of INTC as interrupt
controller.Will also allow us to remove the irq forwarding workaround from the
INTC code in the future.Signed-off-by: Simon Horman
Signed-off-by: Magnus Damm
Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Instead of printing out useless information such as the virtual base
address and one of 4 interrupts, convert the SDHI probe() to print
out physical base address together with clock rate.We do have a struct device so make use of dev_info().
Signed-off-by: Magnus Damm
Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball -
Modify the SDHI driver to get rid of unwanted irq flags.
IRQF_DISABLED unused, see include/linux/interrupt.h
IRQF_TRIGGER_FALLING only relevant on external IRQ pins,
but since SDHI is internal in the SoC this can go away.Needed to support SDHI on sh73a0 that comes with a GIC
that errors out with the IRQF_TRIGGER_FALLING setting.Signed-off-by: Magnus Damm
Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Chris Ball
