linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Revert "of/device: Really only set bus DMA mask when appropriate"
@ 2019-02-28 22:33 Alistair Francis
  2019-02-28 22:39 ` Paul Walmsley
  2019-02-28 22:42 ` Robin Murphy
  0 siblings, 2 replies; 8+ messages in thread
From: Alistair Francis @ 2019-02-28 22:33 UTC (permalink / raw)
  To: linux-riscv, robh, robin.murphy
  Cc: linux-kernel, alistair23, Alistair Francis

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.

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",
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-07-11 18:09 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-07-10 22:27   ` Alistair Francis
2019-07-11 11:01     ` Robin Murphy
2019-07-11 18:05       ` Alistair Francis

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).