| Message ID | 5a38e5eb9fdc4b53ba4a11602e2cef0d@realtek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: rtsx: improve rw performance | expand |
On Fri, 3 Dec 2021 at 11:43, Ricky WU <ricky_wu@realtek.com> wrote: > > sd_check_seq() to distinguish sequential rw or normal rw > if this data is sequential call to sd_rw_sequential() Can you please extend this commit message? This doesn't answer why or what this change really does, please try to do that, as to help me to review this. Kind regards Uffe > > Signed-off-by: Ricky Wu <ricky_wu@realtek.com> > --- > drivers/mmc/host/rtsx_pci_sdmmc.c | 185 +++++++++++++++++++++++++++++- > 1 file changed, 180 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c > index 58cfaffa3c2d..9eb433b1f6f8 100644 > --- a/drivers/mmc/host/rtsx_pci_sdmmc.c > +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c > @@ -22,6 +22,8 @@ > #include <asm/unaligned.h> > #include <linux/pm_runtime.h> > > +enum RW_MODE {NORMAL_RW, SEQ_RW}; > + > struct realtek_pci_sdmmc { > struct platform_device *pdev; > struct rtsx_pcr *pcr; > @@ -31,6 +33,7 @@ struct realtek_pci_sdmmc { > > struct work_struct work; > struct mutex host_mutex; > + struct delayed_work rw_idle_work; > > u8 ssc_depth; > unsigned int clock; > @@ -46,6 +49,12 @@ struct realtek_pci_sdmmc { > s32 cookie; > int cookie_sg_count; > bool using_cookie; > + > + enum RW_MODE rw_mode; > + u8 prev_dir; > + u8 cur_dir; > + u64 prev_sec_addr; > + u32 prev_sec_cnt; > }; > > static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios); > @@ -226,6 +235,14 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host, > dev_dbg(sdmmc_dev(host), "%s: SD/MMC CMD %d, arg = 0x%08x\n", > __func__, cmd_idx, arg); > > + if (cmd_idx == MMC_SEND_STATUS && host->rw_mode == SEQ_RW) { > + cmd->resp[0] = R1_READY_FOR_DATA | (R1_STATE_TRAN << 9); > + goto out; > + } > + > + if (!mmc_op_multi(cmd->opcode)) > + host->rw_mode = NORMAL_RW; > + > rsp_type = sd_response_type(cmd); > if (rsp_type < 0) > goto out; > @@ -542,6 +559,93 @@ static int sd_write_long_data(struct realtek_pci_sdmmc *host, > return 0; > } > > +static int sd_rw_sequential(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) > +{ > + struct rtsx_pcr *pcr = host->pcr; > + struct mmc_host *mmc = host->mmc; > + struct mmc_card *card = mmc->card; > + struct mmc_data *data = mrq->data; > + int uhs = mmc_card_uhs(card); > + u8 cfg2; > + int err; > + size_t data_len = data->blksz * data->blocks; > + > + cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 | > + SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 | SD_RSP_LEN_0; > + > + if (!uhs) > + cfg2 |= SD_NO_CHECK_WAIT_CRC_TO; > + > + rtsx_pci_init_cmd(pcr); > + sd_cmd_set_data_len(pcr, data->blocks, data->blksz); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, IRQSTAT0, > + DMA_DONE_INT, DMA_DONE_INT); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC3, > + 0xFF, (u8)(data_len >> 24)); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC2, > + 0xFF, (u8)(data_len >> 16)); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC1, > + 0xFF, (u8)(data_len >> 8)); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC0, 0xFF, (u8)data_len); > + > + if (host->cur_dir == DMA_DIR_FROM_CARD) > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, > + 0x03 | DMA_PACK_SIZE_MASK, > + DMA_DIR_FROM_CARD | DMA_EN | DMA_512); > + else > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, > + 0x03 | DMA_PACK_SIZE_MASK, > + DMA_DIR_TO_CARD | DMA_EN | DMA_512); > + > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_DATA_SOURCE, > + 0x01, RING_BUFFER); > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_CFG2, 0xFF, cfg2); > + > + if (host->cur_dir == DMA_DIR_FROM_CARD) > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, 0xFF, > + SD_TRANSFER_START | SD_TM_AUTO_READ_3); > + else > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, 0xFF, > + SD_TRANSFER_START | SD_TM_AUTO_WRITE_3); > + > + rtsx_pci_add_cmd(pcr, CHECK_REG_CMD, SD_TRANSFER, > + SD_TRANSFER_END, SD_TRANSFER_END); > + rtsx_pci_send_cmd_no_wait(pcr); > + > + if (host->cur_dir == DMA_DIR_FROM_CARD) > + err = rtsx_pci_dma_transfer(pcr, data->sg, host->sg_count, 1, 10000); > + else > + err = rtsx_pci_dma_transfer(pcr, data->sg, host->sg_count, 0, 10000); > + > + if (err < 0) { > + sd_clear_error(host); > + return err; > + } > + > + return 0; > +} > + > +static int sd_stop_sequential(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) > +{ > + struct rtsx_pcr *pcr = host->pcr; > + struct mmc_command *cmd; > + > + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); > + > + cmd->opcode = MMC_STOP_TRANSMISSION; > + cmd->arg = 0; > + cmd->busy_timeout = 0; > + if (host->cur_dir == DMA_DIR_FROM_CARD) > + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; > + else > + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; > + sd_send_cmd_get_rsp(host, cmd); > + udelay(50); > + rtsx_pci_write_register(pcr, RBCTL, RB_FLUSH, RB_FLUSH); > + kfree(cmd); > + return 0; > +} > + > static inline void sd_enable_initial_mode(struct realtek_pci_sdmmc *host) > { > rtsx_pci_write_register(host->pcr, SD_CFG1, > @@ -796,6 +900,45 @@ static inline int sd_rw_cmd(struct mmc_command *cmd) > (cmd->opcode == MMC_WRITE_BLOCK); > } > > +static void sd_rw_idle_work(struct work_struct *work) > +{ > + struct delayed_work *dwork = to_delayed_work(work); > + struct realtek_pci_sdmmc *host = container_of(dwork, > + struct realtek_pci_sdmmc, rw_idle_work); > + struct mmc_command *cmd; > + > + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); > + > + cmd->opcode = MMC_STOP_TRANSMISSION; > + cmd->arg = 0; > + cmd->busy_timeout = 0; > + if (host->cur_dir == DMA_DIR_FROM_CARD) > + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; > + else > + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; > + > + sd_send_cmd_get_rsp(host, cmd); > + host->rw_mode = NORMAL_RW; > + kfree(cmd); > +} > + > +static int sd_check_seq(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) > +{ > + struct mmc_command *cmd = mrq->cmd; > + struct mmc_data *data = mrq->data; > + > + if (!mmc_op_multi(cmd->opcode)) > + return 0; > + > + if (host->prev_dir != host->cur_dir) > + return 0; > + > + if ((host->prev_sec_addr + host->prev_sec_cnt) != data->blk_addr) > + return 0; > + > + return 1; > +} > + > static void sd_request(struct work_struct *work) > { > struct realtek_pci_sdmmc *host = container_of(work, > @@ -841,12 +984,36 @@ static void sd_request(struct work_struct *work) > if (!data_size) { > sd_send_cmd_get_rsp(host, cmd); > } else if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { > - cmd->error = sd_rw_multi(host, mrq); > - if (!host->using_cookie) > - sdmmc_post_req(host->mmc, host->mrq, 0); > + /* Check seq function*/ > + if (data->flags & MMC_DATA_READ) > + host->cur_dir = DMA_DIR_FROM_CARD; > + else > + host->cur_dir = DMA_DIR_TO_CARD; > + > + if (host->rw_mode == SEQ_RW) { > + cancel_delayed_work(&host->rw_idle_work); > + if (!sd_check_seq(host, mrq)) { > + sd_stop_sequential(host, mrq); > + host->rw_mode = NORMAL_RW; > + } > + } > + > + if (host->rw_mode == SEQ_RW) > + cmd->error = sd_rw_sequential(host, mrq); > + else { > + if (mmc_op_multi(cmd->opcode)) > + host->rw_mode = SEQ_RW; > + cmd->error = sd_rw_multi(host, mrq); > + if (!host->using_cookie) > + sdmmc_post_req(host->mmc, host->mrq, 0); > + } > + > + if (cmd->error) > + host->rw_mode = NORMAL_RW; > + > + if (mmc_op_multi(cmd->opcode) && host->rw_mode == SEQ_RW) > + mod_delayed_work(system_wq, &host->rw_idle_work, msecs_to_jiffies(150)); > > - if (mmc_op_multi(cmd->opcode) && mrq->stop) > - sd_send_cmd_get_rsp(host, mrq->stop); > } else { > sd_normal_rw(host, mrq); > } > @@ -867,6 +1034,11 @@ static void sd_request(struct work_struct *work) > } > > mutex_lock(&host->host_mutex); > + if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { > + host->prev_dir = host->cur_dir; > + host->prev_sec_addr = data->blk_addr; > + host->prev_sec_cnt = data->blocks; > + } > host->mrq = NULL; > mutex_unlock(&host->host_mutex); > > @@ -1457,6 +1629,7 @@ static void rtsx_pci_sdmmc_card_event(struct platform_device *pdev) > struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); > > host->cookie = -1; > + host->rw_mode = NORMAL_RW; > mmc_detect_change(host->mmc, 0); > } > > @@ -1487,6 +1660,7 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev) > host->cookie = -1; > host->power_state = SDMMC_POWER_OFF; > INIT_WORK(&host->work, sd_request); > + INIT_DELAYED_WORK(&host->rw_idle_work, sd_rw_idle_work); > platform_set_drvdata(pdev, host); > pcr->slots[RTSX_SD_CARD].p_dev = pdev; > pcr->slots[RTSX_SD_CARD].card_event = rtsx_pci_sdmmc_card_event; > @@ -1526,6 +1700,7 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) > pm_runtime_disable(&pdev->dev); > } > > + cancel_delayed_work_sync(&host->rw_idle_work); > cancel_work_sync(&host->work); > > mutex_lock(&host->host_mutex); > -- > 2.25.1
> -----Original Message----- > From: Ulf Hansson <ulf.hansson@linaro.org> > Sent: Friday, December 3, 2021 10:33 PM > To: Ricky WU <ricky_wu@realtek.com> > Cc: gregkh@linuxfoundation.org; tommyhebb@gmail.com; > linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH] mmc: rtsx: improve rw performance > > On Fri, 3 Dec 2021 at 11:43, Ricky WU <ricky_wu@realtek.com> wrote: > > > > sd_check_seq() to distinguish sequential rw or normal rw if this data > > is sequential call to sd_rw_sequential() > > Can you please extend this commit message? This doesn't answer why or what > this change really does, please try to do that, as to help me to review this. > This patch is for improving sequential read/write performance. Before this, whether CMD is muti-RW or single-RW the driver do the same flow. This patch distinguishes the two and do different flow to get more performance on sequential RW. sd_check_seq() to distinguish sequential RW (CMD 18/25) or normal RW (CMD 17/24) if the data is sequential call to sd_rw_sequential() > Kind regards > Uffe > > > > > Signed-off-by: Ricky Wu <ricky_wu@realtek.com> > > --- > > drivers/mmc/host/rtsx_pci_sdmmc.c | 185 > > +++++++++++++++++++++++++++++- > > 1 file changed, 180 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c > > b/drivers/mmc/host/rtsx_pci_sdmmc.c > > index 58cfaffa3c2d..9eb433b1f6f8 100644 > > --- a/drivers/mmc/host/rtsx_pci_sdmmc.c > > +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c > > @@ -22,6 +22,8 @@ > > #include <asm/unaligned.h> > > #include <linux/pm_runtime.h> > > > > +enum RW_MODE {NORMAL_RW, SEQ_RW}; > > + > > struct realtek_pci_sdmmc { > > struct platform_device *pdev; > > struct rtsx_pcr *pcr; > > @@ -31,6 +33,7 @@ struct realtek_pci_sdmmc { > > > > struct work_struct work; > > struct mutex host_mutex; > > + struct delayed_work rw_idle_work; > > > > u8 ssc_depth; > > unsigned int clock; > > @@ -46,6 +49,12 @@ struct realtek_pci_sdmmc { > > s32 cookie; > > int cookie_sg_count; > > bool using_cookie; > > + > > + enum RW_MODE rw_mode; > > + u8 prev_dir; > > + u8 cur_dir; > > + u64 prev_sec_addr; > > + u32 prev_sec_cnt; > > }; > > > > static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios > > *ios); @@ -226,6 +235,14 @@ static void sd_send_cmd_get_rsp(struct > realtek_pci_sdmmc *host, > > dev_dbg(sdmmc_dev(host), "%s: SD/MMC CMD %d, arg = > 0x%08x\n", > > __func__, cmd_idx, arg); > > > > + if (cmd_idx == MMC_SEND_STATUS && host->rw_mode == > SEQ_RW) { > > + cmd->resp[0] = R1_READY_FOR_DATA | > (R1_STATE_TRAN << 9); > > + goto out; > > + } > > + > > + if (!mmc_op_multi(cmd->opcode)) > > + host->rw_mode = NORMAL_RW; > > + > > rsp_type = sd_response_type(cmd); > > if (rsp_type < 0) > > goto out; > > @@ -542,6 +559,93 @@ static int sd_write_long_data(struct > realtek_pci_sdmmc *host, > > return 0; > > } > > > > +static int sd_rw_sequential(struct realtek_pci_sdmmc *host, struct > > +mmc_request *mrq) { > > + struct rtsx_pcr *pcr = host->pcr; > > + struct mmc_host *mmc = host->mmc; > > + struct mmc_card *card = mmc->card; > > + struct mmc_data *data = mrq->data; > > + int uhs = mmc_card_uhs(card); > > + u8 cfg2; > > + int err; > > + size_t data_len = data->blksz * data->blocks; > > + > > + cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 | > > + SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 | > SD_RSP_LEN_0; > > + > > + if (!uhs) > > + cfg2 |= SD_NO_CHECK_WAIT_CRC_TO; > > + > > + rtsx_pci_init_cmd(pcr); > > + sd_cmd_set_data_len(pcr, data->blocks, data->blksz); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, IRQSTAT0, > > + DMA_DONE_INT, DMA_DONE_INT); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC3, > > + 0xFF, (u8)(data_len >> 24)); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC2, > > + 0xFF, (u8)(data_len >> 16)); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC1, > > + 0xFF, (u8)(data_len >> 8)); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC0, 0xFF, > > + (u8)data_len); > > + > > + if (host->cur_dir == DMA_DIR_FROM_CARD) > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, > > + 0x03 | DMA_PACK_SIZE_MASK, > > + DMA_DIR_FROM_CARD | DMA_EN | > DMA_512); > > + else > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, > > + 0x03 | DMA_PACK_SIZE_MASK, > > + DMA_DIR_TO_CARD | DMA_EN | DMA_512); > > + > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_DATA_SOURCE, > > + 0x01, RING_BUFFER); > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_CFG2, 0xFF, cfg2); > > + > > + if (host->cur_dir == DMA_DIR_FROM_CARD) > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, > 0xFF, > > + SD_TRANSFER_START | > SD_TM_AUTO_READ_3); > > + else > > + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, > 0xFF, > > + SD_TRANSFER_START | > > + SD_TM_AUTO_WRITE_3); > > + > > + rtsx_pci_add_cmd(pcr, CHECK_REG_CMD, SD_TRANSFER, > > + SD_TRANSFER_END, SD_TRANSFER_END); > > + rtsx_pci_send_cmd_no_wait(pcr); > > + > > + if (host->cur_dir == DMA_DIR_FROM_CARD) > > + err = rtsx_pci_dma_transfer(pcr, data->sg, > host->sg_count, 1, 10000); > > + else > > + err = rtsx_pci_dma_transfer(pcr, data->sg, > > + host->sg_count, 0, 10000); > > + > > + if (err < 0) { > > + sd_clear_error(host); > > + return err; > > + } > > + > > + return 0; > > +} > > + > > +static int sd_stop_sequential(struct realtek_pci_sdmmc *host, struct > > +mmc_request *mrq) { > > + struct rtsx_pcr *pcr = host->pcr; > > + struct mmc_command *cmd; > > + > > + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); > > + > > + cmd->opcode = MMC_STOP_TRANSMISSION; > > + cmd->arg = 0; > > + cmd->busy_timeout = 0; > > + if (host->cur_dir == DMA_DIR_FROM_CARD) > > + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | > MMC_CMD_AC; > > + else > > + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | > MMC_CMD_AC; > > + sd_send_cmd_get_rsp(host, cmd); > > + udelay(50); > > + rtsx_pci_write_register(pcr, RBCTL, RB_FLUSH, RB_FLUSH); > > + kfree(cmd); > > + return 0; > > +} > > + > > static inline void sd_enable_initial_mode(struct realtek_pci_sdmmc > > *host) { > > rtsx_pci_write_register(host->pcr, SD_CFG1, @@ -796,6 +900,45 > > @@ static inline int sd_rw_cmd(struct mmc_command *cmd) > > (cmd->opcode == MMC_WRITE_BLOCK); } > > > > +static void sd_rw_idle_work(struct work_struct *work) { > > + struct delayed_work *dwork = to_delayed_work(work); > > + struct realtek_pci_sdmmc *host = container_of(dwork, > > + struct realtek_pci_sdmmc, rw_idle_work); > > + struct mmc_command *cmd; > > + > > + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); > > + > > + cmd->opcode = MMC_STOP_TRANSMISSION; > > + cmd->arg = 0; > > + cmd->busy_timeout = 0; > > + if (host->cur_dir == DMA_DIR_FROM_CARD) > > + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | > MMC_CMD_AC; > > + else > > + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | > > + MMC_CMD_AC; > > + > > + sd_send_cmd_get_rsp(host, cmd); > > + host->rw_mode = NORMAL_RW; > > + kfree(cmd); > > +} > > + > > +static int sd_check_seq(struct realtek_pci_sdmmc *host, struct > > +mmc_request *mrq) { > > + struct mmc_command *cmd = mrq->cmd; > > + struct mmc_data *data = mrq->data; > > + > > + if (!mmc_op_multi(cmd->opcode)) > > + return 0; > > + > > + if (host->prev_dir != host->cur_dir) > > + return 0; > > + > > + if ((host->prev_sec_addr + host->prev_sec_cnt) != data->blk_addr) > > + return 0; > > + > > + return 1; > > +} > > + > > static void sd_request(struct work_struct *work) { > > struct realtek_pci_sdmmc *host = container_of(work, @@ -841,12 > > +984,36 @@ static void sd_request(struct work_struct *work) > > if (!data_size) { > > sd_send_cmd_get_rsp(host, cmd); > > } else if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { > > - cmd->error = sd_rw_multi(host, mrq); > > - if (!host->using_cookie) > > - sdmmc_post_req(host->mmc, host->mrq, 0); > > + /* Check seq function*/ > > + if (data->flags & MMC_DATA_READ) > > + host->cur_dir = DMA_DIR_FROM_CARD; > > + else > > + host->cur_dir = DMA_DIR_TO_CARD; > > + > > + if (host->rw_mode == SEQ_RW) { > > + cancel_delayed_work(&host->rw_idle_work); > > + if (!sd_check_seq(host, mrq)) { > > + sd_stop_sequential(host, mrq); > > + host->rw_mode = NORMAL_RW; > > + } > > + } > > + > > + if (host->rw_mode == SEQ_RW) > > + cmd->error = sd_rw_sequential(host, mrq); > > + else { > > + if (mmc_op_multi(cmd->opcode)) > > + host->rw_mode = SEQ_RW; > > + cmd->error = sd_rw_multi(host, mrq); > > + if (!host->using_cookie) > > + sdmmc_post_req(host->mmc, > host->mrq, 0); > > + } > > + > > + if (cmd->error) > > + host->rw_mode = NORMAL_RW; > > + > > + if (mmc_op_multi(cmd->opcode) && host->rw_mode == > SEQ_RW) > > + mod_delayed_work(system_wq, > > + &host->rw_idle_work, msecs_to_jiffies(150)); > > > > - if (mmc_op_multi(cmd->opcode) && mrq->stop) > > - sd_send_cmd_get_rsp(host, mrq->stop); > > } else { > > sd_normal_rw(host, mrq); > > } > > @@ -867,6 +1034,11 @@ static void sd_request(struct work_struct *work) > > } > > > > mutex_lock(&host->host_mutex); > > + if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { > > + host->prev_dir = host->cur_dir; > > + host->prev_sec_addr = data->blk_addr; > > + host->prev_sec_cnt = data->blocks; > > + } > > host->mrq = NULL; > > mutex_unlock(&host->host_mutex); > > > > @@ -1457,6 +1629,7 @@ static void rtsx_pci_sdmmc_card_event(struct > platform_device *pdev) > > struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); > > > > host->cookie = -1; > > + host->rw_mode = NORMAL_RW; > > mmc_detect_change(host->mmc, 0); } > > > > @@ -1487,6 +1660,7 @@ static int rtsx_pci_sdmmc_drv_probe(struct > platform_device *pdev) > > host->cookie = -1; > > host->power_state = SDMMC_POWER_OFF; > > INIT_WORK(&host->work, sd_request); > > + INIT_DELAYED_WORK(&host->rw_idle_work, sd_rw_idle_work); > > platform_set_drvdata(pdev, host); > > pcr->slots[RTSX_SD_CARD].p_dev = pdev; > > pcr->slots[RTSX_SD_CARD].card_event = > > rtsx_pci_sdmmc_card_event; @@ -1526,6 +1700,7 @@ static int > rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) > > pm_runtime_disable(&pdev->dev); > > } > > > > + cancel_delayed_work_sync(&host->rw_idle_work); > > cancel_work_sync(&host->work); > > > > mutex_lock(&host->host_mutex); > > -- > > 2.25.1 > ------Please consider the environment before printing this e-mail.
On Mon, 6 Dec 2021 at 13:09, Ricky WU <ricky_wu@realtek.com> wrote: > > > > > -----Original Message----- > > From: Ulf Hansson <ulf.hansson@linaro.org> > > Sent: Friday, December 3, 2021 10:33 PM > > To: Ricky WU <ricky_wu@realtek.com> > > Cc: gregkh@linuxfoundation.org; tommyhebb@gmail.com; > > linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org > > Subject: Re: [PATCH] mmc: rtsx: improve rw performance > > > > On Fri, 3 Dec 2021 at 11:43, Ricky WU <ricky_wu@realtek.com> wrote: > > > > > > sd_check_seq() to distinguish sequential rw or normal rw if this data > > > is sequential call to sd_rw_sequential() > > > > Can you please extend this commit message? This doesn't answer why or what > > this change really does, please try to do that, as to help me to review this. > > > > This patch is for improving sequential read/write performance. I would not use the term "sequential", but rather "multi-block read/writes". > Before this, whether CMD is muti-RW or single-RW the driver do the same flow. > This patch distinguishes the two and do different flow to get more performance > on sequential RW. Alright, thanks for clarifying. So to be clear, please update the commit message to say that it's improving performance for multi-block read/write. Then please add also some information about how that is achieved. Moreover, please rename the functions in the code according to this as well, as to make it more clear. For example, use sd_rw_multi() (and sd_rw_single() if that is needed), rather than sd_rw_sequential(). > sd_check_seq() to distinguish sequential RW (CMD 18/25) or normal RW (CMD 17/24) > if the data is sequential call to sd_rw_sequential() I will wait for a v2 from you, then I will give it another try to review. [...] Kind regards Uffe
> -----Original Message----- > From: Ulf Hansson <ulf.hansson@linaro.org> > Sent: Wednesday, December 8, 2021 6:27 PM > To: Ricky WU <ricky_wu@realtek.com> > Cc: gregkh@linuxfoundation.org; tommyhebb@gmail.com; > linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH] mmc: rtsx: improve rw performance > > On Mon, 6 Dec 2021 at 13:09, Ricky WU <ricky_wu@realtek.com> wrote: > > > > > > > > > -----Original Message----- > > > From: Ulf Hansson <ulf.hansson@linaro.org> > > > Sent: Friday, December 3, 2021 10:33 PM > > > To: Ricky WU <ricky_wu@realtek.com> > > > Cc: gregkh@linuxfoundation.org; tommyhebb@gmail.com; > > > linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org > > > Subject: Re: [PATCH] mmc: rtsx: improve rw performance > > > > > > On Fri, 3 Dec 2021 at 11:43, Ricky WU <ricky_wu@realtek.com> wrote: > > > > > > > > sd_check_seq() to distinguish sequential rw or normal rw if this > > > > data is sequential call to sd_rw_sequential() > > > > > > Can you please extend this commit message? This doesn't answer why > > > or what this change really does, please try to do that, as to help me to > review this. > > > > > > > This patch is for improving sequential read/write performance. > > I would not use the term "sequential", but rather "multi-block read/writes". > > > Before this, whether CMD is muti-RW or single-RW the driver do the same > flow. > > This patch distinguishes the two and do different flow to get more > > performance on sequential RW. > > Alright, thanks for clarifying. > > So to be clear, please update the commit message to say that it's improving > performance for multi-block read/write. Then please add also some > information about how that is achieved. > > Moreover, please rename the functions in the code according to this as well, as > to make it more clear. For example, use sd_rw_multi() (and > sd_rw_single() if that is needed), rather than sd_rw_sequential(). > > > sd_check_seq() to distinguish sequential RW (CMD 18/25) or normal RW > > (CMD 17/24) if the data is sequential call to sd_rw_sequential() > > I will wait for a v2 from you, then I will give it another try to review. > Ok, I will do the v2 patch. And I need to clarify, this patch is improving performance that the CMD is multi-block and the date is sequential. I will change the function name for more clarity. > [...] > > Kind regards > Uffe > ------Please consider the environment before printing this e-mail.
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index 58cfaffa3c2d..9eb433b1f6f8 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c @@ -22,6 +22,8 @@ #include <asm/unaligned.h> #include <linux/pm_runtime.h> +enum RW_MODE {NORMAL_RW, SEQ_RW}; + struct realtek_pci_sdmmc { struct platform_device *pdev; struct rtsx_pcr *pcr; @@ -31,6 +33,7 @@ struct realtek_pci_sdmmc { struct work_struct work; struct mutex host_mutex; + struct delayed_work rw_idle_work; u8 ssc_depth; unsigned int clock; @@ -46,6 +49,12 @@ struct realtek_pci_sdmmc { s32 cookie; int cookie_sg_count; bool using_cookie; + + enum RW_MODE rw_mode; + u8 prev_dir; + u8 cur_dir; + u64 prev_sec_addr; + u32 prev_sec_cnt; }; static int sdmmc_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios); @@ -226,6 +235,14 @@ static void sd_send_cmd_get_rsp(struct realtek_pci_sdmmc *host, dev_dbg(sdmmc_dev(host), "%s: SD/MMC CMD %d, arg = 0x%08x\n", __func__, cmd_idx, arg); + if (cmd_idx == MMC_SEND_STATUS && host->rw_mode == SEQ_RW) { + cmd->resp[0] = R1_READY_FOR_DATA | (R1_STATE_TRAN << 9); + goto out; + } + + if (!mmc_op_multi(cmd->opcode)) + host->rw_mode = NORMAL_RW; + rsp_type = sd_response_type(cmd); if (rsp_type < 0) goto out; @@ -542,6 +559,93 @@ static int sd_write_long_data(struct realtek_pci_sdmmc *host, return 0; } +static int sd_rw_sequential(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) +{ + struct rtsx_pcr *pcr = host->pcr; + struct mmc_host *mmc = host->mmc; + struct mmc_card *card = mmc->card; + struct mmc_data *data = mrq->data; + int uhs = mmc_card_uhs(card); + u8 cfg2; + int err; + size_t data_len = data->blksz * data->blocks; + + cfg2 = SD_NO_CALCULATE_CRC7 | SD_CHECK_CRC16 | + SD_NO_WAIT_BUSY_END | SD_NO_CHECK_CRC7 | SD_RSP_LEN_0; + + if (!uhs) + cfg2 |= SD_NO_CHECK_WAIT_CRC_TO; + + rtsx_pci_init_cmd(pcr); + sd_cmd_set_data_len(pcr, data->blocks, data->blksz); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, IRQSTAT0, + DMA_DONE_INT, DMA_DONE_INT); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC3, + 0xFF, (u8)(data_len >> 24)); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC2, + 0xFF, (u8)(data_len >> 16)); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC1, + 0xFF, (u8)(data_len >> 8)); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMATC0, 0xFF, (u8)data_len); + + if (host->cur_dir == DMA_DIR_FROM_CARD) + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, + 0x03 | DMA_PACK_SIZE_MASK, + DMA_DIR_FROM_CARD | DMA_EN | DMA_512); + else + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, DMACTL, + 0x03 | DMA_PACK_SIZE_MASK, + DMA_DIR_TO_CARD | DMA_EN | DMA_512); + + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_DATA_SOURCE, + 0x01, RING_BUFFER); + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_CFG2, 0xFF, cfg2); + + if (host->cur_dir == DMA_DIR_FROM_CARD) + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, 0xFF, + SD_TRANSFER_START | SD_TM_AUTO_READ_3); + else + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_TRANSFER, 0xFF, + SD_TRANSFER_START | SD_TM_AUTO_WRITE_3); + + rtsx_pci_add_cmd(pcr, CHECK_REG_CMD, SD_TRANSFER, + SD_TRANSFER_END, SD_TRANSFER_END); + rtsx_pci_send_cmd_no_wait(pcr); + + if (host->cur_dir == DMA_DIR_FROM_CARD) + err = rtsx_pci_dma_transfer(pcr, data->sg, host->sg_count, 1, 10000); + else + err = rtsx_pci_dma_transfer(pcr, data->sg, host->sg_count, 0, 10000); + + if (err < 0) { + sd_clear_error(host); + return err; + } + + return 0; +} + +static int sd_stop_sequential(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) +{ + struct rtsx_pcr *pcr = host->pcr; + struct mmc_command *cmd; + + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + + cmd->opcode = MMC_STOP_TRANSMISSION; + cmd->arg = 0; + cmd->busy_timeout = 0; + if (host->cur_dir == DMA_DIR_FROM_CARD) + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; + else + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; + sd_send_cmd_get_rsp(host, cmd); + udelay(50); + rtsx_pci_write_register(pcr, RBCTL, RB_FLUSH, RB_FLUSH); + kfree(cmd); + return 0; +} + static inline void sd_enable_initial_mode(struct realtek_pci_sdmmc *host) { rtsx_pci_write_register(host->pcr, SD_CFG1, @@ -796,6 +900,45 @@ static inline int sd_rw_cmd(struct mmc_command *cmd) (cmd->opcode == MMC_WRITE_BLOCK); } +static void sd_rw_idle_work(struct work_struct *work) +{ + struct delayed_work *dwork = to_delayed_work(work); + struct realtek_pci_sdmmc *host = container_of(dwork, + struct realtek_pci_sdmmc, rw_idle_work); + struct mmc_command *cmd; + + cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + + cmd->opcode = MMC_STOP_TRANSMISSION; + cmd->arg = 0; + cmd->busy_timeout = 0; + if (host->cur_dir == DMA_DIR_FROM_CARD) + cmd->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; + else + cmd->flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC; + + sd_send_cmd_get_rsp(host, cmd); + host->rw_mode = NORMAL_RW; + kfree(cmd); +} + +static int sd_check_seq(struct realtek_pci_sdmmc *host, struct mmc_request *mrq) +{ + struct mmc_command *cmd = mrq->cmd; + struct mmc_data *data = mrq->data; + + if (!mmc_op_multi(cmd->opcode)) + return 0; + + if (host->prev_dir != host->cur_dir) + return 0; + + if ((host->prev_sec_addr + host->prev_sec_cnt) != data->blk_addr) + return 0; + + return 1; +} + static void sd_request(struct work_struct *work) { struct realtek_pci_sdmmc *host = container_of(work, @@ -841,12 +984,36 @@ static void sd_request(struct work_struct *work) if (!data_size) { sd_send_cmd_get_rsp(host, cmd); } else if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { - cmd->error = sd_rw_multi(host, mrq); - if (!host->using_cookie) - sdmmc_post_req(host->mmc, host->mrq, 0); + /* Check seq function*/ + if (data->flags & MMC_DATA_READ) + host->cur_dir = DMA_DIR_FROM_CARD; + else + host->cur_dir = DMA_DIR_TO_CARD; + + if (host->rw_mode == SEQ_RW) { + cancel_delayed_work(&host->rw_idle_work); + if (!sd_check_seq(host, mrq)) { + sd_stop_sequential(host, mrq); + host->rw_mode = NORMAL_RW; + } + } + + if (host->rw_mode == SEQ_RW) + cmd->error = sd_rw_sequential(host, mrq); + else { + if (mmc_op_multi(cmd->opcode)) + host->rw_mode = SEQ_RW; + cmd->error = sd_rw_multi(host, mrq); + if (!host->using_cookie) + sdmmc_post_req(host->mmc, host->mrq, 0); + } + + if (cmd->error) + host->rw_mode = NORMAL_RW; + + if (mmc_op_multi(cmd->opcode) && host->rw_mode == SEQ_RW) + mod_delayed_work(system_wq, &host->rw_idle_work, msecs_to_jiffies(150)); - if (mmc_op_multi(cmd->opcode) && mrq->stop) - sd_send_cmd_get_rsp(host, mrq->stop); } else { sd_normal_rw(host, mrq); } @@ -867,6 +1034,11 @@ static void sd_request(struct work_struct *work) } mutex_lock(&host->host_mutex); + if (sd_rw_cmd(cmd) || sdio_extblock_cmd(cmd, data)) { + host->prev_dir = host->cur_dir; + host->prev_sec_addr = data->blk_addr; + host->prev_sec_cnt = data->blocks; + } host->mrq = NULL; mutex_unlock(&host->host_mutex); @@ -1457,6 +1629,7 @@ static void rtsx_pci_sdmmc_card_event(struct platform_device *pdev) struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); host->cookie = -1; + host->rw_mode = NORMAL_RW; mmc_detect_change(host->mmc, 0); } @@ -1487,6 +1660,7 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev) host->cookie = -1; host->power_state = SDMMC_POWER_OFF; INIT_WORK(&host->work, sd_request); + INIT_DELAYED_WORK(&host->rw_idle_work, sd_rw_idle_work); platform_set_drvdata(pdev, host); pcr->slots[RTSX_SD_CARD].p_dev = pdev; pcr->slots[RTSX_SD_CARD].card_event = rtsx_pci_sdmmc_card_event; @@ -1526,6 +1700,7 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); } + cancel_delayed_work_sync(&host->rw_idle_work); cancel_work_sync(&host->work); mutex_lock(&host->host_mutex);
sd_check_seq() to distinguish sequential rw or normal rw if this data is sequential call to sd_rw_sequential() Signed-off-by: Ricky Wu <ricky_wu@realtek.com> --- drivers/mmc/host/rtsx_pci_sdmmc.c | 185 +++++++++++++++++++++++++++++- 1 file changed, 180 insertions(+), 5 deletions(-)