Add RZ/G1C SD/eMMC support
Subsystems (4)
cover Add RZ/G1C SD/eMMC support
This patch series add SD/eMMC support support for RZ/G1C sbc.
RZ/G1C eMMC IP is different from other RZ/G1 SoC's. It is having an internal DMA for data transfer which is similar to R-Car Gen3.
Support for internal DMAC is added in 4.14 kernel and support for RZ/G1C added on 4.20 kernel.
Backported the relevent patches to linux-4.4.y-cip.
This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from linux rc tree.
Ai Kyuse (3):
mmc: tmio: enhance illegal sequence handling
mmc: tmio: Add hw reset support
mmc: tmio: Add tuning support
Arnd Bergmann (1):
mmc: tmio_mmc_dma: don't print invalid DMA cookie
Ben Hutchings (2):
mmc: tmio, sh_mobile_sdhi: Pass tmio_mmc_host ptr to clk_{enable,
disable} ops
mmc: tmio, sh_mobile_sdhi: Add support for variable input clock
frequency
Chris Brandt (3):
mmc: tmio-mmc: add support for 32bit data port
mmc: sh_mobile_sdhi: add ocr_mask option
mmc: tmio-mmc: fix bad pointer math
Fabrizio Castro (6):
dt-bindings: mmc: renesas_sdhi: Add r8a77470 support
mmc: renesas_sdhi: Add r8a77470 SDHI1 support
ARM: dts: r8a77470: Add SDHI2 support
ARM: dts: r8a77470: Add SDHI0 support
ARM: dts: r8a77470: Add SDHI1 support
ARM: dts: iwg23s-sbc: Add uSD and eMMC support
Masaharu Hayakawa (1):
mmc: tmio: always get number of taps
Masahiro Yamada (1):
mmc: renesas_sdhi: consolidate DMAC CONFIG options
Simon Horman (14):
mmc: tmio: document mandatory and optional callbacks
mmc: core: Add helper to see if a host can be retuned
mmc: sh_mobile_sdhi: Add tuning support
mmc: tmio: drop filenames from comment at top of source
mmc: renesas-sdhi, tmio: make dma more modular
mmc: tmio: rename tmio_mmc_{pio => core}.c
mmc: renesas-sdhi: rename tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c
mmc: renesas-sdhi: rename sh_mobile_sdhi.c => renesas_sdhi_core.c
mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file
mmc: renesas-sdhi: improve checkpatch cleanness
mmc: tmio, renesas-sdhi: add dataend to DMA ops
mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC
dt-bindings: mmc: renesas_sdhi: add R-Car Gen[123] fallback
compatibility strings
mmc: renesas_sdhi: implement R-Car Gen[123] fallback compatibility
strings
Ulf Hansson (2):
mmc: tmio: Remove redundant runtime PM calls
mmc: tmio: Remove redundant check of mmc->slot.cd_irq
Wolfram Sang (49):
mmc: tmio_dma: remove debug messages with little information
mmc: tmio: add flag to reduce delay after changing clock status
mmc: tmio: remove stale comments
mmc: tmio: refactor set_clock a little
mmc: tmio: disable clock before changing it
mmc: sdhi: use faster clock handling on RCar Gen2
mmc: sdhi: error message on ENOMEM is superfluous
mmc: sdhi: Add r8a7795 support
mmc: tmio: Add UHS-I mode support
mmc: sh_mobile_sdhi: Add UHS-I mode support
mmc: tmio: always start clock after frequency calculation
mmc: tmio: stop clock when 0Hz is requested
mmc: sh_mobile_sdhi: remove obsolete irq_by_name registration
mmc: tmio: remove now unneeded seperate irq handlers
mmc: tmio: simplify irq handler
mmc: tmio: merge distributed include files
mmc: tmio: give read32/write32 functions more descriptive names
mmc: tmio: use BIT() within defines
mmc: tmio: use CTL_STATUS consistently
mmc: tmio/sdhi: distinguish between SCLKDIVEN and ILL_FUNC
mmc: tmio: document CTL_STATUS handling
mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
mmc: sh_mobile_sdhi: make clk_update function more compact
mmc: sh_mobile_sdhi: only change the clock on RCar Gen2+
mmc: sh_mobile_sdhi: check return value when changing clk
mmc: sh_mobile_sdhi: properly document R-Car versions
mmc: host: sh_mobile_sdhi: move card_busy from tmio to sdhi
mmc: host: sh_mobile_sdhi: don't populate unneeded functions
mmc: tmio: add eMMC support
mmc: add define for R1 response without CRC
mmc: tmio: fix wrong bitmask for SDIO irqs
mmc: tmio: remove SDIO from TODO list
mmc: tmio: use SDIO master interrupt bit only when allowed
mmc: sh_mobile_sdhi: simplify accessing DT data
mmc: sh_mobile_sdhi: improve prerequisite for hw_reset
mmc: sh_mobile_sdhi: remove superfluous check in hw_reset
mmc: sh_mobile_sdhi: improve prerequisites for tuning
mmc: sh_mobile_sdhi: remove superfluous check in SCC error check
mmc: sh_mobile_sdhi: remove superfluous check in init_tuning
mmc: sh_mobile_sdhi: enable HS200
mmc: host: tmio: drop superfluous exit path
mmc: host: tmio: disable clocks when unbinding
mmc: host: tmio: refactor calls to sdio irq
mmc: host: tmio: SDIO_STATUS_QUIRK is rather SDIO_STATUS_SETBITS
mmc: tmio: discard obsolete SDIO irqs before enabling irqs
mmc: tmio: ensure end of DMA and SD access are in sync
mmc: host: tmio: use defines for CTL_STOP_INTERNAL_ACTION values
mmc: host: tmio: don't BUG on unsupported stop commands
mmc: host: tmio: fill in response from auto cmd12
Yoshihiro Shimoda (1):
mmc: tmio, renesas-sdhi: add max_{segs, blk_count} to tmio_mmc_data
Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 12 + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 75 ++ arch/arm/boot/dts/r8a77470.dtsi | 38 + drivers/mmc/host/Kconfig | 21 +- drivers/mmc/host/Makefile | 6 +- drivers/mmc/host/renesas_sdhi.h | 41 + drivers/mmc/host/renesas_sdhi_core.c | 632 +++++++++ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 273 ++++ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 480 +++++++ drivers/mmc/host/sh_mobile_sdhi.c | 397 ------ drivers/mmc/host/tmio_mmc.c | 10 +- drivers/mmc/host/tmio_mmc.h | 170 ++- drivers/mmc/host/tmio_mmc_core.c | 1399 ++++++++++++++++++++ drivers/mmc/host/tmio_mmc_dma.c | 356 ----- drivers/mmc/host/tmio_mmc_pio.c | 1275 ------------------ include/linux/mfd/tmio.h | 13 +- include/linux/mmc/core.h | 3 + include/linux/mmc/host.h | 5 + include/linux/mmc/tmio.h | 66 - 19 files changed, 3120 insertions(+), 2152 deletions(-) create mode 100644 drivers/mmc/host/renesas_sdhi.h create mode 100644 drivers/mmc/host/renesas_sdhi_core.c create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c create mode 100644 drivers/mmc/host/renesas_sdhi_sys_dmac.c delete mode 100644 drivers/mmc/host/sh_mobile_sdhi.c create mode 100644 drivers/mmc/host/tmio_mmc_core.c delete mode 100644 drivers/mmc/host/tmio_mmc_dma.c delete mode 100644 drivers/mmc/host/tmio_mmc_pio.c delete mode 100644 include/linux/mmc/tmio.h
Signature · 1 line
2.7.4
PATCH 1/83 mmc: tmio_mmc_dma: don't print invalid DMA cookie
From: Arnd Bergmann <[email protected]>
commit d50f42384dbfcf5143de614710e132dc06cd2439 upstream.
The tmio_mmc_start_dma_{rx,tx} function functions contain debug code that prints the dma cookie among other things. However, in case we fall back to PIO mode for some reason, the cookie variable is never initialized, and gcc warns about this:
In file included from ../include/linux/printk.h:277:0,
from ../include/linux/kernel.h:13,
from ../include/linux/list.h:8,
from ../include/linux/kobject.h:20,
from ../include/linux/device.h:17,
from ../drivers/mmc/host/tmio_mmc_dma.c:13:../drivers/mmc/host/tmio_mmc_dma.c: In function 'tmio_mmc_start_dma':../include/linux/dynamic_debug.h:86:3: warning: 'cookie' may be used uninitialized in this function [-Wmaybe-uninitialized]
__dynamic_dev_dbg(&descriptor, dev, fmt, \
^../drivers/mmc/host/tmio_mmc_dma.c:128:15: note: 'cookie' was declared here
dma_cookie_t cookie;
This modifies the dev_dbg() statements so we only print the cookie when we are already in the DMA path.
--- drivers/mmc/host/tmio_mmc_dma.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/mmc/host/tmio_mmc_dma.c +7 -8
@@ -94,9 +94,9 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host) desc =NULL ; ret = cookie; } +dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , + __func__, host->sg_len, ret, cookie, host->mrq); } -dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , - __func__, host->sg_len, ret, cookie, host->mrq); pio:if (!desc) {
@@ -116,8 +116,8 @@ pio: "DMA failed: %d, falling back to PIO\n", ret); } -dev_dbg (&host->pdev->dev,"%s(): desc %p, cookie %d, sg[%d]\n" , __func__, - desc, cookie, host->sg_len); +dev_dbg (&host->pdev->dev,"%s(): desc %p, sg[%d]\n" , __func__, + desc, host->sg_len); }static void tmio_mmc_start_dma_tx (struct tmio_mmc_host *host)
@@ -174,9 +174,9 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) desc =NULL ; ret = cookie; } +dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , + __func__, host->sg_len, ret, cookie, host->mrq); } -dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , - __func__, host->sg_len, ret, cookie, host->mrq); pio:if (!desc) {
@@ -196,8 +196,7 @@ pio: "DMA failed: %d, falling back to PIO\n", ret); } -dev_dbg (&host->pdev->dev,"%s(): desc %p, cookie %d\n" , __func__, - desc, cookie); +dev_dbg (&host->pdev->dev,"%s(): desc %p\n" , __func__, desc); } void tmio_mmc_start_dma(struct tmio_mmc_host *host,
Signature · 1 line
2.7.4
PATCH 2/83 mmc: tmio_dma: remove debug messages with little information
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 254d1456560fa42d4ca901c9b9308e87c951fee1 upstream.
When compiling the driver with CONFIG_MMC_DEBUG set, I got build warnings. They have been 'fixed' meanwhile. However, because these debug messages look random anyhow (some duplicate information printed etc), let's just drop them and rather re-add something consistent if that should ever be needed.
--- drivers/mmc/host/tmio_mmc_dma.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/mmc/host/tmio_mmc_dma.c +0 -11
@@ -94,10 +94,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host) desc =NULL ; ret = cookie; } -dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , - __func__, host->sg_len, ret, cookie, host->mrq); } - pio:if (!desc) {/* DMA failed, fall back to PIO */
@@ -115,9 +112,6 @@ pio:dev_warn (&host->pdev->dev,"DMA failed: %d, falling back to PIO\n" , ret); } - -dev_dbg (&host->pdev->dev,"%s(): desc %p, sg[%d]\n" , __func__, - desc, host->sg_len); }static void tmio_mmc_start_dma_tx (struct tmio_mmc_host *host)
@@ -174,10 +168,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) desc =NULL ; ret = cookie; } -dev_dbg (&host->pdev->dev,"%s(): mapped %d -> %d, cookie %d, rq %p\n" , - __func__, host->sg_len, ret, cookie, host->mrq); } - pio:if (!desc) {/* DMA failed, fall back to PIO */
@@ -195,8 +186,6 @@ pio:dev_warn (&host->pdev->dev,"DMA failed: %d, falling back to PIO\n" , ret); } - -dev_dbg (&host->pdev->dev,"%s(): desc %p\n" , __func__, desc); } void tmio_mmc_start_dma(struct tmio_mmc_host *host,
Signature · 1 line
2.7.4
PATCH 2/83 mmc: tmio_dma: remove debug messages with little information
Hi!
Quoted 9 lines
From: Wolfram Sang <[email protected]>
commit
254d1456560fa42d4ca901c9b9308e87c951fee1upstream.When compiling the driver with
CONFIG_MMC_DEBUGset, I got build warnings. They have been 'fixed' meanwhile. However, because these debug messages look random anyhow (some duplicate information printed etc), let's just drop them and rather re-add something consistent if that should ever be needed.
Its too late to change that now, but 1/ fixes messages and then 2/ just deletes them. Single patch would do.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/d4a3a76e/attachment.sig>
PATCH 2/83 mmc: tmio_dma: remove debug messages with little information
Hi Pavel,
Thanks for the feedback
Quoted 17 lines
-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Friday, November 8, 2019 9:08 AM
To: Biju Das <[email protected]>
Cc: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>; Chris Paterson <[email protected]>; Fabrizio Castro <[email protected]>
Subject: Re: [PATCH 4.4.y-cip 02/83] mmc:tmio_dma: remove debug messages with little informationHi!
Quoted 4 lines
From: Wolfram Sang <[email protected]>
commit
254d1456560fa42d4ca901c9b9308e87c951fee1upstream.
Quoted 8 lines
Quoted 5 lines
When compiling the driver with
CONFIG_MMC_DEBUGset, I got build warnings. They have been 'fixed' meanwhile. However, because these debug messages look random anyhow (some duplicate information printed etc), let's just drop them and rather re-add something consistent if that should ever be needed.Its too late to change that now, but 1/ fixes messages and then 2/ just deletes them. Single patch would do.
Are you ok to merge this patches while applying? or Do you want me to send another series fixing this? Please let me know.
Regards,
Biju
PATCH 2/83 mmc: tmio_dma: remove debug messages with little information
Hi!
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
From: Wolfram Sang <[email protected]>
commit
254d1456560fa42d4ca901c9b9308e87c951fee1upstream.When compiling the driver with
CONFIG_MMC_DEBUGset, I got build warnings. They have been 'fixed' meanwhile. However, because these debug messages look random anyhow (some duplicate information printed etc), let's just drop them and rather re-add something consistent if that should ever be needed.
Quoted 5 lines
Quoted 2 lines
Its too late to change that now, but 1/ fixes messages and then 2/ just deletes them. Single patch would do.
Are you ok to merge this patches while applying? or Do you want me to send another series fixing this? Please let me know.
I believe this is minor detail, and we can use the patches as-is.
See my reply to Chris for thoughts about rest of the series.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/ebf3161b/attachment.sig>
PATCH 3/83 mmc: tmio: add flag to reduce delay after changing clock status
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 04e24b80a3ddf4cdf85e49a99d33aec27c9432ad upstream.
The docs for RCar Gen2 & 3 I have access to, mention delays of 5ms after stop and 1ms after start. Make it possible to apply these values.
--- drivers/mmc/host/tmio_mmc_pio.c | 7 ++++--- include/linux/mfd/tmio.h | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +4 -3
@@ -172,7 +172,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, host->set_clk_div (host->pdev, (clk>>22 ) &1 );sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &0x1ff ); -msleep (10 ); +if (!(host->pdata->flags &TMIO_MMC_FAST_CLK_CHG )) +msleep (10 ); }static void tmio_mmc_clk_stop (struct tmio_mmc_host *host)
@@ -185,14 +186,14 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~0x0100 &sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (10 ); +msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); }static void tmio_mmc_clk_start (struct tmio_mmc_host *host) {sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,0x0100 |sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (10 ); +msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 );/* implicit BUG_ON(!res) */ if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) {
include/linux/mfd/tmio.h +4 -0
@@ -65,6 +65,10 @@* Some controllers can support SDIO IRQ signalling. */ #define TMIO_MMC_SDIO_IRQ (1 << 2) + +/* Some controllers don't need to wait 10ms for clock changes */ +#define TMIO_MMC_FAST_CLK_CHG (1 << 3) +/* * Some controllers require waiting for the SD bus to become * idle before writing to some registers.
Signature · 1 line
2.7.4
PATCH 4/83 mmc: tmio: remove stale comments
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 6d2bcbe5d1ee44271b30d445b55c49219b33fc6e upstream.
These don't make sense anymore. Since commit 5d60e500541ed1 ("mmc: tmio:
add new TMIO_MMC_HAVE_HIGH_REG flags"), we don't deal with a resource here.
--- drivers/mmc/host/tmio_mmc_pio.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +0 -3
@@ -178,7 +178,6 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,static void tmio_mmc_clk_stop (struct tmio_mmc_host *host) { -/* implicit BUG_ON(!res) */ if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) {sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0000 );msleep (10 );
@@ -195,7 +194,6 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host) sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 ); -/* implicit BUG_ON(!res) */ if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) {sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0100 );msleep (10 );
@@ -206,7 +204,6 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) {/* FIXME - should we set stop clock reg here */ sd_ctrl_write16 (host,CTL_RESET_SD ,0x0000 ); -/* implicit BUG_ON(!res) */ if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG )sd_ctrl_write16 (host,CTL_RESET_SDIO ,0x0000 );msleep (10 );
Signature · 1 line
2.7.4
PATCH 5/83 mmc: tmio: refactor set_clock a little
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit bf96208f0539d2009ca0b031da2ed7c430edc3a2 upstream.
Some of the indentation made the code awful to read. Fix that. Also, introduce defines instead of magic hex values. Note that this includes one change: We mask out know 0xff instead of 0x1ff. But 0x100 has always been the clock enable bit. It doesn't make any sense to set it depending on the clock calculation. Update copyright notices, too. I'll be working on those files some more in the future.
--- drivers/mmc/host/tmio_mmc_pio.c | 15 +++++++++------ include/linux/mmc/tmio.h | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +9 -6
@@ -1,6 +1,8 @@/* * linux/drivers/mmc/host/tmio_mmc_pio.c * +* Copyright (C) 2016 Sang Engineering, Wolfram Sang +* Copyright (C) 2015-16 Renesas Electronics Corporation * Copyright (C) 2011 Guennadi Liakhovetski * Copyright (C) 2007 Ian Molton * Copyright (C) 2004 Ian Molton
@@ -159,19 +161,20 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,if (new_clock) {for (clock = host->mmc->f_min, clk =0x80000080 ; - new_clock >= (clock<<1 ); clk >>=1 ) + new_clock >= (clock <<1 ); + clk >>=1 ) clock <<=1 ;/* 1/1 clock is option */ if ((host->pdata->flags &TMIO_MMC_CLK_ACTUAL ) && - ((clk >>22 ) &0x1 )) + ((clk >>22 ) &0x1 )) clk |=0xff ; }if (host->set_clk_div) - host->set_clk_div (host->pdev, (clk>>22 ) &1 ); + host->set_clk_div (host->pdev, (clk >>22 ) &1 ); -sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &0x1ff ); +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &CLK_CTL_DIV_MASK );if (!(host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ))msleep (10 ); }
@@ -183,14 +186,14 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)msleep (10 ); } -sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~0x0100 & +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN &sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL ));msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); }static void tmio_mmc_clk_start (struct tmio_mmc_host *host) { -sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,0x0100 | +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN |sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL ));msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 );
include/linux/mmc/tmio.h +5 -0
@@ -1,6 +1,8 @@/* * include/linux/mmc/tmio.h * +* Copyright (C) 2016 Sang Engineering, Wolfram Sang +* Copyright (C) 2015-16 Renesas Electronics Corporation * Copyright (C) 2007 Ian Molton * Copyright (C) 2004 Ian Molton *
@@ -61,6 +63,9 @@#define TMIO_STAT_CMD_BUSY 0x40000000#define TMIO_STAT_ILL_ACCESS 0x80000000 +#define CLK_CTL_DIV_MASK 0xff +#define CLK_CTL_SCLKEN BIT(8) +#define TMIO_BBS 512/* Boot block size */ #endif /* LINUX_MMC_TMIO_H */
Signature · 1 line
2.7.4
PATCH 6/83 mmc: tmio: disable clock before changing it
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 14d5828f4ebbfbe8e07d4d01eb85a684a9290243 upstream.
Rcar2 & 3 docs state that for going to and coming from the 0xff setting, the clock must first be disabled before the DIV bits are changed. Instead of tracking this, let's just do this unconditionally.
--- drivers/mmc/host/tmio_mmc_pio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/tmio_mmc_pio.c +2 -0
@@ -174,6 +174,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,if (host->set_clk_div) host->set_clk_div (host->pdev, (clk >>22 ) &1 ); +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN & +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL ));sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &CLK_CTL_DIV_MASK );if (!(host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ))msleep (10 );
Signature · 1 line
2.7.4
PATCH 7/83 mmc: sdhi: use faster clock handling on RCar Gen2
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 16a655248965cd04db3e6616a47231fecbf87839 upstream.
--- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sh_mobile_sdhi.c +1 -1
@@ -59,7 +59,7 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = {static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { .tmio_flags =TMIO_MMC_HAS_IDLE_WAIT |TMIO_MMC_WRPROTECT_DISABLE | -TMIO_MMC_CLK_ACTUAL , +TMIO_MMC_CLK_ACTUAL |TMIO_MMC_FAST_CLK_CHG , .capabilities =MMC_CAP_SD_HIGHSPEED |MMC_CAP_SDIO_IRQ , .dma_buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES , .dma_rx_offset =0x2000 ,
Signature · 1 line
2.7.4
PATCH 8/83 mmc: sdhi: error message on ENOMEM is superfluous
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 2bf8ab6ba23483a49d29a726d047f3be81ccc952 upstream.
We will get a full dump anyhow.
--- drivers/mmc/host/sh_mobile_sdhi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +1 -3
@@ -215,10 +215,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)return -EINVAL ; priv =devm_kzalloc (&pdev->dev,sizeof (struct sh_mobile_sdhi ),GFP_KERNEL ); -if (priv ==NULL ) { -dev_err (&pdev->dev,"kzalloc failed\n" ); +if (!priv)return -ENOMEM ; - } mmc_data = &priv->mmc_data; dma_priv = &priv->dma_priv;
Signature · 1 line
2.7.4
PATCH 9/83 mmc: sdhi: Add r8a7795 support
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit a72e8b170069e98e1f5ca2a2855ee399148a9152 upstream.
Registers are 64bit apart, so we refactor bus_shift handling a little and set it based on the DT compatible. Also, EXT_ACC is different. It has been tested on a Salvator-X (Gen3) and, to check for regressions, on a Lager (Gen2).
--- drivers/mmc/host/sh_mobile_sdhi.c | 46 ++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +33 -13
@@ -1,6 +1,8 @@/* * SuperH Mobile SDHI * +* Copyright (C) 2016 Sang Engineering, Wolfram Sang +* Copyright (C) 2015-16 Renesas Electronics Corporation * Copyright (C) 2009 Magnus Damm * * This program is free software; you can redistribute it and/or modify
@@ -43,6 +45,7 @@ struct sh_mobile_sdhi_of_data {unsigned long capabilities2;enum dma_slave_buswidth dma_buswidth;dma_addr_t dma_rx_offset; +unsigned bus_shift; };static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
@@ -65,6 +68,13 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { .dma_rx_offset = 0x2000, }; +static const struct sh_mobile_sdhi_of_data of_rcar_gen3_compatible = { + .tmio_flags =TMIO_MMC_HAS_IDLE_WAIT |TMIO_MMC_WRPROTECT_DISABLE | +TMIO_MMC_CLK_ACTUAL |TMIO_MMC_FAST_CLK_CHG , + .capabilities =MMC_CAP_SD_HIGHSPEED , + .bus_shift =2 , +}; +static const struct of_device_id sh_mobile_sdhi_of_match[] = { { .compatible ="renesas,sdhi-shmobile" }, { .compatible ="renesas,sdhi-sh7372" },
@@ -105,6 +115,15 @@ static void sh_mobile_sdhi_sdbuf_width(struct tmio_mmc_host *host, int width)case 0xCB0D : val = (width ==32 ) ?0x0000 :0x0001 ;break ; +case 0xCC10 :/* Gen3, SD only */ +case 0xCD10 :/* Gen3, SD + MMC */ +if (width ==64 ) + val =0x0000 ; +else if (width ==32 ) + val =0x0101 ; +else + val =0x0001 ; +break ;default :/* nothing to do */ return ;
@@ -234,16 +253,26 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) goto eprobe; } +if (of_id && of_id->data) { +const struct sh_mobile_sdhi_of_data *of_data = of_id->data; + + mmc_data->flags |= of_data->tmio_flags; + mmc_data->capabilities |= of_data->capabilities; + mmc_data->capabilities2 |= of_data->capabilities2; + mmc_data->dma_rx_offset = of_data->dma_rx_offset; + dma_priv->dma_buswidth = of_data->dma_buswidth; + host->bus_shift = of_data->bus_shift; + } + host->dma = dma_priv; host->write16_hook = sh_mobile_sdhi_write16_hook; host->clk_enable = sh_mobile_sdhi_clk_enable; host->clk_disable = sh_mobile_sdhi_clk_disable; host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk; -/* SD control register space size is 0x100, 0x200 for bus_shift=1 */ -if (resource_size (res) >0x100 ) + +/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */ +if (!host->bus_shift &&resource_size (res) >0x100 )/* old way to determine the shift */ host->bus_shift =1 ; -else - host->bus_shift =0 ;if (mmd) *mmc_data = *mmd;
@@ -275,15 +304,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)*/ mmc_data->flags |=TMIO_MMC_SDIO_STATUS_QUIRK ; -if (of_id && of_id->data) { -const struct sh_mobile_sdhi_of_data *of_data = of_id->data; - mmc_data->flags |= of_data->tmio_flags; - mmc_data->capabilities |= of_data->capabilities; - mmc_data->capabilities2 |= of_data->capabilities2; - mmc_data->dma_rx_offset = of_data->dma_rx_offset; - dma_priv->dma_buswidth = of_data->dma_buswidth; - } - ret =tmio_mmc_host_probe (host, mmc_data);if (ret <0 ) goto efree;
Signature · 1 line
2.7.4
PATCH 10/83 mmc: tmio, sh_mobile_sdhi: Pass tmio_mmc_host ptr to clk_{enable, disable} ops
In reply to Biju DasFrom: Ben Hutchings <[email protected]>
commit 0ea28210c15680bbabc3d6079f771f1a1e69509a upstream.
Change the clk_enable operation to take a pointer to the struct tmio_mmc_host and have it set f_max. For consistency, also change the clk_disable operation to take a pointer to struct tmio_mmc_host.
--- drivers/mmc/host/sh_mobile_sdhi.c | 12 +++++------- drivers/mmc/host/tmio_mmc.h | 4 ++-- drivers/mmc/host/tmio_mmc_pio.c | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +5 -7
@@ -132,16 +132,15 @@ static void sh_mobile_sdhi_sdbuf_width(struct tmio_mmc_host *host, int width)sd_ctrl_write16 (host,EXT_ACC , val); } -static int sh_mobile_sdhi_clk_enable (struct platform_device *pdev,unsigned int *f) +static int sh_mobile_sdhi_clk_enable (struct tmio_mmc_host *host) { -struct mmc_host *mmc =platform_get_drvdata (pdev); -struct tmio_mmc_host *host =mmc_priv (mmc); +struct mmc_host *mmc = host->mmc;struct sh_mobile_sdhi *priv =host_to_priv (host);int ret =clk_prepare_enable (priv->clk);if (ret <0 )return ret; - *f =clk_get_rate (priv->clk); + mmc->f_max =clk_get_rate (priv->clk);/* enable 16bit data access on SDBUF as default */ sh_mobile_sdhi_sdbuf_width (host,16 );
@@ -149,11 +148,10 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned intreturn 0 ; } -static void sh_mobile_sdhi_clk_disable (struct platform_device *pdev) +static void sh_mobile_sdhi_clk_disable (struct tmio_mmc_host *host) { -struct mmc_host *mmc =platform_get_drvdata (pdev); -struct tmio_mmc_host *host =mmc_priv (mmc);struct sh_mobile_sdhi *priv =host_to_priv (host); +clk_disable_unprepare (priv->clk); }
drivers/mmc/host/tmio_mmc.h +2 -2
@@ -95,8 +95,8 @@ struct tmio_mmc_host {bool sdio_irq_enabled;int (*write16_hook)(struct tmio_mmc_host *host,int addr); -int (*clk_enable)(struct platform_device *pdev,unsigned int *f); -void (*clk_disable)(struct platform_device *pdev); +int (*clk_enable)(struct tmio_mmc_host *host); +void (*clk_disable)(struct tmio_mmc_host *host);int (*multi_io_quirk)(struct mmc_card *card,unsigned int direction,int blk_size); };
drivers/mmc/host/tmio_mmc_pio.c +2 -2
@@ -843,7 +843,7 @@ static int tmio_mmc_clk_update(struct tmio_mmc_host *host)if (!host->clk_enable)return -ENOTSUPP ; - ret = host->clk_enable (host->pdev, &mmc->f_max); + ret = host->clk_enable (host);if (!ret) mmc->f_min = mmc->f_max /512 ;
@@ -1249,7 +1249,7 @@ int tmio_mmc_host_runtime_suspend(struct device *dev)tmio_mmc_clk_stop (host);if (host->clk_disable) - host->clk_disable (host->pdev); + host->clk_disable (host);return 0 ; }
Signature · 1 line
2.7.4
PATCH 11/83 mmc: tmio, sh_mobile_sdhi: Add support for variable input clock frequency
In reply to Biju DasFrom: Ben Hutchings <[email protected]>
commit 2fb55956ce4db259a5d6ce41cc32368b5055575e upstream.
Currently tmio_mmc assumes that the input clock frequency is fixed and only its own clock divider can be changed. This is not true in the case of sh_mobile_sdhi; we can use the clock API to change it.
In tmio_mmc:
- Delegate setting of f_min from tmio to the clk_enable operation (if implemented), as it can be smaller than f_max / 512
- Add an optional clk_update operation called from tmio_mmc_set_clock() that updates the input clock frequency
- Rename tmio_mmc_clk_update() to tmio_mmc_clk_enable(), to avoid confusion with the clk_update operation
In sh_mobile_sdhi:
- Make the setting of f_max conditional; it should be set through the max-frequency property in the device tree in future
- Set f_min based on the input clock's minimum frequency
- Implement the clk_update operation, selecting the best input clock frequency for the bus frequency that's wanted
sh_mobile_sdhi_clk_update() is loosely based on Kuninori Morimoto's work in sh_mmcif.
--- drivers/mmc/host/sh_mobile_sdhi.c | 56 +++++++++++++++++++++++++++++++++++++-- drivers/mmc/host/tmio_mmc.h | 2 ++ drivers/mmc/host/tmio_mmc_pio.c | 24 +++++++---------- 3 files changed, 66 insertions(+), 16 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +54 -2
@@ -140,7 +140,20 @@ static int sh_mobile_sdhi_clk_enable(struct tmio_mmc_host *host)if (ret <0 )return ret; - mmc->f_max =clk_get_rate (priv->clk); +/* +* The clock driver may not know what maximum frequency +* actually works, so it should be set with the max-frequency +* property which will already have been read to f_max. If it +* was missing, assume the current frequency is the maximum. +*/ +if (!mmc->f_max) + mmc->f_max =clk_get_rate (priv->clk); + +/* +* Minimum frequency is the minimum input clock frequency +* divided by our maximum divider. +*/ + mmc->f_min =max (clk_round_rate (priv->clk,1 ) /512 ,1L );/* enable 16bit data access on SDBUF as default */ sh_mobile_sdhi_sdbuf_width (host,16 );
@@ -148,6 +161,44 @@ static int sh_mobile_sdhi_clk_enable(struct tmio_mmc_host *host)return 0 ; } +static unsigned int sh_mobile_sdhi_clk_update (struct tmio_mmc_host *host, +unsigned int new_clock) +{ +struct sh_mobile_sdhi *priv =host_to_priv (host); +unsigned int freq, best_freq, diff_min, diff; +int i; + + diff_min = ~0 ; + best_freq =0 ; + +/* +* We want the bus clock to be as close as possible to, but no +* greater than, new_clock. As we can divide by 1 << i for +* any i in [0, 9] we want the input clock to be as close as +* possible, but no greater than, new_clock << i. +*/ +for (i =min (9 ,ilog2 (UINT_MAX / new_clock)); i >=0 ; i--) { + freq =clk_round_rate (priv->clk, new_clock << i); +if (freq > (new_clock << i)) { +/* Too fast; look for a slightly slower option */ + freq =clk_round_rate (priv->clk, + (new_clock << i) /4 *3 ); +if (freq > (new_clock << i)) +continue ; + } + + diff = new_clock - (freq >> i); +if (diff <= diff_min) { + best_freq = freq; + diff_min = diff; + } + } + +clk_set_rate (priv->clk, best_freq); + +return best_freq; +} +static void sh_mobile_sdhi_clk_disable (struct tmio_mmc_host *host) {struct sh_mobile_sdhi *priv =host_to_priv (host);
@@ -265,6 +316,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) host->dma = dma_priv; host->write16_hook = sh_mobile_sdhi_write16_hook; host->clk_enable = sh_mobile_sdhi_clk_enable; + host->clk_update = sh_mobile_sdhi_clk_update; host->clk_disable = sh_mobile_sdhi_clk_disable; host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk;
@@ -362,7 +414,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) } } -dev_info (&pdev->dev,"%s base at 0x%08lx clock rate %u MHz\n" , +dev_info (&pdev->dev,"%s base at 0x%08lx max clock rate %u MHz\n" ,mmc_hostname (host->mmc), (unsigned long ) (platform_get_resource (pdev,IORESOURCE_MEM ,0 )->start), host->mmc->f_max /1000000 );
drivers/mmc/host/tmio_mmc.h +2 -0
@@ -96,6 +96,8 @@ struct tmio_mmc_host {int (*write16_hook)(struct tmio_mmc_host *host,int addr);int (*clk_enable)(struct tmio_mmc_host *host); +unsigned int (*clk_update)(struct tmio_mmc_host *host, +unsigned int new_clock);void (*clk_disable)(struct tmio_mmc_host *host);int (*multi_io_quirk)(struct mmc_card *card,unsigned int direction,int blk_size);
drivers/mmc/host/tmio_mmc_pio.c +10 -14
@@ -160,9 +160,12 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,u32 clk =0 , clock;if (new_clock) { -for (clock = host->mmc->f_min, clk =0x80000080 ; - new_clock >= (clock <<1 ); - clk >>=1 ) +if (host->clk_update) + clock = host->clk_update (host, new_clock) /512 ; +else + clock = host->mmc->f_min; + +for (clk =0x80000080 ; new_clock >= (clock <<1 ); clk >>=1 ) clock <<=1 ;/* 1/1 clock is option */
@@ -835,19 +838,12 @@ fail:pm_runtime_put_autosuspend (mmc_dev (mmc)); } -static int tmio_mmc_clk_update (struct tmio_mmc_host *host) +static int tmio_mmc_clk_enable (struct tmio_mmc_host *host) { -struct mmc_host *mmc = host->mmc; -int ret; -if (!host->clk_enable)return -ENOTSUPP ; - ret = host->clk_enable (host); -if (!ret) - mmc->f_min = mmc->f_max /512 ; - -return ret; +return host->clk_enable (host); }static void tmio_mmc_power_on (struct tmio_mmc_host *host,unsigned short vdd)
@@ -1133,7 +1129,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, mmc->caps &MMC_CAP_NONREMOVABLE || mmc->slot.cd_irq >= 0); -if (tmio_mmc_clk_update (_host) <0 ) { +if (tmio_mmc_clk_enable (_host) <0 ) { mmc->f_max = pdata->hclk; mmc->f_min = mmc->f_max /512 ; }
@@ -1261,7 +1257,7 @@ int tmio_mmc_host_runtime_resume(struct device *dev)struct tmio_mmc_host *host =mmc_priv (mmc);tmio_mmc_reset (host); -tmio_mmc_clk_update (host); +tmio_mmc_clk_enable (host);if (host->clk_cache) {tmio_mmc_set_clock (host, host->clk_cache);
Signature · 1 line
2.7.4
PATCH 12/83 mmc: tmio: Add UHS-I mode support
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 452e5eef6d311e52f657b34d999758107ec3dd4a upstream.
Based on work by Shinobu Uehara and Ben Dooks. This adds the voltage switch operation needed for all UHS-I modes, but not the tuning needed for SDR-104 which will come later.
--- drivers/mmc/host/tmio_mmc.h | 2 ++ drivers/mmc/host/tmio_mmc_pio.c | 12 +++++++++++- include/linux/mmc/tmio.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc.h +2 -0
@@ -101,6 +101,8 @@ struct tmio_mmc_host {void (*clk_disable)(struct tmio_mmc_host *host);int (*multi_io_quirk)(struct mmc_card *card,unsigned int direction,int blk_size); +int (*start_signal_voltage_switch)(struct mmc_host *mmc, +struct mmc_ios *ios); };struct tmio_mmc_host *tmio_mmc_host_alloc (struct platform_device *pdev);
drivers/mmc/host/tmio_mmc_pio.c +11 -1
@@ -1010,12 +1010,20 @@ static int tmio_multi_io_quirk(struct mmc_card *card,return blk_size; } -static const struct mmc_host_ops tmio_mmc_ops = { +static int tmio_mmc_card_busy (struct mmc_host *mmc) +{ +struct tmio_mmc_host *host =mmc_priv (mmc); + +return !(sd_ctrl_read32 (host,CTL_STATUS2 ) &TMIO_STATUS2_DAT0 ); +} + +static struct mmc_host_ops tmio_mmc_ops = { .request = tmio_mmc_request, .set_ios = tmio_mmc_set_ios, .get_ro = tmio_mmc_get_ro, .get_cd = mmc_gpio_get_cd, .enable_sdio_irq = tmio_mmc_enable_sdio_irq, + .card_busy = tmio_mmc_card_busy, .multi_io_quirk = tmio_multi_io_quirk, };
@@ -1114,7 +1122,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, goto host_free; } + tmio_mmc_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch; mmc->ops = &tmio_mmc_ops; + mmc->caps |=MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; mmc->max_segs =32 ;
include/linux/mmc/tmio.h +2 -0
@@ -63,6 +63,8 @@#define TMIO_STAT_CMD_BUSY 0x40000000#define TMIO_STAT_ILL_ACCESS 0x80000000 +#define TMIO_STATUS2_DAT0 BIT(7) +#define CLK_CTL_DIV_MASK 0xff#define CLK_CTL_SCLKEN BIT(8)
Signature · 1 line
2.7.4
PATCH 13/83 mmc: sh_mobile_sdhi: Add UHS-I mode support
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 057a4592e6dbad0e571628968f3e20a3706e4701 upstream.
Implement voltage switch, supporting modes up to SDR-50.
Based on work by Shinobu Uehara, Rob Taylor, William Towle and Ian Molton.
--- Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 ++ drivers/mmc/host/sh_mobile_sdhi.c | 52 ++++++++++++++++++++++ 2 files changed, 55 insertions(+)
Documentation/devicetree/bindings/mmc/tmio_mmc.txt +3 -0
@@ -27,3 +27,6 @@ Required properties: Optional properties: - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable +- pinctrl-names: should be "default", "state_uhs" +- pinctrl-0: should contain default/high speed pin ctrl +- pinctrl-1: should contain uhs mode pin ctrl
drivers/mmc/host/sh_mobile_sdhi.c +52 -0
82 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 14/83 mmc: tmio: always start clock after frequency calculation
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 7fbc030da800d07193da4a4355ca2e197cf00cfb upstream.
Starting the clock is always done after frequency change anyhow, so we can do it directly after the clock calculation and remove the specific calls. This is the first part of doing proper clock de-/activation at calculation time.
--- drivers/mmc/host/tmio_mmc_pio.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +16 -18
@@ -154,6 +154,18 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) } } +static void tmio_mmc_clk_start (struct tmio_mmc_host *host) +{ +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN | +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); +msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 ); + +if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) { +sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0100 ); +msleep (10 ); + } +} +static void tmio_mmc_set_clock (struct tmio_mmc_host *host,unsigned int new_clock) {
@@ -182,6 +194,8 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &CLK_CTL_DIV_MASK );if (!(host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ))msleep (10 ); + +tmio_mmc_clk_start (host); }static void tmio_mmc_clk_stop (struct tmio_mmc_host *host)
@@ -196,18 +210,6 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); } -static void tmio_mmc_clk_start (struct tmio_mmc_host *host) -{ -sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN | -sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 ); - -if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) { -sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0100 ); -msleep (10 ); - } -} -static void tmio_mmc_reset (struct tmio_mmc_host *host) {/* FIXME - should we set stop clock reg here */
@@ -953,14 +955,12 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)tmio_mmc_clk_stop (host);break ;case MMC_POWER_UP : -tmio_mmc_set_clock (host, ios->clock);tmio_mmc_power_on (host, ios->vdd); -tmio_mmc_clk_start (host); +tmio_mmc_set_clock (host, ios->clock);tmio_mmc_set_bus_width (host, ios->bus_width);break ;case MMC_POWER_ON :tmio_mmc_set_clock (host, ios->clock); -tmio_mmc_clk_start (host);tmio_mmc_set_bus_width (host, ios->bus_width);break ; }
@@ -1269,10 +1269,8 @@ int tmio_mmc_host_runtime_resume(struct device *dev)tmio_mmc_reset (host);tmio_mmc_clk_enable (host); -if (host->clk_cache) { +if (host->clk_cache)tmio_mmc_set_clock (host, host->clk_cache); -tmio_mmc_clk_start (host); - }tmio_mmc_enable_dma (host, true);
Signature · 1 line
2.7.4
PATCH 15/83 mmc: tmio: stop clock when 0Hz is requested
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 148634d24d4a7dc82a49efcf1a215e1d0695f62c upstream.
Setting frequency to 0 is not enough, the clock explicitly has to be disabled. Otherwise voltage switching (which needs SDCLK to be quiet) fails for various cards.
Because we now do the 'new_clock == 0' check right at the beginning, the indentation level of the rest of the code can be decreased a little.
--- drivers/mmc/host/tmio_mmc_pio.c | 50 +++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +26 -24
@@ -166,25 +166,39 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host) } } +static void tmio_mmc_clk_stop (struct tmio_mmc_host *host) +{ +if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) { +sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0000 ); +msleep (10 ); + } + +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN & +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); +msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); +} +static void tmio_mmc_set_clock (struct tmio_mmc_host *host,unsigned int new_clock) {u32 clk =0 , clock; -if (new_clock) { -if (host->clk_update) - clock = host->clk_update (host, new_clock) /512 ; -else - clock = host->mmc->f_min; +if (new_clock ==0 ) { +tmio_mmc_clk_stop (host); +return ; + } -for (clk =0x80000080 ; new_clock >= (clock <<1 ); clk >>=1 ) - clock <<=1 ; +if (host->clk_update) + clock = host->clk_update (host, new_clock) /512 ; +else + clock = host->mmc->f_min; -/* 1/1 clock is option */ -if ((host->pdata->flags &TMIO_MMC_CLK_ACTUAL ) && - ((clk >>22 ) &0x1 )) - clk |=0xff ; - } +for (clk =0x80000080 ; new_clock >= (clock <<1 ); clk >>=1 ) + clock <<=1 ; + +/* 1/1 clock is option */ +if ((host->pdata->flags &TMIO_MMC_CLK_ACTUAL ) && ((clk >>22 ) &0x1 )) + clk |=0xff ;if (host->set_clk_div) host->set_clk_div (host->pdev, (clk >>22 ) &1 );
@@ -198,18 +212,6 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,tmio_mmc_clk_start (host); } -static void tmio_mmc_clk_stop (struct tmio_mmc_host *host) -{ -if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) { -sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0000 ); -msleep (10 ); - } - -sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN & -sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); -} -static void tmio_mmc_reset (struct tmio_mmc_host *host) {/* FIXME - should we set stop clock reg here */
Signature · 1 line
2.7.4
PATCH 15/83 mmc: tmio: stop clock when 0Hz is requested
Hi!
Quoted 8 lines
From: Wolfram Sang <[email protected]>
commit
148634d24d4a7dc82a49efcf1a215e1d0695f62cupstream.Setting frequency to 0 is not enough, the clock explicitly has to be disabled. Otherwise voltage switching (which needs SDCLK to be quiet) fails for various cards.
Quoted 7 lines
Because we now do the '
new_clock== 0' check right at the beginning, the indentation level of the rest of the code can be decreased a little.{
u32 clk = 0, clock;
clk = 0 initialization is never used.
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_clk_start(struct tmio_mmc_host *host) · line 197
Quoted 2 lines
drivers/mmc/host/tmio_mmc_pio.c +2
-0+for (clk =0x80000080 ; new_clock >= (clock <<1 ); clk >>=1 ) + clock <<=1 ;
This is black magic. Where does 0x80000080 come from? Would it be possible to get some comment/explanation?
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_clk_start(struct tmio_mmc_host *host) · line 204
Quoted 6 lines
drivers/mmc/host/tmio_mmc_pio.c +3
-0+/* 1/1 clock is option */ +if ((host->pdata->flags &TMIO_MMC_CLK_ACTUAL ) && ((clk >>22 ) &0x1 )) + clk |=0xff ;if (host->set_clk_div) host->set_clk_div (host->pdev, (clk >>22 ) &1 );
What does bit 22 in clk mean? Should it go to temporary variable with explanation? (Also it is & 1 in one operation and & 0x1 in other operation).
It seems that low bits of clk variable are used as an actual clock divider, with high bit doing something else. That is quite confusing...
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/ca8b7e64/attachment.sig>
PATCH 15/83 mmc: tmio: stop clock when 0Hz is requested
Hi Pavel,
Quoted 35 lines
Subject: Re: [PATCH 4.4.y-cip 15/83] mmc: tmio: stop clock when 0Hz is requested
Hi!
Quoted 8 lines
From: Wolfram Sang <[email protected]>
commit
148634d24d4a7dc82a49efcf1a215e1d0695f62cupstream.Setting frequency to 0 is not enough, the clock explicitly has to be disabled. Otherwise voltage switching (which needs SDCLK to be quiet) fails for various cards.
Quoted 7 lines
Because we now do the '
new_clock== 0' check right at the beginning, the indentation level of the rest of the code can be decreased a little.{
u32 clk = 0, clock;clk = 0 initialization is never used.
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_clk_start(struct tmio_mmc_host *host) · line 197
Quoted 2 lines
drivers/mmc/host/tmio_mmc_pio.c +2
-0+for (clk =0x80000080 ; new_clock >= (clock <<1 ); clk >>=1 ) + clock <<=1 ;This is black magic. Where does
0x80000080come from? Would it be possible to get some comment/explanation?Review
Quoted 2 lines
(quoted diff) +2
-0+ /* 1/1 clock is option */ + if ((host->pdata->flags & TMIO_MMC_CLK_ACTUAL) && ((clk >> 22)&
0x1))Quoted 2 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-0+ clk |=0xff ;
Quoted 8 lines
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_clk_start(struct tmio_mmc_host *host) · line 204
Quoted 2 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-0if (host->set_clk_div) host->set_clk_div (host->pdev, (clk >>22 ) &1 );What does bit 22 in clk mean? Should it go to temporary variable with explanation? (Also it is & 1 in one operation and &
0x1in other operation).It seems that low bits of clk variable are used as an actual clock divider, with high bit doing something else. That is quite confusing...
Yes I agree this could have been done with Macro. Not sure, may be because of HALA [SD Host/Ancillary Product License Agreement],
it is defined as magic number at that time.
Regards,
Biju
PATCH 16/83 mmc: tmio: Remove redundant runtime PM calls
In reply to Biju DasFrom: Ulf Hansson <[email protected]>
commit 6aef2eecc4d4c9edb8c8d3e3a7f6af3cee42b2ec upstream.
Commit 9250aea76bfc ("mmc: core: Enable runtime PM management of host devices"), made some calls to the runtime PM API from the driver redundant. Especially those which deals with runtime PM reference counting, so let's remove them.
--- drivers/mmc/host/tmio_mmc_pio.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +0 -19
@@ -271,9 +271,6 @@ static void tmio_mmc_reset_work(struct work_struct *work)tmio_mmc_abort_dma (host);mmc_request_done (host->mmc, mrq); - -pm_runtime_mark_last_busy (mmc_dev (host->mmc)); -pm_runtime_put_autosuspend (mmc_dev (host->mmc)); }/* called with host->lock held, interrupts disabled */
@@ -303,9 +300,6 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)tmio_mmc_abort_dma (host);mmc_request_done (host->mmc, mrq); - -pm_runtime_mark_last_busy (mmc_dev (host->mmc)); -pm_runtime_put_autosuspend (mmc_dev (host->mmc)); }static void tmio_mmc_done_work (struct work_struct *work)
@@ -817,8 +811,6 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)spin_unlock_irqrestore (&host->lock, flags); -pm_runtime_get_sync (mmc_dev (mmc)); -if (mrq->data) { ret =tmio_mmc_start_data (host, mrq->data);if (ret)
@@ -837,9 +829,6 @@ fail: host->mrq =NULL ; mrq->cmd->error = ret;mmc_request_done (mmc, mrq); - -pm_runtime_mark_last_busy (mmc_dev (mmc)); -pm_runtime_put_autosuspend (mmc_dev (mmc)); }static int tmio_mmc_clk_enable (struct tmio_mmc_host *host)
@@ -923,8 +912,6 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)struct device *dev = &host->pdev->dev;unsigned long flags; -pm_runtime_get_sync (mmc_dev (mmc)); -mutex_lock (&host->ios_lock);spin_lock_irqsave (&host->lock, flags);
@@ -979,9 +966,6 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->clk_cache = ios->clock;mutex_unlock (&host->ios_lock); - -pm_runtime_mark_last_busy (mmc_dev (mmc)); -pm_runtime_put_autosuspend (mmc_dev (mmc)); }static int tmio_mmc_get_ro (struct mmc_host *mmc)
@@ -992,11 +976,8 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc)if (ret >=0 )return ret; -pm_runtime_get_sync (mmc_dev (mmc)); ret = !((pdata->flags &TMIO_MMC_WRPROTECT_DISABLE ) || (sd_ctrl_read32 (host,CTL_STATUS ) &TMIO_STAT_WRPROTECT )); -pm_runtime_mark_last_busy (mmc_dev (mmc)); -pm_runtime_put_autosuspend (mmc_dev (mmc));return ret; }
Signature · 1 line
2.7.4
PATCH 17/83 mmc: sh_mobile_sdhi: remove obsolete irq_by_name registration
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit adcbc949046366edb46e44f72ac9197c32675cfd upstream.
There is no user left in the kernel, so this code can be removed. (Legacy, non-DT sh_mobile boards have been removed a while ago.) The
diff looks more complicated than it is: The if-block for multiplexed isr is now the main code path, the rest is removed.
--- drivers/mmc/host/sh_mobile_sdhi.c | 57 ++++++--------------------------------- 1 file changed, 8 insertions(+), 49 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +8 -49
@@ -28,7 +28,6 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/mmc/host.h> -#include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mfd/tmio.h> #include <linux/sh_dma.h> #include <linux/delay.h>
@@ -318,7 +317,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)struct tmio_mmc_host *host;struct resource *res;int irq, ret, i =0 ; -bool multiplexed_isr = true;struct tmio_mmc_dma *dma_priv; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -410,62 +408,23 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)if (ret <0 ) goto efree; -/* -* Allow one or more specific (named) ISRs or -* one or more multiplexed (un-named) ISRs. -*/ - - irq =platform_get_irq_byname (pdev,SH_MOBILE_SDHI_IRQ_CARD_DETECT ); -if (irq >=0 ) { - multiplexed_isr = false; - ret =devm_request_irq (&pdev->dev, irq, tmio_mmc_card_detect_irq,0 , +while (1 ) { + irq =platform_get_irq (pdev, i); +if (irq <0 ) +break ; + i++; + ret =devm_request_irq (&pdev->dev, irq, tmio_mmc_irq,0 ,dev_name (&pdev->dev), host);if (ret) goto eirq; } - irq =platform_get_irq_byname (pdev,SH_MOBILE_SDHI_IRQ_SDIO ); -if (irq >=0 ) { - multiplexed_isr = false; - ret =devm_request_irq (&pdev->dev, irq, tmio_mmc_sdio_irq,0 , -dev_name (&pdev->dev), host); -if (ret) - goto eirq; - } - - irq =platform_get_irq_byname (pdev,SH_MOBILE_SDHI_IRQ_SDCARD ); -if (irq >=0 ) { - multiplexed_isr = false; - ret =devm_request_irq (&pdev->dev, irq, tmio_mmc_sdcard_irq,0 , -dev_name (&pdev->dev), host); -if (ret) - goto eirq; - }else if (!multiplexed_isr) { -dev_err (&pdev->dev, -"Principal SD-card IRQ is missing among named interrupts\n" ); +/* There must be at least one IRQ source */ +if (!i) { ret = irq; goto eirq; } -if (multiplexed_isr) { -while (1 ) { - irq =platform_get_irq (pdev, i); -if (irq <0 ) -break ; - i++; - ret =devm_request_irq (&pdev->dev, irq, tmio_mmc_irq,0 , -dev_name (&pdev->dev), host); -if (ret) - goto eirq; - } - -/* There must be at least one IRQ source */ -if (!i) { - ret = irq; - goto eirq; - } - } - dev_info(&pdev->dev, "%s base at 0x%08lx max clock rate %u MHz\n", mmc_hostname(host->mmc), (unsigned long) (platform_get_resource(pdev, IORESOURCE_MEM, 0)->start),
Signature · 1 line
2.7.4
PATCH 18/83 mmc: tmio: remove now unneeded seperate irq handlers
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 4da986703882b2987b5731e8b31b88eece8c2fbb upstream.
We removed installation of separate handlers previously, so we can also remove the separate handlers.
--- drivers/mmc/host/tmio_mmc.h | 3 --- drivers/mmc/host/tmio_mmc_pio.c | 36 +++++++----------------------------- 2 files changed, 7 insertions(+), 32 deletions(-)
drivers/mmc/host/tmio_mmc.h +0 -3
@@ -115,9 +115,6 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host);void tmio_mmc_enable_mmc_irqs (struct tmio_mmc_host *host,u32 i);void tmio_mmc_disable_mmc_irqs (struct tmio_mmc_host *host,u32 i);irqreturn_t tmio_mmc_irq (int irq,void *devid); -irqreturn_t tmio_mmc_sdcard_irq (int irq,void *devid); -irqreturn_t tmio_mmc_card_detect_irq (int irq,void *devid); -irqreturn_t tmio_mmc_sdio_irq (int irq,void *devid);static inline char *tmio_mmc_kmap_atomic (struct scatterlist *sg,unsigned long *flags)
drivers/mmc/host/tmio_mmc_pio.c +7 -29
@@ -658,18 +658,6 @@ static bool __tmio_mmc_card_detect_irq(struct tmio_mmc_host *host,return false; } -irqreturn_t tmio_mmc_card_detect_irq (int irq,void *devid) -{ -unsigned int ireg, status; -struct tmio_mmc_host *host = devid; - -tmio_mmc_card_irq_status (host, &ireg, &status); -__tmio_mmc_card_detect_irq (host, ireg, status); - -return IRQ_HANDLED ; -} -EXPORT_SYMBOL (tmio_mmc_card_detect_irq); -static bool __tmio_mmc_sdcard_irq (struct tmio_mmc_host *host,int ireg,int status) {
@@ -699,19 +687,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,return false; } -irqreturn_t tmio_mmc_sdcard_irq (int irq,void *devid) -{ -unsigned int ireg, status; -struct tmio_mmc_host *host = devid; - -tmio_mmc_card_irq_status (host, &ireg, &status); -__tmio_mmc_sdcard_irq (host, ireg, status); - -return IRQ_HANDLED ; -} -EXPORT_SYMBOL (tmio_mmc_sdcard_irq); - -irqreturn_t tmio_mmc_sdio_irq (int irq,void *devid) +static bool tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;
@@ -720,7 +696,7 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)unsigned int sdio_status;if (!(pdata->flags &TMIO_MMC_SDIO_IRQ )) -return IRQ_NONE ; +return false; status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ); ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask;
@@ -734,9 +710,8 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)if (mmc->caps &MMC_CAP_SDIO_IRQ && ireg &TMIO_SDIO_STAT_IOIRQ )mmc_signal_sdio_irq (mmc); -return IRQ_RETVAL (ireg); +return ireg; } -EXPORT_SYMBOL (tmio_mmc_sdio_irq);irqreturn_t tmio_mmc_irq (int irq,void *devid) {
@@ -751,7 +726,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)if (__tmio_mmc_sdcard_irq (host, ireg, status))return IRQ_HANDLED ; -return tmio_mmc_sdio_irq (irq, devid); +if (tmio_mmc_sdio_irq (irq, devid)) +return IRQ_HANDLED ; + +return IRQ_NONE ; }EXPORT_SYMBOL (tmio_mmc_irq);
Signature · 1 line
2.7.4
PATCH 18/83 mmc: tmio: remove now unneeded seperate irq handlers
Hi!
Quoted 19 lines
We removed installation of separate handlers previously, so we can also remove the separate handlers.
drivers/mmc/host/tmio_mmc_pio.c +2
-3- -irqreturn_t tmio_mmc_sdio_irq (int irq,void *devid) +static bool tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;@@ -720,7 +696,7 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)unsigned int sdio_status;if (!(pdata->flags &TMIO_MMC_SDIO_IRQ )) -return IRQ_NONE ; +return false; status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ); ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask;
drivers/mmc/host/tmio_mmc_pio.c irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid) · line 714
Quoted 6 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-1@@ -734,9 +710,8 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)if (mmc->caps &MMC_CAP_SDIO_IRQ && ireg &TMIO_SDIO_STAT_IOIRQ )mmc_signal_sdio_irq (mmc); -return IRQ_RETVAL (ireg); +return ireg; }
I'm not a great fan of function conversion to boolean here. With irqreturn_t it is clear what the values area; it is more ambiguous with the bool.
drivers/mmc/host/tmio_mmc_pio.c irqreturn_t tmio_mmc_irq(int irq, void *devid) · line 733
Quoted 10 lines
drivers/mmc/host/tmio_mmc_pio.c +4
-1@@ -751,7 +726,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)if (__tmio_mmc_sdcard_irq (host, ireg, status))return IRQ_HANDLED ; -return tmio_mmc_sdio_irq (irq, devid); +if (tmio_mmc_sdio_irq (irq, devid)) +return IRQ_HANDLED ; + +return IRQ_NONE ; }
And it is converted right back into irqreturn_t here, anyway...
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/c39ee09f/attachment.sig>
PATCH 18/83 mmc: tmio: remove now unneeded seperate irq handlers
Hi Pavel,
Quoted 40 lines
Subject: Re: [PATCH 4.4.y-cip 18/83] mmc: tmio: remove now unneeded seperate irq handlers
Hi!
Quoted 10 lines
We removed installation of separate handlers previously, so we can also remove the separate handlers.
drivers/mmc/host/tmio_mmc_pio.c +1
-2- -irqreturn_t tmio_mmc_sdio_irq (int irq,void *devid) +static bool tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;drivers/mmc/host/tmio_mmc_pio.c irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid) · line 702
Quoted 8 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-1@@ -720,7 +696,7 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)unsigned int sdio_status;if (!(pdata->flags &TMIO_MMC_SDIO_IRQ )) -return IRQ_NONE ; +return false; status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ); ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask;@@
Quoted 2 lines
-734,9 +710,8 @@
irqreturn_ttmio_mmc_sdio_irq(int irq, void *devid)
if (mmc->caps&MMC_CAP_SDIO_IRQ&& ireg &
TMIO_SDIO_STAT_IOIRQ)drivers/mmc/host/tmio_mmc_pio.c irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid) · line 714
Quoted 5 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-1mmc_signal_sdio_irq (mmc); -return IRQ_RETVAL (ireg); +return ireg; }I'm not a great fan of function conversion to boolean here. With
irqreturn_tit is clear what the values area; it is more ambiguous with the bool.Quoted 4 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-0@@ -751,7 +726,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)if (__tmio_mmc_sdcard_irq (host, ireg, status))return IRQ_HANDLED ;
Quoted 8 lines
drivers/mmc/host/tmio_mmc_pio.c irqreturn_t tmio_mmc_irq(int irq, void *devid) · line 733
Quoted 6 lines
drivers/mmc/host/tmio_mmc_pio.c +4
-1-return tmio_mmc_sdio_irq (irq, devid); +if (tmio_mmc_sdio_irq (irq, devid)) +return IRQ_HANDLED ; + +return IRQ_NONE ; }And it is converted right back into
irqreturn_there, anyway...
Yes, it looks ok now.
Regards,
Biju
PATCH 19/83 mmc: tmio: simplify irq handler
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 958401266e5812619b04765bef23712a72badd55 upstream.
Having just one irq handler again, let's include the 'card_status' function in the main handler which is way more readable. Drop a useless debug output while here. It should be a dev_dbg in case we ever need it again.
--- drivers/mmc/host/tmio_mmc_pio.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +8 -15
@@ -626,19 +626,6 @@ out:spin_unlock (&host->lock); } -static void tmio_mmc_card_irq_status (struct tmio_mmc_host *host, -int *ireg,int *status) -{ - *status =sd_ctrl_read32 (host,CTL_STATUS ); - *ireg = *status &TMIO_MASK_IRQ & ~host->sdcard_irq_mask; - -pr_debug_status (*status); -pr_debug_status (*ireg); - -/* Clear the status except the interrupt status */ -sd_ctrl_write32 (host,CTL_STATUS ,TMIO_MASK_IRQ ); -} -static bool __tmio_mmc_card_detect_irq (struct tmio_mmc_host *host,int ireg,int status) {
@@ -718,9 +705,15 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)struct tmio_mmc_host *host = devid;unsigned int ireg, status; -pr_debug ("MMC IRQ begin\n" ); + status =sd_ctrl_read32 (host,CTL_STATUS ); + ireg = status &TMIO_MASK_IRQ & ~host->sdcard_irq_mask; + +pr_debug_status (status); +pr_debug_status (ireg); + +/* Clear the status except the interrupt status */ +sd_ctrl_write32 (host,CTL_STATUS ,TMIO_MASK_IRQ ); -tmio_mmc_card_irq_status (host, &ireg, &status);if (__tmio_mmc_card_detect_irq (host, ireg, status))return IRQ_HANDLED ;if (__tmio_mmc_sdcard_irq (host, ireg, status))
Signature · 1 line
2.7.4
PATCH 20/83 mmc: tmio: merge distributed include files
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit ac86045ee9cd89774030ff1c21c7ff35f1c1eeaa upstream.
There is no reason to have a public and private header file. Merge them into a private one, so looking up symbols is less confusing.
--- drivers/mmc/host/tmio_mmc.h | 56 ++++++++++++++++++++++++++++++- drivers/mmc/host/tmio_mmc_dma.c | 1 - drivers/mmc/host/tmio_mmc_pio.c | 1 - include/linux/mmc/tmio.h | 73 ----------------------------------------- 4 files changed, 55 insertions(+), 76 deletions(-) delete mode 100644 include/linux/mmc/tmio.h
drivers/mmc/host/tmio_mmc.h +55 -1
@@ -1,6 +1,8 @@/* * linux/drivers/mmc/host/tmio_mmc.h * +* Copyright (C) 2016 Sang Engineering, Wolfram Sang +* Copyright (C) 2015-16 Renesas Electronics Corporation * Copyright (C) 2007 Ian Molton * Copyright (C) 2004 Ian Molton *
@@ -18,12 +20,64 @@#include <linux/dmaengine.h> #include <linux/highmem.h> -#include <linux/mmc/tmio.h> #include <linux/mutex.h> #include <linux/pagemap.h> #include <linux/scatterlist.h> #include <linux/spinlock.h> +#define CTL_SD_CMD 0x00 +#define CTL_ARG_REG 0x04 +#define CTL_STOP_INTERNAL_ACTION 0x08 +#define CTL_XFER_BLK_COUNT 0xa +#define CTL_RESPONSE 0x0c +#define CTL_STATUS 0x1c +#define CTL_STATUS2 0x1e +#define CTL_IRQ_MASK 0x20 +#define CTL_SD_CARD_CLK_CTL 0x24 +#define CTL_SD_XFER_LEN 0x26 +#define CTL_SD_MEM_CARD_OPT 0x28 +#define CTL_SD_ERROR_DETAIL_STATUS 0x2c +#define CTL_SD_DATA_PORT 0x30 +#define CTL_TRANSACTION_CTL 0x34 +#define CTL_SDIO_STATUS 0x36 +#define CTL_SDIO_IRQ_MASK 0x38 +#define CTL_DMA_ENABLE 0xd8 +#define CTL_RESET_SD 0xe0 +#define CTL_VERSION 0xe2 +#define CTL_SDIO_REGS 0x100 +#define CTL_CLK_AND_WAIT_CTL 0x138 +#define CTL_RESET_SDIO 0x1e0 + +/* Definitions for values the CTRL_STATUS register can take. */ +#define TMIO_STAT_CMDRESPEND 0x00000001 +#define TMIO_STAT_DATAEND 0x00000004 +#define TMIO_STAT_CARD_REMOVE 0x00000008 +#define TMIO_STAT_CARD_INSERT 0x00000010 +#define TMIO_STAT_SIGSTATE 0x00000020 +#define TMIO_STAT_WRPROTECT 0x00000080 +#define TMIO_STAT_CARD_REMOVE_A 0x00000100 +#define TMIO_STAT_CARD_INSERT_A 0x00000200 +#define TMIO_STAT_SIGSTATE_A 0x00000400 +#define TMIO_STAT_CMD_IDX_ERR 0x00010000 +#define TMIO_STAT_CRCFAIL 0x00020000 +#define TMIO_STAT_STOPBIT_ERR 0x00040000 +#define TMIO_STAT_DATATIMEOUT 0x00080000 +#define TMIO_STAT_RXOVERFLOW 0x00100000 +#define TMIO_STAT_TXUNDERRUN 0x00200000 +#define TMIO_STAT_CMDTIMEOUT 0x00400000 +#define TMIO_STAT_RXRDY 0x01000000 +#define TMIO_STAT_TXRQ 0x02000000 +#define TMIO_STAT_ILL_FUNC 0x20000000 +#define TMIO_STAT_CMD_BUSY 0x40000000 +#define TMIO_STAT_ILL_ACCESS 0x80000000 + +#define TMIO_STATUS2_DAT0 BIT(7) + +#define CLK_CTL_DIV_MASK 0xff +#define CLK_CTL_SCLKEN BIT(8) + +#define TMIO_BBS 512/* Boot block size */ +/* Definitions for values the CTRL_SDIO_STATUS register can take. */ #define TMIO_SDIO_STAT_IOIRQ 0x0001#define TMIO_SDIO_STAT_EXPUB52 0x4000
drivers/mmc/host/tmio_mmc_dma.c +0 -1
@@ -15,7 +15,6 @@#include <linux/dmaengine.h> #include <linux/mfd/tmio.h> #include <linux/mmc/host.h> -#include <linux/mmc/tmio.h> #include <linux/pagemap.h> #include <linux/scatterlist.h>
drivers/mmc/host/tmio_mmc_pio.c +0 -1
@@ -39,7 +39,6 @@#include <linux/mmc/host.h> #include <linux/mmc/mmc.h> #include <linux/mmc/slot-gpio.h> -#include <linux/mmc/tmio.h> #include <linux/module.h> #include <linux/pagemap.h> #include <linux/platform_device.h>
include/linux/mmc/tmio.h deleted +0 -73
73 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 21/83 mmc: tmio: give read32/write32 functions more descriptive names
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 2c54506b769d0633aac8f0511ef23f76bedeec9e upstream.
Looking at the backlogs, I am not the only one who missed that the above functions do not read u32 from one register, but create a virtual u32 from reading to adjacent u16 registers (which depending on 'bus_shift' can be up to 8 byte apart). Because this driver supports old hardware for which we don't have documentation, I first wrongly assumed there was a variant which had a few u32 registers. Let's give the functions more descriptive names to make it more obvious what is happening.
--- drivers/mmc/host/tmio_mmc.h | 5 ++--- drivers/mmc/host/tmio_mmc_pio.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-)
drivers/mmc/host/tmio_mmc.h +2 -3
@@ -232,7 +232,7 @@ static inline void sd_ctrl_read16_rep(struct tmio_mmc_host *host, int addr,readsw (host->ctl + (addr << host->bus_shift), buf, count); } -static inline u32 sd_ctrl_read32 (struct tmio_mmc_host *host,int addr) +static inline u32 sd_ctrl_read16_and_16_as_32 (struct tmio_mmc_host *host,int addr) {return readw (host->ctl + (addr << host->bus_shift)) |readw (host->ctl + ((addr +2 ) << host->bus_shift)) <<16 ;
@@ -254,11 +254,10 @@ static inline void sd_ctrl_write16_rep(struct tmio_mmc_host *host, int addr, writesw(host->ctl + (addr << host->bus_shift), buf, count); } -static inline void sd_ctrl_write32 (struct tmio_mmc_host *host,int addr,u32 val) +static inline void sd_ctrl_write32_as_16_and_16 (struct tmio_mmc_host *host,int addr,u32 val) {writew (val, host->ctl + (addr << host->bus_shift));writew (val >>16 , host->ctl + ((addr +2 ) << host->bus_shift)); } -#endif
drivers/mmc/host/tmio_mmc_pio.c +11 -11
@@ -55,18 +55,18 @@void tmio_mmc_enable_mmc_irqs (struct tmio_mmc_host *host,u32 i) { host->sdcard_irq_mask &= ~(i &TMIO_MASK_IRQ ); -sd_ctrl_write32 (host,CTL_IRQ_MASK , host->sdcard_irq_mask); +sd_ctrl_write32_as_16_and_16 (host,CTL_IRQ_MASK , host->sdcard_irq_mask); }void tmio_mmc_disable_mmc_irqs (struct tmio_mmc_host *host,u32 i) { host->sdcard_irq_mask |= (i &TMIO_MASK_IRQ ); -sd_ctrl_write32 (host,CTL_IRQ_MASK , host->sdcard_irq_mask); +sd_ctrl_write32_as_16_and_16 (host,CTL_IRQ_MASK , host->sdcard_irq_mask); }static void tmio_mmc_ack_mmc_irqs (struct tmio_mmc_host *host,u32 i) { -sd_ctrl_write32 (host,CTL_STATUS , ~i); +sd_ctrl_write32_as_16_and_16 (host,CTL_STATUS , ~i); }static void tmio_mmc_init_sg (struct tmio_mmc_host *host,struct mmc_data *data)
@@ -375,7 +375,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_commandtmio_mmc_enable_mmc_irqs (host, irq_mask);/* Fire off the command */ -sd_ctrl_write32 (host,CTL_ARG_REG , cmd->arg); +sd_ctrl_write32_as_16_and_16 (host,CTL_ARG_REG , cmd->arg);sd_ctrl_write16 (host,CTL_SD_CMD , c);return 0 ;
@@ -530,7 +530,7 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host) goto out;if (host->chan_tx && (data->flags &MMC_DATA_WRITE ) && !host->force_pio) { -u32 status =sd_ctrl_read32 (host,CTL_STATUS ); +u32 status =sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS );bool done = false;/*
@@ -585,7 +585,7 @@ static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,*/ for (i =3 , addr =CTL_RESPONSE ; i >=0 ; i--, addr +=4 ) - cmd->resp[i] =sd_ctrl_read32 (host, addr); + cmd->resp[i] =sd_ctrl_read16_and_16_as_32 (host, addr);if (cmd->flags &MMC_RSP_136 ) { cmd->resp[0 ] = (cmd->resp[0 ] <<8 ) | (cmd->resp[1 ] >>24 );
@@ -704,14 +704,14 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)struct tmio_mmc_host *host = devid;unsigned int ireg, status; - status =sd_ctrl_read32 (host,CTL_STATUS ); + status =sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ); ireg = status &TMIO_MASK_IRQ & ~host->sdcard_irq_mask;pr_debug_status (status);pr_debug_status (ireg);/* Clear the status except the interrupt status */ -sd_ctrl_write32 (host,CTL_STATUS ,TMIO_MASK_IRQ ); +sd_ctrl_write32_as_16_and_16 (host,CTL_STATUS ,TMIO_MASK_IRQ );if (__tmio_mmc_card_detect_irq (host, ireg, status))return IRQ_HANDLED ;
@@ -947,7 +947,7 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc)return ret; ret = !((pdata->flags &TMIO_MMC_WRPROTECT_DISABLE ) || - (sd_ctrl_read32 (host,CTL_STATUS ) &TMIO_STAT_WRPROTECT )); + (sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) &TMIO_STAT_WRPROTECT ));return ret; }
@@ -967,7 +967,7 @@ static int tmio_mmc_card_busy(struct mmc_host *mmc) {struct tmio_mmc_host *host =mmc_priv (mmc); -return !(sd_ctrl_read32 (host,CTL_STATUS2 ) &TMIO_STATUS2_DAT0 ); +return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS2 ) &TMIO_STATUS2_DAT0 ); }static struct mmc_host_ops tmio_mmc_ops = {
@@ -1116,7 +1116,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,tmio_mmc_clk_stop (_host);tmio_mmc_reset (_host); - _host->sdcard_irq_mask =sd_ctrl_read32 (_host,CTL_IRQ_MASK ); + _host->sdcard_irq_mask =sd_ctrl_read16_and_16_as_32 (_host,CTL_IRQ_MASK );tmio_mmc_disable_mmc_irqs (_host,TMIO_MASK_ALL );/* Unmask the IRQs we want to know about */
Signature · 1 line
2.7.4
PATCH 22/83 mmc: tmio: use BIT() within defines
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 2cafc5cb4fcbe648d0d16ec5039ee292d85d7bfa upstream.
BIT() makes it easier to match the bits to the datasheet. This is especially important here, since some variants have different names in their datasheets (like with Renesas R-Car).
--- drivers/mmc/host/tmio_mmc.h | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
drivers/mmc/host/tmio_mmc.h +23 -21
@@ -49,27 +49,29 @@#define CTL_RESET_SDIO 0x1e0/* Definitions for values the CTRL_STATUS register can take. */ -#define TMIO_STAT_CMDRESPEND 0x00000001 -#define TMIO_STAT_DATAEND 0x00000004 -#define TMIO_STAT_CARD_REMOVE 0x00000008 -#define TMIO_STAT_CARD_INSERT 0x00000010 -#define TMIO_STAT_SIGSTATE 0x00000020 -#define TMIO_STAT_WRPROTECT 0x00000080 -#define TMIO_STAT_CARD_REMOVE_A 0x00000100 -#define TMIO_STAT_CARD_INSERT_A 0x00000200 -#define TMIO_STAT_SIGSTATE_A 0x00000400 -#define TMIO_STAT_CMD_IDX_ERR 0x00010000 -#define TMIO_STAT_CRCFAIL 0x00020000 -#define TMIO_STAT_STOPBIT_ERR 0x00040000 -#define TMIO_STAT_DATATIMEOUT 0x00080000 -#define TMIO_STAT_RXOVERFLOW 0x00100000 -#define TMIO_STAT_TXUNDERRUN 0x00200000 -#define TMIO_STAT_CMDTIMEOUT 0x00400000 -#define TMIO_STAT_RXRDY 0x01000000 -#define TMIO_STAT_TXRQ 0x02000000 -#define TMIO_STAT_ILL_FUNC 0x20000000 -#define TMIO_STAT_CMD_BUSY 0x40000000 -#define TMIO_STAT_ILL_ACCESS 0x80000000 +#define TMIO_STAT_CMDRESPEND BIT(0) +#define TMIO_STAT_DATAEND BIT(2) +#define TMIO_STAT_CARD_REMOVE BIT(3) +#define TMIO_STAT_CARD_INSERT BIT(4) +#define TMIO_STAT_SIGSTATE BIT(5) +#define TMIO_STAT_WRPROTECT BIT(7) +#define TMIO_STAT_CARD_REMOVE_A BIT(8) +#define TMIO_STAT_CARD_INSERT_A BIT(9) +#define TMIO_STAT_SIGSTATE_A BIT(10) + +/* These belong technically to CTRL_STATUS2, but the driver merges them */ +#define TMIO_STAT_CMD_IDX_ERR BIT(16) +#define TMIO_STAT_CRCFAIL BIT(17) +#define TMIO_STAT_STOPBIT_ERR BIT(18) +#define TMIO_STAT_DATATIMEOUT BIT(19) +#define TMIO_STAT_RXOVERFLOW BIT(20) +#define TMIO_STAT_TXUNDERRUN BIT(21) +#define TMIO_STAT_CMDTIMEOUT BIT(22) +#define TMIO_STAT_RXRDY BIT(24) +#define TMIO_STAT_TXRQ BIT(25) +#define TMIO_STAT_ILL_FUNC BIT(29) +#define TMIO_STAT_CMD_BUSY BIT(30) +#define TMIO_STAT_ILL_ACCESS BIT(31)#define TMIO_STATUS2_DAT0 BIT(7)
Signature · 1 line
2.7.4
PATCH 23/83 mmc: tmio: use CTL_STATUS consistently
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 83e95351d49f60d6cf37706bf94529116d03e648 upstream.
To prevent confusion, use the virtual u32 CTL_STATUS in card_busy() the same way as in other parts of this driver.
--- drivers/mmc/host/tmio_mmc.h | 3 +-- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/mmc/host/tmio_mmc.h +1 -2
@@ -67,14 +67,13 @@#define TMIO_STAT_RXOVERFLOW BIT(20)#define TMIO_STAT_TXUNDERRUN BIT(21)#define TMIO_STAT_CMDTIMEOUT BIT(22) +#define TMIO_STAT_DAT0 BIT(23)/* only known on R-Car so far */ #define TMIO_STAT_RXRDY BIT(24)#define TMIO_STAT_TXRQ BIT(25)#define TMIO_STAT_ILL_FUNC BIT(29)#define TMIO_STAT_CMD_BUSY BIT(30)#define TMIO_STAT_ILL_ACCESS BIT(31) -#define TMIO_STATUS2_DAT0 BIT(7) -#define CLK_CTL_DIV_MASK 0xff#define CLK_CTL_SCLKEN BIT(8)
drivers/mmc/host/tmio_mmc_pio.c +1 -1
@@ -967,7 +967,7 @@ static int tmio_mmc_card_busy(struct mmc_host *mmc) {struct tmio_mmc_host *host =mmc_priv (mmc); -return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS2 ) &TMIO_STATUS2_DAT0 ); +return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) &TMIO_STAT_DAT0 ); }static struct mmc_host_ops tmio_mmc_ops = {
Signature · 1 line
2.7.4
PATCH 24/83 mmc: tmio/sdhi: distinguish between SCLKDIVEN and ILL_FUNC
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit a21553c9e0c236ae241d9f4333aafae24ae19dfc upstream.
This bit has a different meaning in SDHI and original TMIO. Document that and use the proper naming.
--- drivers/mmc/host/sh_mobile_sdhi.c | 3 ++- drivers/mmc/host/tmio_mmc.h | 3 ++- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +2 -1
@@ -252,7 +252,8 @@ static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host) {int timeout =1000 ; -while (--timeout && !(sd_ctrl_read16 (host,CTL_STATUS2 ) & (1 <<13 ))) +while (--timeout && !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) + &TMIO_STAT_SCLKDIVEN ))udelay (1 );if (!timeout) {
drivers/mmc/host/tmio_mmc.h +2 -1
@@ -70,7 +70,8 @@#define TMIO_STAT_DAT0 BIT(23)/* only known on R-Car so far */ #define TMIO_STAT_RXRDY BIT(24)#define TMIO_STAT_TXRQ BIT(25) -#define TMIO_STAT_ILL_FUNC BIT(29) +#define TMIO_STAT_ILL_FUNC BIT(29)/* only when !TMIO_MMC_HAS_IDLE_WAIT */ +#define TMIO_STAT_SCLKDIVEN BIT(29)/* only when TMIO_MMC_HAS_IDLE_WAIT */ #define TMIO_STAT_CMD_BUSY BIT(30)#define TMIO_STAT_ILL_ACCESS BIT(31)
drivers/mmc/host/tmio_mmc_pio.c +1 -1
@@ -542,7 +542,7 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host)* waiting for one more interrupt fixes the problem. */ if (host->pdata->flags &TMIO_MMC_HAS_IDLE_WAIT ) { -if (status &TMIO_STAT_ILL_FUNC ) +if (status &TMIO_STAT_SCLKDIVEN ) done = true; }else {if (!(status &TMIO_STAT_CMD_BUSY ))
Signature · 1 line
2.7.4
PATCH 25/83 mmc: tmio: document CTL_STATUS handling
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 184adf202bca05ca34380cb53b349307aede7ef3 upstream.
Now that reading CTL_STATUS is consistent, we can remove CTL_STATUS2 and document how this is handled internally.
--- drivers/mmc/host/tmio_mmc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc.h +2 -1
@@ -30,8 +30,9 @@#define CTL_STOP_INTERNAL_ACTION 0x08#define CTL_XFER_BLK_COUNT 0xa#define CTL_RESPONSE 0x0c +/* driver merges STATUS and following STATUS2 */ #define CTL_STATUS 0x1c -#define CTL_STATUS2 0x1e +/* driver merges IRQ_MASK and following IRQ_MASK2 */ #define CTL_IRQ_MASK 0x20#define CTL_SD_CARD_CLK_CTL 0x24#define CTL_SD_XFER_LEN 0x26
Signature · 1 line
2.7.4
PATCH 26/83 mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 3d376fb2ea907f0c1bbccf87125456439feb4ed4 upstream.
RCar Gen2 and later implementations of TMIO/SDHI have their own set of features and additions. FAST_CLK_CHG is just one of them and I see a few others being added soon. Some may work on older chipsets but this needs to be tested case by case. Instead of adding a bunch of flags for each feature, add a global RCar2+ one for now. We can still break out features if the need arises.
--- drivers/mmc/host/sh_mobile_sdhi.c | 4 ++-- drivers/mmc/host/tmio_mmc_pio.c | 6 +++--- include/linux/mfd/tmio.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +2 -2
@@ -64,7 +64,7 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = {static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { .tmio_flags =TMIO_MMC_HAS_IDLE_WAIT |TMIO_MMC_WRPROTECT_DISABLE | -TMIO_MMC_CLK_ACTUAL |TMIO_MMC_FAST_CLK_CHG , +TMIO_MMC_CLK_ACTUAL |TMIO_MMC_MIN_RCAR2 , .capabilities =MMC_CAP_SD_HIGHSPEED |MMC_CAP_SDIO_IRQ , .dma_buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES , .dma_rx_offset =0x2000 ,
@@ -72,7 +72,7 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = {static const struct sh_mobile_sdhi_of_data of_rcar_gen3_compatible = { .tmio_flags =TMIO_MMC_HAS_IDLE_WAIT |TMIO_MMC_WRPROTECT_DISABLE | -TMIO_MMC_CLK_ACTUAL |TMIO_MMC_FAST_CLK_CHG , +TMIO_MMC_CLK_ACTUAL |TMIO_MMC_MIN_RCAR2 , .capabilities =MMC_CAP_SD_HIGHSPEED , .bus_shift =2 , };
drivers/mmc/host/tmio_mmc_pio.c +3 -3
@@ -157,7 +157,7 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host) {sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN |sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?1 :10 ); +msleep (host->pdata->flags &TMIO_MMC_MIN_RCAR2 ?1 :10 );if (host->pdata->flags &TMIO_MMC_HAVE_HIGH_REG ) {sd_ctrl_write16 (host,CTL_CLK_AND_WAIT_CTL ,0x0100 );
@@ -174,7 +174,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN &sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); -msleep (host->pdata->flags &TMIO_MMC_FAST_CLK_CHG ?5 :10 ); +msleep (host->pdata->flags &TMIO_MMC_MIN_RCAR2 ?5 :10 ); } static void tmio_mmc_set_clock(struct tmio_mmc_host *host,
@@ -205,7 +205,7 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host,sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN &sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL ));sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , clk &CLK_CTL_DIV_MASK ); -if (!(host->pdata->flags &TMIO_MMC_FAST_CLK_CHG )) +if (!(host->pdata->flags &TMIO_MMC_MIN_RCAR2 ))msleep (10 );tmio_mmc_clk_start (host);
include/linux/mfd/tmio.h +2 -2
@@ -66,8 +66,8 @@*/ #define TMIO_MMC_SDIO_IRQ (1 << 2) -/* Some controllers don't need to wait 10ms for clock changes */ -#define TMIO_MMC_FAST_CLK_CHG (1 << 3) +/* Some features are only available or tested on RCar Gen2 or later */ +#define TMIO_MMC_MIN_RCAR2 (1 << 3)/* * Some controllers require waiting for the SD bus to become
Signature · 1 line
2.7.4
PATCH 26/83 mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
Hi!
include/linux/mfd/tmio.h line 71
Quoted 9 lines
include/linux/mfd/tmio.h +2
-2@@ -66,8 +66,8 @@*/ #define TMIO_MMC_SDIO_IRQ (1 << 2) -/* Some controllers don't need to wait 10ms for clock changes */ -#define TMIO_MMC_FAST_CLK_CHG (1 << 3) +/* Some features are only available or tested on RCar Gen2 or later */ +#define TMIO_MMC_MIN_RCAR2 (1 << 3)
I'd add a comment here that gen2 allows fast clock changes ... and whatever other features the driver is actually using.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/8abb7a83/attachment.sig>
PATCH 26/83 mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
Hi Pavel,
[>]
Quoted 9 lines
Subject: Re: [PATCH 4.4.y-cip 26/83] mmc: tmio/sdhi: introduce flag for RCar 2+ specific features
Hi!
Quoted 4 lines
include/linux/mfd/tmio.h +0
-0@@ -66,8 +66,8 @@*/ #define TMIO_MMC_SDIO_IRQ (1 << 2)
Quoted 8 lines
include/linux/mfd/tmio.h line 71
Quoted 5 lines
include/linux/mfd/tmio.h +2
-2-/* Some controllers don't need to wait 10ms for clock changes */ -#define TMIO_MMC_FAST_CLK_CHG (1 << 3) +/* Some features are only available or tested on RCar Gen2 or later */ +#define TMIO_MMC_MIN_RCAR2 (1 << 3)I'd add a comment here that gen2 allows fast clock changes ... and whatever other features the driver is actually using.
Yes, I agree it should have done in the mainline first.
Regards,
Biju
PATCH 27/83 mmc: sh_mobile_sdhi: make clk_update function more compact
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 3072ba8cd95bd0e7fbe9a3a1c9b61fb190257855 upstream.
Save a few lines, the codebase is large enough.
--- drivers/mmc/host/sh_mobile_sdhi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +1 -4
@@ -169,12 +169,9 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host, unsigned int new_clock) {struct sh_mobile_sdhi *priv =host_to_priv (host); -unsigned int freq, best_freq, diff_min, diff; +unsigned int freq, diff, best_freq =0 , diff_min = ~0 ;int i; - diff_min = ~0 ; - best_freq =0 ; -/* * We want the bus clock to be as close as possible to, but no * greater than, new_clock. As we can divide by 1 << i for
Signature · 1 line
2.7.4
PATCH 28/83 mmc: sh_mobile_sdhi: only change the clock on RCar Gen2+
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 8fc009986471729533fb1246c7ea9395635dac26 upstream.
We had a regression on r8a7740 where the SDHI clock was a generic peripheral clock, so changing its rate was not desired. This should be fixed in the clock driver. However, it also shows that the new clock calculation should only be used on tested systems. Add a check for that.
--- drivers/mmc/host/sh_mobile_sdhi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mmc/host/sh_mobile_sdhi.c +4 -0
@@ -172,6 +172,10 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host,unsigned int freq, diff, best_freq =0 , diff_min = ~0 ;int i; +/* tested only on RCar Gen2+ currently; may work for others */ +if (!(host->pdata->flags &TMIO_MMC_MIN_RCAR2 )) +return clk_get_rate (priv->clk); +/* * We want the bus clock to be as close as possible to, but no * greater than, new_clock. As we can divide by 1 << i for
Signature · 1 line
2.7.4
PATCH 29/83 mmc: sh_mobile_sdhi: check return value when changing clk
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit f3f44d512cafef7e3d2cb140f642786dd6ec8818 upstream.
And return the old clock rate if something went wrong.
--- drivers/mmc/host/sh_mobile_sdhi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +3 -3
@@ -170,7 +170,7 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host, {struct sh_mobile_sdhi *priv =host_to_priv (host);unsigned int freq, diff, best_freq =0 , diff_min = ~0 ; -int i; +int i, ret;/* tested only on RCar Gen2+ currently; may work for others */ if (!(host->pdata->flags &TMIO_MMC_MIN_RCAR2 ))
@@ -199,9 +199,9 @@ static unsigned int sh_mobile_sdhi_clk_update(struct tmio_mmc_host *host, } } -clk_set_rate (priv->clk, best_freq); + ret =clk_set_rate (priv->clk, best_freq); -return best_freq; +return ret ==0 ? best_freq :clk_get_rate (priv->clk); }static void sh_mobile_sdhi_clk_disable (struct tmio_mmc_host *host)
Signature · 1 line
2.7.4
PATCH 30/83 mmc: sh_mobile_sdhi: properly document R-Car versions
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit a2a16c77a1a2c951b5930c3182e2737cb13e1a53 upstream.
Replace hardcoded values with meaningful names and document what we know.
--- drivers/mmc/host/sh_mobile_sdhi.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +10 -4
@@ -39,6 +39,12 @@#define EXT_ACC 0xe4 +#define SDHI_VER_GEN2_SDR50 0x490c +/* very old datasheets said 0x490c for SDR104, too. They are wrong! */ +#define SDHI_VER_GEN2_SDR104 0xcb0d +#define SDHI_VER_GEN3_SD 0xcc10 +#define SDHI_VER_GEN3_SDMMC 0xcd10 +#define host_to_priv (host) container_of((host)->pdata, struct sh_mobile_sdhi, mmc_data)struct sh_mobile_sdhi_of_data {
@@ -113,14 +119,14 @@ static void sh_mobile_sdhi_sdbuf_width(struct tmio_mmc_host *host, int width)* sh_mobile_sdhi_of_data :: dma_buswidth */ switch (sd_ctrl_read16 (host,CTL_VERSION )) { -case 0x490C : +case SDHI_VER_GEN2_SDR50 : val = (width ==32 ) ?0x0001 :0x0000 ;break ; -case 0xCB0D : +case SDHI_VER_GEN2_SDR104 : val = (width ==32 ) ?0x0000 :0x0001 ;break ; -case 0xCC10 :/* Gen3, SD only */ -case 0xCD10 :/* Gen3, SD + MMC */ +case SDHI_VER_GEN3_SD : +case SDHI_VER_GEN3_SDMMC :if (width ==64 ) val =0x0000 ;else if (width ==32 )
Signature · 1 line
2.7.4
PATCH 31/83 mmc: host: sh_mobile_sdhi: move card_busy from tmio to sdhi
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 6a4679f312357ac7c74c0e1b996efdd1d0a612fa upstream.
card_busy is only used/tested on SDHI for R-Car Gen2 and later. Move it to the SDHI driver, so we can then activate it conditionally depending on the SDHI type.
--- drivers/mmc/host/sh_mobile_sdhi.c | 8 ++++++++ drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_pio.c | 9 +-------- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +8 -0
@@ -217,6 +217,13 @@ static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host)clk_disable_unprepare (priv->clk); } +static int sh_mobile_sdhi_card_busy (struct mmc_host *mmc) +{ +struct tmio_mmc_host *host =mmc_priv (mmc); + +return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) &TMIO_STAT_DAT0 ); +} +static int sh_mobile_sdhi_start_signal_voltage_switch (struct mmc_host *mmc,struct mmc_ios *ios) {
@@ -376,6 +383,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) host->clk_update = sh_mobile_sdhi_clk_update; host->clk_disable = sh_mobile_sdhi_clk_disable; host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk; + host->card_busy = sh_mobile_sdhi_card_busy; host->start_signal_voltage_switch = sh_mobile_sdhi_start_signal_voltage_switch;/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
drivers/mmc/host/tmio_mmc.h +1 -0
@@ -158,6 +158,7 @@ struct tmio_mmc_host {void (*clk_disable)(struct tmio_mmc_host *host);int (*multi_io_quirk)(struct mmc_card *card,unsigned int direction,int blk_size); +int (*card_busy)(struct mmc_host *mmc);int (*start_signal_voltage_switch)(struct mmc_host *mmc,struct mmc_ios *ios); };
drivers/mmc/host/tmio_mmc_pio.c +1 -8
@@ -963,20 +963,12 @@ static int tmio_multi_io_quirk(struct mmc_card *card,return blk_size; } -static int tmio_mmc_card_busy (struct mmc_host *mmc) -{ -struct tmio_mmc_host *host =mmc_priv (mmc); - -return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) &TMIO_STAT_DAT0 ); -} -static struct mmc_host_ops tmio_mmc_ops = { .request = tmio_mmc_request, .set_ios = tmio_mmc_set_ios, .get_ro = tmio_mmc_get_ro, .get_cd = mmc_gpio_get_cd, .enable_sdio_irq = tmio_mmc_enable_sdio_irq, - .card_busy = tmio_mmc_card_busy, .multi_io_quirk = tmio_multi_io_quirk, };
@@ -1075,6 +1067,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, goto host_free; } + tmio_mmc_ops.card_busy = _host->card_busy; tmio_mmc_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch; mmc->ops = &tmio_mmc_ops;
Signature · 1 line
2.7.4
PATCH 31/83 mmc: host: sh_mobile_sdhi: move card_busy from tmio to sdhi
Quoted 10 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
6a4679f312357ac7c74c0e1b996efdd1d0a612faupstream.
card_busyis only used/tested on SDHI for R-Car Gen2 and later. Move it to the SDHI driver, so we can then activate it conditionally depending on the SDHI type.
drivers/mmc/host/sh_mobile_sdhi.c static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host) · line 226
Quoted 10 lines
drivers/mmc/host/sh_mobile_sdhi.c +7
-0@@ -217,6 +217,13 @@ static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host)clk_disable_unprepare (priv->clk); } +static int sh_mobile_sdhi_card_busy (struct mmc_host *mmc) +{ +struct tmio_mmc_host *host =mmc_priv (mmc); + +return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) &TMIO_STAT_DAT0 ); +} +
Bool would make sense here, if the change is practical without changing too many interfaces... (and unless interface is something like 0/1/-ERRNO...)
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/e0254263/attachment.sig>
PATCH 31/83 mmc: host: sh_mobile_sdhi: move card_busy from tmio to sdhi
Hi Pavel,
Quoted 18 lines
Subject: Re: [PATCH 4.4.y-cip 31/83] mmc: host:
sh_mobile_sdhi: movecard_busyfrom tmio to sdhiReview static void sh_mobile_sdhi_clk_disable(struct
Quoted 10 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
6a4679f312357ac7c74c0e1b996efdd1d0a612faupstream.
card_busyis only used/tested on SDHI for R-Car Gen2 and later. Move it to the SDHI driver, so we can then activate it conditionally depending on the SDHI type.(quoted diff) +0
-0@@ -217,6 +217,13 @@ static void sh_mobile_sdhi_clk_disable(struct
tmio_mmc_host*host)Quoted 3 lines
drivers/mmc/host/sh_mobile_sdhi.c +0
-0clk_disable_unprepare (priv->clk); }
Quoted 10 lines
drivers/mmc/host/sh_mobile_sdhi.c static void sh_mobile_sdhi_clk_disable(struct tmio_mmc_host *host) · line 226
Quoted 6 lines
drivers/mmc/host/sh_mobile_sdhi.c +6
-0+static int sh_mobile_sdhi_card_busy (struct mmc_host *mmc) { +struct tmio_mmc_host *host =mmc_priv (mmc); + +return !(sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS ) & +TMIO_STAT_DAT0 ); } +Bool would make sense here, if the change is practical without changing too many interfaces... (and unless interface is something like 0/1/-ERRNO...)
Yes I agree with you. Last statement is clearly returns a Boolean value.
Regards,
Biju
PATCH 32/83 mmc: host: sh_mobile_sdhi: don't populate unneeded functions
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit ff026099d775c74548839f1d627eb0b2bec0b857 upstream.
Populating card_busy caused a side-effect on a chip variant we don't have documentation for (r8a73a4). So, enable it and voltage switching only on devices known to support those features.
--- drivers/mmc/host/sh_mobile_sdhi.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +8 -2
@@ -383,8 +383,14 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) host->clk_update = sh_mobile_sdhi_clk_update; host->clk_disable = sh_mobile_sdhi_clk_disable; host->multi_io_quirk = sh_mobile_sdhi_multi_io_quirk; - host->card_busy = sh_mobile_sdhi_card_busy; - host->start_signal_voltage_switch = sh_mobile_sdhi_start_signal_voltage_switch; + +/* SDR speeds are only available on Gen2+ */ +if (mmc_data->flags &TMIO_MMC_MIN_RCAR2 ) { +/* card_busy caused issues on r8a73a4 (pre-Gen2) CD-less SDHI */ + host->card_busy = sh_mobile_sdhi_card_busy; + host->start_signal_voltage_switch = + sh_mobile_sdhi_start_signal_voltage_switch; + }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */ if (!host->bus_shift &&resource_size (res) >0x100 )/* old way to determine the shift */
Signature · 1 line
2.7.4
PATCH 33/83 mmc: tmio: add eMMC support
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 0bc0b6e86524526c92a9409faea79d53db8e7e6e upstream.
We need to add R1 without CRC support, refactor the bus width routine a little and extend a quirk check. To support "non-removable;" we need a workaround which will be hopefully removed when reworking PM soon.
--- drivers/mmc/host/tmio_mmc.h | 3 +++ drivers/mmc/host/tmio_mmc_pio.c | 38 ++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-)
drivers/mmc/host/tmio_mmc.h +3 -0
@@ -79,6 +79,9 @@#define CLK_CTL_DIV_MASK 0xff#define CLK_CTL_SCLKEN BIT(8) +#define CARD_OPT_WIDTH8 BIT(13) +#define CARD_OPT_WIDTH BIT(15) +#define TMIO_BBS 512/* Boot block size */ /* Definitions for values the CTRL_SDIO_STATUS register can take. */
drivers/mmc/host/tmio_mmc_pio.c +26 -12
@@ -336,7 +336,9 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_commandswitch (mmc_resp_type (cmd)) {case MMC_RSP_NONE : c |=RESP_NONE ;break ; -case MMC_RSP_R1 : c |=RESP_R1 ;break ; +case MMC_RSP_R1 : +case MMC_RSP_R1_NO_CRC : + c |=RESP_R1 ;break ;case MMC_RSP_R1B : c |=RESP_R1B ;break ;case MMC_RSP_R2 : c |=RESP_R2 ;break ;case MMC_RSP_R3 : c |=RESP_R3 ;break ;
@@ -733,12 +735,13 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host,pr_debug ("setup data transfer: blocksize %08x nr_blocks %d\n" , data->blksz, data->blocks); -/* Some hardware cannot perform 2 byte requests in 4 bit mode */ -if (host->mmc->ios.bus_width ==MMC_BUS_WIDTH_4 ) { +/* Some hardware cannot perform 2 byte requests in 4/8 bit mode */ +if (host->mmc->ios.bus_width ==MMC_BUS_WIDTH_4 || + host->mmc->ios.bus_width ==MMC_BUS_WIDTH_8 ) {int blksz_2bytes = pdata->flags &TMIO_MMC_BLKSZ_2BYTES ;if (data->blksz <2 || (data->blksz <4 && !blksz_2bytes)) { -pr_err ("%s: %d byte block unsupported in 4 bit mode\n" , +pr_err ("%s: %d byte block unsupported in 4/8 bit mode\n" ,mmc_hostname (host->mmc), data->blksz);return -EINVAL ; }
@@ -860,14 +863,16 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host)static void tmio_mmc_set_bus_width (struct tmio_mmc_host *host,unsigned char bus_width) { -switch (bus_width) { -case MMC_BUS_WIDTH_1 : -sd_ctrl_write16 (host,CTL_SD_MEM_CARD_OPT ,0x80e0 ); -break ; -case MMC_BUS_WIDTH_4 : -sd_ctrl_write16 (host,CTL_SD_MEM_CARD_OPT ,0x00e0 ); -break ; - } +u16 reg =sd_ctrl_read16 (host,CTL_SD_MEM_CARD_OPT ) + & ~(CARD_OPT_WIDTH |CARD_OPT_WIDTH8 ); + +/* reg now applies to MMC_BUS_WIDTH_4 */ +if (bus_width ==MMC_BUS_WIDTH_1 ) + reg |=CARD_OPT_WIDTH ; +else if (bus_width ==MMC_BUS_WIDTH_8 ) + reg |=CARD_OPT_WIDTH8 ; + +sd_ctrl_write16 (host,CTL_SD_MEM_CARD_OPT , reg); }/* Set MMC clock / power.
@@ -1085,6 +1090,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, mmc->caps &MMC_CAP_NONREMOVABLE || mmc->slot.cd_irq >= 0); +/* +* On Gen2+, eMMC with NONREMOVABLE currently fails because native +* hotplug gets disabled. It seems RuntimePM related yet we need further +* research. Since we are planning a PM overhaul anyway, let's enforce +* for now the device being active by enabling native hotplug always. +*/ +if (pdata->flags &TMIO_MMC_MIN_RCAR2 ) + _host->native_hotplug = true; +if (tmio_mmc_clk_enable (_host) <0 ) { mmc->f_max = pdata->hclk; mmc->f_min = mmc->f_max /512 ;
Signature · 1 line
2.7.4
PATCH 33/83 mmc: tmio: add eMMC support
Quoted 12 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
0bc0b6e86524526c92a9409faea79d53db8e7e6eupstream.We need to add R1 without CRC support, refactor the bus width routine a little and extend a quirk check. To support "non-removable;" we need a workaround which will be hopefully removed when reworking PM soon.
index addbc71..eafd92d 100644
drivers/mmc/host/tmio_mmc.h line 83
Quoted 5 lines
drivers/mmc/host/tmio_mmc.h +2
-0@@ -79,6 +79,9 @@#define CLK_CTL_DIV_MASK 0xff#define CLK_CTL_SCLKEN BIT(8) +#define CARD_OPT_WIDTH8 BIT(13) +#define CARD_OPT_WIDTH BIT(15)
WIDTH_1 and WIDTH_8 would be better names, for consistency with rest of code. "WIDTH" without number is quite confusing.
Best regards,
Pavel
Quoted 3 lines
drivers/mmc/host/tmio_mmc.h +3
-0+/* Some hardware cannot perform 2 byte requests in 4/8 bit mode */ +if (host->mmc->ios.bus_width ==MMC_BUS_WIDTH_4 || + host->mmc->ios.bus_width ==MMC_BUS_WIDTH_8 ) {
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/cb80b4d0/attachment-0001.sig>
PATCH 33/83 mmc: tmio: add eMMC support
Hi Pavel,
Quoted 18 lines
Subject: Re: [PATCH 4.4.y-cip 33/83] mmc: tmio: add eMMC support
Quoted 15 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
0bc0b6e86524526c92a9409faea79d53db8e7e6eupstream.We need to add R1 without CRC support, refactor the bus width routine a little and extend a quirk check. To support "non-removable;" we need a workaround which will be hopefully removed when reworking PM soon.
index addbc71..eafd92d 100644
drivers/mmc/host/tmio_mmc.h +0
-0@@ -79,6 +79,9 @@#define CLK_CTL_DIV_MASK 0xff#define CLK_CTL_SCLKEN BIT(8)
Quoted 5 lines
drivers/mmc/host/tmio_mmc.h line 83
Quoted 2 lines
drivers/mmc/host/tmio_mmc.h +2
-0+#define CARD_OPT_WIDTH8 BIT(13) +#define CARD_OPT_WIDTH BIT(15)
WIDTH_1andWIDTH_8would be better names, for consistency with rest of code. "WIDTH" without number is quite confusing.
I agree, it is little bit confusing. May be we should fixing this Mainline first and then backport to cip kernel.
Cheers,
Biju
Quoted 8 lines
drivers/mmc/host/tmio_mmc.h line 84
Quoted 1 line
drivers/mmc/host/tmio_mmc.h +1
-0+/* Some hardware cannot perform 2 byte requests in 4/8 bit mode */
drivers/mmc/host/tmio_mmc.h line 86
Quoted 2 lines
drivers/mmc/host/tmio_mmc.h +2
-0+if (host->mmc->ios.bus_width ==MMC_BUS_WIDTH_4 || + host->mmc->ios.bus_width ==MMC_BUS_WIDTH_8 ) {--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 34/83 mmc: tmio-mmc: add support for 32bit data port
In reply to Biju DasFrom: Chris Brandt <[email protected]>
commit 8185e51f358a8dd4801b67e8c66f03eb9eeaba75 upstream.
For the r7s72100 SOC, the DATA_PORT register was changed to 32-bits wide. Therefore a new flag has been created that will allow 32-bit reads/writes to the DATA_PORT register instead of 16-bit (because 16-bits accesses are not supported).
--- drivers/mmc/host/tmio_mmc.h | 12 ++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 30 ++++++++++++++++++++++++++++++ include/linux/mfd/tmio.h | 5 +++++ 3 files changed, 47 insertions(+)
drivers/mmc/host/tmio_mmc.h +12 -0
@@ -245,6 +245,12 @@ static inline u32 sd_ctrl_read16_and_16_as_32(struct tmio_mmc_host *host, int adreadw (host->ctl + ((addr +2 ) << host->bus_shift)) <<16 ; } +static inline void sd_ctrl_read32_rep (struct tmio_mmc_host *host,int addr, +u32 *buf,int count) +{ +readsl (host->ctl + (addr << host->bus_shift), buf, count); +} +static inline void sd_ctrl_write16 (struct tmio_mmc_host *host,int addr,u16 val) {/* If there is a hook and it returns non-zero then there
@@ -267,4 +273,10 @@ static inline void sd_ctrl_write32_as_16_and_16(struct tmio_mmc_host *host, int writew(val >> 16, host->ctl + ((addr + 2) << host->bus_shift)); } +static inline void sd_ctrl_write32_rep (struct tmio_mmc_host *host,int addr, +const u32 *buf,int count) +{ +writesl (host->ctl + (addr << host->bus_shift), buf, count); +} +#endif
drivers/mmc/host/tmio_mmc_pio.c +30 -0
@@ -393,6 +393,36 @@ static void tmio_mmc_transfer_data(struct tmio_mmc_host *host,/* * Transfer the data */ +if (host->pdata->flags &TMIO_MMC_32BIT_DATA_PORT ) { +u8 data[4 ] = { }; + +if (is_read) +sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , (u32 *)buf, + count >>2 ); +else +sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , (u32 *)buf, + count >>2 ); + +/* if count was multiple of 4 */ +if (!(count &0x3 )) +return ; + + buf8 = (u8 *)(buf + (count >>2 )); + count %=4 ; + +if (is_read) { +sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , + (u32 *)data,1 ); +memcpy (buf8, data, count); + }else { +memcpy (data, buf8, count); +sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , + (u32 *)data,1 ); + } + +return ; + } +if (is_read)sd_ctrl_read16_rep (host,CTL_SD_DATA_PORT , buf, count >>1 );else
include/linux/mfd/tmio.h +5 -0
@@ -100,6 +100,11 @@#define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8)/* +* Some controllers have a 32-bit wide data port register +*/ +#define TMIO_MMC_32BIT_DATA_PORT (1 << 9) + +/* * Some controllers allows to set SDx actual clock */ #define TMIO_MMC_CLK_ACTUAL (1 << 10)
Signature · 1 line
2.7.4
PATCH 35/83 mmc: add define for R1 response without CRC
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 51b50c961676428cd356d6fa494a2e9f53dc77bf upstream.
The core uses it for polling. Give drivers a proper define handle this case like for other response types.
--- include/linux/mmc/core.h | 3 +++ 1 file changed, 3 insertions(+)
include/linux/mmc/core.h +3 -0
@@ -55,6 +55,9 @@ struct mmc_command {#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)#define MMC_RSP_R7 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) +/* Can be used by core to poll after switch to MMC HS mode */ +#define MMC_RSP_R1_NO_CRC (MMC_RSP_PRESENT|MMC_RSP_OPCODE) +#define mmc_resp_type (cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))/*
Signature · 1 line
2.7.4
PATCH 36/83 mmc: sh_mobile_sdhi: add ocr_mask option
In reply to Biju DasFrom: Chris Brandt <[email protected]>
commit f19417f38264f9a2f7b4627aa4060133c237b211 upstream.
In moving platforms from board files to DT, there still needs to be a way to set the ocr_mask setting for the tmio driver during probe. Without this setting, the probe will fail because the supported voltages are not known.
This patch will also traditional platform registration platforms to migrate to DT.
--- drivers/mmc/host/sh_mobile_sdhi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/sh_mobile_sdhi.c +2 -0
@@ -49,6 +49,7 @@struct sh_mobile_sdhi_of_data {unsigned long tmio_flags; +u32 tmio_ocr_mask;unsigned long capabilities;unsigned long capabilities2;enum dma_slave_buswidth dma_buswidth;
@@ -370,6 +371,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)const struct sh_mobile_sdhi_of_data *of_data = of_id->data; mmc_data->flags |= of_data->tmio_flags; + mmc_data->ocr_mask = of_data->tmio_ocr_mask; mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; mmc_data->dma_rx_offset = of_data->dma_rx_offset;
Signature · 1 line
2.7.4
PATCH 36/83 mmc: sh_mobile_sdhi: add ocr_mask option
Hi!
Quoted 8 lines
commit
f19417f38264f9a2f7b4627aa4060133c237b211upstream.In moving platforms from board files to DT, there still needs to be a way to set the
ocr_masksetting for the tmio driver during probe. Without this setting, the probe will fail because the supported voltages are not known.This patch will also traditional platform registration platforms to migrate to DT.
This is not quite english.
Quoted 10 lines
+++
b/drivers/mmc/host/sh_mobile_sdhi.cdrivers/mmc/host/sh_mobile_sdhi.c +1
-0@@ -49,6 +49,7 @@struct sh_mobile_sdhi_of_data {unsigned long tmio_flags; +u32 tmio_ocr_mask;unsigned long capabilities;unsigned long capabilities2;enum dma_slave_buswidth dma_buswidth;
drivers/mmc/host/sh_mobile_sdhi.c static int sh_mobile_sdhi_probe(struct platform_device *pdev) · line 377
Quoted 7 lines
drivers/mmc/host/sh_mobile_sdhi.c +1
-0@@ -370,6 +371,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)const struct sh_mobile_sdhi_of_data *of_data = of_id->data; mmc_data->flags |= of_data->tmio_flags; + mmc_data->ocr_mask = of_data->tmio_ocr_mask; mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; mmc_data->dma_rx_offset = of_data->dma_rx_offset;
And as of_data->tmio_ocr_mask is never written, I don't see how this can fix the problem effect.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/d31f69fd/attachment.sig>
PATCH 36/83 mmc: sh_mobile_sdhi: add ocr_mask option
Hi Pavel,
Thanks for the feedback.
Quoted 31 lines
Subject: Re: [PATCH 4.4.y-cip 36/83] mmc:
sh_mobile_sdhi: addocr_maskoptionHi!
Quoted 5 lines
commit
f19417f38264f9a2f7b4627aa4060133c237b211upstream.In moving platforms from board files to DT, there still needs to be a way to set the
ocr_masksetting for the tmio driver during probe. Without this setting, the probe will fail because the supported voltages arenot known.
Quoted 3 lines
This patch will also traditional platform registration platforms to migrate to DT.
This is not quite english.
drivers/mmc/host/sh_mobile_sdhi.c line 55
Quoted 9 lines
+++
b/drivers/mmc/host/sh_mobile_sdhi.cdrivers/mmc/host/sh_mobile_sdhi.c +1
-0@@ -49,6 +49,7 @@struct sh_mobile_sdhi_of_data {unsigned long tmio_flags; +u32 tmio_ocr_mask;unsigned long capabilities;unsigned long capabilities2; enum dma_slave_buswidth dma_buswidth; @@ -370,6 +371,7 @@static int
Quoted 4 lines
sh_mobile_sdhi_probe(struct platform_device *pdev)
const structsh_mobile_sdhi_of_data*of_data= of_id-
data;
Quoted 8 lines
drivers/mmc/host/sh_mobile_sdhi.c static int sh_mobile_sdhi_probe(struct platform_device *pdev) · line 377
Quoted 5 lines
drivers/mmc/host/sh_mobile_sdhi.c +1
-0mmc_data->flags |= of_data->tmio_flags; + mmc_data->ocr_mask = of_data->tmio_ocr_mask; mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; mmc_data->dma_rx_offset = of_data->dma_rx_offset;And as
of_data->tmio_ocr_maskis never written, I don't see how this can fix the problem effect.
This patch fixes the problem on RZ/A boards.
https://cregit.linuxsources.org/code/4.11/drivers/mmc/host/sh_mobile_sdhi.c.html
regards,
Biju
PATCH 37/83 mmc: tmio: enhance illegal sequence handling
In reply to Biju DasFrom: Ai Kyuse <[email protected]>
commit 96e0b2ba00ee5dacb12bed6585145ce784ec9153 upstream.
An illegal sequence command error may occur if there is a stopbit or cmd_index error as well as a CRC error. The correct course of action is to re-enable IRQs
An illegal sequence data error may occur if there is a CRC or stopbit error, or underrun. In this case set data->error correctly.
This is in preparation for enabling tuning support which relies on differentiating between illegal sequence and other errors.
--- drivers/mmc/host/tmio_mmc_pio.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +9 -6
@@ -552,7 +552,7 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)schedule_work (&host->done); } -static void tmio_mmc_data_irq (struct tmio_mmc_host *host) +static void tmio_mmc_data_irq (struct tmio_mmc_host *host,unsigned int stat) {struct mmc_data *data;spin_lock (&host->lock);
@@ -561,6 +561,9 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host)if (!data) goto out; +if (stat &TMIO_STAT_CRCFAIL || stat &TMIO_STAT_STOPBIT_ERR || + stat &TMIO_STAT_TXUNDERRUN ) + data->error = -EILSEQ ;if (host->chan_tx && (data->flags &MMC_DATA_WRITE ) && !host->force_pio) {u32 status =sd_ctrl_read16_and_16_as_32 (host,CTL_STATUS );bool done = false;
@@ -609,8 +612,6 @@ static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host, goto out; } - host->cmd =NULL ; -/* This controller is sicker than the PXA one. Not only do we need to * drop the top 8 bits of the first response word, we also need to * modify the order of the response for short response command types.
@@ -630,14 +631,16 @@ static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,if (stat &TMIO_STAT_CMDTIMEOUT ) cmd->error = -ETIMEDOUT ; -else if (stat &TMIO_STAT_CRCFAIL && cmd->flags &MMC_RSP_CRC ) +else if ((stat &TMIO_STAT_CRCFAIL && cmd->flags &MMC_RSP_CRC ) || + stat &TMIO_STAT_STOPBIT_ERR || + stat &TMIO_STAT_CMD_IDX_ERR ) cmd->error = -EILSEQ ;/* If there is data to handle we enable data IRQs here, and * we will ultimatley finish the request in the data_end handler. * If theres no data or we encountered an error, finish now. */ -if (host->data && !cmd->error) { +if (host->data && (!cmd->error || cmd->error == -EILSEQ )) {if (host->data->flags &MMC_DATA_READ ) {if (host->force_pio || !host->chan_rx)tmio_mmc_enable_mmc_irqs (host,TMIO_MASK_READOP );
@@ -698,7 +701,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,/* Data transfer completion */ if (ireg &TMIO_STAT_DATAEND ) {tmio_mmc_ack_mmc_irqs (host,TMIO_STAT_DATAEND ); -tmio_mmc_data_irq (host); +tmio_mmc_data_irq (host, status);return true; }
Signature · 1 line
2.7.4
PATCH 37/83 mmc: tmio: enhance illegal sequence handling
Hi!
Quoted 14 lines
commit
96e0b2ba00ee5dacb12bed6585145ce784ec9153upstream.An illegal sequence command error may occur if there is a stopbit or
cmd_indexerror as well as a CRC error. The correct course of action is to re-enable IRQsAn illegal sequence data error may occur if there is a CRC or stopbit error, or underrun. In this case set
data->errorcorrectly.This is in preparation for enabling tuning support which relies on differentiating between illegal sequence and other errors.
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host, · line 617
Quoted 8 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-2@@ -609,8 +612,6 @@ static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host, goto out; } - host->cmd =NULL ; -/* This controller is sicker than the PXA one. Not only do we need to * drop the top 8 bits of the first response word, we also need to * modify the order of the response for short response command
Is this removal intentional? I'm not sure from the changelog.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/1194cc00/attachment.sig>
PATCH 37/83 mmc: tmio: enhance illegal sequence handling
HI Pavel,
Quoted 23 lines
Subject: Re: [PATCH 4.4.y-cip 37/83] mmc: tmio: enhance illegal sequence handling
Hi!
Review static void tmio_mmc_cmd_irq(struct
Quoted 14 lines
commit
96e0b2ba00ee5dacb12bed6585145ce784ec9153upstream.An illegal sequence command error may occur if there is a stopbit or
cmd_indexerror as well as a CRC error. The correct course of action is to re-enable IRQsAn illegal sequence data error may occur if there is a CRC or stopbit error, or underrun. In this case set
data->errorcorrectly.This is in preparation for enabling tuning support which relies on differentiating between illegal sequence and other errors.
(quoted diff) +0
-0@@ -609,8 +612,6 @@ static void tmio_mmc_cmd_irq(struct
tmio_mmc_host*host,Quoted 3 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-0goto out; }
Quoted 7 lines
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,
Quoted 5 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-2- host->cmd =NULL ; -/* This controller is sicker than the PXA one. Not only do we need to * drop the top 8 bits of the first response word, we also need to * modify the order of the response for short response command Is this removal intentional? I'm not sure from the changelog.
Yes, it is not clear from the changelog.
Regards,
Biju
PATCH 38/83 mmc: tmio: document mandatory and optional callbacks
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 2f87365f832bbc26e32f23588aaeb40abe15ff0d upstream.
--- drivers/mmc/host/tmio_mmc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc.h +4 -1
@@ -154,8 +154,10 @@ struct tmio_mmc_host {bool native_hotplug;bool sdio_irq_enabled; -int (*write16_hook)(struct tmio_mmc_host *host,int addr); +/* Mandatory callback */ int (*clk_enable)(struct tmio_mmc_host *host); + +/* Optional callbacks */ unsigned int (*clk_update)(struct tmio_mmc_host *host,unsigned int new_clock);void (*clk_disable)(struct tmio_mmc_host *host);
@@ -164,6 +166,7 @@ struct tmio_mmc_host {int (*card_busy)(struct mmc_host *mmc);int (*start_signal_voltage_switch)(struct mmc_host *mmc,struct mmc_ios *ios); +int (*write16_hook)(struct tmio_mmc_host *host,int addr); };struct tmio_mmc_host *tmio_mmc_host_alloc (struct platform_device *pdev);
Signature · 1 line
2.7.4
PATCH 39/83 mmc: tmio: Add hw reset support
In reply to Biju DasFrom: Ai Kyuse <[email protected]>
commit e8f36b5d3b54a49df02c950050659a5082e2c880 upstream.
Add hw reset support.
--- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_pio.c | 9 +++++++++ 2 files changed, 10 insertions(+)
drivers/mmc/host/tmio_mmc.h +1 -0
@@ -167,6 +167,7 @@ struct tmio_mmc_host {int (*start_signal_voltage_switch)(struct mmc_host *mmc,struct mmc_ios *ios);int (*write16_hook)(struct tmio_mmc_host *host,int addr); +void (*hw_reset)(struct tmio_mmc_host *host); };struct tmio_mmc_host *tmio_mmc_host_alloc (struct platform_device *pdev);
drivers/mmc/host/tmio_mmc_pio.c +9 -0
@@ -792,6 +792,14 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host,return 0 ; } +static void tmio_mmc_hw_reset (struct mmc_host *mmc) +{ +struct tmio_mmc_host *host =mmc_priv (mmc); + +if (host->hw_reset) + host->hw_reset (host); +} +/* Process requests from the MMC layer */ static void tmio_mmc_request (struct mmc_host *mmc,struct mmc_request *mrq) {
@@ -1008,6 +1016,7 @@ static struct mmc_host_ops tmio_mmc_ops = { .get_cd = mmc_gpio_get_cd, .enable_sdio_irq = tmio_mmc_enable_sdio_irq, .multi_io_quirk = tmio_multi_io_quirk, + .hw_reset = tmio_mmc_hw_reset, };static int tmio_mmc_init_ocr (struct tmio_mmc_host *host)
Signature · 1 line
2.7.4
PATCH 40/83 mmc: core: Add helper to see if a host can be retuned
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit c820af5f18ec248b3cb61a9a9ce47ef0f2e9ec63 upstream.
This is in preparation for restoring saved tuning parameters when resuming the TMIO driver.
--- include/linux/mmc/host.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/mmc/host.h +5 -0
@@ -515,4 +515,9 @@ static inline void mmc_retune_recheck(struct mmc_host *host) host->retune_now = 1; } +static inline bool mmc_can_retune (struct mmc_host *host) +{ +return host->can_retune ==1 ; +} +#endif /* LINUX_MMC_HOST_H */
Signature · 1 line
2.7.4
PATCH 40/83 mmc: core: Add helper to see if a host can be retuned
Quoted 8 lines · Biju Das
From: Simon Horman <[email protected]>
commit
c820af5f18ec248b3cb61a9a9ce47ef0f2e9ec63upstream.This is in preparation for restoring saved tuning parameters when resuming the TMIO driver.
include/linux/mmc/host.h static inline void mmc_retune_recheck(struct mmc_host *host) · line 522
Quoted 8 lines
include/linux/mmc/host.h +5
-0@@ -515,4 +515,9 @@ static inline void mmc_retune_recheck(struct mmc_host *host) host->retune_now =1 ; } +static inline bool mmc_can_retune (struct mmc_host *host) +{ +return host->can_retune ==1 ; +} +
Probably not worth changing any more, but it would be easier to review if it was merged with the first user.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/b4456945/attachment.sig>
PATCH 41/83 mmc: tmio: Add tuning support
In reply to Biju DasFrom: Ai Kyuse <[email protected]>
commit 4f11997773b6b452b5a0d620c5ac5050e75c227e upstream.
Add tuning support for use with SDR104 mode
--- drivers/mmc/host/tmio_mmc.h | 14 ++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+)
drivers/mmc/host/tmio_mmc.h +14 -0
@@ -153,6 +153,7 @@ struct tmio_mmc_host {struct mutex ios_lock;/* protect set_ios() context */ bool native_hotplug;bool sdio_irq_enabled; +u32 scc_tappos;/* Mandatory callback */ int (*clk_enable)(struct tmio_mmc_host *host);
@@ -168,6 +169,19 @@ struct tmio_mmc_host { struct mmc_ios *ios);int (*write16_hook)(struct tmio_mmc_host *host,int addr);void (*hw_reset)(struct tmio_mmc_host *host); +void (*prepare_tuning)(struct tmio_mmc_host *host,unsigned long tap); +bool (*check_scc_error)(struct tmio_mmc_host *host); + +/* +* Mandatory callback for tuning to occur which is optional for SDR50 +* and mandatory for SDR104. +*/ +unsigned int (*init_tuning)(struct tmio_mmc_host *host); +int (*select_tuning)(struct tmio_mmc_host *host); + +/* Tuning values: 1 for success, 0 for failure */ +DECLARE_BITMAP (taps,BITS_PER_BYTE *sizeof (long )); +unsigned int tap_num; };struct tmio_mmc_host *tmio_mmc_host_alloc (struct platform_device *pdev);
drivers/mmc/host/tmio_mmc_pio.c +62 -0
98 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 41/83 mmc: tmio: Add tuning support
Hi!
drivers/mmc/host/tmio_mmc.h struct tmio_mmc_host { · line 183
Quoted 7 lines
commit
4f11997773b6b452b5a0d620c5ac5050e75c227eupstream.Add tuning support for use with SDR104 mode
drivers/mmc/host/tmio_mmc.h +2
-0+/* Tuning values: 1 for success, 0 for failure */ +DECLARE_BITMAP (taps,BITS_PER_BYTE *sizeof (long ));
I don't see why tuning should depend on register size (thus sizeof(long)) of the host CPU. If 32 is enough, put 32 there... if not, just use 64?
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_hw_reset(struct mmc_host *mmc) · line 827
Quoted 5 lines
drivers/mmc/host/tmio_mmc_pio.c +5
-0+if (host->tap_num *2 >=sizeof (host->taps) *BITS_PER_BYTE ) { +dev_warn_once (&host->pdev->dev, +"Too many taps, skipping tuning. Please consider updating size of taps field of tmio_mmc_host\n" ); + goto out; + }
Or perhaps introduce a #define MAX_TAPS; it will be cleaner than checking bit sizes like this.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/2fa8c8d9/attachment.sig>
PATCH 41/83 mmc: tmio: Add tuning support
Hi Pavel,
Quoted 20 lines
Subject: Re: [PATCH 4.4.y-cip 41/83] mmc: tmio: Add tuning support
Hi!
drivers/mmc/host/tmio_mmc.h struct tmio_mmc_host { · line 183
Quoted 7 lines
commit
4f11997773b6b452b5a0d620c5ac5050e75c227eupstream.Add tuning support for use with SDR104 mode
drivers/mmc/host/tmio_mmc.h +2
-0+/* Tuning values: 1 for success, 0 for failure */ +DECLARE_BITMAP (taps,BITS_PER_BYTE *sizeof (long ));I don't see why tuning should depend on register size (thus sizeof(long)) of the host CPU. If 32 is enough, put 32 there... if not, just use 64?
drivers/mmc/host/tmio_mmc_pio.c static void tmio_mmc_hw_reset(struct mmc_host *mmc)
Quoted 3 lines
drivers/mmc/host/tmio_mmc_pio.c +3
-0+if (host->tap_num *2 >=sizeof (host->taps) *BITS_PER_BYTE ) { + dev_warn_once(&host->pdev->dev, + "Too many taps, skipping tuning. Please consider updatingsize of taps field of tmio_mmc_host\n");
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ goto out; + }Or perhaps introduce a #define
MAX_TAPS; it will be cleaner than checking bit sizes like this.
Yes there is a room for improvement for this patch in Mainline.
Regards,
Biju
PATCH 42/83 mmc: sh_mobile_sdhi: Add tuning support
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 06f438dd389a699d27585f2a4d3685fd1ce05a75 upstream.
Add tuning support for use with SDR104 mode
This includes adding support for the sampling clock controller (SCC).
Based on work by Ai Kyuse.
--- drivers/mmc/host/sh_mobile_sdhi.c | 265 +++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 1 deletion(-)
drivers/mmc/host/sh_mobile_sdhi.c +264 -1
@@ -47,6 +47,11 @@#define host_to_priv (host) container_of((host)->pdata, struct sh_mobile_sdhi, mmc_data) +struct sh_mobile_sdhi_scc { +unsigned long clk_rate;/* clock rate for SDR104 */ +u32 tap;/* sampling clock position for SDR104 */ +}; +struct sh_mobile_sdhi_of_data {unsigned long tmio_flags;u32 tmio_ocr_mask;
@@ -55,6 +60,9 @@ struct sh_mobile_sdhi_of_data {enum dma_slave_buswidth dma_buswidth;dma_addr_t dma_rx_offset;unsigned bus_shift; +int scc_offset; +struct sh_mobile_sdhi_scc *taps; +int taps_num; };static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = {
@@ -69,12 +77,35 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = { .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, }; +/* Definitions for sampling clocks */ +static struct sh_mobile_sdhi_scc rcar_gen2_scc_taps[] = { + { + .clk_rate =156000000 , + .tap =0x00000703 , + }, + { + .clk_rate =0 , + .tap =0x00000300 , + }, +}; +static const struct sh_mobile_sdhi_of_data of_rcar_gen2_compatible = { .tmio_flags =TMIO_MMC_HAS_IDLE_WAIT |TMIO_MMC_WRPROTECT_DISABLE |TMIO_MMC_CLK_ACTUAL |TMIO_MMC_MIN_RCAR2 , .capabilities =MMC_CAP_SD_HIGHSPEED |MMC_CAP_SDIO_IRQ , .dma_buswidth =DMA_SLAVE_BUSWIDTH_4_BYTES , .dma_rx_offset =0x2000 , + .scc_offset =0x0300 , + .taps = rcar_gen2_scc_taps, + .taps_num =ARRAY_SIZE (rcar_gen2_scc_taps), +}; + +/* Definitions for sampling clocks */ +static struct sh_mobile_sdhi_scc rcar_gen3_scc_taps[] = { + { + .clk_rate =0 , + .tap =0x00000300 , + }, };static const struct sh_mobile_sdhi_of_data of_rcar_gen3_compatible = {
@@ -82,6 +113,9 @@ static const struct sh_mobile_sdhi_of_data of_rcar_gen3_compatible = { TMIO_MMC_CLK_ACTUAL | TMIO_MMC_MIN_RCAR2, .capabilities = MMC_CAP_SD_HIGHSPEED, .bus_shift = 2, + .scc_offset = 0x1000, + .taps = rcar_gen3_scc_taps, + .taps_num = ARRAY_SIZE(rcar_gen3_scc_taps), };static const struct of_device_id sh_mobile_sdhi_of_match[] = {
@@ -109,6 +143,7 @@ struct sh_mobile_sdhi {struct tmio_mmc_dma dma_priv;struct pinctrl *pinctrl;struct pinctrl_state *pins_default, *pins_uhs; +void __iomem *scc_ctl; };static void sh_mobile_sdhi_sdbuf_width (struct tmio_mmc_host *host,int width)
@@ -263,6 +298,201 @@ static int sh_mobile_sdhi_start_signal_voltage_switch(struct mmc_host *mmc,return 0 ; } +/* SCC registers */ +#define SH_MOBILE_SDHI_SCC_DTCNTL 0x000 +#define SH_MOBILE_SDHI_SCC_TAPSET 0x002 +#define SH_MOBILE_SDHI_SCC_DT2FF 0x004 +#define SH_MOBILE_SDHI_SCC_CKSEL 0x006 +#define SH_MOBILE_SDHI_SCC_RVSCNTL 0x008 +#define SH_MOBILE_SDHI_SCC_RVSREQ 0x00A + +/* Definitions for values the SH_MOBILE_SDHI_SCC_DTCNTL register */ +#define SH_MOBILE_SDHI_SCC_DTCNTL_TAPEN BIT(0) +#define SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_SHIFT 16 +#define SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_MASK 0xff + +/* Definitions for values the SH_MOBILE_SDHI_SCC_CKSEL register */ +#define SH_MOBILE_SDHI_SCC_CKSEL_DTSEL BIT(0) +/* Definitions for values the SH_MOBILE_SDHI_SCC_RVSCNTL register */ +#define SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN BIT(0) +/* Definitions for values the SH_MOBILE_SDHI_SCC_RVSREQ register */ +#define SH_MOBILE_SDHI_SCC_RVSREQ_RVSERR BIT(2) + +static inline u32 sd_scc_read32 (struct tmio_mmc_host *host, +struct sh_mobile_sdhi *priv,int addr) +{ +return readl (priv->scc_ctl + (addr << host->bus_shift)); +} + +static inline void sd_scc_write32 (struct tmio_mmc_host *host, +struct sh_mobile_sdhi *priv, +int addr,u32 val) +{ +writel (val, priv->scc_ctl + (addr << host->bus_shift)); +} + +static unsigned int sh_mobile_sdhi_init_tuning (struct tmio_mmc_host *host) +{ +struct sh_mobile_sdhi *priv; + +if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) +return 0 ; + + priv =host_to_priv (host); + +/* set sampling clock selection range */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_DTCNTL , +0x8 <<SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_SHIFT ); + +/* Initialize SCC */ +sd_ctrl_write32_as_16_and_16 (host,CTL_STATUS ,0x0 ); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_DTCNTL , +SH_MOBILE_SDHI_SCC_DTCNTL_TAPEN | +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_DTCNTL )); + +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN & +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_CKSEL , +SH_MOBILE_SDHI_SCC_CKSEL_DTSEL | +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_CKSEL )); + +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN | +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL , + ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_DT2FF , host->scc_tappos); + +/* Read TAPNUM */ +return (sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_DTCNTL ) >> +SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_SHIFT ) & +SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_MASK ; +} + +static void sh_mobile_sdhi_prepare_tuning (struct tmio_mmc_host *host, +unsigned long tap) +{ +struct sh_mobile_sdhi *priv =host_to_priv (host); + +/* Set sampling clock position */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_TAPSET , tap); +} + +#define SH_MOBILE_SDHI_MAX_TAP 3 + +static int sh_mobile_sdhi_select_tuning (struct tmio_mmc_host *host) +{ +struct sh_mobile_sdhi *priv =host_to_priv (host); +unsigned long tap_cnt;/* counter of tuning success */ +unsigned long tap_set;/* tap position */ +unsigned long tap_start;/* start position of tuning success */ +unsigned long tap_end;/* end position of tuning success */ +unsigned long ntap;/* temporary counter of tuning success */ +unsigned long i; + +/* Clear SCC_RVSREQ */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSREQ ,0 ); + +/* +* Find the longest consecutive run of successful probes. If that +* is more than SH_MOBILE_SDHI_MAX_TAP probes long then use the +* center index as the tap. +*/ + tap_cnt =0 ; + ntap =0 ; + tap_start =0 ; + tap_end =0 ; +for (i =0 ; i < host->tap_num *2 ; i++) { +if (test_bit (i, host->taps)) + ntap++; +else { +if (ntap > tap_cnt) { + tap_start = i - ntap; + tap_end = i -1 ; + tap_cnt = ntap; + } + ntap =0 ; + } + } + +if (ntap > tap_cnt) { + tap_start = i - ntap; + tap_end = i -1 ; + tap_cnt = ntap; + } + +if (tap_cnt >=SH_MOBILE_SDHI_MAX_TAP ) + tap_set = (tap_start + tap_end) /2 % host->tap_num; +else +return -EIO ; + +/* Set SCC */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_TAPSET , tap_set); + +/* Enable auto re-tuning */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL , +SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN | +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL )); + +return 0 ; +} + + +static bool sh_mobile_sdhi_check_scc_error (struct tmio_mmc_host *host) +{ +struct sh_mobile_sdhi *priv; + +if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) +return 0 ; + + priv =host_to_priv (host); + +/* Check SCC error */ +if (sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL ) & +SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN && +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSREQ ) & +SH_MOBILE_SDHI_SCC_RVSREQ_RVSERR ) { +/* Clear SCC error */ +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSREQ ,0 ); +return true; + } + +return false; +} + +static void sh_mobile_sdhi_hw_reset (struct tmio_mmc_host *host) +{ +struct sh_mobile_sdhi *priv; + +if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) +return ; + + priv =host_to_priv (host); + +/* Reset SCC */ +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL , ~CLK_CTL_SCLKEN & +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_CKSEL , + ~SH_MOBILE_SDHI_SCC_CKSEL_DTSEL & +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_CKSEL )); + +sd_ctrl_write16 (host,CTL_SD_CARD_CLK_CTL ,CLK_CTL_SCLKEN | +sd_ctrl_read16 (host,CTL_SD_CARD_CLK_CTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL , + ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL )); + +sd_scc_write32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL , + ~SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN & +sd_scc_read32 (host, priv,SH_MOBILE_SDHI_SCC_RVSCNTL )); +} +static int sh_mobile_sdhi_wait_idle (struct tmio_mmc_host *host) {int timeout =1000 ;
@@ -332,7 +562,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)struct tmio_mmc_data *mmd = pdev->dev.platform_data;struct tmio_mmc_host *host;struct resource *res; -int irq, ret, i =0 ; +int irq, ret, i;struct tmio_mmc_dma *dma_priv; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -392,6 +622,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) host->card_busy = sh_mobile_sdhi_card_busy; host->start_signal_voltage_switch = sh_mobile_sdhi_start_signal_voltage_switch; + host->init_tuning = sh_mobile_sdhi_init_tuning; + host->prepare_tuning = sh_mobile_sdhi_prepare_tuning; + host->select_tuning = sh_mobile_sdhi_select_tuning; + host->check_scc_error = sh_mobile_sdhi_check_scc_error; + host->hw_reset = sh_mobile_sdhi_hw_reset; }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
@@ -432,6 +667,34 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)if (ret <0 ) goto efree; +if (host->mmc->caps &MMC_CAP_UHS_SDR104 ) { + host->mmc->caps |=MMC_CAP_HW_RESET ; + +if (of_id && of_id->data) { +const struct sh_mobile_sdhi_of_data *of_data; +const struct sh_mobile_sdhi_scc *taps; +bool hit = false; + + of_data = of_id->data; + taps = of_data->taps; + +for (i =0 ; i < of_data->taps_num; i++) { +if (taps[i].clk_rate ==0 || + taps[i].clk_rate == host->mmc->f_max) { + host->scc_tappos = taps->tap; + hit = true; +break ; + } + } + +if (!hit) +dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); + + priv->scc_ctl = host->ctl + of_data->scc_offset; + } + } + + i =0 ;while (1 ) { irq =platform_get_irq (pdev, i);if (irq <0 )
Signature · 1 line
2.7.4
PATCH 43/83 mmc: tmio: fix wrong bitmask for SDIO irqs
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 0c4bf5beff79fd32c5a3b2b511ed6527861ada18 upstream.
Commit 7729c7a232a953 ("mmc: tmio: Provide separate interrupt handlers") refactored the sdio irq handler and wrongly used the mask for SD irqs, not for SDIO irqs. This doesn't really matter in practice because both values keep the only interrupt we are interested in. But still, this is wrong and wants to be fixed.
--- drivers/mmc/host/tmio_mmc_pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc_pio.c +1 -1
@@ -724,7 +724,7 @@ static bool tmio_mmc_sdio_irq(int irq, void *devid)return false; status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ); - ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask; + ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; sdio_status = status & ~TMIO_SDIO_MASK_ALL ;if (pdata->flags &TMIO_MMC_SDIO_STATUS_QUIRK )
Signature · 1 line
2.7.4
PATCH 44/83 mmc: tmio: remove SDIO from TODO list
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit e726e8c959fc735473f248e142de4d4f77ed342b upstream.
We surely have SDIO support by now :)
--- drivers/mmc/host/tmio_mmc_pio.c | 1 - 1 file changed, 1 deletion(-)
drivers/mmc/host/tmio_mmc_pio.c +0 -1
@@ -22,7 +22,6 @@* TODO: * Investigate using a workqueue for PIO transfers * Eliminate FIXMEs -* SDIO support * Better Power management * Handle MMC errors better * double buffer support
Signature · 1 line
2.7.4
PATCH 45/83 mmc: tmio: use SDIO master interrupt bit only when allowed
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit c51ff6c6180e76a1ba96aef799a9c41aa80fcc95 upstream.
The master bit to enable SDIO interrupts can only be accessed if SCLKDIVEN bit allows that. However, the core uses the SDIO enable callback at times when SCLKDIVEN forbids the change. This leads to "timeout waiting for SD bus idle" messages.
We now activate the master bit in probe once if SDIO is supported. IRQ en-/disabling will be done now by the individual IRQ enablement bits only.
--- drivers/mmc/host/tmio_mmc_pio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +4 -3
@@ -140,12 +140,10 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) host->sdio_irq_mask =TMIO_SDIO_MASK_ALL & ~TMIO_SDIO_STAT_IOIRQ ; -sd_ctrl_write16 (host,CTL_TRANSACTION_CTL ,0x0001 );sd_ctrl_write16 (host,CTL_SDIO_IRQ_MASK , host->sdio_irq_mask); }else if (!enable && host->sdio_irq_enabled) { host->sdio_irq_mask =TMIO_SDIO_MASK_ALL ;sd_ctrl_write16 (host,CTL_SDIO_IRQ_MASK , host->sdio_irq_mask); -sd_ctrl_write16 (host,CTL_TRANSACTION_CTL ,0x0000 ); host->sdio_irq_enabled = false;pm_runtime_mark_last_busy (mmc_dev (mmc));
@@ -1235,7 +1233,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,if (pdata->flags &TMIO_MMC_SDIO_IRQ ) { _host->sdio_irq_mask =TMIO_SDIO_MASK_ALL ;sd_ctrl_write16 (_host,CTL_SDIO_IRQ_MASK , _host->sdio_irq_mask); -sd_ctrl_write16 (_host,CTL_TRANSACTION_CTL ,0x0000 ); +sd_ctrl_write16 (_host,CTL_TRANSACTION_CTL ,0x0001 ); }spin_lock_init (&_host->lock);
@@ -1283,6 +1281,9 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)struct platform_device *pdev = host->pdev;struct mmc_host *mmc = host->mmc; +if (host->pdata->flags &TMIO_MMC_SDIO_IRQ ) +sd_ctrl_write16 (host,CTL_TRANSACTION_CTL ,0x0000 ); +if (!host->native_hotplug)pm_runtime_get_sync (&pdev->dev);
Signature · 1 line
2.7.4
PATCH 46/83 mmc: sh_mobile_sdhi: simplify accessing DT data
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit dc9f1a8d790ee766c47eca163261225680691e64 upstream.
By using the helper of_device_get_match_data(), we can skip some checking and make the code simpler.
--- drivers/mmc/host/sh_mobile_sdhi.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +4 -10
@@ -555,8 +555,7 @@ static void sh_mobile_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)static int sh_mobile_sdhi_probe (struct platform_device *pdev) { -const struct of_device_id *of_id = -of_match_device (sh_mobile_sdhi_of_match, &pdev->dev); +const struct sh_mobile_sdhi_of_data *of_data =of_device_get_match_data (&pdev->dev);struct sh_mobile_sdhi *priv;struct tmio_mmc_data *mmc_data;struct tmio_mmc_data *mmd = pdev->dev.platform_data;
@@ -597,9 +596,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) goto eprobe; } -if (of_id && of_id->data) { -const struct sh_mobile_sdhi_of_data *of_data = of_id->data; +if (of_data) { mmc_data->flags |= of_data->tmio_flags; mmc_data->ocr_mask = of_data->tmio_ocr_mask; mmc_data->capabilities |= of_data->capabilities;
@@ -670,14 +668,10 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)if (host->mmc->caps &MMC_CAP_UHS_SDR104 ) { host->mmc->caps |=MMC_CAP_HW_RESET ; -if (of_id && of_id->data) { -const struct sh_mobile_sdhi_of_data *of_data; -const struct sh_mobile_sdhi_scc *taps; +if (of_data) { +const struct sh_mobile_sdhi_scc *taps = of_data->taps;bool hit = false; - of_data = of_id->data; - taps = of_data->taps; -for (i =0 ; i < of_data->taps_num; i++) {if (taps[i].clk_rate ==0 || taps[i].clk_rate == host->mmc->f_max) {
Signature · 1 line
2.7.4
PATCH 47/83 mmc: sh_mobile_sdhi: improve prerequisite for hw_reset
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 6ade9a2c2da855ff38e74c4298976400feca968e upstream.
We need a SCC unit for hw_reset. Those units can only be described in of_data. So, of_data and a valid SCC offset are prerequisites for enabling the hw_reset capability. Merge the two 'if' conditions into one and add a check for an scc offset.
--- drivers/mmc/host/sh_mobile_sdhi.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +14 -16
@@ -665,27 +665,25 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)if (ret <0 ) goto efree; -if (host->mmc->caps &MMC_CAP_UHS_SDR104 ) { +if (of_data && of_data->scc_offset && host->mmc->caps &MMC_CAP_UHS_SDR104 ) { +const struct sh_mobile_sdhi_scc *taps = of_data->taps; +bool hit = false; + host->mmc->caps |=MMC_CAP_HW_RESET ; -if (of_data) { -const struct sh_mobile_sdhi_scc *taps = of_data->taps; -bool hit = false; - -for (i =0 ; i < of_data->taps_num; i++) { -if (taps[i].clk_rate ==0 || - taps[i].clk_rate == host->mmc->f_max) { - host->scc_tappos = taps->tap; - hit = true; -break ; - } +for (i =0 ; i < of_data->taps_num; i++) { +if (taps[i].clk_rate ==0 || + taps[i].clk_rate == host->mmc->f_max) { + host->scc_tappos = taps->tap; + hit = true; +break ; } + } -if (!hit) -dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); +if (!hit) +dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); - priv->scc_ctl = host->ctl + of_data->scc_offset; - } + priv->scc_ctl = host->ctl + of_data->scc_offset; } i =0 ;
Signature · 1 line
2.7.4
PATCH 48/83 mmc: sh_mobile_sdhi: remove superfluous check in hw_reset
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 97c64b2cd57608f7064810780056d17944f49128 upstream.
The capability for HW_RESET is only activated if SDR104 is present, so no need to check for SDR104 in the function itself again.
--- drivers/mmc/host/sh_mobile_sdhi.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +0 -3
@@ -468,9 +468,6 @@ static void sh_mobile_sdhi_hw_reset(struct tmio_mmc_host *host) {struct sh_mobile_sdhi *priv; -if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) -return ; - priv =host_to_priv (host);/* Reset SCC */
Signature · 1 line
2.7.4
PATCH 49/83 mmc: sh_mobile_sdhi: improve prerequisites for tuning
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit e831ead3b3ddc4227cef10dc63d919fd7242d7b8 upstream.
Prerequisites for tuning are the same as for hw_reset. We need an SCC and a supported mode. Populate the tuning related functions only when those conditions are met. This also removes a tiny race window. Previously, the functions were populated when the SCC offset was not initialized which could have led to an OOPS.
--- drivers/mmc/host/sh_mobile_sdhi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +6 -5
@@ -617,11 +617,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) host->card_busy = sh_mobile_sdhi_card_busy; host->start_signal_voltage_switch = sh_mobile_sdhi_start_signal_voltage_switch; - host->init_tuning = sh_mobile_sdhi_init_tuning; - host->prepare_tuning = sh_mobile_sdhi_prepare_tuning; - host->select_tuning = sh_mobile_sdhi_select_tuning; - host->check_scc_error = sh_mobile_sdhi_check_scc_error; - host->hw_reset = sh_mobile_sdhi_hw_reset; }/* Orginally registers were 16 bit apart, could be 32 or 64 nowadays */
@@ -662,6 +657,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)if (ret <0 ) goto efree; +/* Enable tuning iff we have an SCC and a supported mode */ if (of_data && of_data->scc_offset && host->mmc->caps &MMC_CAP_UHS_SDR104 ) {const struct sh_mobile_sdhi_scc *taps = of_data->taps;bool hit = false;
@@ -681,6 +677,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)dev_warn (&host->pdev->dev,"Unknown clock rate for SDR104\n" ); priv->scc_ctl = host->ctl + of_data->scc_offset; + host->init_tuning = sh_mobile_sdhi_init_tuning; + host->prepare_tuning = sh_mobile_sdhi_prepare_tuning; + host->select_tuning = sh_mobile_sdhi_select_tuning; + host->check_scc_error = sh_mobile_sdhi_check_scc_error; + host->hw_reset = sh_mobile_sdhi_hw_reset; } i =0 ;
Signature · 1 line
2.7.4
PATCH 50/83 mmc: sh_mobile_sdhi: remove superfluous check in SCC error check
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 03c5b0d90300fc725fc1fb644872b522483a2d7e upstream.
The function will only be available if SDR104 was detected in probe, so no need to check in the function itself again.
--- drivers/mmc/host/sh_mobile_sdhi.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +1 -6
@@ -444,12 +444,7 @@ static int sh_mobile_sdhi_select_tuning(struct tmio_mmc_host *host)static bool sh_mobile_sdhi_check_scc_error (struct tmio_mmc_host *host) { -struct sh_mobile_sdhi *priv; - -if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) -return 0 ; - - priv =host_to_priv (host); +struct sh_mobile_sdhi *priv =host_to_priv (host);/* Check SCC error */ if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) &
Signature · 1 line
2.7.4
PATCH 51/83 mmc: sh_mobile_sdhi: remove superfluous check in init_tuning
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 7f9096f1c89ea698c22fde91285de2ef3eabd614 upstream.
The function will only be available if SDR104 was detected in probe, so no need to check in the function itself again.
--- drivers/mmc/host/sh_mobile_sdhi.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +0 -3
@@ -335,9 +335,6 @@ static unsigned int sh_mobile_sdhi_init_tuning(struct tmio_mmc_host *host) {struct sh_mobile_sdhi *priv; -if (!(host->mmc->caps &MMC_CAP_UHS_SDR104 )) -return 0 ; - priv =host_to_priv (host);/* set sampling clock selection range */
Signature · 1 line
2.7.4
PATCH 52/83 mmc: sh_mobile_sdhi: enable HS200
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit b1c95170f97ef19ff63a6da1eb2c70899186aecc upstream.
Setup tuning when the board is HS200 enabled.
--- drivers/mmc/host/sh_mobile_sdhi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sh_mobile_sdhi.c +3 -1
@@ -650,7 +650,9 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) goto efree;/* Enable tuning iff we have an SCC and a supported mode */ -if (of_data && of_data->scc_offset && host->mmc->caps &MMC_CAP_UHS_SDR104 ) { +if (of_data && of_data->scc_offset && + (host->mmc->caps &MMC_CAP_UHS_SDR104 || + host->mmc->caps2 &MMC_CAP2_HS200_1_8V_SDR )) {const struct sh_mobile_sdhi_scc *taps = of_data->taps;bool hit = false;
Signature · 1 line
2.7.4
PATCH 53/83 mmc: host: tmio: drop superfluous exit path
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit ad7014b3949b6c2b6ce46a546d6d204b5643e621 upstream.
The probe exit path on error does nothing since commit 94b110aff8679b ("mmc: tmio: add tmio_mmc_host_alloc/free()"), so we can bail out immediately.
--- drivers/mmc/host/tmio_mmc_pio.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +6 -14
@@ -1146,7 +1146,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, ret =mmc_of_parse (mmc);if (ret <0 ) - goto host_free; +return ret; _host->pdata = pdata;platform_set_drvdata (pdev, mmc);
@@ -1156,14 +1156,12 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, ret =tmio_mmc_init_ocr (_host);if (ret <0 ) - goto host_free; +return ret; _host->ctl =devm_ioremap (&pdev->dev, res_ctl->start,resource_size (res_ctl)); -if (!_host->ctl) { - ret = -ENOMEM ; - goto host_free; - } +if (!_host->ctl) +return -ENOMEM ; tmio_mmc_ops.card_busy = _host->card_busy; tmio_mmc_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch;
@@ -1201,10 +1199,8 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,* Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from * looping forever... */ -if (mmc->f_min ==0 ) { - ret = -EINVAL ; - goto host_free; - } +if (mmc->f_min ==0 ) +return -EINVAL ;/* * While using internal tmio hardware logic for card detection, we need
@@ -1269,10 +1265,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, }return 0 ; - -host_free: - -return ret; }EXPORT_SYMBOL (tmio_mmc_host_probe);
Signature · 1 line
2.7.4
PATCH 54/83 mmc: tmio: Remove redundant check of mmc->slot.cd_irq
In reply to Biju DasFrom: Ulf Hansson <[email protected]>
commit efd7be7bfc8eb8942ba3dc319f323cfd0eda99e2 upstream.
To validate whether native hotplug needs to be used, the tmio driver checks whether the mmc->slot.cd_irq has been successfully assigned.
This check is redundant at its current place in tmio_mmc_host_probe(), as the mmc core assigns mmc->slot.cd_irq a valid value first when mmc_gpiod_request_cd_irq() is called. Therefore, let's just remove the check for now, as that also removes a layering violation of the tmio driver accessing core specific data via ->slot.cd_irq.
--- drivers/mmc/host/tmio_mmc_pio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +1 -2
@@ -1178,8 +1178,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, _host->native_hotplug = !(pdata->flags &TMIO_MMC_USE_GPIO_CD || mmc->caps &MMC_CAP_NEEDS_POLL || - mmc->caps &MMC_CAP_NONREMOVABLE || - mmc->slot.cd_irq >=0 ); + !mmc_card_is_removable (mmc));/* * On Gen2+, eMMC with NONREMOVABLE currently fails because native
Signature · 1 line
2.7.4
PATCH 55/83 mmc: host: tmio: disable clocks when unbinding
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit dfcba5ffca989749d1fc49d5b82a2d007b1295b7 upstream.
Create a helper function to disable clocks and use it in remove(), too. Now, clk_summary in debugfs reports the clocks as disabled and unprepared after unbinding.
--- drivers/mmc/host/tmio_mmc_pio.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +9 -2
@@ -903,6 +903,12 @@ static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)return host->clk_enable (host); } +static void tmio_mmc_clk_disable (struct tmio_mmc_host *host) +{ +if (host->clk_disable) + host->clk_disable (host); +} +static void tmio_mmc_power_on (struct tmio_mmc_host *host,unsigned short vdd) {struct mmc_host *mmc = host->mmc;
@@ -1287,6 +1293,8 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); + +tmio_mmc_clk_disable (host); }EXPORT_SYMBOL (tmio_mmc_host_remove);
@@ -1301,8 +1309,7 @@ int tmio_mmc_host_runtime_suspend(struct device *dev)if (host->clk_cache)tmio_mmc_clk_stop (host); -if (host->clk_disable) - host->clk_disable (host); +tmio_mmc_clk_disable (host);return 0 ; }
Signature · 1 line
2.7.4
PATCH 56/83 mmc: host: tmio: refactor calls to sdio irq
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit e4f38eb18aedd098b3019e82df07f583a5cbcc58 upstream.
tmio_mmc_sdio_irq() is not used as a seperate irq handler anymore, so we can make it similar to the other irq helper functions, namely:
* only give the host as argument function which is what it really needs
* prefix function name with __
--- drivers/mmc/host/tmio_mmc_pio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +2 -2
@@ -709,7 +709,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,return false; } -static bool tmio_mmc_sdio_irq (int irq,void *devid) +static bool __tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;
@@ -754,7 +754,7 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)if (__tmio_mmc_sdcard_irq (host, ireg, status))return IRQ_HANDLED ; -if (tmio_mmc_sdio_irq (irq, devid)) +if (__tmio_mmc_sdio_irq (irq, devid))return IRQ_HANDLED ;return IRQ_NONE ;
Signature · 1 line
2.7.4
PATCH 56/83 mmc: host: tmio: refactor calls to sdio irq
Quoted 13 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
e4f38eb18aedd098b3019e82df07f583a5cbcc58upstream.
tmio_mmc_sdio_irq()is not used as a seperate irq handler anymore, so we can make it similar to the other irq helper functions, namely:* only give the host as argument function which is what it really needs
* prefix function name with __+++
b/drivers/mmc/host/tmio_mmc_pio.c
drivers/mmc/host/tmio_mmc_pio.c static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, · line 715
Quoted 8 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-1@@ -709,7 +709,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,return false; } -static bool tmio_mmc_sdio_irq (int irq,void *devid) +static bool __tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;
In mainline, the commit removes the argument, as it says in the changelog. Not here in the backport. Why the difference?
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/56413811/attachment.sig>
PATCH 56/83 mmc: host: tmio: refactor calls to sdio irq
Hi Pavel,
Thanks for the feedback.
Quoted 21 lines
Subject: Re: [PATCH 4.4.y-cip 56/83] mmc: host: tmio: refactor calls to sdio irq
Review static bool __tmio_mmc_sdcard_irq(struct
Quoted 14 lines · Biju Das
From: Wolfram Sang <[email protected]>
commit
e4f38eb18aedd098b3019e82df07f583a5cbcc58upstream.
tmio_mmc_sdio_irq()is not used as a seperate irq handler anymore, so we can make it similar to the other irq helper functions, namely:* only give the host as argument function which is what it really needs
* prefix function name with __+++
b/drivers/mmc/host/tmio_mmc_pio.c(quoted diff) +0
-0@@ -709,7 +709,7 @@ static bool __tmio_mmc_sdcard_irq(struct
tmio_mmc_host*host,Quoted 3 lines
drivers/mmc/host/tmio_mmc_pio.c +0
-0return false; }
Quoted 10 lines
drivers/mmc/host/tmio_mmc_pio.c static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, · line 715
Quoted 5 lines
drivers/mmc/host/tmio_mmc_pio.c +1
-1-static bool tmio_mmc_sdio_irq (int irq,void *devid) +static bool __tmio_mmc_sdio_irq (int irq,void *devid) {struct tmio_mmc_host *host = devid;struct mmc_host *mmc = host->mmc;In mainline, the commit removes the argument, as it says in the changelog. Not here in the backport. Why the difference?
Good catch. I will check this. It should not deviate from the original patch.
I will check and let you know.
Regards,
Biju
PATCH 57/83 mmc: host: tmio: SDIO_STATUS_QUIRK is rather SDIO_STATUS_SETBITS
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 20dd03734cac41a0545dd24f5e81d8ff0c80874b upstream.
QUIRK sounds like there is something wrong, but actually there are just some bits which need to be 1. Rename it to be more clear.
--- drivers/mmc/host/sh_mobile_sdhi.c | 6 ++---- drivers/mmc/host/tmio_mmc_pio.c | 2 +- include/linux/mfd/tmio.h | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-)
drivers/mmc/host/sh_mobile_sdhi.c +2 -4
@@ -640,10 +640,8 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)*/ mmc_data->flags |=TMIO_MMC_HAVE_CMD12_CTRL ; -/* -* All SDHI need SDIO_INFO1 reserved bit -*/ - mmc_data->flags |=TMIO_MMC_SDIO_STATUS_QUIRK ; +/* All SDHI have SDIO status bits which must be 1 */ + mmc_data->flags |=TMIO_MMC_SDIO_STATUS_SETBITS ; ret =tmio_mmc_host_probe (host, mmc_data);if (ret <0 )
drivers/mmc/host/tmio_mmc_pio.c +1 -1
@@ -724,7 +724,7 @@ static bool __tmio_mmc_sdio_irq(int irq, void *devid) ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask; sdio_status = status & ~TMIO_SDIO_MASK_ALL ; -if (pdata->flags &TMIO_MMC_SDIO_STATUS_QUIRK ) +if (pdata->flags &TMIO_MMC_SDIO_STATUS_SETBITS ) sdio_status |=6 ;sd_ctrl_write16 (host,CTL_SDIO_STATUS , sdio_status);
include/linux/mfd/tmio.h +2 -4
@@ -94,10 +94,8 @@*/ #define TMIO_MMC_HAVE_CMD12_CTRL (1 << 7) -/* -* Some controllers needs to set 1 on SDIO status reserved bits -*/ -#define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) +/* Controller has some SDIO status bits which must be 1 */ +#define TMIO_MMC_SDIO_STATUS_SETBITS (1 << 8)/* * Some controllers have a 32-bit wide data port register
Signature · 1 line
2.7.4
PATCH 58/83 mmc: tmio: discard obsolete SDIO irqs before enabling irqs
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit ee28981535f4261ed5d127ddf4d1a3f8778f520d upstream.
Before enabling SDIO irqs, clear the status bit, so we discard old and stale interrupts. Needed to get two wireless cards working. Use the newly introduced macro in all places.
--- drivers/mmc/host/tmio_mmc.h | 2 ++ drivers/mmc/host/tmio_mmc_pio.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/mmc/host/tmio_mmc.h +2 -0
@@ -90,6 +90,8 @@#define TMIO_SDIO_STAT_EXWT 0x8000#define TMIO_SDIO_MASK_ALL 0xc007 +#define TMIO_SDIO_SETBITS_MASK 0x0006 +/* Define some IRQ masks */ /* This is the mask used at reset by the chip */ #define TMIO_MASK_ALL 0x837f031d
drivers/mmc/host/tmio_mmc_pio.c +11 -2
@@ -134,12 +134,21 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)struct tmio_mmc_host *host =mmc_priv (mmc);if (enable && !host->sdio_irq_enabled) { +u16 sdio_status; +/* Keep device active while SDIO irq is enabled */ pm_runtime_get_sync (mmc_dev (mmc)); - host->sdio_irq_enabled = true; + host->sdio_irq_enabled = true; host->sdio_irq_mask =TMIO_SDIO_MASK_ALL & ~TMIO_SDIO_STAT_IOIRQ ; + +/* Clear obsolete interrupts before enabling */ + sdio_status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ) & ~TMIO_SDIO_MASK_ALL ; +if (host->pdata->flags &TMIO_MMC_SDIO_STATUS_SETBITS ) + sdio_status |=TMIO_SDIO_SETBITS_MASK ; +sd_ctrl_write16 (host,CTL_SDIO_STATUS , sdio_status); +sd_ctrl_write16 (host,CTL_SDIO_IRQ_MASK , host->sdio_irq_mask); }else if (!enable && host->sdio_irq_enabled) { host->sdio_irq_mask =TMIO_SDIO_MASK_ALL ;
@@ -725,7 +734,7 @@ static bool __tmio_mmc_sdio_irq(int irq, void *devid) sdio_status = status & ~TMIO_SDIO_MASK_ALL ;if (pdata->flags &TMIO_MMC_SDIO_STATUS_SETBITS ) - sdio_status |=6 ; + sdio_status |=TMIO_SDIO_SETBITS_MASK ;sd_ctrl_write16 (host,CTL_SDIO_STATUS , sdio_status);
Signature · 1 line
2.7.4
PATCH 59/83 mmc: tmio: ensure end of DMA and SD access are in sync
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 52ad9a8e854ca13151f4af8140297f73d49e318a upstream.
The current code assumes that DMA is finished before SD access end is flagged. Thus, it schedules the 'dma_complete' tasklet in the SD card interrupt routine when DATAEND is set. The assumption is not safe, though. Even by mounting an SD card, it can be seen that sometimes DMA complete is first, sometimes DATAEND. It seems they are usually close enough timewise to not cause problems. However, a customer reported that with CMD53 sometimes things really break apart. As a result, the BSP has a patch which introduces flags for both events and makes sure both flags are set before scheduling the tasklet. The customer accepted the patch, yet it doesn't seem a proper upstream solution to me.
This patch refactors the code to replace the tasklet with already existing and more lightweight mechanisms. First of all, we set the callback in a DMA descriptor to automatically get notified when DMA is done. In the callback, we then use a completion to make sure the SD access has already ended. Then, we proceed as before.
--- drivers/mmc/host/tmio_mmc.h | 2 +- drivers/mmc/host/tmio_mmc_dma.c | 58 ++++++++++++++++++++++++----------------- drivers/mmc/host/tmio_mmc_pio.c | 4 +-- 3 files changed, 37 insertions(+), 27 deletions(-)
drivers/mmc/host/tmio_mmc.h +1 -1
@@ -136,7 +136,7 @@ struct tmio_mmc_host {bool force_pio;struct dma_chan *chan_rx;struct dma_chan *chan_tx; -struct tasklet_struct dma_complete; +struct completion dma_dataend;struct tasklet_struct dma_issue;struct scatterlist bounce_sg;u8 *bounce_buf;
drivers/mmc/host/tmio_mmc_dma.c +34 -24
88 lines not on this page · raw message
drivers/mmc/host/tmio_mmc_pio.c +2 -2
@@ -596,11 +596,11 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host, unsigned int stat)if (done) {tmio_mmc_disable_mmc_irqs (host,TMIO_STAT_DATAEND ); -tasklet_schedule (&host->dma_complete); +complete (&host->dma_dataend); } }else if (host->chan_rx && (data->flags &MMC_DATA_READ ) && !host->force_pio) {tmio_mmc_disable_mmc_irqs (host,TMIO_STAT_DATAEND ); -tasklet_schedule (&host->dma_complete); +complete (&host->dma_dataend); }else {tmio_mmc_do_data_irq (host);tmio_mmc_disable_mmc_irqs (host,TMIO_MASK_READOP |TMIO_MASK_WRITEOP );
Signature · 1 line
2.7.4
PATCH 60/83 mmc: host: tmio: use defines for CTL_STOP_INTERNAL_ACTION values
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 9afcbf4a6f1995f3b47088764eaef7b56154beb9 upstream.
--- drivers/mmc/host/tmio_mmc.h | 4 ++++ drivers/mmc/host/tmio_mmc_pio.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/mmc/host/tmio_mmc.h +4 -0
@@ -49,6 +49,10 @@#define CTL_CLK_AND_WAIT_CTL 0x138#define CTL_RESET_SDIO 0x1e0 +/* Definitions for values the CTL_STOP_INTERNAL_ACTION register can take */ +#define TMIO_STOP_STP BIT(0) +#define TMIO_STOP_SEC BIT(8) +/* Definitions for values the CTRL_STATUS register can take. */ #define TMIO_STAT_CMDRESPEND BIT(0)#define TMIO_STAT_DATAEND BIT(2)
drivers/mmc/host/tmio_mmc_pio.c +3 -3
@@ -340,7 +340,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command/* CMD12 is handled by hardware */ if (cmd->opcode ==MMC_STOP_TRANSMISSION && !cmd->arg) { -sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0x001 ); +sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,TMIO_STOP_STP );return 0 ; }
@@ -367,7 +367,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_commandif (data) { c |=DATA_PRESENT ;if (data->blocks >1 ) { -sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0x100 ); +sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,TMIO_STOP_SEC ); c |=TRANSFER_MULTI ;/*
@@ -554,7 +554,7 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)if (stop) {if (stop->opcode ==MMC_STOP_TRANSMISSION && !stop->arg) -sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0x000 ); +sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0 );else BUG (); }
Signature · 1 line
2.7.4
PATCH 61/83 mmc: host: tmio: don't BUG on unsupported stop commands
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit 022f731e03d190d0e4f52f2b1bd90fae0eadd56d upstream.
Halting the kernel on an unsupported stop command seems overkill, report the error and say what we already did (due to autocmd12) instead.
--- drivers/mmc/host/tmio_mmc_pio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +5 -4
@@ -553,10 +553,11 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host) }if (stop) { -if (stop->opcode ==MMC_STOP_TRANSMISSION && !stop->arg) -sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0 ); -else -BUG (); +if (stop->opcode !=MMC_STOP_TRANSMISSION || stop->arg) +dev_err (&host->pdev->dev,"unsupported stop: CMD%u,0x%x. We did CMD12,0\n" , + stop->opcode, stop->arg); + +sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0 ); }schedule_work (&host->done);
Signature · 1 line
2.7.4
PATCH 62/83 mmc: host: tmio: fill in response from auto cmd12
In reply to Biju DasFrom: Wolfram Sang <[email protected]>
commit eb7c00e1461124ad0e85f1a9a3954d7164809c13 upstream.
After we received the dataend interrupt, R1 response register carries the value from the automatically generated stop command. Report that info back to the MMC block layer, so we will be notified in case of e.g. ECC errors which happened during the last transfer.
--- drivers/mmc/host/tmio_mmc_pio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/tmio_mmc_pio.c +3 -0
@@ -557,6 +557,9 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)dev_err (&host->pdev->dev,"unsupported stop: CMD%u,0x%x. We did CMD12,0\n" , stop->opcode, stop->arg); +/* fill in response from auto CMD12 */ + stop->resp[0 ] =sd_ctrl_read16_and_16_as_32 (host,CTL_RESPONSE ); +sd_ctrl_write16 (host,CTL_STOP_INTERNAL_ACTION ,0 ); }
Signature · 1 line
2.7.4
PATCH 63/83 mmc: tmio: always get number of taps
In reply to Biju DasFrom: Masaharu Hayakawa <[email protected]>
commit 43b0b361b0170030603cf76f70b099f3323edcf3 upstream.
Current code gets number of taps only once and keeps the value. This is not correct, we need to obtain it every time before executing tuning, so remove the outer if-block.
--- drivers/mmc/host/tmio_mmc_pio.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/mmc/host/tmio_mmc_pio.c +7 -9
@@ -819,16 +819,14 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)struct tmio_mmc_host *host =mmc_priv (mmc);int i, ret =0 ; -if (!host->tap_num) { -if (!host->init_tuning || !host->select_tuning) -/* Tuning is not supported */ - goto out; +if (!host->init_tuning || !host->select_tuning) +/* Tuning is not supported */ + goto out; - host->tap_num = host->init_tuning (host); -if (!host->tap_num) -/* Tuning is not supported */ - goto out; - } + host->tap_num = host->init_tuning (host); +if (!host->tap_num) +/* Tuning is not supported */ + goto out;if (host->tap_num *2 >=sizeof (host->taps) *BITS_PER_BYTE ) { dev_warn_once(&host->pdev->dev,
Signature · 1 line
2.7.4
PATCH 63/83 mmc: tmio: always get number of taps
Hi!
Quoted 5 lines
commit
43b0b361b0170030603cf76f70b099f3323edcf3upstream.Current code gets number of taps only once and keeps the value. This is not correct, we need to obtain it every time before executing tuning, so remove the outer if-block.
I'd somehow assume number of tuning parameters would be fixed... Does the hardware really change it? Out of curiosity, why is it doing so?
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/79f69835/attachment.sig>
PATCH 63/83 mmc: tmio: always get number of taps
Hi Pavel,
Quoted 4 lines
Subject: Re: [PATCH 4.4.y-cip 63/83] mmc: tmio: always get number of taps
Hi!
Quoted 8 lines
Quoted 5 lines
commit
43b0b361b0170030603cf76f70b099f3323edcf3upstream.Current code gets number of taps only once and keeps the value. This is not correct, we need to obtain it every time before executing tuning, so remove the outer if-block.
I'd somehow assume number of tuning parameters would be fixed... Does the hardware really change it? Out of curiosity, why is it doing so?
I guess it is for hs200 and hs400 tuning.
Regds,
Biju
PATCH 64/83 mmc: tmio: drop filenames from comment at top of source
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit b21f13d8f7bf1b65b2e5396fbd8bfb857627b666 upstream.
Reshuffle the comment at the top of the source dropping filenames and moving up human readable strings.
This seems to be somewhat more useful information to start the source file with. It is also less fragile, f.e. to file renames.
--- drivers/mmc/host/tmio_mmc.c | 8 +++----- drivers/mmc/host/tmio_mmc.h | 7 +++---- drivers/mmc/host/tmio_mmc_dma.c | 4 +--- drivers/mmc/host/tmio_mmc_pio.c | 8 +++----- 4 files changed, 10 insertions(+), 17 deletions(-)
drivers/mmc/host/tmio_mmc.c +3 -5
@@ -1,5 +1,7 @@/* -* linux/drivers/mmc/host/tmio_mmc.c +* Driver for the MMC / SD / SDIO cell found in: +* +* TC6393XB TC6391XB TC6387XB T7L66XB ASIC3 * * Copyright (C) 2007 Ian Molton * Copyright (C) 2004 Ian Molton
@@ -7,10 +9,6 @@* This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. -* -* Driver for the MMC / SD / SDIO cell found in: -* -* TC6393XB TC6391XB TC6387XB T7L66XB ASIC3 */ #include <linux/device.h>
drivers/mmc/host/tmio_mmc.h +3 -4
@@ -1,5 +1,7 @@/* -* linux/drivers/mmc/host/tmio_mmc.h +* Driver for the MMC / SD / SDIO cell found in: +* +* TC6393XB TC6391XB TC6387XB T7L66XB ASIC3 * * Copyright (C) 2016 Sang Engineering, Wolfram Sang * Copyright (C) 2015-16 Renesas Electronics Corporation
@@ -10,9 +12,6 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * -* Driver for the MMC / SD / SDIO cell found in: -* -* TC6393XB TC6391XB TC6387XB T7L66XB ASIC3 */ #ifndef TMIO_MMC_H
drivers/mmc/host/tmio_mmc_dma.c +1 -3
@@ -1,13 +1,11 @@/* -* linux/drivers/mmc/tmio_mmc_dma.c +* DMA function for TMIO MMC implementations * * Copyright (C) 2010-2011 Guennadi Liakhovetski * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. -* -* DMA function for TMIO MMC implementations */ #include <linux/device.h>
drivers/mmc/host/tmio_mmc_pio.c +3 -5
@@ -1,5 +1,7 @@/* -* linux/drivers/mmc/host/tmio_mmc_pio.c +* Driver for the MMC / SD / SDIO IP found in: +* +* TC6393XB, TC6391XB, TC6387XB, T7L66XB, ASIC3, SH-Mobile SoCs * * Copyright (C) 2016 Sang Engineering, Wolfram Sang * Copyright (C) 2015-16 Renesas Electronics Corporation
@@ -11,10 +13,6 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * -* Driver for the MMC / SD / SDIO IP found in: -* -* TC6393XB, TC6391XB, TC6387XB, T7L66XB, ASIC3, SH-Mobile SoCs -* * This driver draws mainly on scattered spec sheets, Reverse engineering * of the toshiba e800 SD driver and some parts of the 2.4 ASIC3 driver (4 bit * support). (Further 4 bit support from a later datasheet).
Signature · 1 line
2.7.4
PATCH 65/83 mmc: renesas-sdhi, tmio: make dma more modular
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 631fa73cfba8dcfd0d1db8eb608527183ed95648 upstream.
Refactor DMA support to allow it to be provided by a set of call-backs that are provided by a host driver. The motivation is to allow multiple DMA implementations to be provided and instantiated at run-time.
Instantiate the existing DMA implementation from the sh_mobile_sdhi driver which appears to match the current use-case. This has the side effect of moving the DMA code from the tmio_core to the sh_mobile_sdhi driver.
A follow-up patch will change the source file for the SDHI DMA implementation accordingly. Another follow-up patch will re-organise the SDHI driver removing the need for tmio_mmc_get_dma_ops().
--- drivers/mmc/host/Makefile | 3 +-- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mmc/host/tmio_mmc.h | 55 ++++++++++++++++----------------------- drivers/mmc/host/tmio_mmc_dma.c | 24 +++++++++++++---- drivers/mmc/host/tmio_mmc_pio.c | 43 +++++++++++++++++++++++++++++- 6 files changed, 86 insertions(+), 43 deletions(-)
drivers/mmc/host/Makefile +1 -2
@@ -37,8 +37,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o tmio_mmc_core-y := tmio_mmc_pio.o -tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_SDHI)) += tmio_mmc_dma.o -obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o +obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o tmio_mmc_dma.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
drivers/mmc/host/sh_mobile_sdhi.c +1 -1
@@ -643,7 +643,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)/* All SDHI have SDIO status bits which must be 1 */ mmc_data->flags |=TMIO_MMC_SDIO_STATUS_SETBITS ; - ret =tmio_mmc_host_probe (host, mmc_data); + ret =tmio_mmc_host_probe (host, mmc_data,tmio_mmc_get_dma_ops ());if (ret <0 ) goto efree;
drivers/mmc/host/tmio_mmc.c +1 -1
@@ -97,7 +97,7 @@ static int tmio_mmc_probe(struct platform_device *pdev)/* SD control register space size is 0x200, 0x400 for bus_shift=1 */ host->bus_shift =resource_size (res) >>10 ; - ret =tmio_mmc_host_probe (host, pdata); + ret =tmio_mmc_host_probe (host, pdata,NULL );if (ret) goto host_free;
drivers/mmc/host/tmio_mmc.h +22 -33
84 lines not on this page · raw message
drivers/mmc/host/tmio_mmc_dma.c +19 -5
@@ -20,7 +20,7 @@#define TMIO_MMC_MIN_DMA_LEN 8 -void tmio_mmc_enable_dma (struct tmio_mmc_host *host,bool enable) +static void tmio_mmc_enable_dma (struct tmio_mmc_host *host,bool enable) {if (!host->chan_tx || !host->chan_rx)return ;
@@ -29,7 +29,7 @@ void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) host->dma->enable (host, enable); } -void tmio_mmc_abort_dma (struct tmio_mmc_host *host) +static void tmio_mmc_abort_dma (struct tmio_mmc_host *host) {tmio_mmc_enable_dma (host, false);
@@ -218,7 +218,7 @@ pio: } } -void tmio_mmc_start_dma (struct tmio_mmc_host *host, +static void tmio_mmc_start_dma (struct tmio_mmc_host *host,struct mmc_data *data) {if (data->flags &MMC_DATA_READ ) {
@@ -252,7 +252,8 @@ static void tmio_mmc_issue_tasklet_fn(unsigned long priv)dma_async_issue_pending (chan); } -void tmio_mmc_request_dma (struct tmio_mmc_host *host,struct tmio_mmc_data *pdata) +static void tmio_mmc_request_dma (struct tmio_mmc_host *host, +struct tmio_mmc_data *pdata) {/* We can only either use DMA for both Tx and Rx or not use it at all */ if (!host->dma || (!host->pdev->dev.of_node &&
@@ -332,7 +333,7 @@ ecfgtx: host->chan_tx =NULL ; } -void tmio_mmc_release_dma (struct tmio_mmc_host *host) +static void tmio_mmc_release_dma (struct tmio_mmc_host *host) {if (host->chan_tx) {struct dma_chan *chan = host->chan_tx;
@@ -349,3 +350,16 @@ void tmio_mmc_release_dma(struct tmio_mmc_host *host) host->bounce_buf =NULL ; } } + +static const struct tmio_mmc_dma_ops tmio_mmc_dma_ops = { + .start = tmio_mmc_start_dma, + .enable = tmio_mmc_enable_dma, + .request = tmio_mmc_request_dma, + .release = tmio_mmc_release_dma, + .abort = tmio_mmc_abort_dma, +}; + +const struct tmio_mmc_dma_ops *tmio_mmc_get_dma_ops (void ) +{ +return &tmio_mmc_dma_ops; +}
drivers/mmc/host/tmio_mmc_pio.c +42 -1
78 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 66/83 mmc: tmio: rename tmio_mmc_{pio => core}.c
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 426e95d1766bad20e59f219af64fdd50c39bcfee upstream.
Rename tmio_mmc_pio.c to tmio_mmc_core.c to more accurately reflect its
function: to provide core code for the tmio-mmc and sh-mobole-sdhi drivers.
--- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc_core.c | 1394 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 1394 -------------------------------------- 3 files changed, 1394 insertions(+), 1395 deletions(-) create mode 100644 drivers/mmc/host/tmio_mmc_core.c delete mode 100644 drivers/mmc/host/tmio_mmc_pio.c
drivers/mmc/host/Makefile +0 -1
@@ -36,7 +36,6 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -tmio_mmc_core-y := tmio_mmc_pio.o obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o tmio_mmc_dma.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
drivers/mmc/host/tmio_mmc_core.c new file +1394 -0
1,394 lines not on this page · raw message
drivers/mmc/host/tmio_mmc_pio.c deleted +0 -1394
1,394 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 66/83 mmc: tmio: rename tmio_mmc_{pio => core}.c
Hi!
Quoted 10 lines
commit
426e95d1766bad20e59f219af64fdd50c39bcfeeupstream.Rename
tmio_mmc_pio.ctotmio_mmc_core.cto more accurately reflect its
function: to provide core code for the tmio-mmc and sh-mobole-sdhi drivers.Signed-off-by Simon Horman <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Wolfram Sang <[email protected]>Signed-off-by Ulf Hansson <[email protected]>Signed-off-by Biju Das <[email protected]>
Quoted 4 lines
--- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc_core.c | 1394 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 1394 --------------------------------------
This patch creates tmio_mmc_core.c ...
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 41
Quoted 9 lines
+++ b/drivers/mmc/host/Makefile
drivers/mmc/host/Makefile +0
-1@@ -36,7 +36,6 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -tmio_mmc_core-y := tmio_mmc_pio.o obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o tmio_mmc_dma.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
... which is already present in the Makefile before the patch. That can't be right.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/28981284/attachment.sig>
PATCH 66/83 mmc: tmio: rename tmio_mmc_{pio => core}.c
Hi Pavel,
Quoted 32 lines
-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Friday, November 8, 2019 9:48 AM
To: Biju Das <[email protected]>
Cc: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>; Chris Paterson <[email protected]>; Fabrizio Castro <[email protected]>
Subject: Re: [PATCH 4.4.y-cip 66/83] mmc: tmio: rename tmio_mmc_{pio => core}.cHi!
Quoted 5 lines
commit
426e95d1766bad20e59f219af64fdd50c39bcfeeupstream.Rename
tmio_mmc_pio.ctotmio_mmc_core.cto more accurately reflect its
function: to provide core code for the tmio-mmc and sh-mobole-sdhidrivers.
Quoted 6 lines
Signed-off-by Simon Horman <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Wolfram Sang <[email protected]>Signed-off-by Ulf Hansson <[email protected]>Signed-off-by Biju Das <[email protected]>Quoted 6 lines
--- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc_core.c | 1394 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 1394--------------------------------------
Quoted 1 line
This patch creates
tmio_mmc_core.c...
yes, if you see the subec mmc: tmio: rename tmio_mmc_{pio => core}.c
Is it anything wrong? Am I missing something here?
Regards,
Biju
Quoted 19 lines
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 39
Quoted 7 lines
+++ b/drivers/mmc/host/Makefile
drivers/mmc/host/Makefile +0
-1@@ -36,7 +36,6 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -tmio_mmc_core-y := tmio_mmc_pio.o obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.otmio_mmc_dma.o
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 41
Quoted 2 lines
drivers/mmc/host/Makefile +0
-0obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o... which is already present in the
Makefilebefore the patch. That can't be right.Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 66/83 mmc: tmio: rename tmio_mmc_{pio => core}.c
Hi!
Quoted 19 lines
Quoted 19 lines
Quoted 5 lines
commit
426e95d1766bad20e59f219af64fdd50c39bcfeeupstream.Rename
tmio_mmc_pio.ctotmio_mmc_core.cto more accurately reflect its
function: to provide core code for the tmio-mmc and sh-mobole-sdhidrivers.
Quoted 12 lines
Signed-off-by Simon Horman <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Wolfram Sang <[email protected]>Signed-off-by Ulf Hansson <[email protected]>Signed-off-by Biju Das <[email protected]>--- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc_core.c | 1394 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 1394--------------------------------------
Quoted 5 lines
Quoted 1 line
This patch creates
tmio_mmc_core.c...yes, if you see the subec mmc: tmio: rename tmio_mmc_{pio => core}.c
Is it anything wrong? Am I missing something here?
There were more comments in my email, see below.
But reading them again, I see I was wrong. Makefile magic was used to turn tmio_mmc_pio.c into tmio_mmc_core.o, so there's no bug here.
Sorry for the noise.
Best regards,
Pavel
Quoted 13 lines
Quoted 13 lines
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 39
Quoted 7 lines
+++ b/drivers/mmc/host/Makefile
drivers/mmc/host/Makefile +0
-1@@ -36,7 +36,6 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -tmio_mmc_core-y := tmio_mmc_pio.o obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.otmio_mmc_dma.o
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 41
Quoted 2 lines
drivers/mmc/host/Makefile +0
-0obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o... which is already present in the
Makefilebefore the patch. That can't be right.
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/3923adb8/attachment.sig>
PATCH 66/83 mmc: tmio: rename tmio_mmc_{pio => core}.c
Hi Pavel,
Quoted 28 lines
Subject: Re: [PATCH 4.4.y-cip 66/83] mmc: tmio: rename tmio_mmc_{pio => core}.c
Hi!
Quoted 23 lines
Quoted 19 lines
Quoted 5 lines
commit
426e95d1766bad20e59f219af64fdd50c39bcfeeupstream.Rename
tmio_mmc_pio.ctotmio_mmc_core.cto more accurately reflect its
function: to provide core code for the tmio-mmc and sh-mobole-sdhidrivers.
Quoted 6 lines
Signed-off-by Simon Horman <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Wolfram Sang <[email protected]>Signed-off-by Ulf Hansson <[email protected]>Signed-off-by Biju Das <[email protected]>Quoted 6 lines
--- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/tmio_mmc_core.c | 1394 ++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/tmio_mmc_pio.c | 1394--------------------------------------
Quoted 1 line
This patch creates
tmio_mmc_core.c...yes, if you see the subec mmc: tmio: rename tmio_mmc_{pio => core}.c
Quoted 8 lines
Quoted 1 line
Is it anything wrong? Am I missing something here?
There were more comments in my email, see below.
But reading them again, I see I was wrong.
Makefilemagic was used to turntmio_mmc_pio.cinto tmio_mmc_core.o, so there's no bug here.Sorry for the noise.
OK.
Cheers,
Biju
Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 39
Quoted 7 lines
+++ b/drivers/mmc/host/Makefile
drivers/mmc/host/Makefile +0
-1@@ -36,7 +36,6 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -tmio_mmc_core-y := tmio_mmc_pio.o obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.otmio_mmc_dma.o
Quoted 5 lines
Quoted 5 lines
drivers/mmc/host/Makefile obj-$(CONFIG_MMC_S3C) += s3cmci.o · line 41
Quoted 2 lines
drivers/mmc/host/Makefile +0
-0obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o... which is already present in the
Makefilebefore the patch. That can't be right.--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 67/83 mmc: renesas-sdhi: rename tmio_mmc_dma.c => renesas_sdhi_sys_dmac.c
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit c2a96987c76f093be50550130f5629723b091176 upstream.
Rename the source file for DMA for SDHI as a follow-up to attaching DMA code to the SDHI driver rather than the tmio_core driver.
The name "renesas" is chosen as the SDHI driver is applicable to a wider range of SoCs than SH-Mobile it seems to be a more appropriate name. However, the SDHI driver source itself, is left as sh_mobile_sdhi to avoid unnecessary churn.
The name sys_dmac was chosen to reflect the type of DMA used.
Internal symbols have also been renamed to reflect the filename change.
A follow-up patch will re-organise the SDHI driver removing the need for renesas_sdhi_get_dma_ops().
--- drivers/mmc/host/Makefile | 2 +- drivers/mmc/host/renesas_sdhi.h | 18 ++ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 368 +++++++++++++++++++++++++++++++ drivers/mmc/host/sh_mobile_sdhi.c | 3 +- drivers/mmc/host/tmio_mmc.h | 9 - drivers/mmc/host/tmio_mmc_dma.c | 365 ------------------------------ 6 files changed, 389 insertions(+), 376 deletions(-) create mode 100644 drivers/mmc/host/renesas_sdhi.h create mode 100644 drivers/mmc/host/renesas_sdhi_sys_dmac.c delete mode 100644 drivers/mmc/host/tmio_mmc_dma.c
drivers/mmc/host/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o tmio_mmc_dma.o +obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o renesas_sdhi_sys_dmac.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
drivers/mmc/host/renesas_sdhi.h new file +18 -0
@@ -0,0 +1,18 @@ +/* +* Renesas Mobile SDHI +* +* Copyright (C) 2017 Horms Solutions Ltd., Simon Horman +* Copyright (C) 2017 Renesas Electronics Corporation +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef RENESAS_SDHI_H +#define RENESAS_SDHI_H + +#include "tmio_mmc.h" + +const struct tmio_mmc_dma_ops *renesas_sdhi_get_dma_ops (void ); +#endif
drivers/mmc/host/renesas_sdhi_sys_dmac.c new file +368 -0
368 lines not on this page · raw message
drivers/mmc/host/sh_mobile_sdhi.c +2 -1
@@ -35,6 +35,7 @@#include <linux/pinctrl/pinctrl-state.h> #include <linux/regulator/consumer.h> +#include "renesas_sdhi.h" #include "tmio_mmc.h" #define EXT_ACC 0xe4
@@ -643,7 +644,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)/* All SDHI have SDIO status bits which must be 1 */ mmc_data->flags |=TMIO_MMC_SDIO_STATUS_SETBITS ; - ret =tmio_mmc_host_probe (host, mmc_data,tmio_mmc_get_dma_ops ()); + ret =tmio_mmc_host_probe (host, mmc_data,renesas_sdhi_get_dma_ops ());if (ret <0 ) goto efree;
drivers/mmc/host/tmio_mmc.h +0 -9
@@ -212,15 +212,6 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);void tmio_mmc_disable_mmc_irqs (struct tmio_mmc_host *host,u32 i);irqreturn_t tmio_mmc_irq (int irq,void *devid); -#if IS_ENABLED (CONFIG_MMC_SDHI ) -const struct tmio_mmc_dma_ops *tmio_mmc_get_dma_ops (void ); -#else -static inline const struct tmio_mmc_dma_ops *tmio_mmc_get_dma_ops (void ) -{ -return NULL ; -} -#endif -static inline char *tmio_mmc_kmap_atomic (struct scatterlist *sg,unsigned long *flags) {
drivers/mmc/host/tmio_mmc_dma.c deleted +0 -365
365 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 68/83 mmc: renesas-sdhi: rename sh_mobile_sdhi.c => renesas_sdhi_core.c
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit b5b6a5f4f06c0624886b2166e2e8580327f0b943 upstream.
Rename the source file SDHI. A follow-up patch will make it a library file used by a different top-level module file.
The name "renesas" is chosen as the SDHI driver is applicable to a wider range of SoCs than SH-Mobile it seems to be a more appropriate name. However, the SDHI driver source itself, is left as sh_mobile_sdhi to avoid unnecessary churn.
the name "core" was chosen to reflect the desired role of this file, to provide core functionality to the sdhi driver. A follow-up patch will move the file into that role.
Internal symbols have also been renamed to reflect the filename change.
The .name member of struct platform_driver and parameter to MODULE_ALIAS() have not been changed in order to avoid the complication of potentially breaking SH SoCs which still use platform drivers.
--- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/Makefile | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 741 ++++++++++++++++++++++++++++++++++ drivers/mmc/host/sh_mobile_sdhi.c | 746 ----------------------------------- 4 files changed, 743 insertions(+), 748 deletions(-) create mode 100644 drivers/mmc/host/renesas_sdhi_core.c delete mode 100644 drivers/mmc/host/sh_mobile_sdhi.c
drivers/mmc/host/Kconfig +1 -1
@@ -565,7 +565,7 @@ config MMC_SDHI select MMC_TMIO_CORE help This provides support for the SDHI SD/SDIO controller found in - SuperH and ARM SH-Mobile SoCs + Renesas SuperH, ARM and ARM64 based SoCs config MMC_CB710 tristate "ENE CB710 MMC/SD Interface support"
drivers/mmc/host/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -obj-$(CONFIG_MMC_SDHI) += sh_mobile_sdhi.o renesas_sdhi_sys_dmac.o +obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o renesas_sdhi_sys_dmac.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
drivers/mmc/host/renesas_sdhi_core.c new file +741 -0
741 lines not on this page · raw message
drivers/mmc/host/sh_mobile_sdhi.c deleted +0 -746
746 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 69/83 mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 9d08428afb722fedaea699a32aaf603a8f1ebd5a upstream.
Make renesas_sdhi_sys_dmac.c a top-level module file that makes use of library code supplied by renesas_sdhi_core.c
This is in order to facilitate adding other variants of SDHI; in particular SDHI using different DMA controllers.
--- drivers/mmc/host/renesas_sdhi.h | 23 +++++- drivers/mmc/host/renesas_sdhi_core.c | 128 ++----------------------------- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 109 +++++++++++++++++++++++++- 3 files changed, 135 insertions(+), 125 deletions(-)
drivers/mmc/host/renesas_sdhi.h +22 -1
@@ -12,7 +12,28 @@#ifndef RENESAS_SDHI_H #define RENESAS_SDHI_H +#include <linux/platform_device.h> #include "tmio_mmc.h" -const struct tmio_mmc_dma_ops *renesas_sdhi_get_dma_ops (void ); +struct renesas_sdhi_scc { +unsigned long clk_rate;/* clock rate for SDR104 */ +u32 tap;/* sampling clock position for SDR104 */ +}; + +struct renesas_sdhi_of_data { +unsigned long tmio_flags; +u32 tmio_ocr_mask; +unsigned long capabilities; +unsigned long capabilities2; +enum dma_slave_buswidth dma_buswidth; +dma_addr_t dma_rx_offset; +unsigned bus_shift; +int scc_offset; +struct renesas_sdhi_scc *taps; +int taps_num; +}; + +int renesas_sdhi_probe (struct platform_device *pdev, +const struct tmio_mmc_dma_ops *dma_ops); +int renesas_sdhi_remove (struct platform_device *pdev);#endif
drivers/mmc/host/renesas_sdhi_core.c +8 -120
167 lines not on this page · raw message
drivers/mmc/host/renesas_sdhi_sys_dmac.c +105 -4
139 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 69/83 mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file
Quoted 9 lines · Biju Das
From: Simon Horman <[email protected]>
commit
9d08428afb722fedaea699a32aaf603a8f1ebd5aupstream.Make
renesas_sdhi_sys_dmac.ca top-level module file that makes use of library code supplied byrenesas_sdhi_core.cThis is in order to facilitate adding other variants of SDHI; in particular SDHI using different DMA controllers.
Patches 66 to 69 do a big rename while changing the code in question. That makes them hard / tricky to review. I should review that again, either now or in next version of the patch.
drivers/mmc/host/renesas_sdhi_core.c static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable) · line 455
Quoted 7 lines
drivers/mmc/host/renesas_sdhi_core.c +3
-2-static int renesas_sdhi_probe (struct platform_device *pdev) +int renesas_sdhi_probe (struct platform_device *pdev, +const struct tmio_mmc_dma_ops *dma_ops) { -const struct renesas_sdhi_of_data *of_data =of_device_get_match_data (&pdev->dev); +const struct renesas_sdhi_of_data *of_data =of_device_get_match_data ( &pdev->dev);struct renesas_sdhi *priv;
Prototype changed here. The space was added in the wrong place.
Quoted 11 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +0
-2@@ -46,8 +119,6 @@ static void renesas_sdhi_sys_dmac_dma_callback(void *arg) {struct tmio_mmc_host *host = arg; -wait_for_completion (&host->dma_dataend); -spin_lock_irq (&host->lock);if (!host->data)@@ -62,6 +133,11 @@ static void renesas_sdhi_sys_dmac_dma_callback(void *arg) host->sg_ptr, host->sg_len,
drivers/mmc/host/renesas_sdhi_sys_dmac.c static void renesas_sdhi_sys_dmac_dma_callback(void *arg) · line 143
Quoted 10 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +5
-0DMA_TO_DEVICE); +spin_unlock_irq (&host->lock); + +wait_for_completion (&host->dma_dataend); + +spin_lock_irq (&host->lock);tmio_mmc_do_data_irq (host); out:spin_unlock_irq (&host->lock);
But this is worse: wait_for_completion is moving around, along with locking changes. Change is not documented and is not present in upstream version of the commit.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/e11a1348/attachment-0001.sig>
PATCH 69/83 mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file
Hi Pavel,
Quoted 11 lines
Subject: Re: [PATCH 4.4.y-cip 69/83] mmc: renesas-sdhi: make
renesas_sdhi_sys_dmacmain module fileQuoted 7 lines · Biju Das
From: Simon Horman <[email protected]>
commit
9d08428afb722fedaea699a32aaf603a8f1ebd5aupstream.Make
renesas_sdhi_sys_dmac.ca top-level module file that makes use of library code supplied byrenesas_sdhi_core.c
Quoted 6 lines
Quoted 2 lines
This is in order to facilitate adding other variants of SDHI; in particular SDHI using different DMA controllers.
Patches 66 to 69 do a big rename while changing the code in question. That makes them hard / tricky to review. I should review that again, either now or in next version of the patch.
Yes I agree, it is little bit trickier. I am waiting for your comments.
Regards,
biju
Quoted 45 lines
drivers/mmc/host/renesas_sdhi_core.c static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)
Quoted 5 lines
drivers/mmc/host/renesas_sdhi_core.c +2
-2-static int renesas_sdhi_probe (struct platform_device *pdev) +int renesas_sdhi_probe (struct platform_device *pdev, +const struct tmio_mmc_dma_ops *dma_ops) { - const struct renesas_sdhi_of_data *of_data =
of_device_get_match_data(&pdev->dev);Review
Quoted 3 lines
(quoted diff) +2
-0+ const struct renesas_sdhi_of_data *of_data = +of_device_get_match_data( &pdev->dev); struct renesas_sdhi *priv;Prototype changed here. The space was added in the wrong place.
Review static void
Quoted 1 line
(quoted diff) +0
-0@@ -46,8 +119,6 @@ static voidrenesas_sdhi_sys_dmac_dma_callback(void
drivers/mmc/host/renesas_sdhi_sys_dmac.c static void
Quoted 9 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +0
-2*arg) {struct tmio_mmc_host *host = arg; -wait_for_completion (&host->dma_dataend); -spin_lock_irq (&host->lock);if (!host->data)@@ -62,6 +133,11 @@ static void
renesas_sdhi_sys_dmac_dma_callback(void *arg)drivers/mmc/host/renesas_sdhi_sys_dmac.c static void renesas_sdhi_sys_dmac_dma_callback(void *arg) · line 143
Quoted 11 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +5
-0host->sg_ptr, host->sg_len, DMA_TO_DEVICE); +spin_unlock_irq (&host->lock); + +wait_for_completion (&host->dma_dataend); + +spin_lock_irq (&host->lock);tmio_mmc_do_data_irq (host); out:spin_unlock_irq (&host->lock);But this is worse:
wait_for_completionis moving around, along with locking changes. Change is not documented and is not present in upstream version of the commit.Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 69/83 mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file
Hi!
Quoted 11 lines
Quoted 11 lines · Biju Das
Quoted 9 lines
From: Simon Horman <[email protected]>
commit
9d08428afb722fedaea699a32aaf603a8f1ebd5aupstream.Make
renesas_sdhi_sys_dmac.ca top-level module file that makes use of library code supplied byrenesas_sdhi_core.cThis is in order to facilitate adding other variants of SDHI; in particular SDHI using different DMA controllers.
Quoted 6 lines
Quoted 3 lines
Patches 66 to 69 do a big rename while changing the code in question. That makes them hard / tricky to review. I should review that again, either now or in next version of the patch.
Yes I agree, it is little bit trickier. I am waiting for your comments.
Did you see / do you want to comment on the hunks below? Original patch is marked by "> > >", my comments are marked by "> >"
Best regards,
Pavel
Quoted 39 lines
Quoted 39 lines
drivers/mmc/host/renesas_sdhi_core.c static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable)
Quoted 5 lines
drivers/mmc/host/renesas_sdhi_core.c +2
-2-static int renesas_sdhi_probe (struct platform_device *pdev) +int renesas_sdhi_probe (struct platform_device *pdev, +const struct tmio_mmc_dma_ops *dma_ops) { - const struct renesas_sdhi_of_data *of_data =
of_device_get_match_data(&pdev->dev);Review
Quoted 3 lines
(quoted diff) +2
-0+ const struct renesas_sdhi_of_data *of_data = +of_device_get_match_data( &pdev->dev); struct renesas_sdhi *priv;Prototype changed here. The space was added in the wrong place.
Review static void
Quoted 1 line
(quoted diff) +0
-0@@ -46,8 +119,6 @@ static voidrenesas_sdhi_sys_dmac_dma_callback(void
drivers/mmc/host/renesas_sdhi_sys_dmac.c static void
Quoted 9 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +0
-2*arg) {struct tmio_mmc_host *host = arg; -wait_for_completion (&host->dma_dataend); -spin_lock_irq (&host->lock);if (!host->data)@@ -62,6 +133,11 @@ static void
renesas_sdhi_sys_dmac_dma_callback(void *arg)drivers/mmc/host/renesas_sdhi_sys_dmac.c static void renesas_sdhi_sys_dmac_dma_callback(void *arg) · line 143
Quoted 11 lines
drivers/mmc/host/renesas_sdhi_sys_dmac.c +5
-0host->sg_ptr, host->sg_len, DMA_TO_DEVICE); +spin_unlock_irq (&host->lock); + +wait_for_completion (&host->dma_dataend); + +spin_lock_irq (&host->lock);tmio_mmc_do_data_irq (host); out:spin_unlock_irq (&host->lock);But this is worse:
wait_for_completionis moving around, along with locking changes. Change is not documented and is not present in upstream version of the commit.
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/53765c48/attachment.sig>
PATCH 70/83 mmc: renesas-sdhi: improve checkpatch cleanness
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 2fe35968feccaee61413edbe54bec66bc80a67a7 upstream.
Trivial updates to improve checkpatch cleanness.
--- drivers/mmc/host/renesas_sdhi.h | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 43 ++++++++++++++++---------------- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 25 +++++++++++-------- 3 files changed, 37 insertions(+), 33 deletions(-)
drivers/mmc/host/renesas_sdhi.h +1 -1
@@ -34,6 +34,6 @@ struct renesas_sdhi_of_data { };int renesas_sdhi_probe (struct platform_device *pdev, -const struct tmio_mmc_dma_ops *dma_ops); +const struct tmio_mmc_dma_ops *dma_ops);int renesas_sdhi_remove (struct platform_device *pdev);#endif
drivers/mmc/host/renesas_sdhi_core.c +22 -21
134 lines not on this page · raw message
drivers/mmc/host/renesas_sdhi_sys_dmac.c +14 -11
@@ -92,7 +92,6 @@ static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = { };MODULE_DEVICE_TABLE (of, renesas_sdhi_sys_dmac_of_match); -static void renesas_sdhi_sys_dmac_enable_dma (struct tmio_mmc_host *host,bool enable) {
@@ -184,8 +183,8 @@ static void renesas_sdhi_sys_dmac_start_dma_rx(struct tmio_mmc_host *host) ret =dma_map_sg (chan->device->dev, sg, host->sg_len,DMA_FROM_DEVICE );if (ret >0 ) - desc =dmaengine_prep_slave_sg (chan, sg, ret, -DMA_DEV_TO_MEM ,DMA_CTRL_ACK ); + desc =dmaengine_prep_slave_sg (chan, sg, ret,DMA_DEV_TO_MEM , +DMA_CTRL_ACK );if (desc) {reinit_completion (&host->dma_dataend);
@@ -253,6 +252,7 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host)if (!aligned) {unsigned long flags;void *sg_vaddr =tmio_mmc_kmap_atomic (sg, &flags); +sg_init_one (&host->bounce_sg, host->bounce_buf, sg->length);memcpy (host->bounce_buf, sg_vaddr, host->bounce_sg.length);tmio_mmc_kunmap_atomic (sg, &flags, sg_vaddr);
@@ -262,8 +262,8 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host) ret =dma_map_sg (chan->device->dev, sg, host->sg_len,DMA_TO_DEVICE );if (ret >0 ) - desc =dmaengine_prep_slave_sg (chan, sg, ret, -DMA_MEM_TO_DEV ,DMA_CTRL_ACK ); + desc =dmaengine_prep_slave_sg (chan, sg, ret,DMA_MEM_TO_DEV , +DMA_CTRL_ACK );if (desc) {reinit_completion (&host->dma_dataend);
@@ -296,7 +296,7 @@ pio: }static void renesas_sdhi_sys_dmac_start_dma (struct tmio_mmc_host *host, -struct mmc_data *data) +struct mmc_data *data) {if (data->flags &MMC_DATA_READ ) {if (host->chan_rx)
@@ -334,7 +334,7 @@ static void renesas_sdhi_sys_dmac_request_dma(struct tmio_mmc_host *host, {/* We can only either use DMA for both Tx and Rx or not use it at all */ if (!host->dma || (!host->pdev->dev.of_node && - (!pdata->chan_priv_tx || !pdata->chan_priv_rx))) + (!pdata->chan_priv_tx || !pdata->chan_priv_rx)))return ;if (!host->chan_tx && !host->chan_rx) {
@@ -360,7 +360,8 @@ static void renesas_sdhi_sys_dmac_request_dma(struct tmio_mmc_host *host,return ; cfg.direction =DMA_MEM_TO_DEV ; - cfg.dst_addr = res->start + (CTL_SD_DATA_PORT << host->bus_shift); + cfg.dst_addr = res->start + + (CTL_SD_DATA_PORT << host->bus_shift); cfg.dst_addr_width = host->dma->dma_buswidth;if (!cfg.dst_addr_width) cfg.dst_addr_width =DMA_SLAVE_BUSWIDTH_2_BYTES ;
@@ -416,11 +417,13 @@ static void renesas_sdhi_sys_dmac_release_dma(struct tmio_mmc_host *host) {if (host->chan_tx) {struct dma_chan *chan = host->chan_tx; + host->chan_tx =NULL ;dma_release_channel (chan); }if (host->chan_rx) {struct dma_chan *chan = host->chan_rx; + host->chan_rx =NULL ;dma_release_channel (chan); }
@@ -445,10 +448,10 @@ static int renesas_sdhi_sys_dmac_probe(struct platform_device *pdev)static const struct dev_pm_ops renesas_sdhi_sys_dmac_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) + pm_runtime_force_resume)SET_RUNTIME_PM_OPS (tmio_mmc_host_runtime_suspend, - tmio_mmc_host_runtime_resume, -NULL ) + tmio_mmc_host_runtime_resume, +NULL ) };static struct platform_driver renesas_sys_dmac_sdhi_driver = {
Signature · 1 line
2.7.4
PATCH 71/83 mmc: tmio, renesas-sdhi: add max_{segs, blk_count} to tmio_mmc_data
In reply to Biju DasFrom: Yoshihiro Shimoda <[email protected]>
commit 603aa14d3daaa7073bab4c472025c4963030e0cc upstream.
Allow TMIO and SDHI driver implementations to provide values for max_segs and max_blk_count.
A follow-up patch will set these values for Renesas Gen3 SoCs the using an SDHI driver.
--- drivers/mmc/host/renesas_sdhi.h | 2 ++ drivers/mmc/host/renesas_sdhi_core.c | 2 ++ drivers/mmc/host/tmio_mmc_core.c | 6 +++--- include/linux/mfd/tmio.h | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-)
drivers/mmc/host/renesas_sdhi.h +2 -0
@@ -31,6 +31,8 @@ struct renesas_sdhi_of_data {int scc_offset;struct renesas_sdhi_scc *taps;int taps_num; +unsigned int max_blk_count; +unsigned short max_segs; }; int renesas_sdhi_probe(struct platform_device *pdev,
drivers/mmc/host/renesas_sdhi_core.c +2 -0
@@ -502,6 +502,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; mmc_data->dma_rx_offset = of_data->dma_rx_offset; + mmc_data->max_blk_count = of_data->max_blk_count; + mmc_data->max_segs = of_data->max_segs; dma_priv->dma_buswidth = of_data->dma_buswidth; host->bus_shift = of_data->bus_shift; }
drivers/mmc/host/tmio_mmc_core.c +3 -3
@@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, mmc->caps |=MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; - mmc->max_segs =32 ; + mmc->max_segs = pdata->max_segs ? :32 ; mmc->max_blk_size =512 ; - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * - mmc->max_segs; + mmc->max_blk_count = pdata->max_blk_count ? : + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; mmc->max_seg_size = mmc->max_req_size;
include/linux/mfd/tmio.h +2 -0
@@ -128,6 +128,8 @@ struct tmio_mmc_data {unsigned int cd_gpio;int alignment_shift;dma_addr_t dma_rx_offset; +unsigned int max_blk_count; +unsigned short max_segs;void (*set_pwr)(struct platform_device *host,int state);void (*set_clk_div)(struct platform_device *host,int state); };
Signature · 1 line
2.7.4
PATCH 71/83 mmc: tmio, renesas-sdhi: add max_{segs, blk_count} to tmio_mmc_data
Hi!
Quoted 14 lines
commit
603aa14d3daaa7073bab4c472025c4963030e0ccupstream.Allow TMIO and SDHI driver implementations to provide values for
max_segsandmax_blk_count.A follow-up patch will set these values for Renesas Gen3 SoCs the using an SDHI driver.
Signed-off-by Yoshihiro Shimoda <[email protected]>+++
b/drivers/mmc/host/tmio_mmc_core.cdrivers/mmc/host/tmio_mmc_core.c +0
-0@@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, mmc->caps |=MMC_CAP_4_BIT_DATA | pdata->capabilities;
drivers/mmc/host/tmio_mmc_core.c int tmio_mmc_host_probe(struct tmio_mmc_host *_host, · line 1232
Quoted 10 lines
drivers/mmc/host/tmio_mmc_core.c +3
-3mmc->caps2 |= pdata->capabilities2; - mmc->max_segs =32 ; + mmc->max_segs = pdata->max_segs ? :32 ; mmc->max_blk_size =512 ; - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * - mmc->max_segs; + mmc->max_blk_count = pdata->max_blk_count ? : + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; mmc->max_seg_size = mmc->max_req_size;
This also changes PAGE_CACHE_SIZE -> PAGE_SIZE. I guess that's okay/bugfix, as PAGE_CACHE_SIZE probably is equal to PAGE_SIZE in all relevant configurations, but...
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/c2a3f7fc/attachment.sig>
PATCH 71/83 mmc: tmio, renesas-sdhi: add max_{segs, blk_count} to tmio_mmc_data
Hi Pavel,
Thanks for the feedback.
Quoted 35 lines
-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Friday, November 8, 2019 10:04 AM
To: Biju Das <[email protected]>
Cc: cip-dev at lists.cip-project.org; Nobuhiro Iwamatsu <[email protected]>; Pavel Machek <[email protected]>; Chris Paterson <[email protected]>; Fabrizio Castro <[email protected]>
Subject: Re: [PATCH 4.4.y-cip 71/83] mmc: tmio, renesas-sdhi: add max_{segs,blk_count} totmio_mmc_dataHi!
Review int tmio_mmc_host_probe(struct
Quoted 12 lines
commit
603aa14d3daaa7073bab4c472025c4963030e0ccupstream.Allow TMIO and SDHI driver implementations to provide values for
max_segsandmax_blk_count.A follow-up patch will set these values for Renesas Gen3 SoCs the using an SDHI driver.
Signed-off-by Yoshihiro Shimoda <[email protected]>+++
b/drivers/mmc/host/tmio_mmc_core.c(quoted diff) +0
-0@@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct
tmio_mmc_hostdrivers/mmc/host/tmio_mmc_core.c int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
Quoted 8 lines
drivers/mmc/host/tmio_mmc_core.c +1
-2*_host, mmc->caps |=MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; - mmc->max_segs =32 ; + mmc->max_segs = pdata->max_segs ? :32 ; mmc->max_blk_size =512 ; - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size)*
Quoted 10 lines
Quoted 6 lines
drivers/mmc/host/tmio_mmc_core.c +2
-1- mmc->max_segs; + mmc->max_blk_count = pdata->max_blk_count ? : + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; mmc->max_req_size = mmc->max_blk_size * mmc- max_blk_count;
mmc->max_seg_size=mmc->max_req_size;This also changes
PAGE_CACHE_SIZE->PAGE_SIZE. I guess that's okay/bugfix, asPAGE_CACHE_SIZEprobably is equal toPAGE_SIZEin all relevant configurations, but...
It is a big change from PAGE_CACHE_SIZE -> PAGE_SIZE at start of kernel tree Please see the commit (09cbfea " mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
Regards,
Biju
PATCH 72/83 mmc: tmio, renesas-sdhi: add dataend to DMA ops
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 92d0f925e6344a24b12a6eeb4f1030ec0e70e8d1 upstream.
Add dataend to DMA ops to allow DMAC implementation dependent handling of DMA data end.
Also implement the operation for SDHI.
--- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 6 ++++++ drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-)
drivers/mmc/host/renesas_sdhi_sys_dmac.c +6 -0
@@ -114,6 +114,11 @@ static void renesas_sdhi_sys_dmac_abort_dma(struct tmio_mmc_host *host)renesas_sdhi_sys_dmac_enable_dma (host, true); } +static void renesas_sdhi_sys_dmac_dataend_dma (struct tmio_mmc_host *host) +{ +complete (&host->dma_dataend); +} +static void renesas_sdhi_sys_dmac_dma_callback (void *arg) {struct tmio_mmc_host *host = arg;
@@ -439,6 +444,7 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_sys_dmac_dma_ops = { .request = renesas_sdhi_sys_dmac_request_dma, .release = renesas_sdhi_sys_dmac_release_dma, .abort = renesas_sdhi_sys_dmac_abort_dma, + .dataend = renesas_sdhi_sys_dmac_dataend_dma, };static int renesas_sdhi_sys_dmac_probe (struct platform_device *pdev)
drivers/mmc/host/tmio_mmc.h +1 -0
@@ -120,6 +120,7 @@ struct tmio_mmc_dma_ops { struct tmio_mmc_data *pdata);void (*release)(struct tmio_mmc_host *host);void (*abort)(struct tmio_mmc_host *host); +void (*dataend)(struct tmio_mmc_host *host); };struct tmio_mmc_host {
drivers/mmc/host/tmio_mmc_core.c +8 -2
@@ -86,6 +86,12 @@ static inline void tmio_mmc_abort_dma(struct tmio_mmc_host *host) host->dma_ops->abort (host); } +static inline void tmio_mmc_dataend_dma (struct tmio_mmc_host *host) +{ +if (host->dma_ops) + host->dma_ops->dataend (host); +} +void tmio_mmc_enable_mmc_irqs (struct tmio_mmc_host *host,u32 i) { host->sdcard_irq_mask &= ~(i &TMIO_MASK_IRQ );
@@ -637,11 +643,11 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host, unsigned int stat)if (done) {tmio_mmc_disable_mmc_irqs (host,TMIO_STAT_DATAEND ); -complete (&host->dma_dataend); +tmio_mmc_dataend_dma (host); } }else if (host->chan_rx && (data->flags &MMC_DATA_READ ) && !host->force_pio) {tmio_mmc_disable_mmc_irqs (host,TMIO_STAT_DATAEND ); -complete (&host->dma_dataend); +tmio_mmc_dataend_dma (host); }else {tmio_mmc_do_data_irq (host);tmio_mmc_disable_mmc_irqs (host,TMIO_MASK_READOP |TMIO_MASK_WRITEOP );
Signature · 1 line
2.7.4
PATCH 73/83 mmc: renesas-sdhi: add support for R-Car Gen3 SDHI DMAC
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 2a68ea7896e3277d875c5d5e7f34cf2937cb55c3 upstream.
Add a new variant of the SDHI driver to support R-Car Gen3 with DMA via on-chip bus mastering. Since the DMAC is in a part of the SDHI module it is not suitable to be used via DMA Engine.
Clearing of DM_CM_INFO1 after DMA thanks to Dirk Behme
--- drivers/mmc/host/Kconfig | 19 ++ drivers/mmc/host/Makefile | 8 +- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 272 ++++++++++++++++++++++++++ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- drivers/mmc/host/tmio_mmc.h | 1 + 5 files changed, 300 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c
drivers/mmc/host/Kconfig +19 -0
@@ -563,10 +563,29 @@ config MMC_SDHI depends on SUPERH || ARM depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST select MMC_TMIO_CORE + select MMC_SDHI_SYS_DMAC if (SUPERH || ARM) + select MMC_SDHI_INTERNAL_DMAC if ARM64 help This provides support for the SDHI SD/SDIO controller found in Renesas SuperH, ARM and ARM64 based SoCs +config MMC_SDHI_SYS_DMAC + tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC" + depends on MMC_SDHI + help + This provides DMA support for SDHI SD/SDIO controllers + using SYS-DMAC via DMA Engine. This supports the controllers + found in SuperH and Renesas ARM based SoCs. + +config MMC_SDHI_INTERNAL_DMAC + tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" + depends on ARM64 || COMPILE_TEST + depends on MMC_SDHI + help + This provides DMA support for SDHI SD/SDIO controllers + using on-chip bus mastering. This supports the controllers + found in arm64 based SoCs. + config MMC_CB710 tristate "ENE CB710 MMC/SD Interface support" depends on PCI
drivers/mmc/host/Makefile +7 -1
@@ -36,7 +36,13 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o -obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o renesas_sdhi_sys_dmac.o +obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o +ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_SYS_DMAC)),y) +obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_sys_dmac.o +endif +ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_INTERNAL_DMAC)),y) +obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_internal_dmac.o +endif obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
drivers/mmc/host/renesas_sdhi_internal_dmac.c new file +272 -0
272 lines not on this page · raw message
drivers/mmc/host/renesas_sdhi_sys_dmac.c +1 -1
@@ -1,5 +1,5 @@/* -* DMA function for TMIO MMC implementations +* DMA support use of SYS DMAC with SDHI SD/SDIO controller * * Copyright (C) 2010-2011 Guennadi Liakhovetski *
drivers/mmc/host/tmio_mmc.h +1 -0
@@ -150,6 +150,7 @@ struct tmio_mmc_host {struct dma_chan *chan_rx;struct dma_chan *chan_tx;struct completion dma_dataend; +struct tasklet_struct dma_complete;struct tasklet_struct dma_issue;struct scatterlist bounce_sg;u8 *bounce_buf;
Signature · 1 line
2.7.4
PATCH 74/83 mmc: tmio-mmc: fix bad pointer math
In reply to Biju DasFrom: Chris Brandt <[email protected]>
commit b5dd7985e8d3357ff9537c0be231190ab1a131fe upstream.
commit 9c284c41c0886f09e75c323a16278b6d353b0b4a upstream.
The existing code gives an incorrect pointer value.
The buffer pointer 'buf' was of type unsigned short *, and 'count' was a number in bytes. A cast of buf should have been used.
However, instead of casting, just change the code to use u32 pointers.
--- drivers/mmc/host/tmio_mmc_core.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/mmc/host/tmio_mmc_core.c +9 -10
@@ -446,30 +446,29 @@ static void tmio_mmc_transfer_data(struct tmio_mmc_host *host,* Transfer the data */ if (host->pdata->flags &TMIO_MMC_32BIT_DATA_PORT ) { -u8 data[4 ] = { }; +u32 data =0 ; +u32 *buf32 = (u32 *)buf;if (is_read) -sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , (u32 *)buf, +sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , buf32, count >>2 );else -sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , (u32 *)buf, +sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , buf32, count >>2 );/* if count was multiple of 4 */ if (!(count &0x3 ))return ; - buf8 = (u8 *)(buf + (count >>2 )); + buf32 += count >>2 ; count %=4 ;if (is_read) { -sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , - (u32 *)data,1 ); -memcpy (buf8, data, count); +sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , &data,1 ); +memcpy (buf32, &data, count); }else { -memcpy (data, buf8, count); -sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , - (u32 *)data,1 ); +memcpy (&data, buf32, count); +sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , &data,1 ); }return ;
Signature · 1 line
2.7.4
PATCH 74/83 mmc: tmio-mmc: fix bad pointer math
Hi!
Quoted 4 lines
From: Chris Brandt <[email protected]>
commit
b5dd7985e8d3357ff9537c0be231190ab1a131feupstream.
Quoted 8 lines
commit
9c284c41c0886f09e75c323a16278b6d353b0b4aupstream.The existing code gives an incorrect pointer value.
The buffer pointer 'buf' was of type unsigned short *, and 'count' was a number in bytes. A cast of buf should have been used.However, instead of casting, just change the code to use u32 pointers.
Yep, I see, nasty; silent data corruption. Could this be merged to the patch that introduces the problem, or the original patch somehow modified that it will not corrupt data ... for example during bisection?
Quoted 15 lines
+++
b/drivers/mmc/host/tmio_mmc_core.cdrivers/mmc/host/tmio_mmc_core.c +3
-3@@ -446,30 +446,29 @@ static void tmio_mmc_transfer_data(struct tmio_mmc_host *host,* Transfer the data */ if (host->pdata->flags &TMIO_MMC_32BIT_DATA_PORT ) { -u8 data[4 ] = { }; +u32 data =0 ; +u32 *buf32 = (u32 *)buf;if (is_read) -sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , (u32 *)buf, +sd_ctrl_read32_rep (host,CTL_SD_DATA_PORT , buf32, count >>2 );else - sd_ctrl_write32_rep(host, CTL_SD_DATA_PORT, (u32 *)buf,
drivers/mmc/host/tmio_mmc_core.c static void tmio_mmc_transfer_data(struct tmio_mmc_host *host, · line 464
Quoted 10 lines
drivers/mmc/host/tmio_mmc_core.c +2
-1+sd_ctrl_write32_rep (host,CTL_SD_DATA_PORT , buf32, count >>2 );/* if count was multiple of 4 */ if (!(count &0x3 ))return ; - buf8 = (u8 *)(buf + (count >>2 )); + buf32 += count >>2 ; count %=4 ;
Can we do count &= 0x3, to keep style of if () above? Actually you can do
count &= 0x3;
if (!count) return;Plus, there's code handling 16 bit case just below this; it is different in style, and by using
*buf8 = sd_ctrl_read16(host, CTL_SD_DATA_PORT) & 0xff;
instead of read16_rep(), it is buggy on big endian (as comment says). Perhaps synchronizing to similar, non-buggy version would be good?
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/617ad473/attachment.sig>
PATCH 75/83 mmc: renesas_sdhi: consolidate DMAC CONFIG options
In reply to Biju DasFrom: Masahiro Yamada <[email protected]>
commit c813e10a6bbad9ef56bc115c64d48c5a7d0a7dd5 upstream.
The description in the Makefile is odd. Fix the CONFIG selection in a cleaner way.
--- drivers/mmc/host/Kconfig | 4 ++-- drivers/mmc/host/Makefile | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/mmc/host/Kconfig +2 -2
@@ -563,8 +563,6 @@ config MMC_SDHI depends on SUPERH || ARM depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST select MMC_TMIO_CORE - select MMC_SDHI_SYS_DMAC if (SUPERH || ARM) - select MMC_SDHI_INTERNAL_DMAC if ARM64 help This provides support for the SDHI SD/SDIO controller found in Renesas SuperH, ARM and ARM64 based SoCs
@@ -572,6 +570,7 @@ config MMC_SDHI config MMC_SDHI_SYS_DMAC tristate "DMA for SDHI SD/SDIO controllers using SYS-DMAC" depends on MMC_SDHI + default MMC_SDHI if (SUPERH || ARM) help This provides DMA support for SDHI SD/SDIO controllers using SYS-DMAC via DMA Engine. This supports the controllers
@@ -581,6 +580,7 @@ config MMC_SDHI_INTERNAL_DMAC tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" depends on ARM64 || COMPILE_TEST depends on MMC_SDHI + default MMC_SDHI if ARM64 help This provides DMA support for SDHI SD/SDIO controllers using on-chip bus mastering. This supports the controllers
drivers/mmc/host/Makefile +2 -6
@@ -37,12 +37,8 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_TMIO_CORE) += tmio_mmc_core.o obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_core.o -ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_SYS_DMAC)),y) -obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_sys_dmac.o -endif -ifeq ($(subst m,y,$(CONFIG_MMC_SDHI_INTERNAL_DMAC)),y) -obj-$(CONFIG_MMC_SDHI) += renesas_sdhi_internal_dmac.o -endif +obj-$(CONFIG_MMC_SDHI_SYS_DMAC) += renesas_sdhi_sys_dmac.o +obj-$(CONFIG_MMC_SDHI_INTERNAL_DMAC) += renesas_sdhi_internal_dmac.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
Signature · 1 line
2.7.4
PATCH 76/83 dt-bindings: mmc: renesas_sdhi: add R-Car Gen[123] fallback compatibility strings
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit 54839d012d5f98cde2fa102fdcd22e1da661d138 upstream.
Add fallback compatibility strings for R-Car Gen 1, 2 and 3.
In the case of Renesas R-Car hardware we know that there are generations of SoCs, f.e. Gen 1 and 2. But beyond that its not clear what the relationship between IP blocks might be. For example, I believe that r8a7790 is older than r8a7791 but that doesn't imply that the latter is a descendant of the former or vice versa.
We can, however, by examining the documentation and behaviour of the hardware at run-time observe that the current driver implementation appears to be compatible with the IP blocks on SoCs within a given generation.
For the above reasons and convenience when enabling new SoCs a per-generation fallback compatibility string scheme is being adopted for drivers for Renesas SoCs.
--- Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/mmc/tmio_mmc.txt +7 -0
@@ -24,6 +24,13 @@ Required properties: "renesas,sdhi-r8a7792" - SDHI IP on R8A7792 SoC "renesas,sdhi-r8a7793" - SDHI IP on R8A7793 SoC "renesas,sdhi-r8a7794" - SDHI IP on R8A7794 SoC + "renesas,rcar-gen1-sdhi" - a generic R-Car Gen1 SDHI controller + "renesas,rcar-gen2-sdhi" - a generic R-Car Gen2 or RZ/G1 + SDHI controller + + When compatible with the generic version, nodes must list + the SoC-specific version corresponding to the platform + first followed by the generic version. Optional properties: - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
Signature · 1 line
2.7.4
PATCH 77/83 mmc: renesas_sdhi: implement R-Car Gen[123] fallback compatibility strings
In reply to Biju DasFrom: Simon Horman <[email protected]>
commit d6dc425ae595e14026beac3720e43edd70215dc8 upstream.
Implement fallback compatibility strings for R-Car Gen 1, 2 and 3.
In the case of Renesas R-Car hardware we know that there are generations of SoCs, f.e. Gen 1 and 2. But beyond that its not clear what the relationship between IP blocks might be. For example, I believe that r8a7790 is older than r8a7791 but that doesn't imply that the latter is a descendant of the former or vice versa.
We can, however, by examining the documentation and behaviour of the hardware at run-time observe that the current driver implementation appears to be compatible with the IP blocks on SoCs within a given generation.
For the above reasons and convenience when enabling new SoCs a per-generation fallback compatibility string scheme is being adopted for drivers for Renesas SoCs.
Also, improve readability by listing the shmobile fallback compatibility string after the more-specific compatibility strings they provide a fallback for.
--- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/renesas_sdhi_sys_dmac.c +3 -1
@@ -75,7 +75,6 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { };static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = { - { .compatible ="renesas,sdhi-shmobile" }, { .compatible ="renesas,sdhi-sh73a0" , .data = &of_default_cfg, }, { .compatible ="renesas,sdhi-r8a73a4" , .data = &of_default_cfg, }, { .compatible ="renesas,sdhi-r8a7740" , .data = &of_default_cfg, },
@@ -88,6 +87,9 @@ static const struct of_device_id renesas_sdhi_sys_dmac_of_match[] = { { .compatible = "renesas,sdhi-r8a7792", .data = &of_rcar_gen2_compatible, }, { .compatible = "renesas,sdhi-r8a7793", .data = &of_rcar_gen2_compatible, }, { .compatible = "renesas,sdhi-r8a7794", .data = &of_rcar_gen2_compatible, }, + { .compatible = "renesas,rcar-gen1-sdhi", .data = &of_rcar_gen1_compatible, }, + { .compatible = "renesas,rcar-gen2-sdhi", .data = &of_rcar_gen2_compatible, }, + { .compatible = "renesas,sdhi-shmobile" }, {}, }; MODULE_DEVICE_TABLE(of, renesas_sdhi_sys_dmac_of_match);
Signature · 1 line
2.7.4
PATCH 78/83 dt-bindings: mmc: renesas_sdhi: Add r8a77470 support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit be6f8db406a49511a8d213f9443ae79fe5b086c3 upstream.
The RZ/G1C (a.k.a. R8A77470) comes with three SDHI interfaces, SDHI0 and SDHI2 are compatible with R-Car Gen2 SDHIs, and SDHI1 is compatible with R-Car Gen3 SDHIs, as it comes with an internal DMAC, therefore SDHI1 is fully compatible with driver renesas_sdhi_internal_dmac driver. As a result, the compatible strings for the R8A77470 SDHI interfaces are a little bit special. Document SDHI support for the RZ/G1C SoC.
--- Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mmc/tmio_mmc.txt +4 -2
@@ -17,6 +17,8 @@ Required properties: "renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC "renesas,sdhi-r8a7743" - SDHI IP on R8A7743 SoC "renesas,sdhi-r8a7745" - SDHI IP on R8A7745 SoC + "renesas,sdhi-r8a77470" - SDHI IP on R8A77470 SoC + "renesas,sdhi-mmc-r8a77470" - SDHI/MMC IP on R8A77470 SoC "renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC "renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC "renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC
@@ -25,8 +27,8 @@ Required properties: "renesas,sdhi-r8a7793" - SDHI IP on R8A7793 SoC "renesas,sdhi-r8a7794" - SDHI IP on R8A7794 SoC "renesas,rcar-gen1-sdhi" - a generic R-Car Gen1 SDHI controller - "renesas,rcar-gen2-sdhi" - a generic R-Car Gen2 or RZ/G1 - SDHI controller + "renesas,rcar-gen2-sdhi" - a generic R-Car Gen2 and RZ/G1 SDHI + (not SDHI/MMC) controller When compatible with the generic version, nodes must list the SoC-specific version corresponding to the platform
Signature · 1 line
2.7.4
PATCH 79/83 mmc: renesas_sdhi: Add r8a77470 SDHI1 support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit 60ab43ba6b6e0f888aab3ce0f84a8aaf15d15079 upstream.
The RZ/G1C (a.k.a. R8A77470) comes with three SDHI interfaces, SDHI0 and SDHI2 are compatible with the R-Car Gen2 SDHIs, SDHI1 is compatible with R-Car Gen3 SDHIs and it can be used as eMMC as well. This patch adds driver compatibility, and makes sure both drivers get compiled for the R8A77470.
--- drivers/mmc/host/Kconfig | 4 ++-- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +2 -2
@@ -578,9 +578,9 @@ config MMC_SDHI_SYS_DMAC config MMC_SDHI_INTERNAL_DMAC tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering" - depends on ARM64 || COMPILE_TEST + depends on ARM64 || ARCH_R8A77470 || COMPILE_TEST depends on MMC_SDHI - default MMC_SDHI if ARM64 + default MMC_SDHI if (ARM64 || ARCH_R8A77470) help This provides DMA support for SDHI SD/SDIO controllers using on-chip bus mastering. This supports the controllers
drivers/mmc/host/renesas_sdhi_internal_dmac.c +1 -0
@@ -84,6 +84,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = { };static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = { + { .compatible ="renesas,sdhi-mmc-r8a77470" , .data = &of_rcar_gen3_compatible, }, {}, };MODULE_DEVICE_TABLE (of, renesas_sdhi_internal_dmac_of_match);
Signature · 1 line
2.7.4
PATCH 80/83 ARM: dts: r8a77470: Add SDHI2 support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit f068cc816015f8a6af494b584978aa7df96d80fe upstream.
Add SoC specific device tree definitions for the SDHI2 interface.
--- arch/arm/boot/dts/r8a77470.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/r8a77470.dtsi +14 -0
@@ -655,6 +655,20 @@ status = "disabled"; }; + sdhi2: sd at ee160000 { + compatible = "renesas,sdhi-r8a77470", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee160000 0 0x328>; + interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A77470_CLK_SDHI2>; + dmas = <&dmac0 0xd3>, <&dmac0 0xd4>, + <&dmac1 0xd3>, <&dmac1 0xd4>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <97500000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + gic: interrupt-controller at f1001000 { compatible = "arm,gic-400"; #interrupt-cells = <3>;
Signature · 1 line
2.7.4
PATCH 81/83 ARM: dts: r8a77470: Add SDHI0 support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit 15aa5a95e820e8183aa34535131e7c97789b8504 upstream.
RZ/G1C comes with two different types of IP for the SDHI interfaces, SDHI0 and SDHI2 share the same IP type, and such an IP is also compatible with the one found in R-Car Gen2. SDHI1 IP on the other hand is compatible with R-Car Gen3 with internal DMA.
This patch completes the SDHI support of the R-Car Gen2 compatible IPs, including fixing the max-frequency definition of SDHI2, as it turns out there is a bug in Section 1.3.9 of the RZ/G1C Hardware User's Manual (Rev. 1.00 Oct. 2017).
--- arch/arm/boot/dts/r8a77470.dtsi | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
arch/arm/boot/dts/r8a77470.dtsi +15 -1
@@ -655,6 +655,20 @@ status = "disabled"; }; + sdhi0: sd at ee100000 { + compatible = "renesas,sdhi-r8a77470", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee100000 0 0x328>; + interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A77470_CLK_SDHI0>; + dmas = <&dmac0 0xcd>, <&dmac0 0xce>, + <&dmac1 0xcd>, <&dmac1 0xce>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <156000000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + sdhi2: sd at ee160000 { compatible = "renesas,sdhi-r8a77470", "renesas,rcar-gen2-sdhi";
@@ -664,7 +678,7 @@ dmas = <&dmac0 0xd3>, <&dmac0 0xd4>, <&dmac1 0xd3>, <&dmac1 0xd4>; dma-names = "tx", "rx", "tx", "rx"; - max-frequency = <97500000>; + max-frequency = <78000000>; power-domains = <&cpg_clocks>; status = "disabled"; };
Signature · 1 line
2.7.4
PATCH 82/83 ARM: dts: r8a77470: Add SDHI1 support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit 0485da788028ecd525291974c8efe2d072607476 upstream.
Althought interface SDHI1 found on the RZ/G1C SoC (a.k.a. r8a77470) is compatible with the R-Car Gen3 ones, its OF compatibility is restricted to the SoC specific compatible string to avoid confusion, as from a more generic perspective the RZ/G1C is sharing the most similarities with the R-Car Gen2 family of SoCs, and there is a combination of R-Car Gen2 compatible SDHI IPs and R-Car Gen3 compatible SDHI IP on this specific chip.
This patch adds the SoC specific part of SDHI1 support, and since SDHI1 comes with internal DMA, its DT node looks fairly different from SDHI0 and SDHI2.
--- arch/arm/boot/dts/r8a77470.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/r8a77470.dtsi +10 -0
@@ -669,6 +669,16 @@ status = "disabled"; }; + sdhi1: sd at ee300000 { + compatible = "renesas,sdhi-mmc-r8a77470"; + reg = <0 0xee300000 0 0x2000>; + interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A77470_CLK_SDHI1>; + max-frequency = <156000000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + sdhi2: sd at ee160000 { compatible = "renesas,sdhi-r8a77470", "renesas,rcar-gen2-sdhi";
Signature · 1 line
2.7.4
PATCH 83/83 ARM: dts: iwg23s-sbc: Add uSD and eMMC support
In reply to Biju DasFrom: Fabrizio Castro <[email protected]>
commit 9eb36b945b5c21d57c02a26cc629dd9484ced9aa upstream.
Add uSD card and eMMC support to the iwg23s single board computer powered by the RZ/G1C SoC (a.k.a. r8a77470).
--- arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 75 +++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts +75 -0
@@ -6,6 +6,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "r8a77470.dtsi" / { model = "iWave iW-RainboW-G23S single board computer based on RZ/G1C";
@@ -25,6 +26,37 @@ device_type = "memory"; reg = <0 0x40000000 0 0x20000000>; }; + + reg_1p8v: reg-1p8v { + compatible = "regulator-fixed"; + regulator-name = "fixed-1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_3p3v: reg-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + vccq_sdhi2: regulator-vccq-sdhi2 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI2 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio2 24 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1 + 1800000 0>; + }; }; &avb {
@@ -84,6 +116,12 @@ function = "i2c3"; }; + mmc_pins_uhs: mmc_uhs { + groups = "mmc_data8", "mmc_ctrl"; + function = "mmc"; + power-source = <1800>; + }; + qspi0_pins: qspi0 { groups = "qspi0_ctrl", "qspi0_data2"; function = "qspi0";
@@ -94,6 +132,18 @@ function = "scif1"; }; + sdhi2_pins: sd2 { + groups = "sdhi2_data4", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <3300>; + }; + + sdhi2_pins_uhs: sd2_uhs { + groups = "sdhi2_data4", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <1800>; + }; + usb0_pins: usb0 { groups = "usb0"; function = "usb0";
@@ -133,6 +183,31 @@ status = "okay"; }; +&sdhi1 { + pinctrl-0 = <&mmc_pins_uhs>; + pinctrl-names = "state_uhs"; + + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_1p8v>; + bus-width = <8>; + mmc-hs200-1_8v; + non-removable; + fixed-emmc-driver-type = <1>; + status = "okay"; +}; + +&sdhi2 { + pinctrl-0 = <&sdhi2_pins>; + pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-names = "default", "state_uhs"; + + vmmc-supply = <®_3p3v>; + vqmmc-supply = <&vccq_sdhi2>; + bus-width = <4>; + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + &usb2_phy0 { status = "okay"; };
Signature · 1 line
2.7.4
cover Add RZ/G1C SD/eMMC support
In reply to Biju DasHi!
Quoted 5 lines
This patch series add SD/eMMC support support for RZ/G1C sbc.
RZ/G1C eMMC IP is different from other RZ/G1 SoC's. It is having an internal DMA for data transfer which is similar to R-Car Gen3.
Quoted 7 lines
Support for internal DMAC is added in 4.14 kernel and support for RZ/G1C added on 4.20 kernel.
Backported the relevent patches to linux-4.4.y-cip.
This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from linux rc tree.
Thanks for the series. I'm currently reviewing it, I have some comments but nothing really bad so far. I'm now around the middle.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191107/2dbd44d6/attachment.sig>
cover Add RZ/G1C SD/eMMC support
Hello Pavel,
Quoted 13 lines
From: Pavel Machek <[email protected]>
Sent: 07 November 2019 21:02Hi!
Quoted 8 lines
This patch series add SD/eMMC support support for RZ/G1C sbc.
RZ/G1C eMMC IP is different from other RZ/G1 SoC's. It is having an internal DMA for data transfer which is similar to R-Car Gen3.
Support for internal DMAC is added in 4.14 kernel and support for RZ/G1C added on 4.20 kernel.
Quoted 7 lines
Quoted 4 lines
Backported the relevent patches to linux-4.4.y-cip.
This patch series is based on linux-4.4.y-cip and all the patches in this series are cherry-picked from linux rc tree.
Thanks for the series. I'm currently reviewing it, I have some comments but nothing really bad so far. I'm now around the middle.
Thank you for your work on reviewing this series.
Looking at some of your comments, it looks like there are lots of issues to do with the original patches that were upstreamed, rather than changes that were made specifically for the CIP Kernel.
My understanding is that the CIP project follows an upstream first policy, i.e. code must all be upstreamed before being backported to the CIP kernel(s).
For the changes that you're pointing out, should we be upstreaming the relevant fixes, waiting for them to be released upstream, then re-submitting the whole patch series? Or should we be modifying the patches that we're submitting to the CIP kernel directly?
If the former, I'm not actually sure this will always be technically possible.
If the latter, do you want Biju to update each of the patches in his series? Or submit the new cip-specific changes in a new patch?
Kind regards, Chris
Quoted 6 lines
Best regards,
????? ??????? ??????? ??????? ??????? ??????? ??????? ??????? Pavel --
DENX Software Engineering GmbH,????? Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
cover Add RZ/G1C SD/eMMC support
Hi!
Quoted 1 line
Thank you for your work on reviewing this series.
(For the record, I'm now done with the review... with exception of renames&modifications in 66-69).
Quoted 6 lines
Looking at some of your comments, it looks like there are lots of issues to do with the original patches that were upstreamed, rather than changes that were made specifically for the CIP Kernel.
My understanding is that the CIP project follows an upstream first policy, i.e. code must all be upstreamed before being backported to the CIP kernel(s).
For the changes that you're pointing out, should we be upstreaming the relevant fixes, waiting for them to be released upstream, then re-submitting the whole patch series? Or should we be modifying the patches that we're submitting to the CIP kernel directly?
It really depends on case by case basis -- on severity of the problem.
I can take explanations, maybe I'm just misunderstanding the code.
Or perhaps code is really right, but unclear/needs additional comment, etc... In such case I guess we can take patch as is, and just queue cleanups/comments to the mainline.
But patch 34/ introduces data corrupting bug, which is only fixed at the end of the series. I'd prefer having patches changed / reshuffled / something so that it does not corrupt someone's data during bisect.
Plus we need to figure out how to review the renames.
Quoted 3 lines
If the former, I'm not actually sure this will always be technically possible.
If the latter, do you want Biju to update each of the patches in his series? Or submit the new cip-specific changes in a new patch?
Not sure really.
One possible way forward would be to submit 1..33/ as separate series, then figure out 34.. first rename, then figure out the rest.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/3e8f4f47/attachment.sig>
cover Add RZ/G1C SD/eMMC support
Hello Pavel,
Thanks for the feedback.
Quoted 39 lines
Subject: Re: [PATCH 4.4.y-cip 00/83] Add RZ/G1C SD/eMMC support
Hi!
Quoted 1 line
Thank you for your work on reviewing this series.
(For the record, I'm now done with the review... with exception of renames&modifications in 66-69).
Quoted 1 line
Looking at some of your comments, it looks like there are lots of issues to
do with the original patches that were upstreamed, rather than changes that were made specifically for the CIP Kernel.
Quoted 2 lines
My understanding is that the CIP project follows an upstream first policy,
i.e. code must all be upstreamed before being backported to the CIP kernel(s).
Quoted 2 lines
For the changes that you're pointing out, should we be upstreaming the
relevant fixes, waiting for them to be released upstream, then re-submitting the whole patch series? Or should we be modifying the patches that we're submitting to the CIP kernel directly?
Quoted 1 line
It really depends on case by case basis -- on severity of the problem.
I can take explanations, maybe I'm just misunderstanding the code.
Or perhaps code is really right, but unclear/needs additional comment, etc... In such case I guess we can take patch as is, and just queue cleanups/comments to the mainline.
But patch 34/ introduces data corrupting bug, which is only fixed at the end of the series. I'd prefer having patches changed / reshuffled / something so that it does not corrupt someone's data during bisect.
Plus we need to figure out how to review the renames.
Quoted 2 lines
If the former, I'm not actually sure this will always be technically possible. If the latter, do you want Biju to update each of the patches in his series?
Quoted 7 lines
Or submit the new cip-specific changes in a new patch?
Quoted 1 line
Not sure really.
One possible way forward would be to submit 1..33/ as separate series, then figure out 34.. first rename, then figure out the rest.
OK. I will send 1--33 as a separate series and then rest.
Regards,
Biju
cover Add RZ/G1C SD/eMMC support
Hi!
Quoted 7 lines
Quoted 7 lines
Plus we need to figure out how to review the renames.
Quoted 2 lines
If the former, I'm not actually sure this will always be technically possible. If the latter, do you want Biju to update each of the patches in his series?
Or submit the new cip-specific changes in a new patch?
Quoted 1 line
Quoted 6 lines
Quoted 4 lines
Not sure really.
One possible way forward would be to submit 1..33/ as separate series, then figure out 34.. first rename, then figure out the rest.
OK. I will send 1--33 as a separate series and then rest.
Actually, it seems that review on 1--33 is "minor updates are possible in mainline", so if you want (and there are no other comments from other maintainers), I can just take 1--33 and apply them to -cip tree.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191108/dadcc1e5/attachment.sig>
cover Add RZ/G1C SD/eMMC support
Hi Pavel,
Thanks for the feedback.
Quoted 15 lines
Subject: Re: [PATCH 4.4.y-cip 00/83] Add RZ/G1C SD/eMMC support
Hi!
Quoted 3 lines
Quoted 3 lines
Plus we need to figure out how to review the renames.
Quoted 1 line
If the former, I'm not actually sure this will always be technically
possible.
Quoted 1 line
Quoted 1 line
Quoted 1 line
If the latter, do you want Biju to update each of the patches in his
series?
Quoted 5 lines
Quoted 5 lines
Or submit the new cip-specific changes in a new patch?
Quoted 1 line
Not sure really.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
One possible way forward would be to submit 1..33/ as separate series, then figure out 34.. first rename, then figure out the rest.
OK. I will send 1--33 as a separate series and then rest.
Actually, it seems that review on 1--33 is "minor updates are possible in mainline", so if you want (and there are no other comments from other maintainers), I can just take 1--33 and apply them to -cip tree.
Yes please, if other maintainers are happy.
Please apply the below patch patch before 33,
https://patchwork.kernel.org/patch/11232167/
Can you please suggest, how you want to handle rest of the patches?
Regards,
Biju
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): OSBPR01MB2103290FD10A0643F9A78824B8700@OSBPR01MB2103.jpnprd01.prod.outlook.com
cover Add RZ/G1C SD/eMMC support
Hi!
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
Yes please, if other maintainers are happy.
Please apply the below patch patch before 33,
https://patchwork.kernel.org/patch/11232167/I applied 1..33. That caused build failure. I added 35, which fixes the compile problem.
Yes. I knew, that is the reason I provided the above link.
Oops, I was not paying close enough attention. Sorry about that.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Can you please suggest, how you want to handle rest of the patches?
Would it be possible to reorder (and/or merge) patches so that the data corruption bug can not trigger, and re-submit series up-to the big renames? That should give about 30 patches to review...
Will do.
Thanks!
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191115/4c9dc935/attachment.sig>
cover Add RZ/G1C SD/eMMC support
HI Pavel,
Thanks for the feedback.
Quoted 9 lines
Subject: Re: [PATCH 4.4.y-cip 00/83] Add RZ/G1C SD/eMMC support
Hi!
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
Yes please, if other maintainers are happy.
Please apply the below patch patch before 33,
https://patchwork.kernel.org/patch/11232167/
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
I applied 1..33. That caused build failure. I added 35, which fixes the compile problem.
Yes. I knew, that is the reason I provided the above link.
Oops, I was not paying close enough attention. Sorry about that.
Is it possible for you to rearrange the patch?
Ie, patch " mmc: add define for R1 response without CRC" should go before " mmc: tmio: add eMMC support". Other wise you will get a compilation error If someone checkout the branch with the commit id of later patch.
Cheers,
Biju
cover Add RZ/G1C SD/eMMC support
Hi!
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
Yes please, if other maintainers are happy.
Please apply the below patch patch before 33,
https://patchwork.kernel.org/patch/11232167/I applied 1..33. That caused build failure. I added 35, which fixes the compile problem.
Yes. I knew, that is the reason I provided the above link.
Quoted 7 lines
Quoted 1 line
Oops, I was not paying close enough attention. Sorry about that.
Is it possible for you to rearrange the patch?
Ie, patch " mmc: add define for R1 response without CRC" should go before " mmc: tmio: add eMMC support". Other wise you will get a compilation error If someone checkout the branch with the commit id of later patch.
It is possible, but it would require me to rebase and then force push, causing problems for people who pulled the tree in the meantime. I believe risks outweight the advantages at this point.
Best regards,
Pavel
Signature · 9 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191118/efea7154/attachment.sig>