Commit f2ecc964 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.19a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - a small cleanup removing "export" of an __init function

 - a small series adding a new infrastructure for platform flags

 - a series adding generic virtio support for Xen guests (frontend side)

* tag 'for-linus-5.19a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: unexport __init-annotated xen_xlate_map_ballooned_pages()
  arm/xen: Assign xen-grant DMA ops for xen-grant DMA devices
  xen/grant-dma-ops: Retrieve the ID of backend's domain for DT devices
  xen/grant-dma-iommu: Introduce stub IOMMU driver
  dt-bindings: Add xen,grant-dma IOMMU description for xen-grant DMA ops
  xen/virtio: Enable restricted memory access using Xen grant mappings
  xen/grant-dma-ops: Add option to restrict memory access under Xen
  xen/grants: support allocating consecutive grants
  arm/xen: Introduce xen_setup_dma_ops()
  virtio: replace arch_has_restricted_virtio_memory_access()
  kernel: add platform_has() infrastructure
parents 7d78b7eb dbac14a5

Documentation/devicetree/bindings/iommu/xen,grant-dma.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iommu/xen,grant-dma.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Xen specific IOMMU for virtualized devices (e.g. virtio)



maintainers:

  - Stefano Stabellini <sstabellini@kernel.org>



description:

  The Xen IOMMU represents the Xen grant table interface. Grant mappings

  are to be used with devices connected to the Xen IOMMU using the "iommus"

  property, which also specifies the ID of the backend domain.

  The binding is required to restrict memory access using Xen grant mappings.



properties:

  compatible:

    const: xen,grant-dma



  '#iommu-cells':

    const: 1

    description:

      The single cell is the domid (domain ID) of the domain where the backend

      is running.



required:

  - compatible

  - "#iommu-cells"



additionalProperties: false



examples:

  - |

    iommu {

        compatible = "xen,grant-dma";

        #iommu-cells = <1>;

    };

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -15831,6 +15831,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml

F:	drivers/iio/chemical/pms7003.c









PLATFORM FEATURE INFRASTRUCTURE









M:	Juergen Gross <jgross@suse.com>









S:	Maintained









F:	arch/*/include/asm/platform-feature.h









F:	include/asm-generic/platform-feature.h









F:	include/linux/platform-feature.h









F:	kernel/platform-feature.c

















PLDMFW LIBRARY









M:	Jacob Keller <jacob.e.keller@intel.com>









S:	Maintained
































arch/arm/include/asm/xen/xen-ops.h
0 → 100644



+2
−0






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 */









#include <xen/arm/xen-ops.h>
























arch/arm/mm/dma-mapping.c



+2
−5






























Original line number
Diff line number
Diff line







@@ -33,7 +33,7 @@







#include <asm/dma-iommu.h>









#include <asm/mach/map.h>









#include <asm/system_info.h>









#include <xen/swiotlb-xen.h>









#include <asm/xen/xen-ops.h>



















#include "dma.h"









#include "mm.h"








@@ -2287,10 +2287,7 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

















	set_dma_ops(dev, dma_ops);



















#ifdef CONFIG_XEN









	if (xen_initial_domain())









		dev->dma_ops = &xen_swiotlb_dma_ops;









#endif









	xen_setup_dma_ops(dev);









	dev->archdata.dma_ops_setup = true;









}










































arch/arm/xen/enlighten.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -443,6 +443,8 @@ static int __init xen_guest_init(void)







	if (!xen_domain())









		return 0;



















	xen_set_restricted_virtio_memory_access();



















	if (!acpi_disabled)









		xen_acpi_guest_init();









	else