From patchwork Thu May 18 14:54:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sricharan Ramabadhran X-Patchwork-Id: 9734591 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 E3727600CC for ; Thu, 18 May 2017 14:55:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D92F12884F for ; Thu, 18 May 2017 14:55:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD22D28851; Thu, 18 May 2017 14:55:07 +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 5ABD72884F for ; Thu, 18 May 2017 14:55:07 +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=kCuPp88nR22Ki6Jn1fIGe2EVuyFlDaHQiyilebHC4h4=; b=enn srv6/koWwjtI+ZB+TZW5R+t2m8K+8BBpROX96hvk7wqPVPP2kmNWee3acmMl34Bt3vdf4/WMFEIC0 AlQlDMZvOaA9fP1DXBIfL7lkI55mrX1JyktqpgF/FnXf9eTLGbdZFvKZT/ln5YkBzrWlOS4naS+p5 i8FA1IAjR8PfppkrvLRfSyPJeWDO7CReNW+pxOgjE3+qy38eBxgDyI0S7ubMbbHEKMvzuGan9oKMC uOeni5TmWV4iAxSxmNdpyRVKnLFoRMDpKNmJqcxkN2+IRKrZIl8z6DJSUKkD9/dX0dwZBgey8li4m MDmw64+n53HcBBP2HSjWC2kgeZSMyOg==; 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 1dBMpW-0003f6-8t; Thu, 18 May 2017 14:55:06 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBMpS-000343-3r for linux-arm-kernel@lists.infradead.org; Thu, 18 May 2017 14:55:04 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6649560F69; Thu, 18 May 2017 14:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1495119283; bh=mTIHDySefmGneQHLuZWRY/evLKZHa1fhodRMmZTk8cY=; h=From:To:Cc:Subject:Date:From; b=YgnhvK8T5HA1N+QLczttBc6BOAKHFP6nXh0+U7emUsAMwZ/k9EBy7ort49fOuBLhl gIATIObNZBnPga3qslzbZ7kKY5O5D/Mq2IVy701DLejNJD8ftbPEyqxlokuGSCMBXc U756vYi+0nagrtVao1PpdWuHRtSEDys1tD9k2RI4= 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 4B81760E0E; Thu, 18 May 2017 14:54:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1495119272; bh=mTIHDySefmGneQHLuZWRY/evLKZHa1fhodRMmZTk8cY=; h=From:To:Cc:Subject:Date:From; b=N7lcu8OWAoPbngyMFDVfRGpoPJNrsWilrynIP3QD+81HsKg3uN/T8pgq0wv4L2xKO Vwd3KGemdQxR4pqHKn3D8dv46lbmPiTd8AijhGvaqIf5T45LVtF7BhXEfCZGZ+7uN8 npKcIzsPQQvrmYn3np5zkAYjvAq2bXaz7yQ85Ml8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4B81760E0E 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, laurent.pinchart@ideasonboard.com, j.neuschaefer@gmx.net, geert@linux-m68k.org, magnus.damm@gmail.com Subject: [PATCH V4 1/4] iommu: of: Fix check for returning EPROBE_DEFER Date: Thu, 18 May 2017 20:24:14 +0530 Message-Id: <1495119257-26724-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-20170518_075502_316391_0C5C6E95 X-CRM114-Status: GOOD ( 12.29 ) 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 Now with IOMMU probe deferral, we return -EPROBE_DEFER for masters 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 Reviewed-by: Laurent Pinchart 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;