Commit c10100a4 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio',... 

Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next
parents e0dccc3b 7fee5d6f 3168010d f066b8f7 d4ebd11f 7e62edd7 25357900 be280ea7 de026976

Documentation/admin-guide/kernel-parameters.txt

+25 −9
Original line number Diff line number Diff line
@@ -2266,23 +2266,39 @@ 


	ivrs_ioapic	[HW,X86-64]

			Provide an override to the IOAPIC-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map IOAPIC-ID decimal 10 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.

			For example:

			* To map IOAPIC-ID decimal 10 to PCI device 00:14.0

			  write the parameter as:

				ivrs_ioapic[10]=00:14.0

			* To map IOAPIC-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_hpet	[HW,X86-64]

			Provide an override to the HPET-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map HPET-ID decimal 0 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.

			For example:

			* To map HPET-ID decimal 0 to PCI device 00:14.0

			  write the parameter as:

				ivrs_hpet[0]=00:14.0

			* To map HPET-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_acpihid	[HW,X86-64]

			Provide an override to the ACPI-HID:UID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map UART-HID:UID AMD0020:0 to

			PCI device 00:14.5 write the parameter as:

			mapping provided in the IVRS ACPI table.



			For example, to map UART-HID:UID AMD0020:0 to

			PCI segment 0x1 and PCI device ID 00:14.5,

			write the parameter as:

				ivrs_acpihid[0001:00:14.5]=AMD0020:0



			By default, PCI segment is 0, and can be omitted.

			For example, PCI device 00:14.5 write the parameter as:

				ivrs_acpihid[00:14.5]=AMD0020:0



	js=		[HW,JOY] Analog joystick

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ properties: 
              - qcom,sdx55-smmu-500

              - qcom,sdx65-smmu-500

              - qcom,sm6350-smmu-500

              - qcom,sm6375-smmu-500

              - qcom,sm8150-smmu-500

              - qcom,sm8250-smmu-500

              - qcom,sm8350-smmu-500

Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

+17 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ properties: 
    items:

      - const: bclk



  mediatek,infracfg:

    $ref: /schemas/types.yaml#/definitions/phandle

    description: The phandle to the mediatek infracfg syscon



  mediatek,larbs:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    minItems: 1
@@ -167,6 +171,18 @@ allOf: 
      required:

        - power-domains



  - if:

      properties:

        compatible:

          contains:

            enum:

              - mediatek,mt2712-m4u

              - mediatek,mt8173-m4u



    then:

      required:

        - mediatek,infracfg



  - if: # The IOMMUs don't have larbs.

      not:

        properties:
@@ -191,6 +207,7 @@ examples: 
            interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>;

            clocks = <&infracfg CLK_INFRA_M4U>;

            clock-names = "bclk";

            mediatek,infracfg = <&infracfg>;

            mediatek,larbs = <&larb0>, <&larb1>, <&larb2>,

                             <&larb3>, <&larb4>, <&larb5>;

            #iommu-cells = <1>;

MAINTAINERS

+12 −2
Original line number Diff line number Diff line
@@ -10076,7 +10076,6 @@ L: iommu@lists.linux.dev 
S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

F:	drivers/iommu/intel/

F:	include/linux/intel-iommu.h

F:	include/linux/intel-svm.h









INTEL IOP-ADMA DMA DRIVER








@@ -10448,9 +10447,20 @@ T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git







F:	fs/iomap/









F:	include/linux/iomap.h

















IOMMU DRIVERS









IOMMU DMA-API LAYER









M:	Robin Murphy <robin.murphy@arm.com>









L:	iommu@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









F:	drivers/iommu/dma-iommu.c









F:	drivers/iommu/iova.c









F:	include/linux/dma-iommu.h









F:	include/linux/iova.h

















IOMMU SUBSYSTEM









M:	Joerg Roedel <joro@8bytes.org>









M:	Will Deacon <will@kernel.org>









R:	Robin Murphy <robin.murphy@arm.com>









L:	iommu@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
































arch/x86/kernel/tboot.c



+0
−15






























Original line number
Diff line number
Diff line







@@ -6,7 +6,6 @@







 * Copyright (c) 2006-2009, Intel Corporation









 */



















#include <linux/intel-iommu.h>









#include <linux/init_task.h>









#include <linux/spinlock.h>









#include <linux/export.h>








@@ -516,17 +515,3 @@ struct acpi_table_header *tboot_get_dmar_table(struct acpi_table_header *dmar_tb

















	return dmar_tbl;









}


















int tboot_force_iommu(void)









{









	if (!tboot_enabled())









		return 0;



















	if (no_iommu || dmar_disabled)









		pr_warn("Forcing Intel-IOMMU to enabled\n");



















	dmar_disabled = 0;









	no_iommu = 0;



















	return 1;









}