* [git pull] IOMMU Updates for Linux v5.10
@ 2020-10-13 16:03 Joerg Roedel
2020-10-14 19:15 ` Linus Torvalds
2020-10-14 19:18 ` pr-tracker-bot
0 siblings, 2 replies; 4+ messages in thread
From: Joerg Roedel @ 2020-10-13 16:03 UTC (permalink / raw)
To: Linus Torvalds; +Cc: iommu, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 9609 bytes --]
Hi Linus,
there is a minor conflict this time in include/linux/iommu.h which
should be easy to resolve. I would attach my resolution, but somehow git
[show|log] didn't show it to me.
The conflict is in a function signature, specifically the type of the
pasid parameter. My resolution used iopasid_t.
With that in mind:
The following changes since commit 549738f15da0e5a00275977623be199fbbf7df50:
Linux 5.9-rc8 (2020-10-04 16:04:34 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-updates-v5.10
for you to fetch changes up to 7e3c3883c381aeda903778d7e99fc4cd523be610:
Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next (2020-10-07 11:51:59 +0200)
----------------------------------------------------------------
IOMMU Updates for Linux v5.10
Including:
- ARM-SMMU Updates from Will:
- Continued SVM enablement, where page-table is shared with
CPU
- Groundwork to support integrated SMMU with Adreno GPU
- Allow disabling of MSI-based polling on the kernel
command-line
- Minor driver fixes and cleanups (octal permissions, error
messages, ...)
- Secure Nested Paging Support for AMD IOMMU. The IOMMU will
fault when a device tries DMA on memory owned by a guest. This
needs new fault-types as well as a rewrite of the IOMMU memory
semaphore for command completions.
- Allow broken Intel IOMMUs (wrong address widths reported) to
still be used for interrupt remapping.
- IOMMU UAPI updates for supporting vSVA, where the IOMMU can
access address spaces of processes running in a VM.
- Support for the MT8167 IOMMU in the Mediatek IOMMU driver.
- Device-tree updates for the Renesas driver to support r8a7742.
- Several smaller fixes and cleanups all over the place.
----------------------------------------------------------------
Alex Dewar (1):
iommu/pamu: Replace use of kzfree with kfree_sensitive
Andy Shevchenko (1):
iommu/vt-d: Move intel_iommu_gfx_mapped to Intel IOMMU header
Barry Song (3):
iommu/arm-smmu-v3: replace symbolic permissions by octal permissions for module parameter
iommu/arm-smmu-v3: replace module_param_named by module_param for disable_bypass
iommu/arm-smmu-v3: permit users to disable msi polling
David Woodhouse (1):
iommu/vt-d: Gracefully handle DMAR units with no supported address widths
Dmitry Osipenko (1):
iommu/tegra-smmu: Add locking around mapping operations
Fabien Parent (3):
dt-bindings: iommu: Add binding for MediaTek MT8167 IOMMU
iommu/mediatek: Add flag for legacy ivrp paddr
iommu/mediatek: Add support for MT8167
Jacob Pan (6):
docs: IOMMU user API
iommu/uapi: Add argsz for user filled data
iommu/uapi: Use named union for user data
iommu/uapi: Rename uapi functions
iommu/uapi: Handle data and argsz filled by users
iommu/vt-d: Check UAPI data processed by IOMMU core
Jean-Philippe Brucker (9):
iommu/arm-smmu-v3: Fix endianness annotations
arm64: mm: Pin down ASIDs for sharing mm with devices
arm64: cpufeature: Export symbol read_sanitised_ftr_reg()
iommu/io-pgtable-arm: Move some definitions to a header
iommu/arm-smmu-v3: Move definitions to a header
iommu/arm-smmu-v3: Share process page tables
iommu/arm-smmu-v3: Seize private ASID
iommu/arm-smmu-v3: Check for SVA features
iommu/arm-smmu-v3: Add SVA device feature
Joerg Roedel (3):
iommu/sun50i: Fix set-but-not-used variable warning
Merge tag 'arm-smmu-updates' of git://git.kernel.org/.../will/linux into arm/smmu
Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/amd', 'x86/vt-d' and 'core' into next
Jordan Crouse (3):
iommu/arm-smmu: Pass io-pgtable config to implementation specific function
iommu/arm-smmu: Add support for split pagetables
iommu/arm-smmu: Prepare for the adreno-smmu implementation
Krzysztof Kozlowski (5):
iommu/mediatek: Drop of_match_ptr to fix -Wunused-const-variable
iommu/amd: Add missing function prototypes to fix -Wmissing-prototypes
iommu/amd: Fix kerneldoc comments
iommu/vt-d: Drop kerneldoc marker from regular comment
iommu/qcom: Drop of_match_ptr to fix -Wunused-const-variable
Lad Prabhakar (4):
dt-bindings: iommu: renesas,ipmmu-vmsa: Sort compatible string in increasing number of the SoC
dt-bindings: iommu: renesas,ipmmu-vmsa: Add r8a7742 support
ARM: dts: r8a7742: Add IPMMU DT nodes
iommu/renesas: Update help description for IPMMU_VMSA config
Lu Baolu (1):
iommu/vt-d: Use device numa domain if RHSA is missing
Miles Chen (1):
iommu/mediatek: Check 4GB mode by reading infracfg
Nicolin Chen (5):
iommu/tegra-smmu: Fix tlb_mask
memory: tegra: Correct num_tlb_lines for tegra210
iommu/tegra-smmu: Do not use PAGE_SHIFT and PAGE_MASK
iommu/tegra-smmu: Fix iova->phys translation
iommu/tegra-smmu: Allow to group clients in same swgroup
Rob Clark (1):
iommu/arm-smmu: Constify some helpers
Robin Murphy (1):
iommu/dma: Remove broken huge page handling
Suravee Suthikulpanit (3):
iommu/amd: Use 4K page for completion wait write-back semaphore
iommu/amd: Add support for RMP_PAGE_FAULT and RMP_HW_ERR
iommu/amd: Re-purpose Exclusion range registers to support SNP CWWB
Thierry Reding (3):
iommu/tegra-smmu: Set IOMMU group name
iommu/tegra-smmu: Balance IOMMU group reference count
iommu/tegra-smmu: Prune IOMMU group when it is released
Tom Murphy (2):
iommu: Rename iommu_tlb_* functions to iommu_iotlb_*
iommu/dma: Handle init_iova_flush_queue() failure in dma-iommu path
Will Deacon (1):
Merge branch 'for-next/svm' of git://git.kernel.org/.../arm64/linux into for-joerg/arm-smmu/updates
Yu Kuai (1):
iommu/qcom: add missing put_device() call in qcom_iommu_of_xlate()
Yuqi Jin (1):
iommu/iova: Replace cmpxchg with xchg in queue_iova
Zenghui Yu (1):
iommu/arm-smmu-v3: Fix l1 stream table size in the error message
Zhou Wang (1):
iommu/arm-smmu-v3: Ensure queue is read after updating prod pointer
.../devicetree/bindings/iommu/mediatek,iommu.txt | 2 +
.../bindings/iommu/renesas,ipmmu-vmsa.yaml | 3 +-
Documentation/userspace-api/iommu.rst | 209 +++++
MAINTAINERS | 4 +-
arch/arm/boot/dts/r8a7742.dtsi | 48 ++
arch/arm64/include/asm/barrier.h | 1 +
arch/arm64/include/asm/io.h | 1 +
arch/arm64/include/asm/mmu.h | 3 +
arch/arm64/include/asm/mmu_context.h | 11 +-
arch/arm64/kernel/cpufeature.c | 1 +
arch/arm64/mm/context.c | 105 ++-
drivers/iommu/Kconfig | 12 +-
drivers/iommu/amd/amd_iommu.h | 9 +
drivers/iommu/amd/amd_iommu_types.h | 6 +-
drivers/iommu/amd/init.c | 48 +-
drivers/iommu/amd/iommu.c | 90 ++-
drivers/iommu/arm/arm-smmu-v3/Makefile | 5 +-
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 248 ++++++
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 843 ++++-----------------
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 723 ++++++++++++++++++
drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 +-
drivers/iommu/arm/arm-smmu/arm-smmu.c | 102 +--
drivers/iommu/arm/arm-smmu/arm-smmu.h | 84 +-
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 12 +-
drivers/iommu/dma-iommu.c | 22 +-
drivers/iommu/fsl_pamu.c | 2 +-
drivers/iommu/intel/dmar.c | 48 +-
drivers/iommu/intel/iommu.c | 62 +-
drivers/iommu/intel/svm.c | 13 +-
drivers/iommu/io-pgtable-arm.c | 27 +-
drivers/iommu/io-pgtable-arm.h | 30 +
drivers/iommu/iommu.c | 200 ++++-
drivers/iommu/iova.c | 2 +-
drivers/iommu/mtk_iommu.c | 49 +-
drivers/iommu/mtk_iommu.h | 1 +
drivers/iommu/sun50i-iommu.c | 15 +-
drivers/iommu/tegra-smmu.c | 138 +++-
drivers/memory/tegra/tegra210.c | 2 +-
drivers/vfio/vfio_iommu_type1.c | 2 +-
include/drm/intel-gtt.h | 5 +-
include/dt-bindings/memory/mt8167-larb-port.h | 51 ++
include/linux/intel-iommu.h | 1 +
include/linux/io-pgtable.h | 2 +-
include/linux/iommu.h | 45 +-
include/linux/soc/mediatek/infracfg.h | 3 +
include/uapi/linux/iommu.h | 18 +-
46 files changed, 2372 insertions(+), 939 deletions(-)
create mode 100644 Documentation/userspace-api/iommu.rst
create mode 100644 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
create mode 100644 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
create mode 100644 drivers/iommu/io-pgtable-arm.h
create mode 100644 include/dt-bindings/memory/mt8167-larb-port.h
Please pull.
Thanks,
Joerg
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git pull] IOMMU Updates for Linux v5.10
2020-10-13 16:03 [git pull] IOMMU Updates for Linux v5.10 Joerg Roedel
@ 2020-10-14 19:15 ` Linus Torvalds
2020-10-15 11:17 ` Joerg Roedel
2020-10-14 19:18 ` pr-tracker-bot
1 sibling, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2020-10-14 19:15 UTC (permalink / raw)
To: Joerg Roedel; +Cc: iommu, Linux Kernel Mailing List
On Tue, Oct 13, 2020 at 9:04 AM Joerg Roedel <joro@8bytes.org> wrote:
>
> there is a minor conflict this time in include/linux/iommu.h which
> should be easy to resolve. I would attach my resolution, but somehow git
> [show|log] didn't show it to me.
So when a resolution takes one side over the other (as opposed to
mixing two sides), then "git show" doesn't show it as a conflict any
more.
The reason is simple: at "git merge" time, git figures out the common
base, so it has all of "base", "side1" and "side2" to look at and does
a three-way diff (for the simplified normal case). So it can see it as
a conflict, because it sees both where you came from, and where you
ended up.
But once you have resolved the conflict and committed the end result,
"git show" (and "git log") doesn't do the whole expensive "what was
the base" thing any more. "git show" just sees the parents (so "side1"
and "side2") and the end result, but doesn't really see - or care -
about the fact that some time in the distant past you also had that
"base" state.
As a result, "git show" doesn't ever really understand the notion of a
"merge conflict", and all it shows is really "whee, this end result
looks like neither side" as a kind of pseudo-conflict diff.
Anyway, thanks for the describing the conflict, it was indeed not
complicated, this email is just to explain your "but somehow git
[show|log] didn't show it to me" thing.
Linus
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git pull] IOMMU Updates for Linux v5.10
2020-10-13 16:03 [git pull] IOMMU Updates for Linux v5.10 Joerg Roedel
2020-10-14 19:15 ` Linus Torvalds
@ 2020-10-14 19:18 ` pr-tracker-bot
1 sibling, 0 replies; 4+ messages in thread
From: pr-tracker-bot @ 2020-10-14 19:18 UTC (permalink / raw)
To: Joerg Roedel; +Cc: iommu, Linus Torvalds, linux-kernel
The pull request you sent on Tue, 13 Oct 2020 18:03:58 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-updates-v5.10
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/531d29b0b674036347a04c08c0898ff1aa522180
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git pull] IOMMU Updates for Linux v5.10
2020-10-14 19:15 ` Linus Torvalds
@ 2020-10-15 11:17 ` Joerg Roedel
0 siblings, 0 replies; 4+ messages in thread
From: Joerg Roedel @ 2020-10-15 11:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: iommu, Linux Kernel Mailing List
On Wed, Oct 14, 2020 at 12:15:55PM -0700, Linus Torvalds wrote:
> As a result, "git show" doesn't ever really understand the notion of a
> "merge conflict", and all it shows is really "whee, this end result
> looks like neither side" as a kind of pseudo-conflict diff.
Ah okay, that makes sense. Thanks for the explanation.
> Anyway, thanks for the describing the conflict, it was indeed not
> complicated, this email is just to explain your "but somehow git
> [show|log] didn't show it to me" thing.
Yeah, next time I try to get the diff before commiting the merge, that
probably works better. A diff is better than describing conflict
resolutions verbally.
Regards,
Joerg
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-15 11:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-13 16:03 [git pull] IOMMU Updates for Linux v5.10 Joerg Roedel
2020-10-14 19:15 ` Linus Torvalds
2020-10-15 11:17 ` Joerg Roedel
2020-10-14 19:18 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).