Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 28 Feb 2019 14:39:47 -0800 (PST)
From:   Paul Walmsley <paul.walmsley@sifive.com>
To:     Alistair Francis <Alistair.Francis@wdc.com>
cc:     "linux-riscv@lists.infradead.org" <linux-riscv@lists.infradead.org>,
        "robh@kernel.org" <robh@kernel.org>,
        "robin.murphy@arm.com" <robin.murphy@arm.com>,
        "alistair23@gmail.com" <alistair23@gmail.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Revert "of/device: Really only set bus DMA mask when
 appropriate"
In-Reply-To: <20190228223257.6189-1-alistair.francis@wdc.com>
Message-ID: <alpine.DEB.2.21.9999.1902281437380.17965@viisi.sifive.com>
References: <20190228223257.6189-1-alistair.francis@wdc.com>
User-Agent: Alpine 2.21.9999 (DEB 301 2018-08-15)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hello Alistair,

On Thu, 28 Feb 2019, 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.
> 
> 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 */

Does the DT data for the PCIe controller that you're using contain a 
dma-ranges node?

> -	if (!ret)
> -		dev->bus_dma_mask = mask;
>  
>  	coherent = of_dma_is_coherent(np);
>  	dev_dbg(dev, "device is%sdma coherent\n",


- Paul