Skip to content

Commit bed0653

Browse files
committed
Merge tag 'iommu-updates-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux
Pull iommu updates from Joerg Roedel: - Inte VT-d: - IOMMU driver updated to the latest VT-d specification - Don't enable PRS if PDS isn't supported - Replace snprintf with scnprintf - Fix legacy mode page table dump through debugfs - Miscellaneous cleanups - AMD-Vi: - Support kdump boot when SNP is enabled - Apple-DART: - 4-level page-table support - RISC-V IOMMU: - ACPI support - Small number of miscellaneous cleanups and fixes * tag 'iommu-updates-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux: (22 commits) iommu/vt-d: Disallow dirty tracking if incoherent page walk iommu/vt-d: debugfs: Avoid dumping context command register iommu/vt-d: Removal of Advanced Fault Logging iommu/vt-d: PRS isn't usable if PDS isn't supported iommu/vt-d: Remove LPIG from page group response descriptor iommu/vt-d: Drop unused cap_super_offset() iommu/vt-d: debugfs: Fix legacy mode page table dump logic iommu/vt-d: Replace snprintf with scnprintf in dmar_latency_snapshot() iommu/io-pgtable-dart: Fix off by one error in table index check iommu/riscv: Add ACPI support ACPI: scan: Add support for RISC-V in acpi_iommu_configure_id() ACPI: RISC-V: Add support for RIMT iommu/omap: Use int type to store negative error codes iommu/apple-dart: Clear stream error indicator bits for T8110 DARTs iommu/amd: Skip enabling command/event buffers for kdump crypto: ccp: Skip SEV and SNP INIT for kdump boot iommu/amd: Reuse device table for kdump iommu/amd: Add support to remap/unmap IOMMU buffers for kdump iommu/apple-dart: Add 4-level page table support iommu/io-pgtable-dart: Add 4-level page table support ...
2 parents a498d59 + 5f4b8c0 commit bed0653

File tree

26 files changed

+959
-198
lines changed

26 files changed

+959
-198
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ L: [email protected]
347347
348348
S: Maintained
349349
F: drivers/acpi/riscv/
350+
F: include/linux/acpi_rimt.h
350351

351352
ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
352353
M: Sudeep Holla <[email protected]>

arch/riscv/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ config RISCV
1616
select ACPI_MCFG if (ACPI && PCI)
1717
select ACPI_PPTT if ACPI
1818
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
19+
select ACPI_RIMT if ACPI
1920
select ACPI_SPCR_TABLE if ACPI
2021
select ARCH_DMA_DEFAULT_COHERENT
2122
select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

drivers/acpi/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,10 @@ if ARM64
547547
source "drivers/acpi/arm64/Kconfig"
548548
endif
549549

550+
if RISCV
551+
source "drivers/acpi/riscv/Kconfig"
552+
endif
553+
550554
config ACPI_PPTT
551555
bool
552556

drivers/acpi/riscv/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# ACPI Configuration for RISC-V
4+
#
5+
6+
config ACPI_RIMT
7+
bool

drivers/acpi/riscv/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
obj-y += rhct.o init.o irq.o
33
obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.o
44
obj-$(CONFIG_ACPI_CPPC_LIB) += cppc.o
5+
obj-$(CONFIG_ACPI_RIMT) += rimt.o

drivers/acpi/riscv/init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
void __init acpi_arch_init(void)
1111
{
1212
riscv_acpi_init_gsi_mapping();
13+
if (IS_ENABLED(CONFIG_ACPI_RIMT))
14+
riscv_acpi_rimt_init();
1315
}

drivers/acpi/riscv/init.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
#include <linux/init.h>
33

44
void __init riscv_acpi_init_gsi_mapping(void);
5+
void __init riscv_acpi_rimt_init(void);

0 commit comments

Comments
 (0)