From patchwork Tue May 16 05:24:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9728361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E585B60386 for ; Tue, 16 May 2017 05:25:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8FED286EF for ; Tue, 16 May 2017 05:25:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA37D289E5; Tue, 16 May 2017 05:25:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4F816286EF for ; Tue, 16 May 2017 05:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=JbX56hfL0ceudwB1u87UTz15NyBjjbItjR8xbkG+950=; b=WLv jBlY/fFbXbi36v9GnXaDc5UzKIW/MxCllr8aVEg3K2HxWAbEvspYCMTYCu6OJx0BBCGe+fOd2vLK3 Z2dy2VPd+pt9rTo74o2ekgb5MAUYdpvWvE4UnJ6Rk4fUhAxvXSG0+3zKid2uOCbs0g80hbXlIk1H3 64s9IbdVJvMJdgEVn7cCyYE/5fHUWqs9LaskIS+94I3ELzcqa893HbffARpaXZoNaGW4F9ERCOFqf /DPWvHSeBcQJcXErpN+6F6vcCOjcfMaLcpbUn8RXyi2RsxPVyNACuAIvl3Zbmj+gTZfSz/KG1b4Th 5p9x0Ds2Iy6yszmiRdmKcx3DDtKSzWA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dAUyu-0004Op-Ip; Tue, 16 May 2017 05:25:12 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dAUyc-00040F-Jo for linux-arm-kernel@lists.infradead.org; Tue, 16 May 2017 05:25:00 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id EA46260DAF; Tue, 16 May 2017 05:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1494912273; bh=cLIEubXC8U34gQJ4Ue9t9SE+9c5JHK+WItNmkfFTtn8=; h=From:To:Cc:Subject:Date:From; b=j5fQvDB+QP84ISJMrT5l0ijiVFkRCXUdgOxKe/1ubWi+Z8s6bzr3S+QZXlK8GJ9NZ yKQTOYoj6KD7ewjmHuWvb4+2KZdP9MbqaE/fLMQUR8nSMQWy9ZRJrxQGMmGWdcAOsG 2Ret9V4bmFcQWS+9EEK4FVt6WSqXpiwGZnfjfKTk= Received: from srichara-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 7D17A6080C; Tue, 16 May 2017 05:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1494912272; bh=cLIEubXC8U34gQJ4Ue9t9SE+9c5JHK+WItNmkfFTtn8=; h=From:To:Cc:Subject:Date:From; b=bFKxgaCzTSyhxG4q+Lm8W11NCGSQenxdg0P3HRJWMQ5/rejbxgHu3QUYz8XnHvCwI kuW2jOkQGu7kfVtXwTIFxwggLJm+V8Hp2oPplVdwgXcZBmiGttEuvfTaGVVsxb+0NA 6gfUV20V7XAWaQW6PJldRdQ1/2ak4NCaivp0CtS8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 7D17A6080C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org From: Sricharan R To: robin.murphy@arm.com, will.deacon@arm.com, joro@8bytes.org, lorenzo.pieralisi@arm.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, m.szyprowski@samsung.com, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, tn@semihalf.com, hanjun.guo@linaro.org, okaya@codeaurora.org, robh+dt@kernel.org, frowand.list@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, arnd@arndb.de, linux-arch@vger.kernel.org, gregkh@linuxfoundation.org Subject: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER Date: Tue, 16 May 2017 10:54:13 +0530 Message-Id: <1494912253-25957-1-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170515_222454_862416_82DDB534 X-CRM114-Status: GOOD ( 10.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sricharan@codeaurora.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP While returning EPROBE_DEFER for iommu masters take in to account of iommu nodes that could be marked in DT as 'status=disabled', in which case simply return NULL and let the master's probe continue rather than deferring. Signed-off-by: Sricharan R Tested-by: Will Deacon Acked-by: Will Deacon --- drivers/iommu/of_iommu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 9f44ee8..e6e9bec 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -118,6 +118,7 @@ static bool of_iommu_driver_present(struct device_node *np) ops = iommu_ops_from_fwnode(fwnode); if ((ops && !ops->of_xlate) || + !of_device_is_available(iommu_spec->np) || (!ops && !of_iommu_driver_present(iommu_spec->np))) return NULL;