Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp964376ybx; Wed, 30 Oct 2019 07:54:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqz6FY7qqG/GTzYN0L92otsEjHOkNCUjkJN8VAVkU+pdaUcSXB7mNt5rKlSTSHhNrkbO0Z4+ X-Received: by 2002:a17:906:6848:: with SMTP id a8mr9379253ejs.306.1572447290033; Wed, 30 Oct 2019 07:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572447290; cv=none; d=google.com; s=arc-20160816; b=dzDVXjGg6OPMvsg0MK60VWerGoopR5x8SrhRH9nKBzEaTECvT8apIamDbMLixeDUH/ dxw5cO7cA6dFOr874MWcJUEh7bk8s0YklmzB3nWx9XQ7SGtChrRhQQnDP0E0N4u8cA79 PZ0ohCZVj6eGDOvkGUqqw0OH88ZqNyavwxMnmD2Vm8hXWRACVDOHDv3ODAC1Wq4QNBco U6iED1I6NBoYg+7RrZ+gY7c+ykJ1IB3M4W5loV6EY/ezIH1ra1bZM0K+D4y+c63L45lG fDMl7devCyB7uOnB9Ki3xbrxoo8f7EJvy6/jVggm/32AzsG3PuknqbklHMlmkkN73vDd raBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pGe5T5KY0/tjld3dhGEvOO6LVOVF9xyQheOZNh/wEEg=; b=vQlQDAAK5blTnxXi6DGf9OjMqpbUwYkllb2Wbm+2eXdKrk7gyx8iuE32fNIv12Cb8U 5FSlTyvrIb7Nmk3atoLO0xL4XHSWqHqR/YPeJIp0iNfXjZX1wYLqa7sRmToSgdY4Anfl juqoOCRi8aR6TVZmfdJs4oh90U9gDM0Kl+ZCfKhhcwXa0pJHMP4wue4pChC97RqnICZ3 ilxDcOH/fKaENYLvGd/Uk0BXbrp7WabF1hVRuBozh+f94YAsL/sCq/Y1Le8HIcUupLjb F/ar4u6h0iKJZw/bqO+3ApgVJIr+XQcKJPOBw2m+LKM/uSuqm21j72PBKQWj6/NbEszi 2obQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ACVvc7LJ; 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=pass (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 p57si1502967edc.295.2019.10.30.07.54.26; Wed, 30 Oct 2019 07:54:50 -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; dkim=pass header.i=@kernel.org header.s=default header.b=ACVvc7LJ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbfJ3Ovc (ORCPT + 99 others); Wed, 30 Oct 2019 10:51:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:57724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726747AbfJ3Ov2 (ORCPT ); Wed, 30 Oct 2019 10:51:28 -0400 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F0F8208E3; Wed, 30 Oct 2019 14:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572447087; bh=F9GxmV9JRoWx/7+njViQgD19WYLLBQ0StpL47b4u+Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACVvc7LJWEa4HLbetuu4zNT2qScjlWX+/gOTfPg/ez2pNJkXXwcpsfO1DWeDggaM4 ZJF5Egydh7i/VJLGUC8WYT5fJI75n7JeF9sg2mTPzwU9LjoJzNbHi2m1nnwmK4KPk7 PBLjuxa818PNBErf5IGOdwjnAcekH4CvtODFu6RI= From: Will Deacon To: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: Will Deacon , Robin Murphy , Joerg Roedel , Bjorn Helgaas , Lorenzo Pieralisi Subject: [PATCH 5/7] iommu/arm-smmu-v3: Allow building as a module Date: Wed, 30 Oct 2019 14:51:10 +0000 Message-Id: <20191030145112.19738-6-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191030145112.19738-1-will@kernel.org> References: <20191030145112.19738-1-will@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org By removing the redundant call to 'pci_request_acs()' we can allow the ARM SMMUv3 driver to be built as a module. Signed-off-by: Will Deacon --- drivers/iommu/Kconfig | 2 +- drivers/iommu/arm-smmu-v3.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index e3842eabcfdd..7583d47fc4d5 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -388,7 +388,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT config. config ARM_SMMU_V3 - bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" + tristate "ARM Ltd. System MMU Version 3 (SMMUv3) Support" depends on ARM64 select IOMMU_API select IOMMU_IO_PGTABLE_LPAE diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 2ad8e2ca0583..56ce4ba2fcbe 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -3657,7 +3657,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev) #ifdef CONFIG_PCI if (pci_bus_type.iommu_ops != &arm_smmu_ops) { - pci_request_acs(); ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops); if (ret) return ret; -- 2.24.0.rc0.303.g954a862665-goog