Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936233AbcCQQ0T (ORCPT ); Thu, 17 Mar 2016 12:26:19 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:36714 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936044AbcCQQ0O (ORCPT ); Thu, 17 Mar 2016 12:26:14 -0400 From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Fri, 18 Mar 2016 01:29:37 +0900 Message-Id: <20160317162937.24104.40724.sendpatchset@little-apple> In-Reply-To: <20160317162909.24104.31682.sendpatchset@little-apple> References: <20160317162909.24104.31682.sendpatchset@little-apple> Subject: [PATCH 03/10] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1069 Lines: 33 From: Magnus Damm Right now the ->xlate() call gets invoked even though the iommu device has status = "disabled" in DT, so make sure we skip over disabled devices. In my mind it would make sense to have this at some shared level, but I guess some users may want to configure the iommu regardless of DT state. Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- 0017/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:16:51.200513000 +0900 @@ -890,7 +890,13 @@ static struct iommu_group *ipmmu_device_ static int ipmmu_of_xlate_dma(struct device *dev, struct of_phandle_args *spec) { - /* dummy callback to satisfy of_iommu_configure() */ + /* If the IPMMU device is disabled in DT then return error + * to make sure the of_iommu code does not install ops + * even though the iommu device is disabled + */ + if (!of_device_is_available(spec->np)) + return -ENODEV; + return 0; } #endif