From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D84B4C43615 for ; Thu, 23 Aug 2018 11:29:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B9F72154C for ; Thu, 23 Aug 2018 11:29:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B9F72154C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731597AbeHWO6R (ORCPT ); Thu, 23 Aug 2018 10:58:17 -0400 Received: from mga17.intel.com ([192.55.52.151]:32019 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726246AbeHWO6Q (ORCPT ); Thu, 23 Aug 2018 10:58:16 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Aug 2018 04:28:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,278,1531810800"; d="scan'208";a="256604866" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.137]) ([10.237.72.137]) by fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 04:28:58 -0700 Subject: Re: [PATCH v4 1/3] mmc: sdhci: add adma_table_cnt member to struct sdhci_host To: Jisheng Zhang , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20180823180549.78e508db@xhacker.debian> <20180823180700.3432c4db@xhacker.debian> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <082e4ee7-3b6a-f4a0-0db9-bfa63e05ec16@intel.com> Date: Thu, 23 Aug 2018 14:27:16 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180823180700.3432c4db@xhacker.debian> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/08/18 13:07, Jisheng Zhang wrote: > This patch adds adma_table_cnt member to struct sdhci_host to give more > flexibility to drivers to control the ADMA table count. > > Default value of adma_table_cnt is set to (SDHCI_MAX_SEGS * 2 + 1). > > Signed-off-by: Jisheng Zhang Acked-by: Adrian Hunter > --- > drivers/mmc/host/sdhci.c | 17 +++++++++-------- > drivers/mmc/host/sdhci.h | 3 +++ > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 1b3fbd9bd5c5..52ccf4644384 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3322,6 +3322,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, > > host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG; > > + /* > + * The DMA table descriptor count is calculated as the maximum > + * number of segments times 2, to allow for an alignment > + * descriptor for each segment, plus 1 for a nop end descriptor. > + */ > + host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; > + > return host; > } > > @@ -3567,18 +3574,12 @@ int sdhci_setup_host(struct sdhci_host *host) > dma_addr_t dma; > void *buf; > > - /* > - * The DMA descriptor table size is calculated as the maximum > - * number of segments times 2, to allow for an alignment > - * descriptor for each segment, plus 1 for a nop end descriptor, > - * all multipled by the descriptor size. > - */ > if (host->flags & SDHCI_USE_64_BIT_DMA) { > - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * > + host->adma_table_sz = host->adma_table_cnt * > SDHCI_ADMA2_64_DESC_SZ; > host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; > } else { > - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * > + host->adma_table_sz = host->adma_table_cnt * > SDHCI_ADMA2_32_DESC_SZ; > host->desc_sz = SDHCI_ADMA2_32_DESC_SZ; > } > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index f0bd36ce3817..25bddd21de31 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -563,6 +563,9 @@ struct sdhci_host { > /* Host SDMA buffer boundary. */ > u32 sdma_boundary; > > + /* Host ADMA table count */ > + u32 adma_table_cnt; > + > u64 data_timeout; > > unsigned long private[0] ____cacheline_aligned; >