From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751503AbeACGJf (ORCPT + 1 other); Wed, 3 Jan 2018 01:09:35 -0500 Received: from regular1.263xmail.com ([211.150.99.140]:47710 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbeACGJd (ORCPT ); Wed, 3 Jan 2018 01:09:33 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <32dc50deb1390ecb564a86ea8f6113dc> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, tfiga@chromium.org, Jeffy Chen , iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH] iommu/of: Only do IOMMU lookup for available ones Date: Wed, 3 Jan 2018 14:09:20 +0800 Message-Id: <20180103060920.23475-1-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: The for_each_matching_node_and_match() would return every matching nodes including unavailable ones. It's pointless to init unavailable IOMMUs, so add a sanity check to avoid that. Signed-off-by: Jeffy Chen --- drivers/iommu/of_iommu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 50947ebb6d17..6f7456caa30d 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -240,6 +240,9 @@ static int __init of_iommu_init(void) for_each_matching_node_and_match(np, matches, &match) { const of_iommu_init_fn init_fn = match->data; + if (!of_device_is_available(np)) + continue; + if (init_fn && init_fn(np)) pr_err("Failed to initialise IOMMU %pOF\n", np); } -- 2.11.0