From: Robin Murphy <robin.murphy@arm.com>
To: Alistair Francis <Alistair.Francis@wdc.com>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>,
"robh@kernel.org" <robh@kernel.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"alistair23@gmail.com" <alistair23@gmail.com>
Subject: Re: [PATCH] Revert "of/device: Really only set bus DMA mask when appropriate"
Date: Thu, 28 Feb 2019 22:42:09 +0000 [thread overview]
Message-ID: <056edacd-a998-277c-f0de-1aac256165a2@arm.com> (raw)
In-Reply-To: <20190228223257.6189-1-alistair.francis@wdc.com>
On 2019-02-28 10:33 pm, Alistair Francis wrote:
> This reverts commit 6778be4e520959659b27a441c06a84c9cb009085.
>
> Reverting the commit fixes these error messages and an non-functioning
> USB bus when attaching a USB to PCIe card to a RISC-V board:
> xhci_hcd 0000:03:00.0: Host took too long to start, waited 16000 microseconds.
> xhci_hcd 0000:03:00.0: startup error -19
> xhci_hcd 0000:03:00.0: USB bus 2 deregistered
> xhci_hcd 0000:03:00.0: WARNING: Host System Error
> xhci_hcd 0000:03:00.0: remove, state 1
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> I'm not sure if this is the correct fix, it's possible something else is
> wrong, but I wanted to get some feedback.
Given that the bug which this revert would reintroduce cripples DMA on
just about every 64-bit DT system, probably not. Can you clarify what
your DT looks like, and turn on the debug output for of_dma_get_range()
to see what it says?
Robin.
> drivers/of/device.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/of/device.c b/drivers/of/device.c
> index 3717f2a20d0d..8299f8055da7 100644
> --- a/drivers/of/device.c
> +++ b/drivers/of/device.c
> @@ -149,11 +149,9 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
> * set by the driver.
> */
> mask = DMA_BIT_MASK(ilog2(dma_addr + size - 1) + 1);
> + dev->bus_dma_mask = mask;
> dev->coherent_dma_mask &= mask;
> *dev->dma_mask &= mask;
> - /* ...but only set bus mask if we found valid dma-ranges earlier */
> - if (!ret)
> - dev->bus_dma_mask = mask;
>
> coherent = of_dma_is_coherent(np);
> dev_dbg(dev, "device is%sdma coherent\n",
>
next prev parent reply other threads:[~2019-02-28 22:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 22:33 [PATCH] Revert "of/device: Really only set bus DMA mask when appropriate" Alistair Francis
2019-02-28 22:39 ` Paul Walmsley
2019-02-28 22:41 ` Alistair Francis
2019-02-28 23:04 ` Paul Walmsley
2019-02-28 22:42 ` Robin Murphy [this message]
2019-07-10 22:27 ` Alistair Francis
2019-07-11 11:01 ` Robin Murphy
2019-07-11 18:05 ` Alistair Francis
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=056edacd-a998-277c-f0de-1aac256165a2@arm.com \
--to=robin.murphy@arm.com \
--cc=Alistair.Francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=robh@kernel.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).