- 20 Jul, 2011 29 commits
-
-
Shawn Guo authored
The issue was initially found by Eric Benard as below. http://permalink.gmane.org/gmane.linux.ports.arm.kernel/108031 Not sure about other SDHCI based controller, but on Freescale eSDHC, the SDHCI_INT_CARD_INSERT bits will be immediately set again when it gets cleared, if a card is inserted. The driver need to mask the irq to prevent interrupt storm which will freeze the system. And the SDHCI_INT_CARD_REMOVE gets the same situation. The patch fixes the problem based on the initial idea from Eric Benard. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Cc: Eric Benard <eric@eukrea.com> Tested-by:
Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Paul Parsons authored
There is a race condition in the tmio_mmc_irq() interrupt handler, caused by the presence of a while loop, which results in warnings of spurious interrupts. This was found on an HP iPAQ hx4700 whose HTC ASIC3 reportedly incorporates the Toshiba TC6380AF controller. Towards the end of a multiple read (CMD18) operation the handler clears the final RXRDY status bit in the first loop iteration, sees the DATAEND status bit at the bottom of the loop, and so clears the DATAEND status bit in the second loop iteration. However the DATAEND interrupt is still queued in the system somewhere and can't be delivered until the handler has returned. This second interrupt is then reported as spurious in the next call to the handler. Likewise for single read (CMD17) operations. And something similar occurs for multiple write (CMD25) and single write (CMD24) operations, where CMDRESPEND and TXRQ status bits are cleared in a single call. In these cases the interrupt handler clears two separate interrupts when it should only clear the one interrupt for which it was invoked. The fix is to remove the while loop. Signed-off-by:
Paul Parsons <lost.distance@yahoo.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Paul Parsons authored
Only compile tmio_mmc_dma.o when CONFIG_MMC_SDHI is selected (as y or m). Signed-off-by:
Paul Parsons <lost.distance@yahoo.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
Update functions for PIO pushing and pulling data to and from the FIFO so that they can handle unaligned output buffers and unaligned buffer lengths. This makes more of the tests in mmc_test pass. Unaligned lengths in pulls are handled by reading the full FIFO item, and storing the remaining bytes in a small internal buffer (part_buf). The next data pull will copy data out of this buffer first before accessing the FIFO again. Similarly, for pushes the final bytes that don't fill a FIFO item are stored in the part_buf (or sent anyway if it's the last transfer), and then the part_buf is included at the beginning of the next buffer pushed. Unaligned buffers in pulls are handled specially if the architecture cannot do efficient unaligned accesses, by reading FIFO items into a aligned local buffer, and memcpy'ing them into the output buffer, again storing any remaining bytes in the internal buffer. Similarly for pushes the buffer is memcpy'd into an aligned local buffer then written to the FIFO. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
The FIFO_DEPTH hardware configuration parameter can be found from the power-on value of RX_WMark in the FIFOTH register. This is used to initialise the watermarks, but when calculating the number of free fifo spaces a preprocessor definition is used which is hard coded to 32. Fix reading the value out of FIFOTH (the default value in the RX_WMark field is FIFO_DEPTH-1 not FIFO_DEPTH). Allow the fifo depth to be overriden by platform data (since a bootloader may have changed FIFOTH making auto-detection unreliable). Store the fifo_depth for later use. Also fix the calculation to find the number of free bytes in the fifo to include the fifo depth in the left shift by the data shift, since the fifo depth is measured in fifo items not bytes. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
Add brackets around use of the dev argument to the mci_{read,write}{w,l,q}() macros, for extra safety. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
Convert the card insert/remove tasklet to a workqueue, and call the setpower platform specific callback without the spinlock held. This means neither of the setpower or get_cd callbacks are called from atomic context which allows them to sleep. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
When a request is made, the card presence is checked and the request is queued. These two parts must be atomic with respect to card removal, or a card removal could be handled in between, and the new request wouldn't get cancelled until another card was inserted. Therefore move the spinlock protection from dw_mci_queue_request() up into dw_mci_request() to cover the presence check. Note that the test_bit() used for the presence check isn't atomic itself, so should have been protected by a spinlock anyway. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
James Hogan authored
DMA is only used for transactions exceeding a certain length, otherwise PIO is used. The TXDR and RXDR interrupts are masked when in DMA mode but still fire. When switching to PIO mode (e.g. to get SCR field when an SD card is inserted) these interrupts are not cleared and so they trigger the ISR as soon as they are unmasked. If the previous DMA did a write, then the ISR will handle the TXDR interrupt even if the transaction is a read, completing the transaction without modifying the read buffer. This is fixed primarily by clearing these two interrupts before unmasking them when setting up PIO mode, and also by making the ISR more robust by only handling TXDR/RXDR in the correct read/write direction. Signed-off-by:
James Hogan <james.hogan@imgtec.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Simon Horman authored
Some controllers require waiting for the bus to become idle before writing to some registers. I have implemented this by adding a hook to sd_ctrl_write16() and implementing a hook for SDHI which waits for the bus to become idle. Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by:
Simon Horman <horms@verge.net.au> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Simon Horman authored
Move register access functions into a shared header. Use sd_ctrl_write16 in tmio_mmc_dma.c:tmio_mmc_enable_dma(). Other than avoiding (trivial) open-coding, the motivation for this is to allow platform-hooks in access functions to be applied across all applicable accesses. Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by:
Simon Horman <horms@verge.net.au> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Simon Horman authored
This reflects at least the current usage of this register and I think it improves the readability of the code ever so slightly. Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by:
Simon Horman <horms@verge.net.au> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Russell King - ARM Linux authored
Check the status bits in the r/w command response for any errors. If error bits are set, then we won't have seen any data transferred, so it's pointless doing any further checking. Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Linus Walleij <linus.walleij@linaro.org> Tested-by:
Pawel Moll <pawel.moll@arm.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Russell King - ARM Linux authored
Command channel errors fall into four classes: 1. The command was issued with the card in the wrong state 2. The command failed to be received by the card correctly 3. The cards response failed to be received by the host (CRC error) 4. The card failed to respond to the card For (1), in theory we should know that the card is in the correct state. However, a failed stop command (or other failure) may result in the card remaining in a data transfer state from the previous command. If we detect this condition, we try to recover by sending a stop command. For the initial commands (set block count and the read/write command) no data will have been transferred. All that we need deal with is retrying at this point. A failed stop command can be remedied as above. If we are unable to recover the card (eg, the card ignores our requests for status, or we don't recognise the error code) then we immediately fail the request. Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Linus Walleij <linus.walleij@linaro.org> Tested-by:
Pawel Moll <pawel.moll@arm.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Russell King - ARM Linux authored
If the MMC_SEND_STATUS command is not successful, we should not return a zero status word, but instead allow the caller to know positively that an error occurred. Convert the open-coded get_card_status() to use the helper function, and provide definitions for the card state field. Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk> Acked-by:
Linus Walleij <linus.walleij@linaro.org> Tested-by:
Pawel Moll <pawel.moll@arm.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Seungwon Jeon authored
Response timeout (RTO), Response crc error (RCRC) and Response error (RE) signals come with command done (CD) and can be raised preceding command done (CD). That is these error interrupts and CD can be handled in separate dw_mci_interrupt(). If mmc_request_done() is called because of a response timeout before command done has occured, we might send the next request before the CD of current request is finished. This can bring about a broken sequence of request and request-done. And Data error interrupt (DRTO, DCRC, SBE, EBE) and data transfer over (DTO) have the same problem. Signed-off-by:
Seungwon Jeon <tgih.jun@samsung.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Seungwon Jeon authored
This patch sets the card_width bit of CTYPE for the corresponding card. CTYPE[31] and CTYPE[16] correspond respectively to card[15] and card[0] for 8-bit mode. And CTYPE[15] and CTYPE[0] correspond respectively to card[15] and CTYPE[0] for 1-bit or 4-bit mode. Signed-off-by:
Seungwon Jeon <tgih.jun@samsung.com> Acked-by:
Will Newton <will.newton@imgtec.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
1. support brownstone 2. support mmc 3. support basic filesystem and language 4. remove dynamic_debug, since too many log during access sd Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Mark F. Brown <mark.brown314@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
As suggested by Arnd, move platform data to include/linux/platform_data in order to improve build coverage for the driver. Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by:
Arnd Bergmann <arnd@arndb.de> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
Delete obsolete sdhci-pxa.c, which was previously shared amongst the entire PXA series. Instead we now use sdhci-pxav3.c for mmp2 and sdhci-pxav2.c for pxa9xx. Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Mark F. Brown <mark.brown314@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
Update MMP2 platform code to "sdhci-pxav3", following the driver rename. Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Acked-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Mark F. Brown <mark.brown314@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
sdhci-pltfm driver for PXAV2 SoCs, such as pxa910. Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by:
Jun Nie <njun@marvell.com> Signed-off-by:
Qiming Wu <wuqm@marvell.com> Acked-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Mark F. Brown <mark.brown314@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Zhangfei Gao authored
sdhci-pltfm driver for PXAV3 SoCs, such as MMP2. Signed-off-by:
Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Philip Rakity <prakity@marvell.com> Acked-by:
Mark F. Brown <mark.brown314@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
There are a couple of problems left from the sdhci pltfm and OF consolidation changes. * When building more than one sdhci-pltfm based drivers in the same image, linker will give multiple definition error on the sdhci-pltfm helper functions. For example right now, building sdhci-of-esdhc and sdhci-of-hlwd together is a valid combination from Kconfig view. * With the current build method, there is error with building the drivers as module, but module installation fails with modprobe. The patch fixes above problems by changing sdhci-pltfm into a module. To avoid EXPORT_SYMBOL on so many big endian IO accessors, it moves these accessors into sdhci-pltfm.h as the 'static inline' functions. As a result, sdhci.h needs to be included in sdhci-pltfm.h, and in turn can be removed from individual drivers which already include sdhci-pltfm.h. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Robert P. J. Day authored
Standardize the checks for multiple MMC header file inclusion, including adding comments to terminating #endif's, and fixing one incorrect comment. Signed-off-by:
Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
The structure sdhci_pltfm_data is not necessarily to be in a public header like include/linux/mmc/sdhci-pltfm.h, so the patch moves it into drivers/mmc/host/sdhci-pltfm.h and eliminates the former one. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Reviewed-by:
Grant Likely <grant.likely@secretlab.ca> Reviewed-by:
Wolfram Sang <w.sang@pengutronix.de> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
The patch turns the sdhci-of-core common stuff into helper functions added into sdhci-pltfm.c, and makes sdhci-of device drviers self registered using the same pair of .probe and .remove used by sdhci-pltfm device drivers. As a result, sdhci-of-core.c and sdhci-of.h can be eliminated with those common things merged into sdhci-pltfm.c and sdhci-pltfm.h respectively. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Acked-by:
Anton Vorontsov <cbouatmailru@gmail.com> Reviewed-by:
Wolfram Sang <w.sang@pengutronix.de> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
The patch migrates the use of sdhci_of_host and sdhci_of_data to sdhci_pltfm_host and sdhci_pltfm_data, so that the former pair can be eliminated. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Reviewed-by:
Grant Likely <grant.likely@secretlab.ca> Reviewed-by:
Wolfram Sang <w.sang@pengutronix.de> Acked-by:
Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
Shawn Guo authored
The patch turns the common stuff in sdhci-pltfm.c into functions, and add device drivers their own .probe and .remove which in turn call into the common functions, so that those sdhci-pltfm device drivers register itself and keep all device specific things away from common sdhci-pltfm file. Signed-off-by:
Shawn Guo <shawn.guo@linaro.org> Reviewed-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Arnd Bergmann <arnd@arndb.de> Acked-by:
Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by:
Chris Ball <cjb@laptop.org>
-
- 18 Jul, 2011 11 commits
-
-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: pppoe: Must flush connections when MAC address changes too. include/linux/sdla.h: remove the prototype of sdla() tulip: dmfe: Remove old log spamming pr_debugs
-
David S. Miller authored
Kernel bugzilla: 39252 Signed-off-by:
David S. Miller <davem@davemloft.net>
-
WANG Cong authored
`make headers_check` complains that linux-2.6/usr/include/linux/sdla.h:116: userspace cannot reference function or variable defined in the kernel this is due to that there is no such a kernel function, void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet); I don't know why we have it in a kernel header, so remove it. Signed-off-by:
WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Joe Perches authored
Commit 726b65ad ("tulip: Convert uses of KERN_DEBUG") enabled some old previously inactive uses of pr_debug converted by commit dde7c8ef ("tulip/dmfe.c: Use dev_<level> and pr_<level>"). Remove these pr_debugs. Signed-off-by:
Joe Perches <joe@perches.com> Signed-off-by:
David S. Miller <davem@davemloft.net>
-
Mauro Carvalho Chehab authored
While compiling it with Fedora 15, I noticed this issue: inlined from ‘si4713_write_econtrol_string’ at drivers/media/radio/si4713-i2c.c:1065:24: arch/x86/include/asm/uaccess_32.h:211:26: error: call to ‘copy_from_user_overflow’ declared with attribute error: copy_from_user() buffer size is not provably correct Cc: stable@kernel.org Signed-off-by:
Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by:
Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> Acked-by:
Eduardo Valentin <edubezval@gmail.com> Reviewed-by:
Eugene Teo <eugeneteo@kernel.sg> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6Linus Torvalds authored
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: Correct WM8994 MICBIAS supply widget hookup ASoC: Fix shift in WM8958 accessory detection default implementation ASoC: sh: fsi-hdmi: fixup snd_soc_card name ASoC: sh: fsi-da7210: fixup snd_soc_card name ASoC: sh: fsi-ak4642: fixup snd_soc_card name
-
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6Linus Torvalds authored
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: hppfs_lookup(): don't open-code lookup_one_len() hppfs: fix dentry leak cramfs: get_cramfs_inode() returns ERR_PTR() on failure ufs should use d_splice_alias() fix exofs ->get_parent() ceph analog of cifs build_path_from_dentry() race fix cifs: build_path_from_dentry() race fix
-
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/stagingLinus Torvalds authored
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (max1111) Fix race condition causing NULL pointer exception hwmon: (it87) Fix label group removal hwmon: (asus_atk0110) Fix memory leak
-
Al Viro authored
... and it's getting it wrong, too - missing ->d_revalidate() calls when it's dealing with filesystem (procfs) that has non-trivial ->d_revalidate()... Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
-
Al Viro authored
Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
-
Al Viro authored
... and we want to report these failures in ->lookup() anyway. Signed-off-by:
Al Viro <viro@zeniv.linux.org.uk>
-