- Apr 25, 2017
-
-
Hu Ziji authored
Export sdhci_set_ios() in sdhci.c. Thus vendor sdhci driver can implement its own set_ios() routine. Signed-off-by:
Hu Ziji <huziji@marvell.com> Signed-off-by:
Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Gregory CLEMENT authored
First version of the binding didn't have the eMMC clock. This patch allows to not registering the eMMC clock if it is not present in the device tree. Then the device tree can be backwards compatible. Suggested-by:
Stephen Boyd <sboyd@codeaurora.org> Signed-off-by:
Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Konstantin Porotchkin authored
Add fixed clock of 400MHz to system controller driver. This clock is used as SD/eMMC clock source. Signed-off-by:
Konstantin Porotchkin <kostap@marvell.com> Reviewed-by:
Omri Itach <omrii@marvell.com> Reviewed-by:
Hanna Hawa <hannah@marvell.com> [fixed up conflicts, added error handling --rmk] Signed-off-by:
Russell King <rmk+kernel@armlinux.org.uk> Acked-by:
Stephen Boyd <sboyd@codeaurora.org> Signed-off-by:
Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
David Daney <david.daney@cavium.com> Signed-off-by:
Steven J. Hill <steven.hill@cavium.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
Add support for switching to DDR mode for eMMC devices. Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
Add Support for the scatter-gather DMA available in the ThunderX MMC units. Up to 16 DMA requests can be processed together. Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
Add a platform driver for ThunderX ARM SOCs. Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
This core driver will be used by a MIPS platform driver or by an ARM64 PCI driver. The core driver implements the mmc_host_ops and slot probe & remove functions. Callbacks are provided to allow platform specific interrupt enable and bus locking. The host controller supports: - up to 4 slots that can contain sd-cards or eMMC chips - 1, 4 and 8 bit bus width - SDR and DDR - transfers up to 52 Mhz (might be less when multiple slots are used) - DMA read/write - multi-block read/write (but not stream mode) Voltage is limited to 3.3v and shared for all slots (vmmc and vmmcq). A global lock for all MMC devices is required because the host controller is shared. Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
David Daney <david.daney@cavium.com> Signed-off-by:
Steven J. Hill <steven.hill@cavium.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Jan Glauber authored
Add description of Cavium Octeon and ThunderX SOC device tree bindings. CC: Ulf Hansson <ulf.hansson@linaro.org> CC: Rob Herring <robh+dt@kernel.org> CC: Mark Rutland <mark.rutland@arm.com> CC: devicetree@vger.kernel.org Signed-off-by:
Jan Glauber <jglauber@cavium.com> Signed-off-by:
David Daney <david.daney@cavium.com> Signed-off-by:
Steven J. Hill <steven.hill@cavium.com> Acked-by:
Rob Herring <robh+dt@kernel.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Linus Walleij authored
We have this construction: if (a && b && !c) finalize; else block; finalize; Which is equivalent by boolean logic to: if (!a || !b || c) block; finalize; Which is simpler code. Reviewed-by:
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Linus Walleij authored
mmc_wait_for_data_req_done() is called in exactly one place, and having it spread out is making things hard to oversee. Factor this function into mmc_finalize_areq(). Reviewed-by:
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Linus Walleij authored
"previous" is a better name for the variable storing the previous asynchronous request, better than the opaque name "data" atleast. We see that we assign the return status to the returned variable on all code paths, so we might as well just do that immediately after calling mmc_finalize_areq(). Reviewed-by:
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
In preparation to reuse the code for CQE support. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
In preparation to reuse the code for CQE support. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
Factor out data preparation into a separate function mmc_blk_data_prep() which can be re-used for command queuing. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
mmc_apply_rel_rw() will be used by Software Command Queuing also. In that case the command argument is not the block address so change mmc_apply_rel_rw() to get block address from the request. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
RPMB does not allow Command Queue commands. Disable and re-enable the Command Queue when switching. Note that the driver only switches partitions when the queue is empty. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Harjani Ritesh <riteshh@codeaurora.org> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
Normal read and write commands may not be used while the command queue is enabled. Disable the Command Queue when mmc_test is probed and re-enable it when it is removed. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Harjani Ritesh <riteshh@codeaurora.org> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
Add helper functions to enable or disable the Command Queue. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
eMMC can have multiple internal partitions that are represented as separate disks / queues. However switching between partitions is only done when the queue is empty. Consequently the array of mmc requests that are queued can be shared between partitions saving memory. Keep a pointer to the mmc request queue on the card, and use that instead of allocating a new one for each partition. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
Change from viewing the requests in progress as 'current' and 'previous', to viewing them as a queue. The current request is allocated to the first free slot. The presence of incomplete requests is determined from the count (mq->qcnt) of entries in the queue. Non-read-write requests (i.e. discards and flushes) are not added to the queue at all and require no special handling. Also no special handling is needed for the MMC_BLK_NEW_REQUEST case. As well as allowing an arbitrarily sized queue, the queue thread function is significantly simpler. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Adrian Hunter authored
A subsequent patch will remove 'mq->mqrq_cur'. Prepare for that by assigning it to a local variable. Signed-off-by:
Adrian Hunter <adrian.hunter@intel.com> Reviewed-by:
Linus Walleij <linus.walleij@linaro.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Sergio Prado authored
Allows configuring Samsung S3C24XX MMC/SD/SDIO controller using a device tree. Signed-off-by:
Sergio Prado <sergio.prado@e-labworks.com> [Arnd: fix broken conditional expression] Signed-off-by:
Arnd Bergmann <arnd@arndb.de> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Sergio Prado authored
Adds the device tree bindings description for Samsung S3C24XX MMC/SD/SDIO controller, used as a connectivity interface with external MMC, SD and SDIO storage mediums. Acked-by:
Rob Herring <robh@kernel.org> Signed-off-by:
Sergio Prado <sergio.prado@e-labworks.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Azhar Shaikh authored
Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card controllers. Signed-off-by:
Azhar Shaikh <azhar.shaikh@intel.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Azhar Shaikh authored
Set MMC_CAP_AGGRESSIVE_PM for BYT-related Intel SD card controllers. Signed-off-by:
Azhar Shaikh <azhar.shaikh@intel.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Factor out setting the response configuration bits thus further reducing complexity of function meson_mmc_start_cmd. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Factor out setting the block size. This also contributes to reducing complexity of function meson_mmc_start_cmd. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Piotr Sroka authored
Use added dev variable for devm_clk_get. Signed-off-by:
Piotr Sroka <piotrs@cadence.com> Reviewed-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Piotr Sroka authored
DTS properties are used instead of fixed data because PHY settings can be different for different chips/boards. Signed-off-by:
Piotr Sroka <piotrs@cadence.com> Reviewed-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Piotr Sroka authored
DTS properties are used instead of fixed data because PHY settings can be different for different chips/boards. Add description of new DLL PHY delays. Signed-off-by:
Piotr Sroka <piotrs@cadence.com> Reviewed-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:
Rob Herring <robh@kernel.org> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Piotr Sroka authored
Add polling for ACK to be sure that data are written to PHY register. Signed-off-by:
Piotr Sroka <piotrs@cadence.com> Reviewed-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Stefan Wahren authored
This fixes a NULL pointer dereference in case of a MMC request with a set block count command and no data. Reported-by:
Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:
Stefan Wahren <stefan.wahren@i2se.com> Tested-by:
Peter Robinson <pbrobinson@gmail.com> Reviewed-by:
Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Use new core function mmc_get_dma_dir(). Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Add function for determining DMA direction to core. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
CMD23 mode (use "set block count" command before transferring multiple data blocks) typically is more performant as host / card know upfront how many data blocks to expect. Therefore add support for this mode to the driver. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Currently we use a fixed timeout of 4s for all data transfers. Switch to dynamic timeout values by making use of data->timeout_ns. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
So far the driver name is used as interrupt description, therefore in /proc/interrupts it's not possible to tell which interrupt belongs to which port. Change this by switching to NULL what causes the default (device name) to be used. In our case that's the DT node name. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Heiner Kallweit authored
Use GENMASK consistently for all bit masks and switch to using the bitfield macros FIELD_GET and FIELD_PREP. This hides parts of the complexity of dealing with bit fields. Signed-off-by:
Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:
Kevin Hilman <khilman@baylibre.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-
Shawn Lin authored
Currently the get_timeout_clock callback doesn't clearly have a statement that it needs the variant drivers to return the timeout clock rate in kHz if the SDHCI_TIMEOUT_CLK_UNIT isn't present, otherwise the variant drivers should return it in MHz. It's also very likely that further variant drivers which are going to use this callback will be confused by this situation. Given the fact that moderm sdhci variant hosts are very prone to get the timeout clock from common clock framework (actually the only three users did that), it's more natural to return the value in Hz and we make an explicit comment there. Then we put the unit conversion inside the sdhci core. Thus will improve the code and prevent further misuses. Reported-by:
Anssi Hannula <anssi.hannula@bitwise.fi> Signed-off-by:
Shawn Lin <shawn.lin@rock-chips.com> Acked-by:
Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:
Adrian Hunter <adrian.hunter@intel.com> Signed-off-by:
Ulf Hansson <ulf.hansson@linaro.org>
-