From patchwork Thu May 24 17:50:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 136762 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2526889lji; Thu, 24 May 2018 10:50:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrzCzS9PLKLRmU/uZb7GmILHXoFXp7Hppc3LOtXqnGFlt1NM4Po1O0IPq3l23Wt32Co9P+z X-Received: by 2002:a17:902:9a4c:: with SMTP id x12-v6mr8265891plv.213.1527184256808; Thu, 24 May 2018 10:50:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527184256; cv=none; d=google.com; s=arc-20160816; b=bnY/T8DW5sEewaJ2H2c4fsy+Sy0pOj5aAKinBF0k7k1lF/jdSlSp5mg58E1UlRUUyx k5S2HHcCLwHKCdv8icWSe4Ri51haDg3NzoKwfR4NsuA8aLlq3ICjH3q6n+UXuSNTJJsb UJS73W8Bssl2wpx9A+54ROYvV0901LM18yKIBtgvIleH+ugopwnyT9gSbYV2FfAAeM1F 1hMXVNHcC6imTlIRSSAHHQFtK0XNdXSF9GCcRXhgMe+JjgPXUm3Ac93N20HVs6m4xdOd zk7KtB0xp4aodvs2zNktNV/2PpvzDNVQ+hDdRLTFrHG+1IMYKWBmC4rbiSazCqg7f8Xh eIkA== 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=piRNzbrsqEHUmSlJscEld94O7lqX7YuEJ6Uj1rEmoBo=; b=qpxN4EakE6ESs+8PpAp3u4h/hwcUwZ+jy/aEI63AU3t8CCGeRK7stqPLwW9eO+F3pk Kdc/rjW3ShvY6+kQpHwxSp/1W7DG6INLXBPE8TIBitpnht8eLA5XtHRc8W4/VMGdwvEQ pEDowjiu/9U5NNLkBH+2RhafgQf6f36CIzuUgZCUBOevSD4/dUvivbtFRpSxFhakSgSz uT4+yN4lGFetOgmbFWEq4EkTnrjzygbalQJWSEcJgu1GLTknQF34eaXyE/+6yDeqCHLG vN9eBAiLY3aG/E38alOVJpv2kyMuCCw7wBVdzIOeamadoHmQL2QDQG1zjJJZiOrt22CY Ijhg== 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 g63-v6si22185578pfd.93.2018.05.24.10.50.56; Thu, 24 May 2018 10:50:56 -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 S1031527AbeEXRuy (ORCPT + 30 others); Thu, 24 May 2018 13:50:54 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:38830 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031263AbeEXRun (ORCPT ); Thu, 24 May 2018 13:50:43 -0400 Received: by mail-yw0-f196.google.com with SMTP id y123-v6so839339ywa.5; Thu, 24 May 2018 10:50:43 -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=piRNzbrsqEHUmSlJscEld94O7lqX7YuEJ6Uj1rEmoBo=; b=Azj3ZECftBmTRYTiJu84EHBioUx0phOSHhhuLwSmEzK9suQu4NoXfkvMNF7qGOJz4e An7H9vktoX+ViMTt8i3MEdwtRZk6S4aD/ua6S1eA2nqgp3twscb2P2pixu/Imidjp4TU bAyGtBuUUYPPbf/Ubah7y1KlOwVotjvj9bBMI0vBSoUywgH8FLOiPWPGrfbSUn8SOAOb 7SKkEQmCtRGGjAKBbZyMqjBlGs9RllsqmF8OnyD4KmKigcxScLLpP4tWHYhpWJ7gHhnu Q83ycmdd8Yx+yRAaV45MmIyQM1z3rIY4moBfOUrEwmifHzpGeufauHviBQvDTa8bYuT9 HERw== X-Gm-Message-State: ALKqPwdxWOxE7d68dHOEh4Wfr+OZVNLTD7F1ZpuKHkIyuevPku6NENZl rytu2R8m+B+du8hO+6lYHQ== X-Received: by 2002:a81:3145:: with SMTP id x66-v6mr4251041ywx.355.1527184243054; Thu, 24 May 2018 10:50:43 -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 v73-v6sm9183814ywa.92.2018.05.24.10.50.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 10:50:42 -0700 (PDT) From: Rob Herring To: Greg Kroah-Hartman , Linus Walleij , Alexander Graf , Bjorn Andersson , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Joerg Roedel , Robin Murphy , Mark Brown , Frank Rowand Cc: 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 Subject: [PATCH v2 6/8] iommu: Stop deferring probe at end of initcalls Date: Thu, 24 May 2018 12:50:22 -0500 Message-Id: <20180524175024.19874-7-robh@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524175024.19874-1-robh@kernel.org> References: <20180524175024.19874-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. Cc: 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.0 diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5c36a8b7656a..2aac8387717c 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_init_done(dev, true); return ops->of_xlate(dev, iommu_spec); }