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=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 A5577C48BCF for ; Wed, 9 Jun 2021 13:09:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85A33613B8 for ; Wed, 9 Jun 2021 13:09:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234230AbhFINKy (ORCPT ); Wed, 9 Jun 2021 09:10:54 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:44012 "EHLO mail-wr1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230261AbhFINKw (ORCPT ); Wed, 9 Jun 2021 09:10:52 -0400 Received: by mail-wr1-f44.google.com with SMTP id r9so8721081wrz.10 for ; Wed, 09 Jun 2021 06:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=dAKRH9HkKHdZdIBpdDI+4WBmuXPHtENaNb3y2Z1eb82lIpZwJgEwsmru32SRmv5Qof yCFdYzVIC5oeY0iOdRfh4A7nCNuVRIltVb8eHnDuJ2mJfcDb+26G0KsOK1+mm/Zd301T 8B9c1zwR7JKbbaEr7OZwxfTOKlGvGLLmFcj9yBxnPFJc1wETQbw7ksssupVKwVhf/4KP G9rRq5NEq4SNjXA/Mnlw7qJmSyxg/ZLfEu3YDSGITTUzrYV+jPgWdEnNd4im0mOpfPwz /On9gcLgBx0voRGMSnzTKA9nrHoGh42VGhCtkes7tL8t3xqzX/frcJ82BJpwxbmbUCsG jIAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=YCM4+GMR0KdNBXHjmVnv3fB9UjMGjAHedRG0UpA9ATRpFnpblKWhdYMwSG7k7E30lx c4/JNEzCxudT8pCKNEG9vZGxq3pMzcyHg3H/O1+5ANijJfgUWhD4OQ84LI0v5Gc1/Rmd 7ZBlN0Nb1Clv92DQq3VnJ97PGf1jx12eIa1BaJdj6iHJZFwlFuXpwRcd5Cfeq+UPKH1B K3buYUj4qeWZp6I1g9MbkoHJHYZRLoKT9V9bFHz7VfWUqZ9SpQ+y5d1A5VuIvZMQnGuN WnqY12A3xF/wXWw9LPRYjPuwNDq/5DWbJfxzJ8u0cRiMLnfyflsAco8b16rY41Wphod9 c8XA== X-Gm-Message-State: AOAM530NThMJdonFImli78zKvXtKJK6DDQnrLGQnEWVLVFh24fltEWmy 0/BQa/1UyjW0kdBobFmMMwcf2Q== X-Google-Smtp-Source: ABdhPJyEzA2Ttg+fe3SSs/W6tnxSyhgY4k+sIdj5FY05CPkcMvpVPQXJGhWZKXhJKz8WYw3MOYSMig== X-Received: by 2002:adf:ec02:: with SMTP id x2mr24425435wrn.156.1623244076710; Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Received: from ?IPv6:2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c? ([2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c]) by smtp.gmail.com with ESMTPSA id b15sm22391505wru.64.2021.06.09.06.07.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Subject: Re: [RFC] mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk To: Marek Szyprowski , ulf.hansson@linaro.org Cc: khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Bartlomiej Zolnierkiewicz References: <20210608153344.3813661-1-narmstrong@baylibre.com> From: Neil Armstrong Organization: Baylibre Message-ID: Date: Wed, 9 Jun 2021 15:07:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 08/06/2021 17:50, Marek Szyprowski wrote: > Hi > > On 08.06.2021 17:33, Neil Armstrong wrote: >> It has been reported that usage of memcpy() to/from an iomem mapping is invalid, >> and and recent arm64 memcpy update [1] triggers a memory abort when dram-access-quirk >> is used on the G12A/G12B platforms. >> >> This adds a local sg_copy_to_buffer which makes usage of io versions of memcpy >> when dram-access-quirk is enabled. >> >> Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk") >> Reported-by: Marek Szyprowski >> Suggested-by: Mark Rutland >> Signed-off-by: Neil Armstrong >> >> [1] 285133040e6c ("arm64: Import latest memcpy()/memmove() implementation") >> >> Signed-off-by: Neil Armstrong >> --- >> Hi Ulf, Marek, Mark, >> >> I haven't tested the patch yet, but should fix issue reported at [2]. > > Works fine here and fixed the issue. > > Tested-by: Marek Szyprowski Thanks, I'll need to rework to pass an __iomem pointer to memcpy_to/fromio so sparse doesn't scream anymore. Neil > >> Neil >> >> [2] https://lore.kernel.org/r/acb244ad-0759-5a96-c659-5c23003d3dcd@samsung.com >> >> drivers/mmc/host/meson-gx-mmc.c | 48 ++++++++++++++++++++++++++++++--- >> 1 file changed, 44 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c >> index b8b771b643cc..89ff6038092d 100644 >> --- a/drivers/mmc/host/meson-gx-mmc.c >> +++ b/drivers/mmc/host/meson-gx-mmc.c >> @@ -742,6 +742,48 @@ static void meson_mmc_desc_chain_transfer(struct mmc_host *mmc, u32 cmd_cfg) >> writel(start, host->regs + SD_EMMC_START); >> } >> >> +/* local sg copy to buffer version with _to/fromio usage for dram_access_quirk */ >> +static void meson_mmc_copy_buffer(struct meson_host *host, struct mmc_data *data, >> + size_t buflen, bool to_buffer) >> +{ >> + unsigned int sg_flags = SG_MITER_ATOMIC; >> + struct scatterlist *sgl = data->sg; >> + unsigned int nents = data->sg_len; >> + struct sg_mapping_iter miter; >> + void *buf = host->bounce_buf; >> + unsigned int offset = 0; >> + >> + if (to_buffer) >> + sg_flags |= SG_MITER_FROM_SG; >> + else >> + sg_flags |= SG_MITER_TO_SG; >> + >> + sg_miter_start(&miter, sgl, nents, sg_flags); >> + >> + while ((offset < buflen) && sg_miter_next(&miter)) { >> + unsigned int len; >> + >> + len = min(miter.length, buflen - offset); >> + >> + /* When dram_access_quirk, the bounce buffer is a iomem mapping */ >> + if (host->dram_access_quirk) { >> + if (to_buffer) >> + memcpy_toio(buf + offset, miter.addr, len); >> + else >> + memcpy_fromio(miter.addr, buf + offset, len); >> + } else { >> + if (to_buffer) >> + memcpy(buf + offset, miter.addr, len); >> + else >> + memcpy(miter.addr, buf + offset, len); >> + } >> + >> + offset += len; >> + } >> + >> + sg_miter_stop(&miter); >> +} >> + >> static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> { >> struct meson_host *host = mmc_priv(mmc); >> @@ -785,8 +827,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> if (data->flags & MMC_DATA_WRITE) { >> cmd_cfg |= CMD_CFG_DATA_WR; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_to_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, true); >> dma_wmb(); >> } >> >> @@ -955,8 +996,7 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) >> if (meson_mmc_bounce_buf_read(data)) { >> xfer_bytes = data->blksz * data->blocks; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_from_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, false); >> } >> >> next_cmd = meson_mmc_get_next_command(cmd); > > Best regards > 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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 4FC21C48BCF for ; Wed, 9 Jun 2021 13:40:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B1AC6101A for ; Wed, 9 Jun 2021 13:40:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B1AC6101A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dpCV/Z9g3cnUjMGlWzIIgTvQn8IqGLGTyPBAiuiy76s=; b=NvORdwTMb1P6/NHG9nURMeMyQu 4Oc04e4Vvaff1AbefWypBm6TjPLYt/C4w+LMHiWJnwCBo+mK2MtYY1hPT14yQs2qvi6EfexpD2cN4 749k1K/hMBGNeUG2hF49CAh+PU8bqIBNLQ3t6i1oVELhNMaoQsEAj2+hnIEqOtTd+AxKGgP+cMoIi utwSCgNb5hMXwW5pTmpKaAs8/3w8TlM4IPu1vuVYMseImeZyIA41yZ+YKrJcsdX6IVurSpHrO4btv 7LuzdENBWlJZTdsbJeSZzATFzvwWF4f8VHrFSAK8igONZldSw8WDUC3sPdT0HvjRlRNGkiVGQu9cr YJ6ANgLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyPQ-00E2H4-Fp; Wed, 09 Jun 2021 13:38:18 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxw7-00Duhh-TY for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:08:02 +0000 Received: by mail-wr1-x430.google.com with SMTP id e11so15230532wrg.3 for ; Wed, 09 Jun 2021 06:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=dAKRH9HkKHdZdIBpdDI+4WBmuXPHtENaNb3y2Z1eb82lIpZwJgEwsmru32SRmv5Qof yCFdYzVIC5oeY0iOdRfh4A7nCNuVRIltVb8eHnDuJ2mJfcDb+26G0KsOK1+mm/Zd301T 8B9c1zwR7JKbbaEr7OZwxfTOKlGvGLLmFcj9yBxnPFJc1wETQbw7ksssupVKwVhf/4KP G9rRq5NEq4SNjXA/Mnlw7qJmSyxg/ZLfEu3YDSGITTUzrYV+jPgWdEnNd4im0mOpfPwz /On9gcLgBx0voRGMSnzTKA9nrHoGh42VGhCtkes7tL8t3xqzX/frcJ82BJpwxbmbUCsG jIAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=ZqusdYFkuC93yOrWcaL8GGk3YMFzyybfyTlLXLdJOqRyxjlxNFLJL9WkZrgPpjCZVL MzP4albMp0JrcRBOIp9qUIvBfLGxh7pN4h3rYNlNr+ClWFlT2PmmezNgepFlmFf5C3zL eu7jyukfagFZHmy8ftIqcQNAEGOhMy6mGlF+ps4B3xFnDGEmwPmA6JrgPrkopcqF2z9d qK+OeyCU8aedmhHDQqxamY3yljqidawLb1UtQPOhawJPxQvWpdoGyAAROxvbJul9S0kb ScO4tOUijVKn/51pF1WjB2AHpWh6arz/M6LL1foCNSsq+iJVCwne0reUA4Nx4xptR0R6 u4kw== X-Gm-Message-State: AOAM530YDhfdU6e9JwpC7VUsUXUj3+UUIXqdry3u5jDoXW86I0u1IdS9 ViCVe2PFFaAqgiCVo7fS4bTAdg== X-Google-Smtp-Source: ABdhPJyEzA2Ttg+fe3SSs/W6tnxSyhgY4k+sIdj5FY05CPkcMvpVPQXJGhWZKXhJKz8WYw3MOYSMig== X-Received: by 2002:adf:ec02:: with SMTP id x2mr24425435wrn.156.1623244076710; Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Received: from ?IPv6:2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c? ([2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c]) by smtp.gmail.com with ESMTPSA id b15sm22391505wru.64.2021.06.09.06.07.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Subject: Re: [RFC] mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk To: Marek Szyprowski , ulf.hansson@linaro.org Cc: khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Bartlomiej Zolnierkiewicz References: <20210608153344.3813661-1-narmstrong@baylibre.com> From: Neil Armstrong Organization: Baylibre Message-ID: Date: Wed, 9 Jun 2021 15:07:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_060800_043772_8341E805 X-CRM114-Status: GOOD ( 24.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 08/06/2021 17:50, Marek Szyprowski wrote: > Hi > > On 08.06.2021 17:33, Neil Armstrong wrote: >> It has been reported that usage of memcpy() to/from an iomem mapping is invalid, >> and and recent arm64 memcpy update [1] triggers a memory abort when dram-access-quirk >> is used on the G12A/G12B platforms. >> >> This adds a local sg_copy_to_buffer which makes usage of io versions of memcpy >> when dram-access-quirk is enabled. >> >> Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk") >> Reported-by: Marek Szyprowski >> Suggested-by: Mark Rutland >> Signed-off-by: Neil Armstrong >> >> [1] 285133040e6c ("arm64: Import latest memcpy()/memmove() implementation") >> >> Signed-off-by: Neil Armstrong >> --- >> Hi Ulf, Marek, Mark, >> >> I haven't tested the patch yet, but should fix issue reported at [2]. > > Works fine here and fixed the issue. > > Tested-by: Marek Szyprowski Thanks, I'll need to rework to pass an __iomem pointer to memcpy_to/fromio so sparse doesn't scream anymore. Neil > >> Neil >> >> [2] https://lore.kernel.org/r/acb244ad-0759-5a96-c659-5c23003d3dcd@samsung.com >> >> drivers/mmc/host/meson-gx-mmc.c | 48 ++++++++++++++++++++++++++++++--- >> 1 file changed, 44 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c >> index b8b771b643cc..89ff6038092d 100644 >> --- a/drivers/mmc/host/meson-gx-mmc.c >> +++ b/drivers/mmc/host/meson-gx-mmc.c >> @@ -742,6 +742,48 @@ static void meson_mmc_desc_chain_transfer(struct mmc_host *mmc, u32 cmd_cfg) >> writel(start, host->regs + SD_EMMC_START); >> } >> >> +/* local sg copy to buffer version with _to/fromio usage for dram_access_quirk */ >> +static void meson_mmc_copy_buffer(struct meson_host *host, struct mmc_data *data, >> + size_t buflen, bool to_buffer) >> +{ >> + unsigned int sg_flags = SG_MITER_ATOMIC; >> + struct scatterlist *sgl = data->sg; >> + unsigned int nents = data->sg_len; >> + struct sg_mapping_iter miter; >> + void *buf = host->bounce_buf; >> + unsigned int offset = 0; >> + >> + if (to_buffer) >> + sg_flags |= SG_MITER_FROM_SG; >> + else >> + sg_flags |= SG_MITER_TO_SG; >> + >> + sg_miter_start(&miter, sgl, nents, sg_flags); >> + >> + while ((offset < buflen) && sg_miter_next(&miter)) { >> + unsigned int len; >> + >> + len = min(miter.length, buflen - offset); >> + >> + /* When dram_access_quirk, the bounce buffer is a iomem mapping */ >> + if (host->dram_access_quirk) { >> + if (to_buffer) >> + memcpy_toio(buf + offset, miter.addr, len); >> + else >> + memcpy_fromio(miter.addr, buf + offset, len); >> + } else { >> + if (to_buffer) >> + memcpy(buf + offset, miter.addr, len); >> + else >> + memcpy(miter.addr, buf + offset, len); >> + } >> + >> + offset += len; >> + } >> + >> + sg_miter_stop(&miter); >> +} >> + >> static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> { >> struct meson_host *host = mmc_priv(mmc); >> @@ -785,8 +827,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> if (data->flags & MMC_DATA_WRITE) { >> cmd_cfg |= CMD_CFG_DATA_WR; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_to_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, true); >> dma_wmb(); >> } >> >> @@ -955,8 +996,7 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) >> if (meson_mmc_bounce_buf_read(data)) { >> xfer_bytes = data->blksz * data->blocks; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_from_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, false); >> } >> >> next_cmd = meson_mmc_get_next_command(cmd); > > Best regards > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 12A58C48BCF for ; Wed, 9 Jun 2021 13:40:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C67256101A for ; Wed, 9 Jun 2021 13:40:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C67256101A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=3+7idJRfFTKAUjb4F7uGWjVud0yM87dxHO/qL2LOFz8=; b=fqpsAcgvwAWvj1YryTDiS3Z+Ah VolHBwFvecJmLr2y2Qd8v3LRMLFlxGprg7MtErM5TMdBGQzeJHozWxCkomrKPVChrtfUThXEmGkMH NgDUD7IlAeII2qvQ2Dl5ymOmilXyAl/JQFZDZC3D3eUBHtFRYvbSe/dI0mjgyDvwUdnV30BbYPt+/ 3BvFw2mCO5UYDaAi8U5zSpcDmDPTYi1s9CZ0f27O3mCwkNBjAHI5Sa+azxuJ47pfC67A2dFPsuKBa wHw44d2oQaOj+jyedXpSkW19XVxaZHk3DwfXxb0eyXqV3ED1v9XmlDFDfjqhBjBa+hYv+g5WRMQUK d1CavDdQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyR4-00E2hm-46; Wed, 09 Jun 2021 13:39:58 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqxw7-00Duhi-S4 for linux-amlogic@lists.infradead.org; Wed, 09 Jun 2021 13:08:02 +0000 Received: by mail-wr1-x429.google.com with SMTP id q5so25449875wrm.1 for ; Wed, 09 Jun 2021 06:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=dAKRH9HkKHdZdIBpdDI+4WBmuXPHtENaNb3y2Z1eb82lIpZwJgEwsmru32SRmv5Qof yCFdYzVIC5oeY0iOdRfh4A7nCNuVRIltVb8eHnDuJ2mJfcDb+26G0KsOK1+mm/Zd301T 8B9c1zwR7JKbbaEr7OZwxfTOKlGvGLLmFcj9yBxnPFJc1wETQbw7ksssupVKwVhf/4KP G9rRq5NEq4SNjXA/Mnlw7qJmSyxg/ZLfEu3YDSGITTUzrYV+jPgWdEnNd4im0mOpfPwz /On9gcLgBx0voRGMSnzTKA9nrHoGh42VGhCtkes7tL8t3xqzX/frcJ82BJpwxbmbUCsG jIAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kEJI7UvKz+ACKbMHESfgG5FvPLQQKWlKNyAxgiMp+mE=; b=lS07+rD8ZfsuoTmSboqxTN1cqOLnQLHVVnHDdYMg2AwDIkkCljxDcTYh2HKcsxoSl/ tM7jGRYbGuIB+i8Ugi7ZU/1H2v2QJ3uvkTxIuj3Bqd7JPFhHc3ngq+EbEs78ZaUYDOSp FsXjXgdCiK/7KdTkuVxLfOULxbhDGGaeWCwQ5UDFiKV5z/jTFrGjEDhXpB88ea+4Qc5e PC5wvv5zR7suCn+Lxi5U9dgfm7X1SYt0Mksivfvgb3PZ6W5uihcXO6h4QLvR5l2NcboI Be7sV4f7WWURgUH3AFsKEVwuPjYrhc2PEXmaaFh392iUhWChzNarqCCGdGeBjg6sUn2Y QnRw== X-Gm-Message-State: AOAM531aMkcNgZQsiwQxrZ9fpObYy85A6SXjv7PhWxSEccL2tL+KPjSq vUJ5svWLiBmZsS9zefkHn7XppA== X-Google-Smtp-Source: ABdhPJyEzA2Ttg+fe3SSs/W6tnxSyhgY4k+sIdj5FY05CPkcMvpVPQXJGhWZKXhJKz8WYw3MOYSMig== X-Received: by 2002:adf:ec02:: with SMTP id x2mr24425435wrn.156.1623244076710; Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Received: from ?IPv6:2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c? ([2a01:e0a:90c:e290:f5b2:1a3b:b4d:517c]) by smtp.gmail.com with ESMTPSA id b15sm22391505wru.64.2021.06.09.06.07.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Jun 2021 06:07:56 -0700 (PDT) Subject: Re: [RFC] mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk To: Marek Szyprowski , ulf.hansson@linaro.org Cc: khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Bartlomiej Zolnierkiewicz References: <20210608153344.3813661-1-narmstrong@baylibre.com> From: Neil Armstrong Organization: Baylibre Message-ID: Date: Wed, 9 Jun 2021 15:07:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_060800_029049_86BCFE5A X-CRM114-Status: GOOD ( 23.21 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Hi, On 08/06/2021 17:50, Marek Szyprowski wrote: > Hi > > On 08.06.2021 17:33, Neil Armstrong wrote: >> It has been reported that usage of memcpy() to/from an iomem mapping is invalid, >> and and recent arm64 memcpy update [1] triggers a memory abort when dram-access-quirk >> is used on the G12A/G12B platforms. >> >> This adds a local sg_copy_to_buffer which makes usage of io versions of memcpy >> when dram-access-quirk is enabled. >> >> Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk") >> Reported-by: Marek Szyprowski >> Suggested-by: Mark Rutland >> Signed-off-by: Neil Armstrong >> >> [1] 285133040e6c ("arm64: Import latest memcpy()/memmove() implementation") >> >> Signed-off-by: Neil Armstrong >> --- >> Hi Ulf, Marek, Mark, >> >> I haven't tested the patch yet, but should fix issue reported at [2]. > > Works fine here and fixed the issue. > > Tested-by: Marek Szyprowski Thanks, I'll need to rework to pass an __iomem pointer to memcpy_to/fromio so sparse doesn't scream anymore. Neil > >> Neil >> >> [2] https://lore.kernel.org/r/acb244ad-0759-5a96-c659-5c23003d3dcd@samsung.com >> >> drivers/mmc/host/meson-gx-mmc.c | 48 ++++++++++++++++++++++++++++++--- >> 1 file changed, 44 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c >> index b8b771b643cc..89ff6038092d 100644 >> --- a/drivers/mmc/host/meson-gx-mmc.c >> +++ b/drivers/mmc/host/meson-gx-mmc.c >> @@ -742,6 +742,48 @@ static void meson_mmc_desc_chain_transfer(struct mmc_host *mmc, u32 cmd_cfg) >> writel(start, host->regs + SD_EMMC_START); >> } >> >> +/* local sg copy to buffer version with _to/fromio usage for dram_access_quirk */ >> +static void meson_mmc_copy_buffer(struct meson_host *host, struct mmc_data *data, >> + size_t buflen, bool to_buffer) >> +{ >> + unsigned int sg_flags = SG_MITER_ATOMIC; >> + struct scatterlist *sgl = data->sg; >> + unsigned int nents = data->sg_len; >> + struct sg_mapping_iter miter; >> + void *buf = host->bounce_buf; >> + unsigned int offset = 0; >> + >> + if (to_buffer) >> + sg_flags |= SG_MITER_FROM_SG; >> + else >> + sg_flags |= SG_MITER_TO_SG; >> + >> + sg_miter_start(&miter, sgl, nents, sg_flags); >> + >> + while ((offset < buflen) && sg_miter_next(&miter)) { >> + unsigned int len; >> + >> + len = min(miter.length, buflen - offset); >> + >> + /* When dram_access_quirk, the bounce buffer is a iomem mapping */ >> + if (host->dram_access_quirk) { >> + if (to_buffer) >> + memcpy_toio(buf + offset, miter.addr, len); >> + else >> + memcpy_fromio(miter.addr, buf + offset, len); >> + } else { >> + if (to_buffer) >> + memcpy(buf + offset, miter.addr, len); >> + else >> + memcpy(miter.addr, buf + offset, len); >> + } >> + >> + offset += len; >> + } >> + >> + sg_miter_stop(&miter); >> +} >> + >> static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> { >> struct meson_host *host = mmc_priv(mmc); >> @@ -785,8 +827,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) >> if (data->flags & MMC_DATA_WRITE) { >> cmd_cfg |= CMD_CFG_DATA_WR; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_to_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, true); >> dma_wmb(); >> } >> >> @@ -955,8 +996,7 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) >> if (meson_mmc_bounce_buf_read(data)) { >> xfer_bytes = data->blksz * data->blocks; >> WARN_ON(xfer_bytes > host->bounce_buf_size); >> - sg_copy_from_buffer(data->sg, data->sg_len, >> - host->bounce_buf, xfer_bytes); >> + meson_mmc_copy_buffer(host, data, xfer_bytes, false); >> } >> >> next_cmd = meson_mmc_get_next_command(cmd); > > Best regards > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic