From: Ludovic BARRE <ludovic.barre@st.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
Gerald Baeza <gerald.baeza@st.com>,
Loic Pallardy <loic.pallardy@st.com>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DTML <devicetree@vger.kernel.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>
Subject: Re: [PATCH V2 05/27] mmc: mmci: move mmci next cookie to mci host
Date: Tue, 25 Sep 2018 09:08:11 +0200 [thread overview]
Message-ID: <87fd1322-a8bc-15cc-8f91-3cf19043a2ca@st.com> (raw)
In-Reply-To: <CAPDyKFqhyVrRGRraGQzx9kwRxLtr56Gwc_NKqNqwLvZuM=jM1A@mail.gmail.com>
On 09/24/2018 08:46 PM, Ulf Hansson wrote:
> On 21 September 2018 at 11:45, Ludovic Barre <ludovic.Barre@st.com> wrote:
>> From: Ludovic Barre <ludovic.barre@st.com>
>>
>> This patch moves next cookie to mmci host structure to
>> share same cookie management between all variants.
>
> I would suggest you to squash this with patch4, as I think it makes
> more sense to keep these changes together.
ok
>
>>
>> Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
>> ---
>> drivers/mmc/host/mmci.c | 10 ++++------
>> drivers/mmc/host/mmci.h | 2 ++
>> 2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
>> index 6de7c8d..43f2a1a 100644
>> --- a/drivers/mmc/host/mmci.c
>> +++ b/drivers/mmc/host/mmci.c
>> @@ -418,7 +418,6 @@ static void mmci_init_sg(struct mmci_host *host, struct mmc_data *data)
>> struct mmci_dmae_next {
>> struct dma_async_tx_descriptor *desc;
>> struct dma_chan *chan;
>> - s32 cookie;
>> };
>>
>> struct mmci_dmae_priv {
>> @@ -449,7 +448,7 @@ static int mmci_dma_setup(struct mmci_host *host)
>> "tx");
>>
>> /* initialize pre request cookie */
>> - dmae->next_data.cookie = 1;
>> + host->next_cookie = 1;
>>
>> /*
>> * If only an RX channel is specified, the driver will
>> @@ -716,7 +715,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
>> struct mmci_dmae_priv *dmae = host->dma_priv;
>> struct mmci_dmae_next *next = &dmae->next_data;
>>
>> - WARN_ON(data->host_cookie && data->host_cookie != next->cookie);
>> + WARN_ON(data->host_cookie && data->host_cookie != host->next_cookie);
>> WARN_ON(!data->host_cookie && (next->desc || next->chan));
>>
>> dmae->desc_current = next->desc;
>> @@ -728,9 +727,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
>> static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
>> {
>> struct mmci_host *host = mmc_priv(mmc);
>> - struct mmci_dmae_priv *dmae = host->dma_priv;
>> struct mmc_data *data = mrq->data;
>> - struct mmci_dmae_next *nd = &dmae->next_data;
>>
>> if (!data)
>> return;
>> @@ -741,7 +738,8 @@ static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
>> return;
>>
>> if (!mmci_dma_prep_next(host, data))
>> - data->host_cookie = ++nd->cookie < 0 ? 1 : nd->cookie;
>> + data->host_cookie = ++host->next_cookie < 0 ?
>> + 1 : host->next_cookie;
>> }
>>
>> static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
>> diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
>> index 1e9a45b..5bb1ce2 100644
>> --- a/drivers/mmc/host/mmci.h
>> +++ b/drivers/mmc/host/mmci.h
>> @@ -318,5 +318,7 @@ struct mmci_host {
>> int (*get_rx_fifocnt)(struct mmci_host *h, u32 status, int remain);
>>
>> void *dma_priv;
>> +
>> + s32 next_cookie;
>> };
>>
>> --
>> 2.7.4
>>
>
> Kind regards
> Uffe
>
next prev parent reply other threads:[~2018-09-25 7:09 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 9:45 [PATCH V2 00/27] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-09-21 9:45 ` [PATCH V2 01/27] mmc: mmci: internalize dma map/unmap into mmci dma functions Ludovic Barre
2018-09-26 23:49 ` Ulf Hansson
2018-09-21 9:45 ` [PATCH V2 02/27] mmc: mmci: internalize dma_inprogress " Ludovic Barre
2018-09-26 23:49 ` Ulf Hansson
2018-09-21 9:45 ` [PATCH V2 03/27] mmc: mmci: convert dma_setup callback to return an int Ludovic Barre
2018-09-24 14:28 ` Ulf Hansson
2018-09-24 16:12 ` Ludovic BARRE
2018-09-26 23:49 ` Ulf Hansson
2018-09-27 8:55 ` Srinivas Kandagatla
2018-09-21 9:45 ` [PATCH V2 04/27] mmc: mmci: introduce dma_priv pointer to mmci_host Ludovic Barre
2018-09-24 18:52 ` Ulf Hansson
2018-09-25 7:19 ` Ludovic BARRE
2018-09-21 9:45 ` [PATCH V2 05/27] mmc: mmci: move mmci next cookie to mci host Ludovic Barre
2018-09-24 18:46 ` Ulf Hansson
2018-09-25 7:08 ` Ludovic BARRE [this message]
2018-09-21 9:46 ` [PATCH V2 06/27] mmc: mmci: merge prepare data functions Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 07/27] mmc: mmci: add prepare/unprepare_data callbacks Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 08/27] mmc: mmci: add get_next_data callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 09/27] mmc: mmci: modify dma_setup callback Ludovic Barre
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 9:43 ` Ludovic BARRE
2018-09-21 9:46 ` [PATCH V2 10/27] mmc: mmci: add dma_release callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 11/27] mmc: mmci: add dma_start callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 12/27] mmc: mmci: add dma_finalize callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 13/27] mmc: mmci: add dma_error callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 14/27] mmc: mmci: add validate_data callback Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 15/27] mmc: mmci: add set_clk/pwrreg callbacks Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 16/27] mmc: mmci: add datactrl block size variant property Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 17/27] mmc: mmci: expand startbiterr to irqmask and error check Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 18/27] mmc: mmci: add variant properties to define cpsm & cmdresp bits Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 19/27] mmc: mmci: add variant property to define dpsm bit Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 20/27] mmc: mmci: add variant property to define irq pio mask Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 21/27] mmc: mmci: add variant property to write datactrl before command Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 22/27] mmc: mmci: add variant property to not read datacnt Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 23/27] mmc: mmci: add variant property to request a reset Ludovic Barre
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 12:16 ` Ludovic BARRE
2018-10-01 13:43 ` Ulf Hansson
2018-09-21 9:46 ` [PATCH V2 24/27] mmc: mmci: add clock divider for stm32 sdmmc Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 25/27] mmc: mmci: add stm32 sdmmc registers Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 26/27] mmc: mmci: add DT bindings for STM32 sdmmc Ludovic Barre
2018-09-25 15:27 ` Rob Herring
2018-10-01 9:30 ` Ulf Hansson
2018-09-21 9:46 ` [PATCH V2 27/27] mmc: mmci: add stm32 sdmmc variant Ludovic Barre
2018-10-01 9:31 ` Ulf Hansson
2018-10-01 12:56 ` Ludovic BARRE
2018-10-01 13:39 ` Ulf Hansson
2018-10-01 13:53 ` Ludovic BARRE
-- strict thread matches above, loose matches on Subject: below --
2018-09-18 10:55 [PATCH V2 00/27] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-09-18 10:55 ` [PATCH V2 05/27] mmc: mmci: move mmci next cookie to mci host Ludovic Barre
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=87fd1322-a8bc-15cc-8f91-3cf19043a2ca@st.com \
--to=ludovic.barre@st.com \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=gerald.baeza@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=loic.pallardy@st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.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
all inboxes | Powered by JetHome®