iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: renesas_sdhi: remove accessor function for internal_dmac

Browse Source 
This accessor function does not help readability but makes it worse.
Because I soon need to read from the registers as well and don't want to
add another function like this, I chose to remove the existing one and
use the accessor directly. I also switch from writeq to writel because
no 64 bit register is actually involved.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Duy Nguyen <duy.nguyen.rh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20221006190452.5316-2-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Wolfram Sang 2022-10-06 21:04:47 +02:00 committed by Ulf Hansson
parent aae9d3a440
commit a8687078fc
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mmc/host/renesas_sdhi_internal_dmac.c
View File

@ -279,13 +279,6 @@ static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, renesas_sdhi_internal_dmac_of_match); MODULE_DEVICE_TABLE(of, renesas_sdhi_internal_dmac_of_match);
static void
renesas_sdhi_internal_dmac_dm_write(struct tmio_mmc_host *host,
int addr, u64 val)
{
writeq(val, host->ctl + addr);
}
static void static void
renesas_sdhi_internal_dmac_enable_dma(struct tmio_mmc_host *host, bool enable) renesas_sdhi_internal_dmac_enable_dma(struct tmio_mmc_host *host, bool enable)
{ {
@ -295,8 +288,7 @@ renesas_sdhi_internal_dmac_enable_dma(struct tmio_mmc_host *host, bool enable)
return; return;
if (!enable) if (!enable)
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO1, writel(INFO1_CLEAR, host->ctl + DM_CM_INFO1);
INFO1_CLEAR);
if (priv->dma_priv.enable) if (priv->dma_priv.enable)
priv->dma_priv.enable(host, enable); priv->dma_priv.enable(host, enable);
@ -309,10 +301,8 @@ renesas_sdhi_internal_dmac_abort_dma(struct tmio_mmc_host *host)
renesas_sdhi_internal_dmac_enable_dma(host, false); renesas_sdhi_internal_dmac_enable_dma(host, false);
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_RST, writel(RST_RESERVED_BITS & ~val, host->ctl + DM_CM_RST);
RST_RESERVED_BITS & ~val); writel(RST_RESERVED_BITS | val, host->ctl + DM_CM_RST);
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_RST,
RST_RESERVED_BITS | val);
clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags); clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
@ -397,10 +387,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
renesas_sdhi_internal_dmac_enable_dma(host, true); renesas_sdhi_internal_dmac_enable_dma(host, true);
/* set dma parameters */ /* set dma parameters */
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_DTRAN_MODE, writel(dtran_mode, host->ctl + DM_CM_DTRAN_MODE);
dtran_mode); writel(sg_dma_address(sg), host->ctl + DM_DTRAN_ADDR);
renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR,
sg_dma_address(sg));
host->dma_on = true; host->dma_on = true;
@ -420,8 +408,7 @@ static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg)
tmio_mmc_enable_mmc_irqs(host, TMIO_STAT_DATAEND); tmio_mmc_enable_mmc_irqs(host, TMIO_STAT_DATAEND);
/* start the DMAC */ /* start the DMAC */
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_DTRAN_CTRL, writel(DTRAN_CTRL_DM_START, host->ctl + DM_CM_DTRAN_CTRL);
DTRAN_CTRL_DM_START);
} }
static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host) static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host)
@ -502,10 +489,8 @@ renesas_sdhi_internal_dmac_request_dma(struct tmio_mmc_host *host,
struct renesas_sdhi *priv = host_to_priv(host); struct renesas_sdhi *priv = host_to_priv(host);
/* Disable DMAC interrupts, we don't use them */ /* Disable DMAC interrupts, we don't use them */
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO1_MASK, writel(INFO1_MASK_CLEAR, host->ctl + DM_CM_INFO1_MASK);
INFO1_MASK_CLEAR); writel(INFO2_MASK_CLEAR, host->ctl + DM_CM_INFO2_MASK);
renesas_sdhi_internal_dmac_dm_write(host, DM_CM_INFO2_MASK,
INFO2_MASK_CLEAR);
/* Each value is set to non-zero to assume "enabling" each DMA */ /* Each value is set to non-zero to assume "enabling" each DMA */
host->chan_rx = host->chan_tx = (void *)0xdeadbeaf; host->chan_rx = host->chan_tx = (void *)0xdeadbeaf;