You need to sign in or sign up before continuing.
提交 36bbdc30 编写于 作者: A Adrian Hunter 提交者: Ulf Hansson

mmc: tifm_sd: Remove local_irq_{save,restore}() around tifm_sd_bounce_block()

tifm_sd_bounce_block() calls functions that ultimate use kmap_atomic() to
map pages.

A long time ago the kmap_atomic API required a slot to be provided which
risked the possibility that other code might use the same slot at the
same time. Disabling interrupts prevented the possibility of an interrupt
handler doing that. However, that went away with
commit 3e4d3af5 ("mm: stack based kmap_atomic()").

When the second argument to kmap_atomic was removed by commit 482fce99
("mmc: remove the second argument of k[un]map_atomic()"),
local_irq_{save,restore}() should have been removed also.

Remove it now.
Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20221005101951.3165-10-adrian.hunter@intel.comSigned-off-by: NUlf Hansson <ulf.hansson@linaro.org>
上级 b7093c10
...@@ -264,16 +264,13 @@ static int tifm_sd_set_dma_data(struct tifm_sd *host, struct mmc_data *r_data) ...@@ -264,16 +264,13 @@ static int tifm_sd_set_dma_data(struct tifm_sd *host, struct mmc_data *r_data)
unsigned int t_size = TIFM_DMA_TSIZE * r_data->blksz; unsigned int t_size = TIFM_DMA_TSIZE * r_data->blksz;
unsigned int dma_len, dma_blk_cnt, dma_off; unsigned int dma_len, dma_blk_cnt, dma_off;
struct scatterlist *sg = NULL; struct scatterlist *sg = NULL;
unsigned long flags;
if (host->sg_pos == host->sg_len) if (host->sg_pos == host->sg_len)
return 1; return 1;
if (host->cmd_flags & DATA_CARRY) { if (host->cmd_flags & DATA_CARRY) {
host->cmd_flags &= ~DATA_CARRY; host->cmd_flags &= ~DATA_CARRY;
local_irq_save(flags);
tifm_sd_bounce_block(host, r_data); tifm_sd_bounce_block(host, r_data);
local_irq_restore(flags);
if (host->sg_pos == host->sg_len) if (host->sg_pos == host->sg_len)
return 1; return 1;
} }
...@@ -300,11 +297,9 @@ static int tifm_sd_set_dma_data(struct tifm_sd *host, struct mmc_data *r_data) ...@@ -300,11 +297,9 @@ static int tifm_sd_set_dma_data(struct tifm_sd *host, struct mmc_data *r_data)
if (dma_blk_cnt) if (dma_blk_cnt)
sg = &r_data->sg[host->sg_pos]; sg = &r_data->sg[host->sg_pos];
else if (dma_len) { else if (dma_len) {
if (r_data->flags & MMC_DATA_WRITE) { if (r_data->flags & MMC_DATA_WRITE)
local_irq_save(flags);
tifm_sd_bounce_block(host, r_data); tifm_sd_bounce_block(host, r_data);
local_irq_restore(flags); else
} else
host->cmd_flags |= DATA_CARRY; host->cmd_flags |= DATA_CARRY;
sg = &host->bounce_buf; sg = &host->bounce_buf;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册