From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3D07C432C3 for ; Thu, 21 Nov 2019 11:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8108120C01 for ; Thu, 21 Nov 2019 11:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574336973; bh=ERSO93Jlh7qXtPNoTPEXKzIOXARj61BApAQd7ho52co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oMpvKC4ShBJxxV0BzYK4DFfxiQVDClvTEGsn8gzPNZ/+zONbtpMfPEMkka6PBEHC6 KqacW93RMw5lGJBbAgYgweD1fDyccj3gLFB9x1eTsJZdjBI0KSXcNYtvCA+huatXKc i23snxzID6vRw0smTtC2wLgw61nfDEaOZFXD//rY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbfKULtc (ORCPT ); Thu, 21 Nov 2019 06:49:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:38598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfKULta (ORCPT ); Thu, 21 Nov 2019 06:49:30 -0500 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 63744208CC; Thu, 21 Nov 2019 11:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574336969; bh=ERSO93Jlh7qXtPNoTPEXKzIOXARj61BApAQd7ho52co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kUqeWcqxW/Y6aYUMzCsJinfQZCUa9f6tIKzb34t0y5q3AcZJRdqCHZpz0ljJN+ATF nvGWQgj1ffsoUF+n6ixQZn7NwQhJZUui63uQubUx0fJGo/i6pIhjg1uKXIEVzco/EQ rlq5jTuvP6jmpTQeFGn38KpuOr+CLG5zkEvHvOeE= From: Will Deacon To: iommu@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Cc: Will Deacon , Jean-Philippe Brucker , Jordan Crouse , John Garry , Bjorn Helgaas , Saravana Kannan , Greg Kroah-Hartman , "Isaac J. Manjarres" , Robin Murphy , Lorenzo Pieralisi , Joerg Roedel Subject: [PATCH v3 02/14] iommu/of: Request ACS from the PCI core when configuring IOMMU linkage Date: Thu, 21 Nov 2019 11:49:06 +0000 Message-Id: <20191121114918.2293-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191121114918.2293-1-will@kernel.org> References: <20191121114918.2293-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 To avoid having to export 'pci_request_acs()' to modular IOMMU drivers, move the call into the 'of_dma_configure()' path in a similar manner to the way in which ACS is configured when probing via ACPI/IORT. Signed-off-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 614a93aa5305..78faa9f73a91 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -177,6 +177,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, .np = master_np, }; + pci_request_acs(); err = pci_for_each_dma_alias(to_pci_dev(dev), of_pci_iommu_init, &info); } else if (dev_is_fsl_mc(dev)) { -- 2.24.0.432.g9d3f5f5b63-goog