From: Roy Pledge <roy.pledge@nxp.com>
To: Arnd Bergmann <arnd@arndb.de>, Christoph Hellwig <hch@lst.de>,
        "Marek Szyprowski" <m.szyprowski@samsung.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Robin Murphy <robin.murphy@arm.com>,
        Vladimir Murzin <vladimir.murzin@arm.com>,
        "George G. Davis" <george_davis@mentor.com>,
        "Mark Craske" <Mark_Craske@mentor.com>,
        Bastian Hecht <bhecht@de.adit-jv.com>,
        "iommu@lists.linux-foundation.org" <iommu@lists.linux-foundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] dma-coherent: fix rmem_dma_device_init regression
Thread-Topic: [PATCH] dma-coherent: fix rmem_dma_device_init regression
Thread-Index: AQHTLjSEoe2eBM6E3EeigPhYfyZNNA==
Date: Sun, 17 Sep 2017 12:35:00 +0000
Message-ID: <DB6PR04MB2999521F03C88E4A5A1682A386620@DB6PR04MB2999.eurprd04.prod.outlook.com>
References: <20170915150824.3805217-1-arnd@arndb.de>
Accept-Language: en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2017 12:35:00.3569
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3303
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v8HCZAGR002029
Content-Length: 1841
Lines: 51

On 9/15/2017 11:08 AM, Arnd Bergmann wrote:
> My recent bug fix introduced another bug, which caused rmem_dma_device_init
> to always fail, as rmem->priv is never set to anything.
> 
> This restores the previous behavior, calling dma_init_coherent_memory()
> whenever ->priv is NULL.
> 
> Fixes: d35b0996fef3 ("dma-coherent: fix dma_declare_coherent_memory() logic error")
> Reported-by: Roy Pledge <roy.pledge@nxp.com>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Roy, can you test this new fix?
> ---
>   drivers/base/dma-coherent.c | 19 +++++++++----------
>   1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
> index a39b2166b145..744f64f43454 100644
> --- a/drivers/base/dma-coherent.c
> +++ b/drivers/base/dma-coherent.c
> @@ -348,16 +348,15 @@ static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev)
>   	struct dma_coherent_mem *mem = rmem->priv;
>   	int ret;
>   
> -	if (!mem)
> -		return -ENODEV;
> -
> -	ret = dma_init_coherent_memory(rmem->base, rmem->base, rmem->size,
> -				       DMA_MEMORY_EXCLUSIVE, &mem);
> -
> -	if (ret) {
> -		pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
> -			&rmem->base, (unsigned long)rmem->size / SZ_1M);
> -		return ret;
> +	if (!mem) {
> +		ret = dma_init_coherent_memory(rmem->base, rmem->base,
> +					       rmem->size,
> +					       DMA_MEMORY_EXCLUSIVE, &mem);
> +		if (ret) {
> +			pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n",
> +				&rmem->base, (unsigned long)rmem->size / SZ_1M);
> +			return ret;
> +		}
>   	}
>   	mem->use_dev_dma_pfn_offset = true;
>   	rmem->priv = mem;
> 
I tried this and it solves the issue I was seeing. Thanks for the quick fix.

Tested-by:  Roy Pledge <roy.pledge@nxp.com>