From patchwork Wed Apr 24 11:52:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 10914615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43D95161F for ; Wed, 24 Apr 2019 11:53:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FEE42882F for ; Wed, 24 Apr 2019 11:53:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 232B9288B8; Wed, 24 Apr 2019 11:53:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BF9072882F for ; Wed, 24 Apr 2019 11:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Jm72D0gsCoekQsFCnhTwSsNiRtK/QwvRcw9C9kuxAkU=; b=dwwvx0ItlzRS+P AXs364ICsPmpVdI4L90rlRtzrP1qh5T7nrjeGQpDbUMLmFw74XMbxuavKHCUlDpoCVWEXnOkUc7UL Xa4qgP+9vzOiN1EVA03HIj5Ob1f95RK9J9paib7fdy5vHbsxtwRl8KnmN8vu99jOIY3+RRbyoyhgZ Trw2Ax9v8PZkKUHqb1CeJw/BeoY6CraxP165zlz5JgmxcLcPJ7WCSDAzc9d7GT67S9gloK0MwYLxf NFHZeKJ6LHVZBMyxYrjNqJPC4fzeZK45/MDE5yQka71ceU97wQ78bPap2KtEY15t5hR3Jk5YL0RhX eM+J6kn+oLVtBLrVmlIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJGSX-0001bh-Kp; Wed, 24 Apr 2019 11:53:05 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJGSO-0001ab-Kc for linux-arm-kernel@lists.infradead.org; Wed, 24 Apr 2019 11:52:57 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 16C27A78; Wed, 24 Apr 2019 04:52:56 -0700 (PDT) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 80E8D3F238; Wed, 24 Apr 2019 04:52:54 -0700 (PDT) Date: Wed, 24 Apr 2019 12:52:52 +0100 From: Will Deacon To: joro@8bytes.org Subject: [GIT PULL] iommu/arm-smmu: Updates for 5.2 Message-ID: <20190424115252.GB14829@fuggles.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.11.1+86 (6f28e57d73f2) () X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190424_045256_687007_CA6669BB X-CRM114-Status: GOOD ( 14.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marc.w.gonzalez@free.fr, jean-philippe.brucker@arm.com, dianders@chromium.org, iommu@lists.linux-foundation.org, vivek.gautam@codeaurora.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Joerg, Please can you pull these ARM SMMU updates for 5.2? The highlight is ATS support in the SMMUv3 driver from Jean-Philippe. I have collected the appropriate Acks from the PCI and IORT sides. There is a trivial conflict with your api-features branch due to the diff context in linux/iommu.h. Cheers, Will --->8 The following changes since commit 79a3aaa7b82e3106be97842dedfd8429248896e6: Linux 5.1-rc3 (2019-03-31 14:39:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-joerg/arm-smmu/updates for you to fetch changes up to bc580b56cb7888d1f09fff8a50270228fb834ae8: iommu/arm-smmu: Log CBFRSYNRA register on context fault (2019-04-23 12:23:16 +0100) ---------------------------------------------------------------- Douglas Anderson (1): iommu/arm-smmu: Break insecure users by disabling bypass by default Jean-Philippe Brucker (9): PCI: Move ATS declarations outside of CONFIG_PCI PCI: Add a stub for pci_ats_disabled() ACPI/IORT: Check ATS capability in root complex nodes iommu/arm-smmu-v3: Rename arm_smmu_master_data to arm_smmu_master iommu/arm-smmu-v3: Store SteamIDs in master iommu/arm-smmu-v3: Add a master->domain pointer iommu/arm-smmu-v3: Link domains and devices iommu/arm-smmu-v3: Add support for PCI ATS iommu/arm-smmu-v3: Disable tagged pointers Vivek Gautam (1): iommu/arm-smmu: Log CBFRSYNRA register on context fault Will Deacon (1): iommu/arm-smmu-v3: Don't disable SMMU in kdump kernel drivers/acpi/arm64/iort.c | 11 ++ drivers/iommu/Kconfig | 25 +++ drivers/iommu/arm-smmu-regs.h | 2 + drivers/iommu/arm-smmu-v3.c | 355 +++++++++++++++++++++++++++++++++--------- drivers/iommu/arm-smmu.c | 11 +- include/linux/iommu.h | 4 + include/linux/pci.h | 31 ++-- 7 files changed, 344 insertions(+), 95 deletions(-)