linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>,
	ulf.hansson@linaro.org
Cc: asutoshd@codeaurora.org, stummala@codeaurora.org,
	sayalil@codeaurora.org, cang@codeaurora.org,
	rampraka@codeaurora.org, linux-mmc@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH V2 1/2] mmc: sdhci: Let a vendor driver supply and update ADMA descriptor size
Date: Mon, 20 Jan 2020 14:29:56 +0200	[thread overview]
Message-ID: <9cb3dd40-0edd-6e71-bc31-c4bb4a7282c9@intel.com> (raw)
In-Reply-To: <1579519045-26467-1-git-send-email-vbadigan@codeaurora.org>

On 20/01/20 1:17 pm, Veerabhadrarao Badiganti wrote:
> Let a vendor driver supply the maximum descriptor size that it
> can operate on. ADMA descriptor table would be allocated using this
> supplied size.
> If any SD Host controller is of version prior to v4.10 spec
> but supports 16byte descriptor, this change allows them to supply
> correct descriptor size for ADMA table allocation.
> 
> Also let a vendor driver update the descriptor size by overriding
> sdhc_host->desc_size if it has to operates on a different descriptor
> sizes in different conditions.

A couple of minor tweaks below sorry.

> 
> Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
> Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
> ---
>  drivers/mmc/host/sdhci.c | 13 +++++++------
>  drivers/mmc/host/sdhci.h |  3 ++-
>  2 files changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 3140fe2..44fb446 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -3822,14 +3822,15 @@ int sdhci_setup_host(struct sdhci_host *host)
>  		void *buf;
>  
>  		if (host->flags & SDHCI_USE_64_BIT_DMA) {
> -			host->adma_table_sz = host->adma_table_cnt *
> -					      SDHCI_ADMA2_64_DESC_SZ(host);
> -			host->desc_sz = SDHCI_ADMA2_64_DESC_SZ(host);
> +			if (!host->alloc_desc_sz)
> +				host->alloc_desc_sz =
> +					SDHCI_ADMA2_64_DESC_SZ(host);
>  		} else {
> -			host->adma_table_sz = host->adma_table_cnt *
> -					      SDHCI_ADMA2_32_DESC_SZ;
> -			host->desc_sz = SDHCI_ADMA2_32_DESC_SZ;
> +			host->alloc_desc_sz = SDHCI_ADMA2_32_DESC_SZ;
>  		}

The following is simpler:

		if (!(host->flags & SDHCI_USE_64_BIT_DMA))
			host->alloc_desc_sz = SDHCI_ADMA2_32_DESC_SZ;
		else if (!host->alloc_desc_sz)
			host->alloc_desc_sz = SDHCI_ADMA2_64_DESC_SZ(host);

> +		host->desc_sz = host->alloc_desc_sz;
> +		host->adma_table_sz = host->adma_table_cnt *
> +					      host->desc_sz;

Wrap is not needed

>  
>  		host->align_buffer_sz = SDHCI_MAX_SEGS * SDHCI_ADMA2_ALIGN;
>  		/*
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 0ed3e0e..10bda3a 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -554,7 +554,8 @@ struct sdhci_host {
>  	dma_addr_t adma_addr;	/* Mapped ADMA descr. table */
>  	dma_addr_t align_addr;	/* Mapped bounce buffer */
>  
> -	unsigned int desc_sz;	/* ADMA descriptor size */
> +	unsigned int desc_sz;	/* ADMA current descriptor size */
> +	unsigned int alloc_desc_sz;	/* ADMA descr. max size host supports */
>  
>  	struct workqueue_struct *complete_wq;	/* Request completion wq */
>  	struct work_struct	complete_work;	/* Request completion work */
> 


  reply	other threads:[~2020-01-20 12:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16 17:03 [PATCH V2 0/2] Add CQHCI support for sdhci-msm Veerabhadrarao Badiganti
2020-01-16 17:03 ` [PATCH V2 1/2] mmc: sdhci: Let a vendor driver supply and update ADMA descriptor size Veerabhadrarao Badiganti
2020-01-20  8:58   ` Adrian Hunter
2020-01-20 11:17   ` Veerabhadrarao Badiganti
2020-01-20 12:29     ` Adrian Hunter [this message]
2020-01-20 12:30     ` Ulf Hansson
2020-01-20 14:38     ` [PATCH V3] " Veerabhadrarao Badiganti
2020-01-24 11:25       ` Ulf Hansson
2020-01-16 17:03 ` [PATCH V2 2/2] mmc: sdhci-msm: Add CQHCI support for sdhci-msm Veerabhadrarao Badiganti
2020-01-20  8:58   ` Adrian Hunter
2020-01-20 12:30   ` Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9cb3dd40-0edd-6e71-bc31-c4bb4a7282c9@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=asutoshd@codeaurora.org \
    --cc=cang@codeaurora.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=rampraka@codeaurora.org \
    --cc=sayalil@codeaurora.org \
    --cc=stummala@codeaurora.org \
    --cc=ulf.hansson@linaro.org \
    --cc=vbadigan@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).