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=-12.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 7E454C4CEC4 for ; Wed, 18 Sep 2019 15:27:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 48F3A218AE for ; Wed, 18 Sep 2019 15:27:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Iu7nhtAa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731668AbfIRP1t (ORCPT ); Wed, 18 Sep 2019 11:27:49 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:34646 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727057AbfIRP1t (ORCPT ); Wed, 18 Sep 2019 11:27:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gdFHiFVbMqVJw3CBF4SoBjQ/uM5M5qm+KSwdRCShL1k=; b=Iu7nhtAaql/og2GAvnceGjKAbq Cbk8RrS9C1NwKD+UZKy/Y6zws/CMAR/gkDf4wy5Ad3gAAsROwXmfJBW3O3v+X3dOpptf4lMrcN2Ti nhGfQbKKerTGgc00UBSp72uBLs8wbgfuHhUjQj/fugE8nLWb6jbQP7ynshgbYgvChydIsmKhSvE5c BJV3aRwJG6gFty8IsVQ7rMzVkHZ4SjuKLCG9OuaOynHJMVpqHPbcC9GlCR6cU3GO+IfP0zXKnXNPP we1cBUhF6TcK3anK7/mjHxi+KrV/YpV7TTBUSBKUoRxrdihfJ5/mmOO09Uwa2UVW8LEIRa9Aa8o0L NlH5q1jQ==; Received: from [12.1.75.136] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAbrw-0002Ft-Bj; Wed, 18 Sep 2019 15:27:48 +0000 Date: Wed, 18 Sep 2019 08:27:48 -0700 From: Christoph Hellwig To: Linus Torvalds Cc: linux-mmc@vger.kernel.org, iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] dma-mapping updates for 5.4 Message-ID: <20190918152748.GA21241@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, please pull the dma-mapping updates for 5.4. In addition to the usual Kconfig conflics where you just want to keep both edits there are a few more interesting merge issues this time: - most importanly powerpc and microblaze add new callers of dma_atomic_pool_init, while this tree marks the function static and calls it from a common postcore_initcall(). The trivial functions added in powerpc and microblaze adding the calls need to be removed for the code to compile. This will not show up as a merge conflict and needs to be dealt with manually! - the csky tree has edits close to edits from this tree in arch/csky/mm/dma-mapping.c, keep both edits as there are no functional conflicts. - for ia64 keep the removal of arch/ia64/sn/pci/pci_dma.c from the ia64 tree. The ia64 tree moves sba_dma_ops around a bit. Keep the move and the wiring up of ->mmap and ->get_sgtable from this tree. - the -mm tree adds a new compound_nr helper that some of the Xen code removed in this pull request removes. Keep the removal from this tree. - the block tree adds a new helper next to the new block helpers from this tree, keep both - the arm64 tree removes a __KERNEL__ ifdef from arch/arm64/include/asm/dma-mapping.h, which is removed in this tree. Keep the removal. The following changes since commit a55aa89aab90fae7c815b0551b07be37db359d76: Linux 5.3-rc6 (2019-08-25 12:01:23 -0700) are available in the Git repository at: git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.4 for you to fetch changes up to c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e: mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE (2019-09-12 13:14:09 +0100) ---------------------------------------------------------------- dma-mapping updates for 5.4: - add dma-mapping and block layer helpers to take care of IOMMU merging for mmc plus subsequent fixups (Yoshihiro Shimoda) - rework handling of the pgprot bits for remapping (me) - take care of the dma direct infrastructure for swiotlb-xen (me) - improve the dma noncoherent remapping infrastructure (me) - better defaults for ->mmap, ->get_sgtable and ->get_required_mask (me) - cleanup mmaping of coherent DMA allocations (me) - various misc cleanups (Andy Shevchenko, me) ---------------------------------------------------------------- Andy Shevchenko (1): dma-mapping: fix filename references Christoph Hellwig (34): unicore32: remove the unused pgprot_dmacoherent define arm-nommu: remove the unused pgprot_dmacoherent define dma-mapping: remove arch_dma_mmap_pgprot dma-mapping: make dma_atomic_pool_init self-contained arm64: document the choice of page attributes for pgprot_dmacoherent MIPS: document mixing "slightly different CCAs" dma-mapping: move the dma_get_sgtable API comments from arm to common code dma-mapping: explicitly wire up ->mmap and ->get_sgtable dma-mapping: add a dma_can_mmap helper ALSA: pcm: use dma_can_mmap() to check if a device supports dma_mmap_* arm-nommu: call dma_mmap_from_dev_coherent directly parisc: don't set ARCH_NO_COHERENT_DMA_MMAP dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAP dma-mapping: remove dma_{alloc,free,mmap}_writecombine dma-mapping: remove dma_release_declared_memory dma-mapping: remove the dma_mmap_from_dev_coherent export remoteproc: don't allow modular build dma-mapping: remove the dma_declare_coherent_memory export dma-mapping: provide a better default ->get_required_mask vmalloc: lift the arm flag for coherent mappings to common code dma-mapping: always use VM_DMA_COHERENT for generic DMA remap dma-mapping: introduce a dma_common_find_pages helper arm: remove wrappers for the generic dma remap helpers xen/arm: use dma-noncoherent.h calls for xen-swiotlb cache maintainance xen/arm: consolidate page-coherent.h xen/arm: use dev_is_dma_coherent xen/arm: simplify dma_cache_maint xen/arm: remove xen_dma_ops xen: remove the exports for xen_{create,destroy}_contiguous_region swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtable swiotlb-xen: use the same foreign page check everywhere swiotlb-xen: simplify cache maintainance swiotlb-xen: merge xen_unmap_single into xen_swiotlb_unmap_page arm64: use asm-generic/dma-mapping.h Yoshihiro Shimoda (6): block: add a helper function to merge the segments mmc: queue: use bigger segments if DMA MAP layer can merge the segments dma-mapping: introduce dma_get_merge_boundary() iommu/dma: add a new dma_map_ops of get_merge_boundary() mmc: queue: Fix bigger segments usage mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE Documentation/DMA-API.txt | 19 ++-- Documentation/x86/x86_64/boot-options.rst | 2 +- arch/Kconfig | 3 - arch/alpha/kernel/pci_iommu.c | 2 + arch/arc/mm/dma.c | 6 -- arch/arm/Kconfig | 2 +- arch/arm/include/asm/device.h | 3 - arch/arm/include/asm/dma-mapping.h | 6 -- arch/arm/include/asm/pgtable-nommu.h | 1 - arch/arm/include/asm/xen/page-coherent.h | 93 ------------------- arch/arm/mm/dma-mapping-nommu.c | 5 +- arch/arm/mm/dma-mapping.c | 84 +++-------------- arch/arm/mm/mm.h | 3 - arch/arm/xen/mm.c | 129 ++++++++------------------ arch/arm64/Kconfig | 1 - arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/dma-mapping.h | 31 ------- arch/arm64/include/asm/pgtable.h | 12 +++ arch/arm64/include/asm/xen/page-coherent.h | 75 --------------- arch/arm64/mm/dma-mapping.c | 16 +--- arch/c6x/Kconfig | 1 - arch/csky/mm/dma-mapping.c | 6 -- arch/ia64/hp/common/sba_iommu.c | 2 + arch/ia64/kernel/setup.c | 2 +- arch/ia64/sn/pci/pci_dma.c | 2 + arch/m68k/Kconfig | 2 - arch/m68k/include/asm/pgtable_mm.h | 3 + arch/m68k/kernel/dma.c | 3 +- arch/microblaze/Kconfig | 1 - arch/mips/Kconfig | 9 +- arch/mips/jazz/jazzdma.c | 2 + arch/mips/mm/dma-noncoherent.c | 8 -- arch/nds32/kernel/dma.c | 6 -- arch/parisc/Kconfig | 1 - arch/powerpc/kernel/dma-iommu.c | 2 + arch/powerpc/platforms/ps3/system-bus.c | 11 +-- arch/powerpc/platforms/pseries/vio.c | 2 + arch/s390/pci/pci_dma.c | 2 + arch/sh/Kconfig | 1 - arch/unicore32/include/asm/pgtable.h | 2 - arch/x86/include/asm/xen/page-coherent.h | 14 --- arch/x86/kernel/amd_gart_64.c | 3 + arch/x86/kernel/pci-calgary_64.c | 2 + arch/x86/kernel/pci-swiotlb.c | 1 - arch/x86/kernel/setup.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 4 +- arch/x86/xen/mmu_pv.c | 2 - arch/xtensa/Kconfig | 1 - arch/xtensa/kernel/pci-dma.c | 4 +- block/blk-settings.c | 23 +++++ drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +-- drivers/iommu/amd_iommu.c | 2 + drivers/iommu/dma-iommu.c | 29 +++--- drivers/iommu/intel-iommu.c | 2 + drivers/mmc/core/queue.c | 41 +++++++- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/parisc/ccio-dma.c | 1 + drivers/parisc/sba_iommu.c | 1 + drivers/remoteproc/Kconfig | 2 +- drivers/xen/swiotlb-xen.c | 84 ++++------------- include/linux/blkdev.h | 2 + include/linux/dma-mapping.h | 34 +++---- include/linux/dma-noncoherent.h | 13 ++- include/linux/mmc/host.h | 2 + include/linux/vmalloc.h | 2 + include/xen/arm/hypervisor.h | 2 - include/xen/arm/page-coherent.h | 24 +++-- include/xen/swiotlb-xen.h | 5 + kernel/dma/Kconfig | 12 ++- kernel/dma/coherent.c | 13 --- kernel/dma/mapping.c | 105 ++++++++++++++------- kernel/dma/remap.c | 51 ++++++---- mm/vmalloc.c | 5 +- sound/core/pcm_native.c | 13 ++- 74 files changed, 399 insertions(+), 677 deletions(-) delete mode 100644 arch/arm64/include/asm/dma-mapping.h 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=-12.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 51D15C4CEC9 for ; Wed, 18 Sep 2019 15:27:52 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12444207FC for ; Wed, 18 Sep 2019 15:27:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Iu7nhtAa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12444207FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A9890C4E; Wed, 18 Sep 2019 15:27:51 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 81057B88 for ; Wed, 18 Sep 2019 15:27:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C9843832 for ; Wed, 18 Sep 2019 15:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gdFHiFVbMqVJw3CBF4SoBjQ/uM5M5qm+KSwdRCShL1k=; b=Iu7nhtAaql/og2GAvnceGjKAbq Cbk8RrS9C1NwKD+UZKy/Y6zws/CMAR/gkDf4wy5Ad3gAAsROwXmfJBW3O3v+X3dOpptf4lMrcN2Ti nhGfQbKKerTGgc00UBSp72uBLs8wbgfuHhUjQj/fugE8nLWb6jbQP7ynshgbYgvChydIsmKhSvE5c BJV3aRwJG6gFty8IsVQ7rMzVkHZ4SjuKLCG9OuaOynHJMVpqHPbcC9GlCR6cU3GO+IfP0zXKnXNPP we1cBUhF6TcK3anK7/mjHxi+KrV/YpV7TTBUSBKUoRxrdihfJ5/mmOO09Uwa2UVW8LEIRa9Aa8o0L NlH5q1jQ==; Received: from [12.1.75.136] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAbrw-0002Ft-Bj; Wed, 18 Sep 2019 15:27:48 +0000 Date: Wed, 18 Sep 2019 08:27:48 -0700 From: Christoph Hellwig To: Linus Torvalds Subject: [GIT PULL] dma-mapping updates for 5.4 Message-ID: <20190918152748.GA21241@infradead.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Hi Linus, please pull the dma-mapping updates for 5.4. In addition to the usual Kconfig conflics where you just want to keep both edits there are a few more interesting merge issues this time: - most importanly powerpc and microblaze add new callers of dma_atomic_pool_init, while this tree marks the function static and calls it from a common postcore_initcall(). The trivial functions added in powerpc and microblaze adding the calls need to be removed for the code to compile. This will not show up as a merge conflict and needs to be dealt with manually! - the csky tree has edits close to edits from this tree in arch/csky/mm/dma-mapping.c, keep both edits as there are no functional conflicts. - for ia64 keep the removal of arch/ia64/sn/pci/pci_dma.c from the ia64 tree. The ia64 tree moves sba_dma_ops around a bit. Keep the move and the wiring up of ->mmap and ->get_sgtable from this tree. - the -mm tree adds a new compound_nr helper that some of the Xen code removed in this pull request removes. Keep the removal from this tree. - the block tree adds a new helper next to the new block helpers from this tree, keep both - the arm64 tree removes a __KERNEL__ ifdef from arch/arm64/include/asm/dma-mapping.h, which is removed in this tree. Keep the removal. The following changes since commit a55aa89aab90fae7c815b0551b07be37db359d76: Linux 5.3-rc6 (2019-08-25 12:01:23 -0700) are available in the Git repository at: git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.4 for you to fetch changes up to c7d9eccb3c1e802c5cbb2a764eb0eb9807d9f12e: mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE (2019-09-12 13:14:09 +0100) ---------------------------------------------------------------- dma-mapping updates for 5.4: - add dma-mapping and block layer helpers to take care of IOMMU merging for mmc plus subsequent fixups (Yoshihiro Shimoda) - rework handling of the pgprot bits for remapping (me) - take care of the dma direct infrastructure for swiotlb-xen (me) - improve the dma noncoherent remapping infrastructure (me) - better defaults for ->mmap, ->get_sgtable and ->get_required_mask (me) - cleanup mmaping of coherent DMA allocations (me) - various misc cleanups (Andy Shevchenko, me) ---------------------------------------------------------------- Andy Shevchenko (1): dma-mapping: fix filename references Christoph Hellwig (34): unicore32: remove the unused pgprot_dmacoherent define arm-nommu: remove the unused pgprot_dmacoherent define dma-mapping: remove arch_dma_mmap_pgprot dma-mapping: make dma_atomic_pool_init self-contained arm64: document the choice of page attributes for pgprot_dmacoherent MIPS: document mixing "slightly different CCAs" dma-mapping: move the dma_get_sgtable API comments from arm to common code dma-mapping: explicitly wire up ->mmap and ->get_sgtable dma-mapping: add a dma_can_mmap helper ALSA: pcm: use dma_can_mmap() to check if a device supports dma_mmap_* arm-nommu: call dma_mmap_from_dev_coherent directly parisc: don't set ARCH_NO_COHERENT_DMA_MMAP dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAP dma-mapping: remove dma_{alloc,free,mmap}_writecombine dma-mapping: remove dma_release_declared_memory dma-mapping: remove the dma_mmap_from_dev_coherent export remoteproc: don't allow modular build dma-mapping: remove the dma_declare_coherent_memory export dma-mapping: provide a better default ->get_required_mask vmalloc: lift the arm flag for coherent mappings to common code dma-mapping: always use VM_DMA_COHERENT for generic DMA remap dma-mapping: introduce a dma_common_find_pages helper arm: remove wrappers for the generic dma remap helpers xen/arm: use dma-noncoherent.h calls for xen-swiotlb cache maintainance xen/arm: consolidate page-coherent.h xen/arm: use dev_is_dma_coherent xen/arm: simplify dma_cache_maint xen/arm: remove xen_dma_ops xen: remove the exports for xen_{create,destroy}_contiguous_region swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtable swiotlb-xen: use the same foreign page check everywhere swiotlb-xen: simplify cache maintainance swiotlb-xen: merge xen_unmap_single into xen_swiotlb_unmap_page arm64: use asm-generic/dma-mapping.h Yoshihiro Shimoda (6): block: add a helper function to merge the segments mmc: queue: use bigger segments if DMA MAP layer can merge the segments dma-mapping: introduce dma_get_merge_boundary() iommu/dma: add a new dma_map_ops of get_merge_boundary() mmc: queue: Fix bigger segments usage mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLE Documentation/DMA-API.txt | 19 ++-- Documentation/x86/x86_64/boot-options.rst | 2 +- arch/Kconfig | 3 - arch/alpha/kernel/pci_iommu.c | 2 + arch/arc/mm/dma.c | 6 -- arch/arm/Kconfig | 2 +- arch/arm/include/asm/device.h | 3 - arch/arm/include/asm/dma-mapping.h | 6 -- arch/arm/include/asm/pgtable-nommu.h | 1 - arch/arm/include/asm/xen/page-coherent.h | 93 ------------------- arch/arm/mm/dma-mapping-nommu.c | 5 +- arch/arm/mm/dma-mapping.c | 84 +++-------------- arch/arm/mm/mm.h | 3 - arch/arm/xen/mm.c | 129 ++++++++------------------ arch/arm64/Kconfig | 1 - arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/dma-mapping.h | 31 ------- arch/arm64/include/asm/pgtable.h | 12 +++ arch/arm64/include/asm/xen/page-coherent.h | 75 --------------- arch/arm64/mm/dma-mapping.c | 16 +--- arch/c6x/Kconfig | 1 - arch/csky/mm/dma-mapping.c | 6 -- arch/ia64/hp/common/sba_iommu.c | 2 + arch/ia64/kernel/setup.c | 2 +- arch/ia64/sn/pci/pci_dma.c | 2 + arch/m68k/Kconfig | 2 - arch/m68k/include/asm/pgtable_mm.h | 3 + arch/m68k/kernel/dma.c | 3 +- arch/microblaze/Kconfig | 1 - arch/mips/Kconfig | 9 +- arch/mips/jazz/jazzdma.c | 2 + arch/mips/mm/dma-noncoherent.c | 8 -- arch/nds32/kernel/dma.c | 6 -- arch/parisc/Kconfig | 1 - arch/powerpc/kernel/dma-iommu.c | 2 + arch/powerpc/platforms/ps3/system-bus.c | 11 +-- arch/powerpc/platforms/pseries/vio.c | 2 + arch/s390/pci/pci_dma.c | 2 + arch/sh/Kconfig | 1 - arch/unicore32/include/asm/pgtable.h | 2 - arch/x86/include/asm/xen/page-coherent.h | 14 --- arch/x86/kernel/amd_gart_64.c | 3 + arch/x86/kernel/pci-calgary_64.c | 2 + arch/x86/kernel/pci-swiotlb.c | 1 - arch/x86/kernel/setup.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 4 +- arch/x86/xen/mmu_pv.c | 2 - arch/xtensa/Kconfig | 1 - arch/xtensa/kernel/pci-dma.c | 4 +- block/blk-settings.c | 23 +++++ drivers/gpu/drm/omapdrm/dss/dispc.c | 11 +-- drivers/iommu/amd_iommu.c | 2 + drivers/iommu/dma-iommu.c | 29 +++--- drivers/iommu/intel-iommu.c | 2 + drivers/mmc/core/queue.c | 41 +++++++- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/parisc/ccio-dma.c | 1 + drivers/parisc/sba_iommu.c | 1 + drivers/remoteproc/Kconfig | 2 +- drivers/xen/swiotlb-xen.c | 84 ++++------------- include/linux/blkdev.h | 2 + include/linux/dma-mapping.h | 34 +++---- include/linux/dma-noncoherent.h | 13 ++- include/linux/mmc/host.h | 2 + include/linux/vmalloc.h | 2 + include/xen/arm/hypervisor.h | 2 - include/xen/arm/page-coherent.h | 24 +++-- include/xen/swiotlb-xen.h | 5 + kernel/dma/Kconfig | 12 ++- kernel/dma/coherent.c | 13 --- kernel/dma/mapping.c | 105 ++++++++++++++------- kernel/dma/remap.c | 51 ++++++---- mm/vmalloc.c | 5 +- sound/core/pcm_native.c | 13 ++- 74 files changed, 399 insertions(+), 677 deletions(-) delete mode 100644 arch/arm64/include/asm/dma-mapping.h _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-12.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 EB4BCC4CEC4 for ; Wed, 18 Sep 2019 15:28:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE764207FC for ; Wed, 18 Sep 2019 15:28:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Iu7nhtAa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE764207FC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iAbsD-0003N5-4a; Wed, 18 Sep 2019 15:28:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iAbsB-0003Ma-F4 for xen-devel@lists.xenproject.org; Wed, 18 Sep 2019 15:28:03 +0000 X-Inumbo-ID: e035a876-da28-11e9-978d-bc764e2007e4 Received: from bombadil.infradead.org (unknown [2607:7c80:54:e::133]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e035a876-da28-11e9-978d-bc764e2007e4; Wed, 18 Sep 2019 15:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gdFHiFVbMqVJw3CBF4SoBjQ/uM5M5qm+KSwdRCShL1k=; b=Iu7nhtAaql/og2GAvnceGjKAbq Cbk8RrS9C1NwKD+UZKy/Y6zws/CMAR/gkDf4wy5Ad3gAAsROwXmfJBW3O3v+X3dOpptf4lMrcN2Ti nhGfQbKKerTGgc00UBSp72uBLs8wbgfuHhUjQj/fugE8nLWb6jbQP7ynshgbYgvChydIsmKhSvE5c BJV3aRwJG6gFty8IsVQ7rMzVkHZ4SjuKLCG9OuaOynHJMVpqHPbcC9GlCR6cU3GO+IfP0zXKnXNPP we1cBUhF6TcK3anK7/mjHxi+KrV/YpV7TTBUSBKUoRxrdihfJ5/mmOO09Uwa2UVW8LEIRa9Aa8o0L NlH5q1jQ==; Received: from [12.1.75.136] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAbrw-0002Ft-Bj; Wed, 18 Sep 2019 15:27:48 +0000 Date: Wed, 18 Sep 2019 08:27:48 -0700 From: Christoph Hellwig To: Linus Torvalds Message-ID: <20190918152748.GA21241@infradead.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Subject: [Xen-devel] [GIT PULL] dma-mapping updates for 5.4 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" SGkgTGludXMsCgpwbGVhc2UgcHVsbCB0aGUgZG1hLW1hcHBpbmcgdXBkYXRlcyBmb3IgNS40LgoK SW4gYWRkaXRpb24gdG8gdGhlIHVzdWFsIEtjb25maWcgY29uZmxpY3Mgd2hlcmUgeW91IGp1c3Qg d2FudCB0byBrZWVwCmJvdGggZWRpdHMgdGhlcmUgYXJlIGEgZmV3IG1vcmUgaW50ZXJlc3Rpbmcg bWVyZ2UgaXNzdWVzIHRoaXMgdGltZToKIAogLSBtb3N0IGltcG9ydGFubHkgcG93ZXJwYyBhbmQg bWljcm9ibGF6ZSBhZGQgbmV3IGNhbGxlcnMgb2YKICAgZG1hX2F0b21pY19wb29sX2luaXQsIHdo aWxlIHRoaXMgdHJlZSBtYXJrcyB0aGUgZnVuY3Rpb24gc3RhdGljCiAgIGFuZCBjYWxscyBpdCBm cm9tIGEgY29tbW9uIHBvc3Rjb3JlX2luaXRjYWxsKCkuICBUaGUgdHJpdmlhbAogICBmdW5jdGlv bnMgYWRkZWQgaW4gcG93ZXJwYyBhbmQgbWljcm9ibGF6ZSBhZGRpbmcgdGhlIGNhbGxzCiAgIG5l ZWQgdG8gYmUgcmVtb3ZlZCBmb3IgdGhlIGNvZGUgdG8gY29tcGlsZS4gIFRoaXMgd2lsbCBub3Qg c2hvdyB1cAogICBhcyBhIG1lcmdlIGNvbmZsaWN0IGFuZCBuZWVkcyB0byBiZSBkZWFsdCB3aXRo IG1hbnVhbGx5IQogLSB0aGUgY3NreSB0cmVlIGhhcyBlZGl0cyBjbG9zZSB0byBlZGl0cyBmcm9t IHRoaXMgdHJlZSBpbgogICBhcmNoL2Nza3kvbW0vZG1hLW1hcHBpbmcuYywga2VlcCBib3RoIGVk aXRzIGFzIHRoZXJlIGFyZSBubwogICBmdW5jdGlvbmFsIGNvbmZsaWN0cy4KIC0gZm9yIGlhNjQg a2VlcCB0aGUgcmVtb3ZhbCBvZiBhcmNoL2lhNjQvc24vcGNpL3BjaV9kbWEuYyBmcm9tIHRoZQog ICBpYTY0IHRyZWUuICBUaGUgaWE2NCB0cmVlIG1vdmVzIHNiYV9kbWFfb3BzIGFyb3VuZCBhIGJp dC4gIEtlZXAKICAgdGhlIG1vdmUgYW5kIHRoZSB3aXJpbmcgdXAgb2YgLT5tbWFwIGFuZCAtPmdl dF9zZ3RhYmxlIGZyb20gdGhpcwogICB0cmVlLgogLSB0aGUgLW1tIHRyZWUgYWRkcyBhIG5ldyBj b21wb3VuZF9uciBoZWxwZXIgdGhhdCBzb21lIG9mIHRoZSBYZW4KICAgY29kZSByZW1vdmVkIGlu IHRoaXMgcHVsbCByZXF1ZXN0IHJlbW92ZXMuICBLZWVwIHRoZSByZW1vdmFsIGZyb20KICAgdGhp cyB0cmVlLgogLSB0aGUgYmxvY2sgdHJlZSBhZGRzIGEgbmV3IGhlbHBlciBuZXh0IHRvIHRoZSBu ZXcgYmxvY2sgaGVscGVycyBmcm9tCiAgIHRoaXMgdHJlZSwga2VlcCBib3RoCiAtIHRoZSBhcm02 NCB0cmVlIHJlbW92ZXMgYSBfX0tFUk5FTF9fIGlmZGVmIGZyb20KICAgYXJjaC9hcm02NC9pbmNs dWRlL2FzbS9kbWEtbWFwcGluZy5oLCB3aGljaCBpcyByZW1vdmVkIGluIHRoaXMgdHJlZS4KICAg S2VlcCB0aGUgcmVtb3ZhbC4KClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21taXQgYTU1 YWE4OWFhYjkwZmFlN2M4MTViMDU1MWIwN2JlMzdkYjM1OWQ3NjoKCiAgTGludXggNS4zLXJjNiAo MjAxOS0wOC0yNSAxMjowMToyMyAtMDcwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIEdpdCByZXBv c2l0b3J5IGF0OgoKICBnaXQ6Ly9naXQuaW5mcmFkZWFkLm9yZy91c2Vycy9oY2gvZG1hLW1hcHBp bmcuZ2l0IHRhZ3MvZG1hLW1hcHBpbmctNS40Cgpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMgdXAg dG8gYzdkOWVjY2IzYzFlODAyYzVjYmIyYTc2NGViMGViOTgwN2Q5ZjEyZToKCiAgbW1jOiByZW5l c2FzX3NkaGlfaW50ZXJuYWxfZG1hYzogQWRkIE1NQ19DQVAyX01FUkdFX0NBUEFCTEUgKDIwMTkt MDktMTIgMTM6MTQ6MDkgKzAxMDApCgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCmRtYS1tYXBwaW5nIHVwZGF0ZXMgZm9yIDUu NDoKCiAtIGFkZCBkbWEtbWFwcGluZyBhbmQgYmxvY2sgbGF5ZXIgaGVscGVycyB0byB0YWtlIGNh cmUgb2YgSU9NTVUKICAgbWVyZ2luZyBmb3IgbW1jIHBsdXMgc3Vic2VxdWVudCBmaXh1cHMgKFlv c2hpaGlybyBTaGltb2RhKQogLSByZXdvcmsgaGFuZGxpbmcgb2YgdGhlIHBncHJvdCBiaXRzIGZv ciByZW1hcHBpbmcgKG1lKQogLSB0YWtlIGNhcmUgb2YgdGhlIGRtYSBkaXJlY3QgaW5mcmFzdHJ1 Y3R1cmUgZm9yIHN3aW90bGIteGVuIChtZSkKIC0gaW1wcm92ZSB0aGUgZG1hIG5vbmNvaGVyZW50 IHJlbWFwcGluZyBpbmZyYXN0cnVjdHVyZSAobWUpCiAtIGJldHRlciBkZWZhdWx0cyBmb3IgLT5t bWFwLCAtPmdldF9zZ3RhYmxlIGFuZCAtPmdldF9yZXF1aXJlZF9tYXNrIChtZSkKIC0gY2xlYW51 cCBtbWFwaW5nIG9mIGNvaGVyZW50IERNQSBhbGxvY2F0aW9ucyAobWUpCiAtIHZhcmlvdXMgbWlz YyBjbGVhbnVwcyAoQW5keSBTaGV2Y2hlbmtvLCBtZSkKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQW5keSBTaGV2Y2hlbmtv ICgxKToKICAgICAgZG1hLW1hcHBpbmc6IGZpeCBmaWxlbmFtZSByZWZlcmVuY2VzCgpDaHJpc3Rv cGggSGVsbHdpZyAoMzQpOgogICAgICB1bmljb3JlMzI6IHJlbW92ZSB0aGUgdW51c2VkIHBncHJv dF9kbWFjb2hlcmVudCBkZWZpbmUKICAgICAgYXJtLW5vbW11OiByZW1vdmUgdGhlIHVudXNlZCBw Z3Byb3RfZG1hY29oZXJlbnQgZGVmaW5lCiAgICAgIGRtYS1tYXBwaW5nOiByZW1vdmUgYXJjaF9k bWFfbW1hcF9wZ3Byb3QKICAgICAgZG1hLW1hcHBpbmc6IG1ha2UgZG1hX2F0b21pY19wb29sX2lu aXQgc2VsZi1jb250YWluZWQKICAgICAgYXJtNjQ6IGRvY3VtZW50IHRoZSBjaG9pY2Ugb2YgcGFn ZSBhdHRyaWJ1dGVzIGZvciBwZ3Byb3RfZG1hY29oZXJlbnQKICAgICAgTUlQUzogZG9jdW1lbnQg bWl4aW5nICJzbGlnaHRseSBkaWZmZXJlbnQgQ0NBcyIKICAgICAgZG1hLW1hcHBpbmc6IG1vdmUg dGhlIGRtYV9nZXRfc2d0YWJsZSBBUEkgY29tbWVudHMgZnJvbSBhcm0gdG8gY29tbW9uIGNvZGUK ICAgICAgZG1hLW1hcHBpbmc6IGV4cGxpY2l0bHkgd2lyZSB1cCAtPm1tYXAgYW5kIC0+Z2V0X3Nn dGFibGUKICAgICAgZG1hLW1hcHBpbmc6IGFkZCBhIGRtYV9jYW5fbW1hcCBoZWxwZXIKICAgICAg QUxTQTogcGNtOiB1c2UgZG1hX2Nhbl9tbWFwKCkgdG8gY2hlY2sgaWYgYSBkZXZpY2Ugc3VwcG9y dHMgZG1hX21tYXBfKgogICAgICBhcm0tbm9tbXU6IGNhbGwgZG1hX21tYXBfZnJvbV9kZXZfY29o ZXJlbnQgZGlyZWN0bHkKICAgICAgcGFyaXNjOiBkb24ndCBzZXQgQVJDSF9OT19DT0hFUkVOVF9E TUFfTU1BUAogICAgICBkbWEtbWFwcGluZzogcmVtb3ZlIENPTkZJR19BUkNIX05PX0NPSEVSRU5U X0RNQV9NTUFQCiAgICAgIGRtYS1tYXBwaW5nOiByZW1vdmUgZG1hX3thbGxvYyxmcmVlLG1tYXB9 X3dyaXRlY29tYmluZQogICAgICBkbWEtbWFwcGluZzogcmVtb3ZlIGRtYV9yZWxlYXNlX2RlY2xh cmVkX21lbW9yeQogICAgICBkbWEtbWFwcGluZzogcmVtb3ZlIHRoZSBkbWFfbW1hcF9mcm9tX2Rl dl9jb2hlcmVudCBleHBvcnQKICAgICAgcmVtb3RlcHJvYzogZG9uJ3QgYWxsb3cgbW9kdWxhciBi dWlsZAogICAgICBkbWEtbWFwcGluZzogcmVtb3ZlIHRoZSBkbWFfZGVjbGFyZV9jb2hlcmVudF9t ZW1vcnkgZXhwb3J0CiAgICAgIGRtYS1tYXBwaW5nOiBwcm92aWRlIGEgYmV0dGVyIGRlZmF1bHQg LT5nZXRfcmVxdWlyZWRfbWFzawogICAgICB2bWFsbG9jOiBsaWZ0IHRoZSBhcm0gZmxhZyBmb3Ig Y29oZXJlbnQgbWFwcGluZ3MgdG8gY29tbW9uIGNvZGUKICAgICAgZG1hLW1hcHBpbmc6IGFsd2F5 cyB1c2UgVk1fRE1BX0NPSEVSRU5UIGZvciBnZW5lcmljIERNQSByZW1hcAogICAgICBkbWEtbWFw cGluZzogaW50cm9kdWNlIGEgZG1hX2NvbW1vbl9maW5kX3BhZ2VzIGhlbHBlcgogICAgICBhcm06 IHJlbW92ZSB3cmFwcGVycyBmb3IgdGhlIGdlbmVyaWMgZG1hIHJlbWFwIGhlbHBlcnMKICAgICAg eGVuL2FybTogdXNlIGRtYS1ub25jb2hlcmVudC5oIGNhbGxzIGZvciB4ZW4tc3dpb3RsYiBjYWNo ZSBtYWludGFpbmFuY2UKICAgICAgeGVuL2FybTogY29uc29saWRhdGUgcGFnZS1jb2hlcmVudC5o CiAgICAgIHhlbi9hcm06IHVzZSBkZXZfaXNfZG1hX2NvaGVyZW50CiAgICAgIHhlbi9hcm06IHNp bXBsaWZ5IGRtYV9jYWNoZV9tYWludAogICAgICB4ZW4vYXJtOiByZW1vdmUgeGVuX2RtYV9vcHMK ICAgICAgeGVuOiByZW1vdmUgdGhlIGV4cG9ydHMgZm9yIHhlbl97Y3JlYXRlLGRlc3Ryb3l9X2Nv bnRpZ3VvdXNfcmVnaW9uCiAgICAgIHN3aW90bGIteGVuOiByZW1vdmUgeGVuX3N3aW90bGJfZG1h X21tYXAgYW5kIHhlbl9zd2lvdGxiX2RtYV9nZXRfc2d0YWJsZQogICAgICBzd2lvdGxiLXhlbjog dXNlIHRoZSBzYW1lIGZvcmVpZ24gcGFnZSBjaGVjayBldmVyeXdoZXJlCiAgICAgIHN3aW90bGIt eGVuOiBzaW1wbGlmeSBjYWNoZSBtYWludGFpbmFuY2UKICAgICAgc3dpb3RsYi14ZW46IG1lcmdl IHhlbl91bm1hcF9zaW5nbGUgaW50byB4ZW5fc3dpb3RsYl91bm1hcF9wYWdlCiAgICAgIGFybTY0 OiB1c2UgYXNtLWdlbmVyaWMvZG1hLW1hcHBpbmcuaAoKWW9zaGloaXJvIFNoaW1vZGEgKDYpOgog ICAgICBibG9jazogYWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIG1lcmdlIHRoZSBzZWdtZW50cwog ICAgICBtbWM6IHF1ZXVlOiB1c2UgYmlnZ2VyIHNlZ21lbnRzIGlmIERNQSBNQVAgbGF5ZXIgY2Fu IG1lcmdlIHRoZSBzZWdtZW50cwogICAgICBkbWEtbWFwcGluZzogaW50cm9kdWNlIGRtYV9nZXRf bWVyZ2VfYm91bmRhcnkoKQogICAgICBpb21tdS9kbWE6IGFkZCBhIG5ldyBkbWFfbWFwX29wcyBv ZiBnZXRfbWVyZ2VfYm91bmRhcnkoKQogICAgICBtbWM6IHF1ZXVlOiBGaXggYmlnZ2VyIHNlZ21l bnRzIHVzYWdlCiAgICAgIG1tYzogcmVuZXNhc19zZGhpX2ludGVybmFsX2RtYWM6IEFkZCBNTUNf Q0FQMl9NRVJHRV9DQVBBQkxFCgogRG9jdW1lbnRhdGlvbi9ETUEtQVBJLnR4dCAgICAgICAgICAg ICAgICAgICAgIHwgIDE5ICsrLS0KIERvY3VtZW50YXRpb24veDg2L3g4Nl82NC9ib290LW9wdGlv bnMucnN0ICAgICB8ICAgMiArLQogYXJjaC9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAzIC0KIGFyY2gvYWxwaGEva2VybmVsL3BjaV9pb21tdS5jICAgICAgICAg ICAgICAgICB8ICAgMiArCiBhcmNoL2FyYy9tbS9kbWEuYyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDYgLS0KIGFyY2gvYXJtL0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMiArLQogYXJjaC9hcm0vaW5jbHVkZS9hc20vZGV2aWNlLmggICAgICAgICAgICAg ICAgIHwgICAzIC0KIGFyY2gvYXJtL2luY2x1ZGUvYXNtL2RtYS1tYXBwaW5nLmggICAgICAgICAg ICB8ICAgNiAtLQogYXJjaC9hcm0vaW5jbHVkZS9hc20vcGd0YWJsZS1ub21tdS5oICAgICAgICAg IHwgICAxIC0KIGFyY2gvYXJtL2luY2x1ZGUvYXNtL3hlbi9wYWdlLWNvaGVyZW50LmggICAgICB8 ICA5MyAtLS0tLS0tLS0tLS0tLS0tLS0tCiBhcmNoL2FybS9tbS9kbWEtbWFwcGluZy1ub21tdS5j ICAgICAgICAgICAgICAgfCAgIDUgKy0KIGFyY2gvYXJtL21tL2RtYS1tYXBwaW5nLmMgICAgICAg ICAgICAgICAgICAgICB8ICA4NCArKystLS0tLS0tLS0tLS0tLQogYXJjaC9hcm0vbW0vbW0uaCAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAzIC0KIGFyY2gvYXJtL3hlbi9tbS5jICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDEyOSArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LQogYXJjaC9hcm02NC9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxIC0K IGFyY2gvYXJtNjQvaW5jbHVkZS9hc20vS2J1aWxkICAgICAgICAgICAgICAgICB8ICAgMSArCiBh cmNoL2FybTY0L2luY2x1ZGUvYXNtL2RtYS1tYXBwaW5nLmggICAgICAgICAgfCAgMzEgLS0tLS0t LQogYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9wZ3RhYmxlLmggICAgICAgICAgICAgIHwgIDEyICsr KwogYXJjaC9hcm02NC9pbmNsdWRlL2FzbS94ZW4vcGFnZS1jb2hlcmVudC5oICAgIHwgIDc1IC0t LS0tLS0tLS0tLS0tLQogYXJjaC9hcm02NC9tbS9kbWEtbWFwcGluZy5jICAgICAgICAgICAgICAg ICAgIHwgIDE2ICstLS0KIGFyY2gvYzZ4L0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMSAtCiBhcmNoL2Nza3kvbW0vZG1hLW1hcHBpbmcuYyAgICAgICAgICAgICAgICAg ICAgfCAgIDYgLS0KIGFyY2gvaWE2NC9ocC9jb21tb24vc2JhX2lvbW11LmMgICAgICAgICAgICAg ICB8ICAgMiArCiBhcmNoL2lhNjQva2VybmVsL3NldHVwLmMgICAgICAgICAgICAgICAgICAgICAg fCAgIDIgKy0KIGFyY2gvaWE2NC9zbi9wY2kvcGNpX2RtYS5jICAgICAgICAgICAgICAgICAgICB8 ICAgMiArCiBhcmNoL202OGsvS2NvbmZpZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg IDIgLQogYXJjaC9tNjhrL2luY2x1ZGUvYXNtL3BndGFibGVfbW0uaCAgICAgICAgICAgIHwgICAz ICsKIGFyY2gvbTY4ay9rZXJuZWwvZG1hLmMgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMyAr LQogYXJjaC9taWNyb2JsYXplL0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgIHwgICAxIC0K IGFyY2gvbWlwcy9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgOSArLQog YXJjaC9taXBzL2phenovamF6emRtYS5jICAgICAgICAgICAgICAgICAgICAgIHwgICAyICsKIGFy Y2gvbWlwcy9tbS9kbWEtbm9uY29oZXJlbnQuYyAgICAgICAgICAgICAgICB8ICAgOCAtLQogYXJj aC9uZHMzMi9rZXJuZWwvZG1hLmMgICAgICAgICAgICAgICAgICAgICAgIHwgICA2IC0tCiBhcmNo L3BhcmlzYy9LY29uZmlnICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEgLQogYXJjaC9w b3dlcnBjL2tlcm5lbC9kbWEtaW9tbXUuYyAgICAgICAgICAgICAgIHwgICAyICsKIGFyY2gvcG93 ZXJwYy9wbGF0Zm9ybXMvcHMzL3N5c3RlbS1idXMuYyAgICAgICB8ICAxMSArLS0KIGFyY2gvcG93 ZXJwYy9wbGF0Zm9ybXMvcHNlcmllcy92aW8uYyAgICAgICAgICB8ICAgMiArCiBhcmNoL3MzOTAv cGNpL3BjaV9kbWEuYyAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIgKwogYXJjaC9zaC9LY29u ZmlnICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxIC0KIGFyY2gvdW5pY29yZTMy L2luY2x1ZGUvYXNtL3BndGFibGUuaCAgICAgICAgICB8ICAgMiAtCiBhcmNoL3g4Ni9pbmNsdWRl L2FzbS94ZW4vcGFnZS1jb2hlcmVudC5oICAgICAgfCAgMTQgLS0tCiBhcmNoL3g4Ni9rZXJuZWwv YW1kX2dhcnRfNjQuYyAgICAgICAgICAgICAgICAgfCAgIDMgKwogYXJjaC94ODYva2VybmVsL3Bj aS1jYWxnYXJ5XzY0LmMgICAgICAgICAgICAgIHwgICAyICsKIGFyY2gveDg2L2tlcm5lbC9wY2kt c3dpb3RsYi5jICAgICAgICAgICAgICAgICB8ICAgMSAtCiBhcmNoL3g4Ni9rZXJuZWwvc2V0dXAu YyAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIgKy0KIGFyY2gveDg2L3BjaS9zdGEyeDExLWZp eHVwLmMgICAgICAgICAgICAgICAgICB8ICAgNCArLQogYXJjaC94ODYveGVuL21tdV9wdi5jICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAyIC0KIGFyY2gveHRlbnNhL0tjb25maWcgICAgICAg ICAgICAgICAgICAgICAgICAgICB8ICAgMSAtCiBhcmNoL3h0ZW5zYS9rZXJuZWwvcGNpLWRtYS5j ICAgICAgICAgICAgICAgICAgfCAgIDQgKy0KIGJsb2NrL2Jsay1zZXR0aW5ncy5jICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAyMyArKysrKwogZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vZHNz L2Rpc3BjLmMgICAgICAgICAgIHwgIDExICstLQogZHJpdmVycy9pb21tdS9hbWRfaW9tbXUuYyAg ICAgICAgICAgICAgICAgICAgIHwgICAyICsKIGRyaXZlcnMvaW9tbXUvZG1hLWlvbW11LmMgICAg ICAgICAgICAgICAgICAgICB8ICAyOSArKystLS0KIGRyaXZlcnMvaW9tbXUvaW50ZWwtaW9tbXUu YyAgICAgICAgICAgICAgICAgICB8ICAgMiArCiBkcml2ZXJzL21tYy9jb3JlL3F1ZXVlLmMgICAg ICAgICAgICAgICAgICAgICAgfCAgNDEgKysrKysrKy0KIGRyaXZlcnMvbW1jL2hvc3QvcmVuZXNh c19zZGhpX2ludGVybmFsX2RtYWMuYyB8ICAgMiArLQogZHJpdmVycy9wYXJpc2MvY2Npby1kbWEu YyAgICAgICAgICAgICAgICAgICAgIHwgICAxICsKIGRyaXZlcnMvcGFyaXNjL3NiYV9pb21tdS5j ICAgICAgICAgICAgICAgICAgICB8ICAgMSArCiBkcml2ZXJzL3JlbW90ZXByb2MvS2NvbmZpZyAg ICAgICAgICAgICAgICAgICAgfCAgIDIgKy0KIGRyaXZlcnMveGVuL3N3aW90bGIteGVuLmMgICAg ICAgICAgICAgICAgICAgICB8ICA4NCArKysrLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9saW51eC9i bGtkZXYuaCAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyICsKIGluY2x1ZGUvbGludXgvZG1h LW1hcHBpbmcuaCAgICAgICAgICAgICAgICAgICB8ICAzNCArKystLS0tCiBpbmNsdWRlL2xpbnV4 L2RtYS1ub25jb2hlcmVudC5oICAgICAgICAgICAgICAgfCAgMTMgKystCiBpbmNsdWRlL2xpbnV4 L21tYy9ob3N0LmggICAgICAgICAgICAgICAgICAgICAgfCAgIDIgKwogaW5jbHVkZS9saW51eC92 bWFsbG9jLmggICAgICAgICAgICAgICAgICAgICAgIHwgICAyICsKIGluY2x1ZGUveGVuL2FybS9o eXBlcnZpc29yLmggICAgICAgICAgICAgICAgICB8ICAgMiAtCiBpbmNsdWRlL3hlbi9hcm0vcGFn ZS1jb2hlcmVudC5oICAgICAgICAgICAgICAgfCAgMjQgKysrLS0KIGluY2x1ZGUveGVuL3N3aW90 bGIteGVuLmggICAgICAgICAgICAgICAgICAgICB8ICAgNSArCiBrZXJuZWwvZG1hL0tjb25maWcg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTIgKystCiBrZXJuZWwvZG1hL2NvaGVyZW50 LmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTMgLS0tCiBrZXJuZWwvZG1hL21hcHBpbmcu YyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxMDUgKysrKysrKysrKysrKystLS0tLS0tCiBr ZXJuZWwvZG1hL3JlbWFwLmMgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgNTEgKysrKysr LS0tLQogbW0vdm1hbGxvYy5jICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICA1 ICstCiBzb3VuZC9jb3JlL3BjbV9uYXRpdmUuYyAgICAgICAgICAgICAgICAgICAgICAgfCAgMTMg KystCiA3NCBmaWxlcyBjaGFuZ2VkLCAzOTkgaW5zZXJ0aW9ucygrKSwgNjc3IGRlbGV0aW9ucygt KQogZGVsZXRlIG1vZGUgMTAwNjQ0IGFyY2gvYXJtNjQvaW5jbHVkZS9hc20vZG1hLW1hcHBpbmcu aAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRl dmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9s aXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==