From patchwork Wed May 17 11:30:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9730889 X-Patchwork-Delegate: bhelgaas@google.com 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 95E9A602DB for ; Wed, 17 May 2017 11:30:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D78222B26 for ; Wed, 17 May 2017 11:30:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7191828756; Wed, 17 May 2017 11:30:33 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF8012871E for ; Wed, 17 May 2017 11:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753393AbdEQLaa (ORCPT ); Wed, 17 May 2017 07:30:30 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:34430 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbdEQLa1 (ORCPT ); Wed, 17 May 2017 07:30:27 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3E76B60DD5; Wed, 17 May 2017 11:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1495020626; bh=pbTumnXGyKmsx0jzhSp1w1aMfuTxZs43GbqF5HyY2lU=; h=From:To:Cc:Subject:Date:From; b=exR388NJfzcE1q/KLbSA7qy2CryGkhxxKKH1VhnDRpRq9yFqPVzGqELXtkcI5lKhm EE1yfLlqtLYqUNokgoHkhFjH9oCrkRgwBeIguStQyBMCsjy/XvFZEdghDueLfxvFPw 8dGMWgV1PgArmT8FDbD68BEc/lJCm6HVAzweYsLk= 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 253E560B69; Wed, 17 May 2017 11:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1495020625; bh=pbTumnXGyKmsx0jzhSp1w1aMfuTxZs43GbqF5HyY2lU=; h=From:To:Cc:Subject:Date:From; b=Q/TCuS7Z3rI/vbRRj+1aWSDPKAV/yAIXvHbwddJtlQGpIFb9PWFUo4CrTzqyd8hHZ zhFlBb+i4d5mUXT8Aw9WcQBirDxxD/mpvus27KBuezqnxPtsQw8osfsx5RTCWXDIMg HhnRSUtnCSZ44OfC0eCPC8rntat5rQbaVf3IQndY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 253E560B69 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, magnus.damm@gmail.com, geert@linux-m68k.org, j.neuschaefer@gmx.net Cc: sricharan@codeaurora.org Subject: [PATCH 1/3] iommu: of: Fix check for returning EPROBE_DEFER Date: Wed, 17 May 2017 17:00:07 +0530 Message-Id: <1495020609-13397-1-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now with iommu probe deferral, we return -EPROBE_DEFER for master's that are connected to an iommu which is not probed yet, but going to get probed, so that we can attach the correct dma_ops. So while trying to defer the probe of the master, check if the of_iommu node that it is connected to is marked in DT as 'status=disabled', then the iommu is never is going to get probed. So simply return NULL and let the master work without an iommu. Fixes: 7b07cbefb68d ("iommu: of: Handle IOMMU lookup failure with deferred probing or error") Signed-off-by: Sricharan R Reported-by: Geert Uytterhoeven Tested-by: Will Deacon Tested-by: Magnus Damn 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;