From patchwork Mon Jul 9 15:41:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 141443 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2814614ljj; Mon, 9 Jul 2018 08:43:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcG7PoCqtg3x/vH67L3DfH1bYTs115yYT7qp6u/b1j2t8SdHgno3o1sOHha9AaqPitHUaWf X-Received: by 2002:a62:1d97:: with SMTP id d145-v6mr22091800pfd.101.1531151000822; Mon, 09 Jul 2018 08:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531151000; cv=none; d=google.com; s=arc-20160816; b=YV7RoNp5HkWCx3a8c1t7kyD5cHtIQzgutf4ccjZrnuEyxOVWwLf0bInqXOe9D/F/EM xYF50330sh5dnGjEUy5kV9rayoNXBT30f4C9WrPOS11qjc+6DnuyHbxW8zqMnR27k7p/ eS6y6rATtmu1Ej/JxWBadesKxcpooDiLUdpc28ScSRWLbubhKNUxQW+L7/dyUIW0HWeI tjwKZ0d5M2DGE6FHR3UlZ3BnQUmYLDZXNOlfMZOZuavd6hoi+wkZ/NytkQdnvXx4n4cn fEAokD5KR1kE1iWCbHrSsSOIweVy0paSUWL4e4JqIt9vjFsj8Zz1wv53XVOUUklGIw0H cyNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vCohodIIanHa5uBHiQc1B5XPmGoIOIBepeJZ6BKWz/A=; b=IDLoi/HvinuMv6s92J7Ptx7kcvjaTsq+R7BPi1VWliZHHe3qwVuk3JbNCezu0yULzV AqiqUksjz2HunGt2TL8iWMvwhA85pSxtAoywBSVSbvUPcOHCmiZ8sQX3D0rEnw/I3mdb r4Z8VV3ExB/fKUwbDNZbfZb+si1sjgU3sLP0eqo7ppYdOE31ShWo+DS2poFhbezLt4kd OFvNMYKbjvq7zEvTEfi47jWJCzSbntaDlkFe2RrLfDlsUeWY2d+8OEDeBhtSXehM4Jmt IIZn6WS5epD0Jjr/0mY1IhZw8c+Td7H2oc7MlEijvPYYeMKpoG3ayeN3cTGKnlrsjSDq r5MQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r1-v6si14931890plb.172.2018.07.09.08.43.20; Mon, 09 Jul 2018 08:43:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933746AbeGIPnT (ORCPT + 30 others); Mon, 9 Jul 2018 11:43:19 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:36365 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933298AbeGIPmG (ORCPT ); Mon, 9 Jul 2018 11:42:06 -0400 Received: by mail-oi0-f66.google.com with SMTP id r16-v6so36734191oie.3; Mon, 09 Jul 2018 08:42:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vCohodIIanHa5uBHiQc1B5XPmGoIOIBepeJZ6BKWz/A=; b=BB4bCSMXthArGkBcU9Np4Q1RCclRmnmhabBi/PWZIsGOGXrVCbZCctjoTA0kZ2kiVX bo/UNxpbalQEMY9/FnY7SiAFJ+vU2sP+OZlMNwzkw0CHw4Tia4Az5bxx2SF5oevqQrak HxuDo0vnwiYgf00ogrsevx+A5s5He8WU0zQOEtmQjujZPRxZI11OyKxkPlP82CVvGkAh vI/z7nbQx/wwwc68ZezQLZ0brJb+3zPfJR1nuEqIlReIeqxXgYhdjooua34SGDh6/DA5 CE9l0ssklr+702Hz3UQkMZvKQIE0KW9oGyKJzA9g1A3YKRsUcLOxPhvR43Hpp3L8SLbJ FPng== X-Gm-Message-State: APt69E1TMOQpSt59/4f7w9Krnf/dxGhfkvCsVcu0I84sG2p2S6bQZ+7c TwqtZc1GmjWS6QCKB6RCAA== X-Received: by 2002:aca:b60a:: with SMTP id g10-v6mr24442586oif.263.1531150925929; Mon, 09 Jul 2018 08:42:05 -0700 (PDT) Received: from localhost.localdomain (24-223-123-72.static.usa-companies.net. [24.223.123.72]) by smtp.googlemail.com with ESMTPSA id z196-v6sm30759391oig.12.2018.07.09.08.42.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jul 2018 08:42:05 -0700 (PDT) From: Rob Herring To: Greg Kroah-Hartman Cc: Linus Walleij , Alexander Graf , Bjorn Andersson , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Joerg Roedel , Robin Murphy , Mark Brown , Frank Rowand , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, boot-architecture@lists.linaro.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH v4 4/6] iommu: Stop deferring probe at end of initcalls Date: Mon, 9 Jul 2018 09:41:51 -0600 Message-Id: <20180709154153.15742-5-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180709154153.15742-1-robh@kernel.org> References: <20180709154153.15742-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IOMMU subsystem has its own mechanism to not defer probe if driver support is missing. Now that the driver core supports stopping deferring probe if drivers aren't built-in (and probed), use the driver core support so the IOMMU specific support can be removed. Acked-by: Joerg Roedel Cc: iommu@lists.linux-foundation.org Signed-off-by: Rob Herring --- drivers/iommu/of_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5c36a8b7656a..78ddf47dd67a 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -133,7 +133,7 @@ static int of_iommu_xlate(struct device *dev, * a proper probe-ordering dependency mechanism in future. */ if (!ops) - return -EPROBE_DEFER; + return driver_deferred_probe_check_state(dev); return ops->of_xlate(dev, iommu_spec); }