Skip to content

Commit 27cbd7e

Browse files
arndbstorulf
arndb
authored and
storulf
committed
mmc: sh_mmcif: rework dma channel handling
When compiling the sh_mmcif driver for ARM64, we currently get a harmless build warning: ../drivers/mmc/host/sh_mmcif.c: In function 'sh_mmcif_request_dma_one': ../drivers/mmc/host/sh_mmcif.c:417:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (void *)pdata->slave_id_tx : ^ ../drivers/mmc/host/sh_mmcif.c:418:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (void *)pdata->slave_id_rx; This could be worked around by adding another cast to uintptr_t, but I decided to simplify the code a little more to avoid that. This splits out the platform data using code into a separate function and builds that only for CONFIG_SUPERH. This part still has a typecast but does not need a second one. The SH platform code could be further modified to pass a pointer directly as we do on other architectures when we have a filter function. The normal case is simplified further and now just calls dma_request_slave_channel() directly without going through the compat handling. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 2e4456f commit 27cbd7e

File tree

1 file changed

+38
-46
lines changed

1 file changed

+38
-46
lines changed

‎drivers/mmc/host/sh_mmcif.c

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -397,38 +397,26 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
397397
}
398398

399399
static struct dma_chan *
400-
sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
401-
struct sh_mmcif_plat_data *pdata,
402-
enum dma_transfer_direction direction)
400+
sh_mmcif_request_dma_pdata(struct sh_mmcif_host *host, uintptr_t slave_id)
403401
{
404-
struct dma_slave_config cfg = { 0, };
405-
struct dma_chan *chan;
406-
void *slave_data = NULL;
407-
struct resource *res;
408-
struct device *dev = sh_mmcif_host_to_dev(host);
409402
dma_cap_mask_t mask;
410-
int ret;
411403

412404
dma_cap_zero(mask);
413405
dma_cap_set(DMA_SLAVE, mask);
406+
if (slave_id <= 0)
407+
return NULL;
414408

415-
if (pdata)
416-
slave_data = direction == DMA_MEM_TO_DEV ?
417-
(void *)pdata->slave_id_tx :
418-
(void *)pdata->slave_id_rx;
419-
420-
chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
421-
slave_data, dev,
422-
direction == DMA_MEM_TO_DEV ? "tx" : "rx");
423-
424-
dev_dbg(dev, "%s: %s: got channel %p\n", __func__,
425-
direction == DMA_MEM_TO_DEV ? "TX" : "RX", chan);
409+
return dma_request_channel(mask, shdma_chan_filter, (void *)slave_id);
410+
}
426411

427-
if (!chan)
428-
return NULL;
412+
static int sh_mmcif_dma_slave_config(struct sh_mmcif_host *host,
413+
struct dma_chan *chan,
414+
enum dma_transfer_direction direction)
415+
{
416+
struct resource *res;
417+
struct dma_slave_config cfg = { 0, };
429418

430419
res = platform_get_resource(host->pd, IORESOURCE_MEM, 0);
431-
432420
cfg.direction = direction;
433421

434422
if (direction == DMA_DEV_TO_MEM) {
@@ -439,38 +427,42 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
439427
cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
440428
}
441429

442-
ret = dmaengine_slave_config(chan, &cfg);
443-
if (ret < 0) {
444-
dma_release_channel(chan);
445-
return NULL;
446-
}
447-
448-
return chan;
430+
return dmaengine_slave_config(chan, &cfg);
449431
}
450432

451-
static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
452-
struct sh_mmcif_plat_data *pdata)
433+
static void sh_mmcif_request_dma(struct sh_mmcif_host *host)
453434
{
454435
struct device *dev = sh_mmcif_host_to_dev(host);
455436
host->dma_active = false;
456437

457-
if (pdata) {
458-
if (pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0)
459-
return;
460-
} else if (!dev->of_node) {
461-
return;
438+
/* We can only either use DMA for both Tx and Rx or not use it at all */
439+
if (IS_ENABLED(CONFIG_SUPERH) && dev->platform_data) {
440+
struct sh_mmcif_plat_data *pdata = dev->platform_data;
441+
442+
host->chan_tx = sh_mmcif_request_dma_pdata(host,
443+
pdata->slave_id_tx);
444+
host->chan_rx = sh_mmcif_request_dma_pdata(host,
445+
pdata->slave_id_rx);
446+
} else {
447+
host->chan_tx = dma_request_slave_channel(dev, "tx");
448+
host->chan_tx = dma_request_slave_channel(dev, "rx");
462449
}
450+
dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx,
451+
host->chan_rx);
463452

464-
/* We can only either use DMA for both Tx and Rx or not use it at all */
465-
host->chan_tx = sh_mmcif_request_dma_one(host, pdata, DMA_MEM_TO_DEV);
466-
if (!host->chan_tx)
467-
return;
453+
if (!host->chan_tx || !host->chan_rx ||
454+
sh_mmcif_dma_slave_config(host, host->chan_tx, DMA_MEM_TO_DEV) ||
455+
sh_mmcif_dma_slave_config(host, host->chan_rx, DMA_DEV_TO_MEM))
456+
goto error;
468457

469-
host->chan_rx = sh_mmcif_request_dma_one(host, pdata, DMA_DEV_TO_MEM);
470-
if (!host->chan_rx) {
458+
return;
459+
460+
error:
461+
if (host->chan_tx)
471462
dma_release_channel(host->chan_tx);
472-
host->chan_tx = NULL;
473-
}
463+
if (host->chan_rx)
464+
dma_release_channel(host->chan_rx);
465+
host->chan_tx = host->chan_rx = NULL;
474466
}
475467

476468
static void sh_mmcif_release_dma(struct sh_mmcif_host *host)
@@ -1102,7 +1094,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
11021094
if (ios->power_mode == MMC_POWER_UP) {
11031095
if (!host->card_present) {
11041096
/* See if we also get DMA */
1105-
sh_mmcif_request_dma(host, dev->platform_data);
1097+
sh_mmcif_request_dma(host);
11061098
host->card_present = true;
11071099
}
11081100
sh_mmcif_set_power(host, ios);

0 commit comments

Comments
 (0)