Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp755800imu; Tue, 11 Dec 2018 07:07:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/XVRQSDzz3VLMRnTsqTot5+L+kgqzFdgx4W17UbwoJ6+C1FJFTvt/wXXj23enMBoE8ss3RO X-Received: by 2002:a17:902:a83:: with SMTP id 3mr15290148plp.276.1544540849709; Tue, 11 Dec 2018 07:07:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544540849; cv=none; d=google.com; s=arc-20160816; b=PHwGgFgbJfweGYmohCu67uMuNivRyUdBKNZOIgU+0fkefrXQmRcXzbcB4ofolri+a1 9bpq/7K083b/8c4yMDMjV7hVm/pYV3gBZS4HwYZi8u2eW1hKbWnqFcCdO6IzTG6RmTTj ruXpBf5RJhY8NiwT/OT6XN87LR5s9zVDV4JHTYtgIv19YrIkoJcDZavTwgvuRMslNwP+ K7VaPbuLW9Skl0SdXgcT2FJvWAmqDXzQJ9baQCLefHVJV1eOj4/1Mo67/U2R5l9fzq87 zGgqnQtRt1A330iyIQYweobvD4jFpv3AMN/qFeqtZM444pIaHTPMeJfLxQOUH9oz2AWE WIFg== 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; bh=H5VSYLlivzoJMl2NHU6xWt3tgxNZhg7UMWB1RricFrE=; b=hc8oIQmeIeXOY9w37I5iTBZQxL+Aogwpa2P4rNUpYR3aQDPoVQ0/82uHrMobvfXgyp eouvvO4VqCBiXX3+a7hOAoREtssBKDosBsCaBWzGMDHloDIrhFJ+Eu2mHIRzBCQmCDlm vfEB36F1XrOaSBLRbWuwFA5oMivIaHB+W1N/PmC5xysUyQzTQjuW81iTBm+Zhi2njwEW pjeIY2ZsgfBA8EaJWKf3XPIIfIwaFOigPnSGRzqlkcQONA6Zl6lw6QtnRsOKvkhcsj4H mpGHietN6frXRwrQb5uVBOWLShPOhvJTRpNGYMwcDEqFxwOQUe06FZxRL4pXBdtMd/iy VxEQ== 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=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si12137418pgj.199.2018.12.11.07.07.14; Tue, 11 Dec 2018 07:07:29 -0800 (PST) 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=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726690AbeLKPFU (ORCPT + 99 others); Tue, 11 Dec 2018 10:05:20 -0500 Received: from 8bytes.org ([81.169.241.247]:53544 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726231AbeLKPFS (ORCPT ); Tue, 11 Dec 2018 10:05:18 -0500 Received: by theia.8bytes.org (Postfix, from userid 1000) id CC5FD4BD; Tue, 11 Dec 2018 16:05:15 +0100 (CET) From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Joerg Roedel , jroedel@suse.de, Robin Murphy , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ACPI/IORT: Don't call iommu_ops->add_device directly Date: Tue, 11 Dec 2018 16:05:13 +0100 Message-Id: <20181211150513.15161-5-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211150513.15161-1-joro@8bytes.org> References: <20181211150513.15161-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel Make sure to invoke this call-back through the proper function of the IOMMU-API. Signed-off-by: Joerg Roedel --- drivers/acpi/arm64/iort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 70f4e80b9246..d4f7c1adc048 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -805,8 +805,8 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops, { int err = 0; - if (ops->add_device && dev->bus && !dev->iommu_group) - err = ops->add_device(dev); + if (dev->bus && !dev->iommu_group) + err = iommu_probe_device(dev); return err; } -- 2.17.1