| Message ID | 1573115572-13513-72-git-send-email-biju.das@bp.renesas.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add RZ/G1C SD/eMMC support | expand |
Hi! > commit 603aa14d3daaa7073bab4c472025c4963030e0cc upstream. > > Allow TMIO and SDHI driver implementations to provide values for > max_segs and max_blk_count. > > A follow-up patch will set these values for Renesas Gen3 SoCs > the using an SDHI driver. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > +++ b/drivers/mmc/host/tmio_mmc_core.c > @@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, > > mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; > mmc->caps2 |= pdata->capabilities2; > - mmc->max_segs = 32; > + mmc->max_segs = pdata->max_segs ? : 32; > mmc->max_blk_size = 512; > - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * > - mmc->max_segs; > + mmc->max_blk_count = pdata->max_blk_count ? : > + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; > mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; > mmc->max_seg_size = mmc->max_req_size; This also changes PAGE_CACHE_SIZE -> PAGE_SIZE. I guess that's okay/bugfix, as PAGE_CACHE_SIZE probably is equal to PAGE_SIZE in all relevant configurations, but... Best regards, Pavel
Hi Pavel, Thanks for the feedback. > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: Friday, November 8, 2019 10:04 AM > To: Biju Das <biju.das@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; > Chris Paterson <Chris.Paterson2@renesas.com>; Fabrizio Castro > <fabrizio.castro@bp.renesas.com> > Subject: Re: [PATCH 4.4.y-cip 71/83] mmc: tmio, renesas-sdhi: add > max_{segs, blk_count} to tmio_mmc_data > > Hi! > > > commit 603aa14d3daaa7073bab4c472025c4963030e0cc upstream. > > > > Allow TMIO and SDHI driver implementations to provide values for > > max_segs and max_blk_count. > > > > A follow-up patch will set these values for Renesas Gen3 SoCs the > > using an SDHI driver. > > > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > > > +++ b/drivers/mmc/host/tmio_mmc_core.c > > @@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct > tmio_mmc_host > > *_host, > > > > mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; > > mmc->caps2 |= pdata->capabilities2; > > - mmc->max_segs = 32; > > + mmc->max_segs = pdata->max_segs ? : 32; > > mmc->max_blk_size = 512; > > - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) > * > > - mmc->max_segs; > > + mmc->max_blk_count = pdata->max_blk_count ? : > > + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; > > mmc->max_req_size = mmc->max_blk_size * mmc- > >max_blk_count; > > mmc->max_seg_size = mmc->max_req_size; > > This also changes PAGE_CACHE_SIZE -> PAGE_SIZE. I guess that's > okay/bugfix, as PAGE_CACHE_SIZE probably is equal to PAGE_SIZE in all > relevant configurations, but... It is a big change from PAGE_CACHE_SIZE -> PAGE_SIZE at start of kernel tree Please see the commit (09cbfea " mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros") Regards, Biju
diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h index 781fe4c..6e33266 100644 --- a/drivers/mmc/host/renesas_sdhi.h +++ b/drivers/mmc/host/renesas_sdhi.h @@ -31,6 +31,8 @@ struct renesas_sdhi_of_data { int scc_offset; struct renesas_sdhi_scc *taps; int taps_num; + unsigned int max_blk_count; + unsigned short max_segs; }; int renesas_sdhi_probe(struct platform_device *pdev, diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index a64a3ba..2f8c7b8 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -502,6 +502,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, mmc_data->capabilities |= of_data->capabilities; mmc_data->capabilities2 |= of_data->capabilities2; mmc_data->dma_rx_offset = of_data->dma_rx_offset; + mmc_data->max_blk_count = of_data->max_blk_count; + mmc_data->max_segs = of_data->max_segs; dma_priv->dma_buswidth = of_data->dma_buswidth; host->bus_shift = of_data->bus_shift; } diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 8ab58ca..810d2d8 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1224,10 +1224,10 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; - mmc->max_segs = 32; + mmc->max_segs = pdata->max_segs ? : 32; mmc->max_blk_size = 512; - mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * - mmc->max_segs; + mmc->max_blk_count = pdata->max_blk_count ? : + (PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs; mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; mmc->max_seg_size = mmc->max_req_size; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index a1520d8..662fedc 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -128,6 +128,8 @@ struct tmio_mmc_data { unsigned int cd_gpio; int alignment_shift; dma_addr_t dma_rx_offset; + unsigned int max_blk_count; + unsigned short max_segs; void (*set_pwr)(struct platform_device *host, int state); void (*set_clk_div)(struct platform_device *host, int state); };