123456789101112131415161718192021222324252627282930313233343536373839404142 |
- From 3b579413ed231e51625b5f5b5f672d10fc570628 Mon Sep 17 00:00:00 2001
- From: Alistair Francis <alistair.francis@wdc.com>
- Date: Thu, 21 Feb 2019 16:29:37 -0800
- Subject: [PATCH 3/4] HACK: Revert "of/device: Really only set bus DMA mask
- when appropriate"
- 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>
- Upstream-Status: Denied
- ---
- 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 da8158392010..e1fb703ff603 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.22.0
|