shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: dw_mmc: Move FIFO check to other upcoming request for rv1106 sdmmc

Browse Source 
We now don't wait FIFO status at the end of request but
at the beginning of upcoming request, which is the same way
we did for unbusy check in the past. By doing that, we can
hand out cpu.

Fixes: 6eca689b99 ("mmc: dw_mmc: Workaround for RV1106/1103 sdmmc")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie5934b49d2babada81cc447763bb8f980b4884ec
This commit is contained in:
Shawn Lin
2022-04-25 15:10:19 +08:00
committed by Tao Huang
parent 9d8c6e4254
commit 3eefc7e584
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/mmc/host/dw_mmc.c
View File

@@ -1427,6 +1427,7 @@ static void dw_mci_queue_request(struct dw_mci *host, struct dw_mci_slot *slot,
}
}
static bool dw_mci_reset(struct dw_mci *host);
static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct dw_mci_slot *slot = mmc_priv(mmc);
@@ -1446,8 +1447,18 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
return;
}
if (host->is_rv1106_sd) {
u32 reg;
readl_poll_timeout(host->regs + SDMMC_STATUS, reg,
reg & BIT(2), USEC_PER_MSEC, 500 * USEC_PER_MSEC);
}
spin_lock_bh(&host->lock);
if (host->is_rv1106_sd)
dw_mci_reset(host);
dw_mci_queue_request(host, slot, mrq);
spin_unlock_bh(&host->lock);
@@ -1869,9 +1880,6 @@ static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
spin_unlock(&host->lock);
if (host->is_rv1106_sd)
dw_mci_reset(host);
mmc_request_done(prev_mmc, mrq);
spin_lock(&host->lock);
}
@@ -2830,17 +2838,8 @@ rv1106_sd:
if (!test_bit(EVENT_DATA_ERROR, &host->pending_events))
host->dma_ops->complete((void *)host);
if (host->is_rv1106_sd && (pending & SDMMC_IDMAC_INT_TI)) {
/*
* The last desc contain dump data, controller won't issue,
* controller will auto gate clk and it will not affect FIFO
* status. So busy check here can mostly block 2 cycles of
* hclk from simulation, it's not a big deal.
*/
while ((mci_readl(host, STATUS) & BIT(2)) != BIT(2))
;
if (host->is_rv1106_sd && (pending & SDMMC_IDMAC_INT_TI))
goto rv1106_sd;
}
}
}