| Message ID | 1466396749-29456-1-git-send-email-jh80.chung@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016/6/20 12:25, Jaehoon Chung wrote: > Since v2.80a, dwmmc controller introduced the card write threshold for > HS400 mode. So CardThrCtl can be supported during write operation, not > only read operation. > (Note: Only use the write threshold when mode is HS400.) > > To use more compatible, removed "_rd_" from function name. > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > --- > drivers/mmc/host/dw_mmc.c | 31 +++++++++++++++++++++---------- > drivers/mmc/host/dw_mmc.h | 5 ++++- > 2 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 5cf143b..6efda0b 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -899,13 +899,12 @@ done: > mci_writel(host, FIFOTH, fifoth_val); > } > > -static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) > +static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data) > { > unsigned int blksz = data->blksz; > u32 blksz_depth, fifo_depth; > u16 thld_size; > - > - WARN_ON(!(data->flags & MMC_DATA_READ)); before v2.80a, we still only allow it for READ, so shouldn't we need to check both the host->verid and data->flags rather than drop it directly? > + u8 enable; > > /* > * CDTHRCTL doesn't exist prior to 240A (in fact that register offset is > @@ -914,8 +913,20 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) > if (host->verid < DW_MMC_240A) > return; > > + /* > + * Card write Threshold is introduced since 2.80a > + * It's used when HS400 mode is enabled. > + */ > + if (data->flags & MMC_DATA_WRITE && > + !(host->timing != MMC_TIMING_MMC_HS400)) > + return; > + > + if (data->flags & MMC_DATA_WRITE) > + enable = SDMMC_CARD_WR_THR_EN; > + else > + enable = SDMMC_CARD_RD_THR_EN; > + > if (host->timing != MMC_TIMING_MMC_HS200 && > - host->timing != MMC_TIMING_MMC_HS400 && > host->timing != MMC_TIMING_UHS_SDR104) > goto disable; > > @@ -931,11 +942,11 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) > * Currently just choose blksz. > */ > thld_size = blksz; > - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(thld_size, 1)); > + mci_writel(host, CDTHRCTL, SDMMC_SET_THLD(thld_size, enable)); > return; > > disable: > - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(0, 0)); > + mci_writel(host, CDTHRCTL, 0); > } > > static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data) > @@ -1006,12 +1017,12 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data) > host->sg = NULL; > host->data = data; > > - if (data->flags & MMC_DATA_READ) { > + if (data->flags & MMC_DATA_READ) > host->dir_status = DW_MCI_RECV_STATUS; > - dw_mci_ctrl_rd_thld(host, data); > - } else { > + else > host->dir_status = DW_MCI_SEND_STATUS; > - } > + > + dw_mci_ctrl_thld(host, data); > > if (dw_mci_submit_data_dma(host, data)) { > if (host->data->flags & MMC_DATA_READ) > diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h > index 1e8d838..2bf7464 100644 > --- a/drivers/mmc/host/dw_mmc.h > +++ b/drivers/mmc/host/dw_mmc.h > @@ -175,7 +175,10 @@ > /* Version ID register define */ > #define SDMMC_GET_VERID(x) ((x) & 0xFFFF) > /* Card read threshold */ > -#define SDMMC_SET_RD_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) > +#define SDMMC_SET_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) > +#define SDMMC_CARD_WR_THR_EN BIT(2) > +#define SDMMC_CARD_RD_THR_EN BIT(0) > +/* UHS-1 register defines */ > #define SDMMC_UHS_18V BIT(0) > /* All ctrl reset bits */ > #define SDMMC_CTRL_ALL_RESET_FLAGS \ >
Hi Shawn, On 06/20/2016 05:21 PM, Shawn Lin wrote: > On 2016/6/20 12:25, Jaehoon Chung wrote: >> Since v2.80a, dwmmc controller introduced the card write threshold for >> HS400 mode. So CardThrCtl can be supported during write operation, not >> only read operation. >> (Note: Only use the write threshold when mode is HS400.) >> >> To use more compatible, removed "_rd_" from function name. >> >> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> >> --- >> drivers/mmc/host/dw_mmc.c | 31 +++++++++++++++++++++---------- >> drivers/mmc/host/dw_mmc.h | 5 ++++- >> 2 files changed, 25 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c >> index 5cf143b..6efda0b 100644 >> --- a/drivers/mmc/host/dw_mmc.c >> +++ b/drivers/mmc/host/dw_mmc.c >> @@ -899,13 +899,12 @@ done: >> mci_writel(host, FIFOTH, fifoth_val); >> } >> >> -static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) >> +static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data) >> { >> unsigned int blksz = data->blksz; >> u32 blksz_depth, fifo_depth; >> u16 thld_size; >> - >> - WARN_ON(!(data->flags & MMC_DATA_READ)); > > before v2.80a, we still only allow it for READ, so > shouldn't we need to check both the host->verid and > data->flags rather than drop it directly? Yes, i will define the verid for 280A. When i have checked the version 2.80a, it added the some features and bits for some registers. If you have the v2.80a, you can check these features with me. Anyway, your opinion is good. I will update. Thanks! Best Regards, Jaehoon Chung > >> + u8 enable; >> >> /* >> * CDTHRCTL doesn't exist prior to 240A (in fact that register offset is >> @@ -914,8 +913,20 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) >> if (host->verid < DW_MMC_240A) >> return; >> >> + /* >> + * Card write Threshold is introduced since 2.80a >> + * It's used when HS400 mode is enabled. >> + */ >> + if (data->flags & MMC_DATA_WRITE && >> + !(host->timing != MMC_TIMING_MMC_HS400)) >> + return; >> + >> + if (data->flags & MMC_DATA_WRITE) >> + enable = SDMMC_CARD_WR_THR_EN; >> + else >> + enable = SDMMC_CARD_RD_THR_EN; >> + >> if (host->timing != MMC_TIMING_MMC_HS200 && >> - host->timing != MMC_TIMING_MMC_HS400 && >> host->timing != MMC_TIMING_UHS_SDR104) >> goto disable; >> >> @@ -931,11 +942,11 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) >> * Currently just choose blksz. >> */ >> thld_size = blksz; >> - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(thld_size, 1)); >> + mci_writel(host, CDTHRCTL, SDMMC_SET_THLD(thld_size, enable)); >> return; >> >> disable: >> - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(0, 0)); >> + mci_writel(host, CDTHRCTL, 0); >> } >> >> static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data) >> @@ -1006,12 +1017,12 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data) >> host->sg = NULL; >> host->data = data; >> >> - if (data->flags & MMC_DATA_READ) { >> + if (data->flags & MMC_DATA_READ) >> host->dir_status = DW_MCI_RECV_STATUS; >> - dw_mci_ctrl_rd_thld(host, data); >> - } else { >> + else >> host->dir_status = DW_MCI_SEND_STATUS; >> - } >> + >> + dw_mci_ctrl_thld(host, data); >> >> if (dw_mci_submit_data_dma(host, data)) { >> if (host->data->flags & MMC_DATA_READ) >> diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h >> index 1e8d838..2bf7464 100644 >> --- a/drivers/mmc/host/dw_mmc.h >> +++ b/drivers/mmc/host/dw_mmc.h >> @@ -175,7 +175,10 @@ >> /* Version ID register define */ >> #define SDMMC_GET_VERID(x) ((x) & 0xFFFF) >> /* Card read threshold */ >> -#define SDMMC_SET_RD_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) >> +#define SDMMC_SET_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) >> +#define SDMMC_CARD_WR_THR_EN BIT(2) >> +#define SDMMC_CARD_RD_THR_EN BIT(0) >> +/* UHS-1 register defines */ >> #define SDMMC_UHS_18V BIT(0) >> /* All ctrl reset bits */ >> #define SDMMC_CTRL_ALL_RESET_FLAGS \ >> > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5cf143b..6efda0b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -899,13 +899,12 @@ done: mci_writel(host, FIFOTH, fifoth_val); } -static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) +static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data) { unsigned int blksz = data->blksz; u32 blksz_depth, fifo_depth; u16 thld_size; - - WARN_ON(!(data->flags & MMC_DATA_READ)); + u8 enable; /* * CDTHRCTL doesn't exist prior to 240A (in fact that register offset is @@ -914,8 +913,20 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) if (host->verid < DW_MMC_240A) return; + /* + * Card write Threshold is introduced since 2.80a + * It's used when HS400 mode is enabled. + */ + if (data->flags & MMC_DATA_WRITE && + !(host->timing != MMC_TIMING_MMC_HS400)) + return; + + if (data->flags & MMC_DATA_WRITE) + enable = SDMMC_CARD_WR_THR_EN; + else + enable = SDMMC_CARD_RD_THR_EN; + if (host->timing != MMC_TIMING_MMC_HS200 && - host->timing != MMC_TIMING_MMC_HS400 && host->timing != MMC_TIMING_UHS_SDR104) goto disable; @@ -931,11 +942,11 @@ static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data) * Currently just choose blksz. */ thld_size = blksz; - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(thld_size, 1)); + mci_writel(host, CDTHRCTL, SDMMC_SET_THLD(thld_size, enable)); return; disable: - mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(0, 0)); + mci_writel(host, CDTHRCTL, 0); } static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data) @@ -1006,12 +1017,12 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data) host->sg = NULL; host->data = data; - if (data->flags & MMC_DATA_READ) { + if (data->flags & MMC_DATA_READ) host->dir_status = DW_MCI_RECV_STATUS; - dw_mci_ctrl_rd_thld(host, data); - } else { + else host->dir_status = DW_MCI_SEND_STATUS; - } + + dw_mci_ctrl_thld(host, data); if (dw_mci_submit_data_dma(host, data)) { if (host->data->flags & MMC_DATA_READ) diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 1e8d838..2bf7464 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -175,7 +175,10 @@ /* Version ID register define */ #define SDMMC_GET_VERID(x) ((x) & 0xFFFF) /* Card read threshold */ -#define SDMMC_SET_RD_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) +#define SDMMC_SET_THLD(v, x) (((v) & 0xFFF) << 16 | (x)) +#define SDMMC_CARD_WR_THR_EN BIT(2) +#define SDMMC_CARD_RD_THR_EN BIT(0) +/* UHS-1 register defines */ #define SDMMC_UHS_18V BIT(0) /* All ctrl reset bits */ #define SDMMC_CTRL_ALL_RESET_FLAGS \
Since v2.80a, dwmmc controller introduced the card write threshold for HS400 mode. So CardThrCtl can be supported during write operation, not only read operation. (Note: Only use the write threshold when mode is HS400.) To use more compatible, removed "_rd_" from function name. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- drivers/mmc/host/dw_mmc.c | 31 +++++++++++++++++++++---------- drivers/mmc/host/dw_mmc.h | 5 ++++- 2 files changed, 25 insertions(+), 11 deletions(-)