From patchwork Fri Jun 16 07:55:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9790815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D9A6A60325 for ; Fri, 16 Jun 2017 07:55:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD84028542 for ; Fri, 16 Jun 2017 07:55:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C23B12857E; Fri, 16 Jun 2017 07:55:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04AEB28543 for ; Fri, 16 Jun 2017 07:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752375AbdFPHz5 (ORCPT ); Fri, 16 Jun 2017 03:55:57 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:44078 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbdFPHz4 (ORCPT ); Fri, 16 Jun 2017 03:55:56 -0400 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id 39A7025B7AB; Fri, 16 Jun 2017 17:55:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1497599754; bh=RQ3QPDQ8CtSOIT6KjFkG5jmtrTpLQYfau3Uf20juV6Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sFLiS9MfKe4JO5clYp68m0jPgMQvPhQfQ/LuuXReLwg9DwfsBR9/itfElSmA1r3L6 it1pmVE/8tGpK5ONUZSfHzd8j0esRpDJpPrO/r04ZwtlTsbKO/++hO6hz3GnVbqEaz LJ8PATv8E/9pKutwo4zdb8WvI/qFG2wQ4d5u5z9g= Received: by penelope.horms.nl (Postfix, from userid 7100) id 29EFAE230CD; Fri, 16 Jun 2017 09:55:36 +0200 (CEST) Date: Fri, 16 Jun 2017 09:55:36 +0200 From: Simon Horman To: Geert Uytterhoeven Cc: Wolfram Sang , Ulf Hansson , Magnus Damm , Linux MMC List , Linux-Renesas , Yoshihiro Shimoda , Ai Kyuse Subject: Re: [PATCH/RFC 3/5] mmc: sh_mobile_sdhi: add some SoC specific data for R-Car Gen3 Message-ID: <20170616075534.GH22158@verge.net.au> References: <1496927368-18897-1-git-send-email-horms+renesas@verge.net.au> <1496927368-18897-5-git-send-email-horms+renesas@verge.net.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Organisation: Horms Solutions BV User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Jun 09, 2017 at 09:34:46AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Thu, Jun 8, 2017 at 3:09 PM, Simon Horman wrote: > > To avoid complicate code in own dma code for gen3, this patch > > adds set max_segs to 1. Then, the tmio driver will get requests > > as sg_len = 1 only. > > The above doesn't seem to match with the actual code changes? > > > In the performance point of view, the CONFIG_MMC_BLOCK_BOUNCE should > > be set. Otherwise, mmc block layer will set 4-kbyte each as a request. > > FWIW, CONFIG_MMC_BLOCK_BOUNCE is no more in -next. Thanks. The code has been shuffled around to the point where this patch doesn't seem to make much sense as is. I squashed it into the previous patch like this: mmc: tmio, renesas_sdhi: add max_segs and max_blk_count in tmio_mmc_data 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 Signed-off-by: Ai Kyuse Signed-off-by: Simon Horman --- 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/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h index eb3ea15ff92d..6f7233fe32a2 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 f4690cba3443..75c7bf4f7ca2 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -523,6 +523,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 fbe38464e7d7..7cb8d3510396 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1248,10 +1248,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_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 c83c16b931a8..4e261ea94d6a 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); };