SMMUv3 driver and the supporting framework

This will be used as a device property to match the DMA capable devices with the associated SMMU. The header file is a port from linux. The code was changed to remove the types that were not needed for Xen.

Linux ChangeId:ce793486e23e: driver core / ACPI: Represent ACPI companions using fwnode_handle

Signed-off-by Sameer Goel <[email protected]>

---
  xen/include/asm-arm/device.h |  2 ++
  xen/include/xen/fwnode.h     | 33 +++++++++++++++++++++++++++++++++
  2 files changed, 35 insertions(+)

create mode 100644 xen/include/xen/fwnode.h

xen/include/asm-arm/device.h +1 -0

index 6734ae8..78c38fe 100644
@@ -2,6 +2,7 @@
  #define __ASM_ARM_DEVICE_H
 
  #include <xen/init.h>
+#include <xen/fwnode.h>
 
  enum device_type
  {

xen/include/asm-arm/device.h +0 -0

      struct dev_archdata archdata;
  };
 

xen/include/xen/fwnode.h new file +17 -0

new file mode 100644
index 0000000..0fed958
@@ -0,0 +1,33 @@
+/*
+ * fwnode.h - Firmware device node object handle type definition.
+ *
+ * Copyright (C) 2015, Intel Corporation
+ * Author: Rafael J. Wysocki <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Ported from Linux include/linux/fwnode.h
+ *  => commit ce793486e23e0162a732c605189c8028e0910e86
+ *
+ * No functional Xen modifications.
+ */
+
+#ifndef __XEN_FWNODE_H_

xen/include/xen/fwnode.h new file +6 -0

+struct fwnode_handle {
+	enum fwnode_type type;
+	struct fwnode_handle *secondary;
+};
+
+#endif

Hi,

Quoted 3 lines · Sameer Goel

This will be used as a device property to match the DMA capable devices with the associated SMMU. The header file is a port from linux. The code was changed to remove the types that were not needed for Xen.

I think you probably want a bit more context in the commit message about implement fwnode.h in common code.

Within this series, fwnode seems to only be used by Arm. So what would be the advantage to get that in xen/? Is it going to be used by x86 or taken advantage in common code?

Quoted 11 lines

Linux ChangeId:ce793486e23e: driver core / ACPI: Represent ACPI companions using fwnode_handle

Signed-off-by Sameer Goel <[email protected]>

---
  xen/include/asm-arm/device.h |  2 ++ xen/include/xen/fwnode.h     | 33 +++++++++++++++++++++++++++++++++

  2 files changed, 35 insertions(+)

  create mode 100644 xen/include/xen/fwnode.h

Quoted 12 lines

xen/include/asm-arm/device.h +1 -0

index 6734ae8..78c38fe 100644
@@ -2,6 +2,7 @@
   #define __ASM_ARM_DEVICE_H
     #include <xen/init.h>
+#include <xen/fwnode.h>

    enum device_type
  {

xen/include/asm-arm/device.h +0 -0

@@ -19,6 +20,7 @@ struct device
   #ifdef CONFIG_HAS_DEVICE_TREE

Quoted 1 line

      struct dt_device_node *of_node; /* Used by drivers imported from Linux */

I was expecting a todo in the code after the discussion about leave of_node here.

Quoted 2 lines

  #endif
+    struct fwnode_handle *fwnode; /*fw device node identifier */

Space missing before "fw".

Quoted 25 lines

      struct dev_archdata archdata;
  };
  diff --git a/xen/include/xen/fwnode.h b/xen/include/xen/fwnode.h new file mode 100644
index 0000000..0fed958

xen/include/xen/fwnode.h new file +17 -0

@@ -0,0 +1,33 @@
+/*
+ * fwnode.h - Firmware device node object handle type definition.
+ *
+ * Copyright (C) 2015, Intel Corporation
+ * Author: Rafael J. Wysocki <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Ported from Linux include/linux/fwnode.h
+ *  => commit ce793486e23e0162a732c605189c8028e0910e86
+ *
+ * No functional Xen modifications.
+ */
+
+#ifndef __XEN_FWNODE_H_

xen/include/xen/fwnode.h line 27

Quoted 10 lines

xen/include/xen/fwnode.h new file +10 -0

+#define __XEN_FWNODE_H_
+
+enum fwnode_type {
+    FWNODE_INVALID = 0,
+    FWNODE_OF,
+    FWNODE_ACPI,
+    FWNODE_ACPI_STATIC,
+    FWNODE_IRQCHIP
+};
+

Looking at Linux code, the fwnode_type already disappeared from Linux (see commit db3e50f3234b "device property: Get rid of struct fwnode_handle type field").

I understand the goal on using fwnode is to help porting drivers from Linux. So how much this has changed now?

Cheers,

Quoted 7 lines

xen/include/xen/fwnode.h new file +6 -0

+struct fwnode_handle {
+    enum fwnode_type type;
+    struct fwnode_handle *secondary;
+};
+
+#endif

Quoted 36 lines · Julien Grall

Quoted 3 lines · Sameer Goel

This will be used as a device property to match the DMA capable devices with the associated SMMU. The header file is a port from linux. The code was changed to remove the types that were not needed for Xen.

I think you probably want a bit more context in the commit message about implement fwnode.h in common code.

Within this series, fwnode seems to only be used by Arm. So what would be the advantage to get that in xen/? Is it going to be used by x86 or taken advantage in common code?

Quoted 22 lines

Linux ChangeId:ce793486e23e: driver core / ACPI: Represent ACPI companions using fwnode_handle

Signed-off-by Sameer Goel <[email protected]>

---
   xen/include/asm-arm/device.h |  2 ++
   xen/include/xen/fwnode.h     | 33 +++++++++++++++++++++++++++++++++
   2 files changed, 35 insertions(+)

  create mode 100644 xen/include/xen/fwnode.h

xen/include/asm-arm/device.h +1 -0

index 6734ae8..78c38fe 100644
@@ -2,6 +2,7 @@
   #define __ASM_ARM_DEVICE_H
     #include <xen/init.h>
+#include <xen/fwnode.h>
     enum device_type
   {

xen/include/asm-arm/device.h struct device · line 21

Quoted 2 lines

xen/include/asm-arm/device.h +0 -0

@@ -19,6 +20,7 @@ struct device
   #ifdef CONFIG_HAS_DEVICE_TREE
       struct dt_device_node *of_node; /* Used by drivers imported from Linux */

I was expecting a todo in the code after the discussion about leave of_node here.

Quoted 2 lines

xen/include/asm-arm/device.h struct device · line 23

Quoted 2 lines

xen/include/asm-arm/device.h +1 -0

   #endif
+    struct fwnode_handle *fwnode; /*fw device node identifier */

The fwnode handle was provide a match cookie for the SMMUs and not much else. Even with this around we will need the dt info in the device node. I agree that this rolls up into fw spec and I can look at the code cleanup for the next patch.

Hi Sameer,

Quoted 37 lines · Sameer

Quoted 36 lines · Julien Grall

Quoted 3 lines · Sameer Goel

This will be used as a device property to match the DMA capable devices with the associated SMMU. The header file is a port from linux. The code was changed to remove the types that were not needed for Xen.

I think you probably want a bit more context in the commit message about implement fwnode.h in common code.

Within this series, fwnode seems to only be used by Arm. So what would be the advantage to get that in xen/? Is it going to be used by x86 or taken advantage in common code?

Quoted 23 lines

Linux ChangeId:ce793486e23e: driver core / ACPI: Represent ACPI companions using fwnode_handle

Signed-off-by Sameer Goel <[email protected]>

---
   xen/include/asm-arm/device.h |  2 ++ xen/include/xen/fwnode.h     | 33 +++++++++++++++++++++++++++++++++

   2 files changed, 35 insertions(+)

   create mode 100644 xen/include/xen/fwnode.h

xen/include/asm-arm/device.h +1 -0

index 6734ae8..78c38fe 100644
@@ -2,6 +2,7 @@
    #define __ASM_ARM_DEVICE_H
      #include <xen/init.h>
+#include <xen/fwnode.h>

     enum device_type
   {

xen/include/asm-arm/device.h +0 -0

@@ -19,6 +20,7 @@ struct device
    #ifdef CONFIG_HAS_DEVICE_TREE

Quoted 1 line

       struct dt_device_node *of_node; /* Used by drivers imported from Linux */

I was expecting a todo in the code after the discussion about leave of_node here.

Quoted 4 lines

Quoted 2 lines

Quoted 2 lines

   #endif
+    struct fwnode_handle *fwnode; /*fw device node identifier */

The fwnode handle was provide a match cookie for the SMMUs and not much else. Even with this around we will need the dt info in the device node. I agree that this rolls up into fw spec and I can look at the code cleanup for the next patch.

A clean-up patch would be great but not necessary. What I expect is a TODO mentioning the possible clean-up.

Cheers,

Introduce a common structure to hold the fw (ACPI or DT) defined configuration for SMMU hw. The current use case is for arm SMMUs. So, making this architecture specific.

Based on Linux kernel commit 57f98d2f61e1: iommu: Introduce iommu_fwspec

Signed-off-by Sameer Goel <[email protected]>

---
  xen/drivers/passthrough/arm/iommu.c | 66 +++++++++++++++++++++++++++++++++++++
  xen/include/asm-arm/device.h        |  1 +
  xen/include/xen/iommu.h             | 29 ++++++++++++++++
  3 files changed, 96 insertions(+)

xen/drivers/passthrough/arm/iommu.c +0 -0

index 95b1abb..41c6497 100644

xen/drivers/passthrough/arm/iommu.c +6 -0

+    if ( !fwspec )
+        return -ENOMEM;
+
+    fwspec->iommu_fwnode = iommu_fwnode;
+    fwspec->ops = ops;
+    dev->iommu_fwspec = fwspec;

xen/drivers/passthrough/arm/iommu.c +9 -0

+        xfree(fwspec);
+        dev->iommu_fwspec = NULL;
+    }
+}
+
+int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+    struct iommu_fwspec *fwspec_n = NULL;

xen/drivers/passthrough/arm/iommu.c +15 -0

+        if ( !fwspec_n )
+            return -ENOMEM;
+
+        memcpy(fwspec_n, fwspec, size);
+        xfree(fwspec);
+    }
+
+    for (i = 0; i < num_ids; i++)
+        fwspec_n->ids[fwspec_n->num_ids + i] = ids[i];
+
+    fwspec_n->num_ids += num_ids;
+    dev->iommu_fwspec = fwspec_n;
+
+    return 0;
+}

xen/include/asm-arm/device.h +1 -0

index 78c38fe..5027c87 100644
@@ -21,6 +21,7 @@ struct device
      struct dt_device_node *of_node; /* Used by drivers imported from Linux */
  #endif
      struct fwnode_handle *fwnode; /*fw device node identifier */
+    struct iommu_fwspec *iommu_fwspec;
      struct dev_archdata archdata;
  };
 

xen/include/xen/iommu.h +0 -0

index 0dac4f3..34e8d68 100644

xen/include/xen/iommu.h +14 -0

+/**
+ * struct iommu_fwspec - per-device IOMMU instance data
+ * @ops: ops for this device's IOMMU
+ * @iommu_fwnode: firmware handle for this device's IOMMU
+ * @iommu_priv: IOMMU driver private data for this device
+ * @num_ids: number of associated device IDs
+ * @ids: IDs which this device may present to the IOMMU
+ */
+struct iommu_fwspec {
+    const struct iommu_ops *ops;
+    struct fwnode_handle   *iommu_fwnode;
+    void                   *iommu_priv;
+    unsigned int           num_ids;
+    u32                    ids[1];

Hi,

Quoted 23 lines · Sameer Goel

Introduce a common structure to hold the fw (ACPI or DT) defined configuration for SMMU hw. The current use case is for arm SMMUs. So, making this architecture specific.

Based on Linux kernel commit 57f98d2f61e1: iommu: Introduce iommu_fwspec

Signed-off-by Sameer Goel <[email protected]>

---
  xen/drivers/passthrough/arm/iommu.c | 66
+++++++++++++++++++++++++++++++++++++
  xen/include/asm-arm/device.h        |  1 + xen/include/xen/iommu.h             | 29 ++++++++++++++++

  3 files changed, 96 insertions(+)

xen/drivers/passthrough/arm/iommu.c +2 -0

index 95b1abb..41c6497 100644
@@ -73,3 +73,69 @@ int arch_iommu_populate_page_table(struct domain *d)
       /* The IOMMU shares the p2m with the CPU */
       return -ENOSYS;
   }
+
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle 

Quoted 3 lines

*fwnode)
+{
+    return iommu_get_ops();

Can you please add a comment explain why you always return iommu_get_ops()?

Would it be possible that the device is not behind an IOMMU?

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d) · line 90

Quoted 12 lines

xen/drivers/passthrough/arm/iommu.c +3 -0

+}
+
+int iommu_fwspec_init(struct device *dev, struct fwnode_handle 

*iommu_fwnode,
+        const struct iommu_ops *ops)

xen/drivers/passthrough/arm/iommu.c +7 -0

+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+
+    if ( fwspec )
+        return ops == fwspec->ops ? 0 : -EINVAL;
+
+    fwspec = _xzalloc(sizeof(struct iommu_fwspec), sizeof(void *));

On the previous version this was xzalloc(struct iommu_fwspec), why?

I also don't understand the align on sizeof(void *).

Quoted 6 lines

+    if ( !fwspec )
+        return -ENOMEM;

xen/drivers/passthrough/arm/iommu.c +4 -0

+
+    fwspec->iommu_fwnode = iommu_fwnode;
+    fwspec->ops = ops;
+    dev->iommu_fwspec = fwspec;

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d) · line 106

Quoted 10 lines

xen/drivers/passthrough/arm/iommu.c +10 -0

+
+    return 0;
+}
+
+void iommu_fwspec_free(struct device *dev)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+
+    if ( fwspec )
+    {

Linux is dropping the reference on the iommu_fwnode. Are we never expecting to take reference on the it in Xen?

Quoted 14 lines

+        xfree(fwspec);
+        dev->iommu_fwspec = NULL;
+    }

xen/drivers/passthrough/arm/iommu.c +11 -0

+}
+
+int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+    struct iommu_fwspec *fwspec_n = NULL;
+    size_t size, size_n;
+    int i;
+
+    if ( !fwspec )
+        return -EINVAL;

Quoted 6 lines

+
+    size = offsetof(struct iommu_fwspec, ids[fwspec->num_ids]); +    size_n = offsetof(struct iommu_fwspec, ids[fwspec->num_ids + num_ids]);
+    if ( size_n > size )
+    { > +        fwspec_n = _xzalloc(size_n, sizeof(void *));

Same question about _xzalloc() here.

Hi,

Quoted 17 lines · Sameer Goel

Introduce a common structure to hold the fw (ACPI or DT) defined configuration for SMMU hw. The current use case is for arm SMMUs. So, making this architecture specific.

Based on Linux kernel commit 57f98d2f61e1: iommu: Introduce iommu_fwspec

Signed-off-by Sameer Goel <[email protected]>

---
  xen/drivers/passthrough/arm/iommu.c | 66 +++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/device.h        |  1 + xen/include/xen/iommu.h             | 29 ++++++++++++++++

  3 files changed, 96 insertions(+)

xen/drivers/passthrough/arm/iommu.c +0 -0

index 95b1abb..41c6497 100644

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d) · line 79

Quoted 7 lines

xen/drivers/passthrough/arm/iommu.c +4 -0

@@ -73,3 +73,69 @@ int arch_iommu_populate_page_table(struct domain *d)
       /* The IOMMU shares the p2m with the CPU */
       return -ENOSYS;
   }
+
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
+{
+    return iommu_get_ops();

Can you please add a comment explain why you always return iommu_get_ops()?

Would it be possible that the device is not behind an IOMMU?

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d) · line 90

Quoted 12 lines

xen/drivers/passthrough/arm/iommu.c +11 -0

+}
+
+int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
+        const struct iommu_ops *ops)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+
+    if ( fwspec )
+        return ops == fwspec->ops ? 0 : -EINVAL;
+
+    fwspec = _xzalloc(sizeof(struct iommu_fwspec), sizeof(void *));

On the previous version this was xzalloc(struct iommu_fwspec), why?

I also don't understand the align on sizeof(void *).

Quoted 11 lines

xen/drivers/passthrough/arm/iommu.c +10 -0

+    if ( !fwspec )
+        return -ENOMEM;
+
+    fwspec->iommu_fwnode = iommu_fwnode;
+    fwspec->ops = ops;
+    dev->iommu_fwspec = fwspec;
+
+    return 0;
+}
+

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d) · line 106

Quoted 6 lines

xen/drivers/passthrough/arm/iommu.c +6 -0

+void iommu_fwspec_free(struct device *dev)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+
+    if ( fwspec )
+    {

Linux is dropping the reference on the iommu_fwnode. Are we never expecting to take reference on the it in Xen?

Quoted 14 lines

xen/drivers/passthrough/arm/iommu.c +13 -0

+        xfree(fwspec);
+        dev->iommu_fwspec = NULL;
+    }
+}
+
+int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
+{
+    struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+    struct iommu_fwspec *fwspec_n = NULL;
+    size_t size, size_n;
+    int i;
+
+    if ( !fwspec )

xen/drivers/passthrough/arm/iommu.c int arch_iommu_populate_page_table(struct domain *d)

Quoted 6 lines

xen/drivers/passthrough/arm/iommu.c +6 -0

+        return -EINVAL;
+
+    size = offsetof(struct iommu_fwspec, ids[fwspec->num_ids]);
+    size_n = offsetof(struct iommu_fwspec, ids[fwspec->num_ids + num_ids]);
+    if ( size_n > size )
+    { > +        fwspec_n = _xzalloc(size_n, sizeof(void *));

Same question about _xzalloc() here.

Quoted 33 lines

xen/drivers/passthrough/arm/iommu.c +15 -0

+        if ( !fwspec_n )
+            return -ENOMEM;
+
+        memcpy(fwspec_n, fwspec, size);
+        xfree(fwspec);
+    }
+
+    for (i = 0; i < num_ids; i++)
+        fwspec_n->ids[fwspec_n->num_ids + i] = ids[i];
+
+    fwspec_n->num_ids += num_ids;
+    dev->iommu_fwspec = fwspec_n;
+
+    return 0;
+}

xen/include/asm-arm/device.h +0 -0

index 78c38fe..5027c87 100644
@@ -21,6 +21,7 @@ struct device

      struct dt_device_node *of_node; /* Used by drivers imported from Linux */ #endif
      struct fwnode_handle *fwnode; /*fw device node identifier */ +    struct iommu_fwspec *iommu_fwspec;
      struct dev_archdata archdata;
  };
  diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 0dac4f3..34e8d68 100644

xen/include/xen/iommu.h +0 -0

@@ -208,4 +208,33 @@ DECLARE_PER_CPU(bool_t, iommu_dont_flush_iotlb);
   extern struct spinlock iommu_pt_cleanup_lock;
   extern struct page_list_head iommu_pt_cleanup_list;

xen/include/xen/iommu.h DECLARE_PER_CPU(bool_t, iommu_dont_flush_iotlb); · line 216

Quoted 6 lines

  +/**
+ * Following block was ported from Linux to help with the implementation of
+ * arm64 iommu devices. Hence the architecture specific compile
+ */

xen/include/xen/iommu.h +2 -0

+
+#if defined(CONFIG_ARM)

If it is Arm only, then it should be moved in asm-arm/iommu.h.

Quoted 24 lines

xen/include/xen/iommu.h +23 -0

+/**
+ * struct iommu_fwspec - per-device IOMMU instance data
+ * @ops: ops for this device's IOMMU
+ * @iommu_fwnode: firmware handle for this device's IOMMU
+ * @iommu_priv: IOMMU driver private data for this device
+ * @num_ids: number of associated device IDs
+ * @ids: IDs which this device may present to the IOMMU
+ */
+struct iommu_fwspec {
+    const struct iommu_ops *ops;
+    struct fwnode_handle   *iommu_fwnode;
+    void                   *iommu_priv;
+    unsigned int           num_ids;
+    u32                    ids[1];
+};
+
+int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode,
+              const struct iommu_ops *ops);
+void iommu_fwspec_free(struct device *dev);
+int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids);
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode);
+
+#endif

Quoted 2 lines

  #endif /* _IOMMU_H_ */

Cheers,

Add support for parsing IORT table to initialize SMMU devices.
* The code for creating an SMMU device has been modified, so that the SMMU device can be initialized.
* The NAMED NODE code has been commented out as this will need DOM0 kernel support.
* ITS code has been included but it has not been tested.

Signed-off-by Sameer Goel <[email protected]>

---
  xen/arch/arm/setup.c               |   3 +
  xen/drivers/acpi/Makefile          |   1 +
  xen/drivers/acpi/arm/Makefile      |   1 +
  xen/drivers/acpi/arm/iort.c        | 173 +++++++++++++++++++++----------------
  xen/drivers/passthrough/arm/smmu.c |   1 +
  xen/include/acpi/acpi_iort.h       |  17 ++--
  xen/include/asm-arm/device.h       |   2 +
  xen/include/xen/acpi.h             |  21 +++++
  xen/include/xen/pci.h              |   8 ++
  9 files changed, 146 insertions(+), 81 deletions(-)

create mode 100644 xen/drivers/acpi/arm/Makefile

xen/arch/arm/setup.c +3 -0

index 92f173b..4ba09b2 100644
@@ -49,6 +49,7 @@
  #include <asm/setup.h>
  #include <xsm/xsm.h>
  #include <asm/acpi.h>
+#include <acpi/acpi_iort.h>
 
  struct bootinfo __initdata bootinfo;
 

@@ -796,6 +797,8 @@ void __init start_xen(unsigned long boot_phys_offset,
 
      tasklet_subsys_init();
 
+    /* Parse the ACPI iort data */
+    acpi_iort_init();
 
      xsm_dt_init();
 

xen/drivers/acpi/Makefile +1 -0

index 444b11d..e7ffd82 100644
@@ -1,5 +1,6 @@
  subdir-y += tables
  subdir-y += utilities
+subdir-$(CONFIG_ARM) += arm
  subdir-$(CONFIG_X86) += apei
 
  obj-bin-y += tables.init.o

xen/drivers/acpi/arm/Makefile new file +1 -0

new file mode 100644
index 0000000..7c039bb
@@ -0,0 +1 @@
+obj-y += iort.o

xen/drivers/acpi/arm/iort.c +99 -74

index 2e368a6..7f54062 100644
@@ -14,17 +14,47 @@
   * This file implements early detection/parsing of I/O mapping
   * reported to OS through firmware via I/O Remapping Table (IORT)
   * IORT document number: ARM DEN 0049A
+ *
+ * Based on Linux drivers/acpi/arm64/iort.c
+ * => commit ca78d3173cff3503bcd15723b049757f75762d15
+ *
+ * Xen modification:
+ * Sameer Goel <[email protected]>
+ * Copyright (C) 2017, The Linux Foundation, All rights reserved.
+ *
   */
 
-#define pr_fmt(fmt)	"ACPI: IORT: " fmt
-
-#include <linux/acpi_iort.h>
-#include <linux/iommu.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
+#include <xen/acpi.h>
+#include <acpi/acpi_iort.h>
+#include <xen/fwnode.h>
+#include <xen/iommu.h>
+#include <xen/lib.h>
+#include <xen/list.h>
+#include <xen/pci.h>
+
+#include <asm/device.h>
+
+/* Xen: Define compatibility functions */
+#define FW_BUG		"[Firmware Bug]: "
+#define pr_err(fmt, ...) printk(XENLOG_ERR fmt, ## __VA_ARGS__)
+#define pr_warn(fmt, ...) printk(XENLOG_WARNING fmt, ## __VA_ARGS__)
+
+/* Alias to Xen allocation helpers */
+#define kfree xfree
+#define kmalloc(size, flags)            _xmalloc(size, sizeof(void *))
+#define kzalloc(size, flags)            _xzalloc(size, sizeof(void *))
+
+/* Redefine WARN macros */
+#undef WARN
+#undef WARN_ON
+#define WARN(condition, format...) ({					\
+	int __ret_warn_on = !!(condition);				\
+	if (unlikely(__ret_warn_on))					\
+		printk(format);						\
+	unlikely(__ret_warn_on);					\
+})
+#define WARN_TAINT(cond, taint, format...) WARN(cond, format)
+#define WARN_ON(cond)                      (!!cond)
 
  #define IORT_TYPE_MASK(type)	(1 << (type))
  #define IORT_MSI_TYPE		(1 << ACPI_IORT_NODE_ITS_GROUP)

@@ -256,6 +286,13 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
  	acpi_status status;
 
  	if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT) {
+		status = AE_NOT_IMPLEMENTED;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0
  		struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
  		struct acpi_device *adev = to_acpi_device_node(dev->fwnode);
  		struct acpi_iort_named_component *ncomp;

@@ -275,11 +312,12 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
  		status = !strcmp(ncomp->device_name, buf.pointer) ?
  							AE_OK : AE_NOT_FOUND;
  		acpi_os_free(buf.pointer);
+#endif
  	} else if (node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {
  		struct acpi_iort_root_complex *pci_rc;
-		struct pci_bus *bus;
+		struct pci_dev *pci_dev;
 
-		bus = to_pci_bus(dev);
+		pci_dev = to_pci_dev(dev);
  		pci_rc = (struct acpi_iort_root_complex *)node->node_data;
 
  		/*

@@ -287,12 +325,11 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
  		 * with root complexes. Each segment number can represent only
  		 * one root complex.
  		 */
-		status = pci_rc->pci_segment_number == pci_domain_nr(bus) ?
+		status = pci_rc->pci_segment_number == pci_domain_nr(pci_dev) ?
  							AE_OK : AE_NOT_FOUND;
  	} else {
  		status = AE_NOT_FOUND;
  	}
-out:
  	return status;
  }
 

@@ -320,6 +357,11 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,
  	return 0;
  }
 
+/*
+ * Named components are not supported yet so we do not need the
+ * iort_node_get_id function
+ */
+#if 0
  static
  struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
  					u32 *id_out, u8 type_mask,

@@ -358,6 +400,7 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
 
  	return NULL;
  }
+#endif
 
  static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node,
  						u32 rid_in, u32 *rid_out,

@@ -410,6 +453,10 @@ fail_map:
  	return NULL;
  }
 
+/* Xen: Comment out the NamedComponent and ITS mapping code till the support
+ * is available.
+ */
+#if 0
  static struct acpi_iort_node *iort_find_dev_node(struct device *dev)
  {
  	struct pci_bus *pbus;

@@ -481,7 +528,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,
  	return 0;
  }
 
-/**
+/*
   * iort_get_device_domain() - Find MSI domain related to a device
   * @dev: The device.
   * @req_id: Requester ID for the device.

@@ -510,7 +557,7 @@ static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data)
  	*rid = alias;
  	return 0;
  }
-
+#endif
  static int arm_smmu_iort_xlate(struct device *dev, u32 streamid,
  			       struct fwnode_handle *fwnode,
  			       const struct iommu_ops *ops)

@@ -546,6 +593,7 @@ static const struct iommu_ops *iort_iommu_xlate(struct device *dev,
  	return ret ? NULL : ops;
  }
 
+#if 0 /* Xen: We do not need this function for Xen */
  /**
   * iort_set_dma_mask - Set-up dma mask for a device.
   *

@@ -567,7 +615,7 @@ void iort_set_dma_mask(struct device *dev)
  	if (!dev->dma_mask)
  		dev->dma_mask = &dev->coherent_dma_mask;
  }
-
+#endif
  /**
   * iort_iommu_configure - Set-up IOMMU configuration for a device.
   *

@@ -583,14 +631,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
  	u32 streamid = 0;
 
  	if (dev_is_pci(dev)) {
-		struct pci_bus *bus = to_pci_dev(dev)->bus;
+		struct pci_dev *pci_device = to_pci_dev(dev);
  		u32 rid;
 
-		pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid,
-				       &rid);
+		rid = PCI_BDF2(pci_device->bus, pci_device->devfn);
 
  		node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,
-				      iort_match_node_callback, &bus->dev);
+				      iort_match_node_callback, dev);
  		if (!node)
  			return NULL;
 

@@ -600,6 +647,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
  		ops = iort_iommu_xlate(dev, parent, streamid);
 
  	} else {
+		return NULL;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0
  		int i = 0;
 
  		node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT,

@@ -616,11 +670,17 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
  			parent = iort_node_get_id(node, &streamid,
  						  IORT_IOMMU_TYPE, i++);
  		}
+#endif
  	}
 
  	return ops;
  }
 
+/*
+ * Xen: Not using the parsing ops for now. Need to check and see if it will
+ * be useful to use these in some form, or let the driver parse IORT node.
+ */
+#if 0
  static void __init acpi_iort_register_irq(int hwirq, const char *name,
  					  int trigger,
  					  struct resource *res)

@@ -807,7 +867,7 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
  		return NULL;
  	}
  }
-
+#endif
  /**
   * iort_add_smmu_platform_device() - Allocate a platform device for SMMU
   * @node: Pointer to SMMU ACPI IORT node

@@ -817,78 +877,42 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
  static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node)
  {
  	struct fwnode_handle *fwnode;
-	struct platform_device *pdev;
-	struct resource *r;
-	enum dev_dma_attr attr;
-	int ret, count;
-	const struct iort_iommu_config *ops = iort_get_iommu_cfg(node);
-
-	if (!ops)
-		return -ENODEV;
-
-	pdev = platform_device_alloc(ops->name, PLATFORM_DEVID_AUTO);
-	if (!pdev)
-		return -ENOMEM;
-
-	count = ops->iommu_count_resources(node);
-
-	r = kcalloc(count, sizeof(*r), GFP_KERNEL);
-	if (!r) {
-		ret = -ENOMEM;
-		goto dev_put;
-	}
-
-	ops->iommu_init_resources(r, node);
+	struct device *dev;
+	int ret;
 
-	ret = platform_device_add_resources(pdev, r, count);
  	/*
-	 * Resources are duplicated in platform_device_add_resources,
-	 * free their allocated memory
+	 * Not enabling the parsing ops for now. The corresponding driver
+	 * can parse this information as needed, so deleting relevant code as
+	 * compared to base revision.
  	 */
-	kfree(r);
 
-	if (ret)
-		goto dev_put;
+	dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+	if (!dev)
+		return -ENOMEM;
 
  	/*
  	 * Add a copy of IORT node pointer to platform_data to
  	 * be used to retrieve IORT data information.
  	 */
-	ret = platform_device_add_data(pdev, &node, sizeof(node));
-	if (ret)
-		goto dev_put;
-
-	/*
-	 * We expect the dma masks to be equivalent for
-	 * all SMMUs set-ups
-	 */
-	pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+	dev->type = DEV_ACPI;
+	dev->acpi_node = node;
 
  	fwnode = iort_get_fwnode(node);
 
  	if (!fwnode) {
  		ret = -ENODEV;
-		goto dev_put;
+		goto error;
  	}
 
-	pdev->dev.fwnode = fwnode;
-
-	attr = ops->iommu_is_coherent(node) ?
-			     DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;
-
-	/* Configure DMA for the page table walker */
-	acpi_dma_configure(&pdev->dev, attr);
+	dev->fwnode = fwnode;
 
-	ret = platform_device_add(pdev);
-	if (ret)
-		goto dma_deconfigure;
+	/* Call the acpi init functions for IOMMU devices */
+	ret = acpi_device_init(DEVICE_IOMMU, (void *)dev, node->type);
 
  	return 0;
 
-dma_deconfigure:
-	acpi_dma_deconfigure(&pdev->dev);
-dev_put:
-	platform_device_put(pdev);
+error:
+	kfree(dev);
 
  	return ret;
  }

@@ -957,5 +981,6 @@ void __init acpi_iort_init(void)
 
  	iort_init_platform_devices();
 
-	acpi_probe_device_table(iort);
+	/* Xen; Do not need a device table probe */
+	/* acpi_probe_device_table(iort);*/
  }

xen/drivers/passthrough/arm/smmu.c +1 -0

index 362d578..ad956d5 100644
@@ -181,6 +181,7 @@ static void __iomem *devm_ioremap_resource(struct device *dev,
   * Xen: PCI functions
   * TODO: It should be implemented when PCI will be supported
   */
+#undef to_pci_dev
  #define to_pci_dev(dev)	(NULL)
  static inline int pci_for_each_dma_alias(struct pci_dev *pdev,
  					 int (*fn) (struct pci_dev *pdev,

xen/include/acpi/acpi_iort.h +10 -7

index 77e0809..d4315a4 100644
@@ -19,27 +19,32 @@
  #ifndef __ACPI_IORT_H__
  #define __ACPI_IORT_H__
 
-#include <linux/acpi.h>
-#include <linux/fwnode.h>
-#include <linux/irqdomain.h>
+#include <xen/acpi.h>
+#include <asm/device.h>
 
+/* Xen: Not using IORT IRQ bindings */
+#if 0
  #define IORT_IRQ_MASK(irq)		(irq & 0xffffffffULL)
  #define IORT_IRQ_TRIGGER_MASK(irq)	((irq >> 32) & 0xffffffffULL)
 
  int iort_register_domain_token(int trans_id, struct fwnode_handle *fw_node);
  void iort_deregister_domain_token(int trans_id);
  struct fwnode_handle *iort_find_domain_token(int trans_id);
-#ifdef CONFIG_ACPI_IORT
+#endif
+#ifdef CONFIG_ARM_64
  void acpi_iort_init(void);
  bool iort_node_match(u8 type);
+#if 0
  u32 iort_msi_map_rid(struct device *dev, u32 req_id);
  struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id);
  /* IOMMU interface */
  void iort_set_dma_mask(struct device *dev);
+#endif
  const struct iommu_ops *iort_iommu_configure(struct device *dev);
  #else
  static inline void acpi_iort_init(void) { }
  static inline bool iort_node_match(u8 type) { return false; }
+#if 0
  static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id)
  { return req_id; }
  static inline struct irq_domain *iort_get_device_domain(struct device *dev,

@@ -47,12 +52,10 @@ static inline struct irq_domain *iort_get_device_domain(struct device *dev,
  { return NULL; }
  /* IOMMU interface */
  static inline void iort_set_dma_mask(struct device *dev) { }
+#endif
  static inline
  const struct iommu_ops *iort_iommu_configure(struct device *dev)
  { return NULL; }
  #endif
 
-#define IORT_ACPI_DECLARE(name, table_id, fn)		\
-	ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn)
-
  #endif /* __ACPI_IORT_H__ */

xen/include/asm-arm/device.h +2 -0

index 5027c87..4eef9ce 100644
@@ -7,6 +7,7 @@
  enum device_type
  {
      DEV_DT,
+    DEV_ACPI,
  };
 
  struct dev_archdata {

@@ -20,6 +21,7 @@ struct device
  #ifdef CONFIG_HAS_DEVICE_TREE
      struct dt_device_node *of_node; /* Used by drivers imported from Linux */
  #endif
+    void *acpi_node; /*Current use case is acpi_iort_node */
      struct fwnode_handle *fwnode; /*fw device node identifier */
      struct iommu_fwspec *iommu_fwspec;
      struct dev_archdata archdata;

xen/include/xen/acpi.h +21 -0

index 9409350..2f6aae1 100644
@@ -32,6 +32,7 @@
 
  #include <acpi/acpi.h>
  #include <asm/acpi.h>
+#include <xen/fwnode.h>
 
  #define ACPI_MADT_GET_(fld, x) (((x) & ACPI_MADT_##fld##_MASK) / \
  	(ACPI_MADT_##fld##_MASK & -ACPI_MADT_##fld##_MASK))

@@ -49,6 +50,26 @@
                  (!(entry)) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||  \
                  (entry)->header.length < sizeof(*(entry)))
 
+static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
+{
+	struct fwnode_handle *fwnode;
+
+	fwnode = xzalloc(struct fwnode_handle);
+	if (!fwnode)
+		return NULL;
+
+	fwnode->type = FWNODE_ACPI_STATIC;
+
+	return fwnode;
+}
+
+static inline void acpi_free_fwnode_static(struct fwnode_handle *fwnode)
+{
+	if (!fwnode || fwnode->type != FWNODE_ACPI_STATIC)
+		return;
+
+	xfree(fwnode);
+}
  #ifdef CONFIG_ACPI
 
  enum acpi_interrupt_id {

xen/include/xen/pci.h +3 -0

index 43f2125..182b1a5 100644
@@ -92,8 +92,16 @@ struct pci_dev {
  #define PT_FAULT_THRESHOLD 10
      } fault;
      u64 vf_rlen[6];
+#ifdef CONFIG_ARM
+    struct device dev;
+#endif

Hi Sameer,

Quoted 6 lines · Sameer Goel

Add support for parsing IORT table to initialize SMMU devices.
* The code for creating an SMMU device has been modified, so that the SMMU device can be initialized.
* The NAMED NODE code has been commented out as this will need DOM0 kernel support.
* ITS code has been included but it has not been tested.

Could you please refactor this patch into another set of two patches. I am planning to rebase my IORT for Dom0 Hiding patch rework on this patch.

Thanks,
Manish

Quoted 480 lines

Signed-off-by Sameer Goel <[email protected]>

---
  xen/arch/arm/setup.c               |   3 + xen/drivers/acpi/Makefile          |   1 + xen/drivers/acpi/arm/Makefile      |   1 + xen/drivers/acpi/arm/iort.c        | 173 +++++++++++++++++++++---------------- xen/drivers/passthrough/arm/smmu.c |   1 + xen/include/acpi/acpi_iort.h       |  17 ++-- xen/include/asm-arm/device.h       |   2 +
  xen/include/xen/acpi.h             |  21 +++++ xen/include/xen/pci.h              |   8 ++

  9 files changed, 146 insertions(+), 81 deletions(-)

  create mode 100644 xen/drivers/acpi/arm/Makefile

xen/arch/arm/setup.c +1 -0

index 92f173b..4ba09b2 100644
@@ -49,6 +49,7 @@
   #include <asm/setup.h>
   #include <xsm/xsm.h>
   #include <asm/acpi.h>
+#include <acpi/acpi_iort.h>
     struct bootinfo __initdata bootinfo;
   @@ -796,6 +797,8 @@ void __init start_xen(unsigned long boot_phys_offset,
         tasklet_subsys_init();

  +    /* Parse the ACPI iort data */
+    acpi_iort_init();
        xsm_dt_init();
  diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index 444b11d..e7ffd82 100644

xen/drivers/acpi/Makefile +0 -0

@@ -1,5 +1,6 @@

  subdir-y += tables
  subdir-y += utilities
+subdir-$(CONFIG_ARM) += arm
  subdir-$(CONFIG_X86) += apei
    obj-bin-y += tables.init.o

xen/drivers/acpi/arm/Makefile new file +1 -0

new file mode 100644
index 0000000..7c039bb
@@ -0,0 +1 @@
+obj-y += iort.o

xen/drivers/acpi/arm/iort.c +8 -0

index 2e368a6..7f54062 100644
@@ -14,17 +14,47 @@
    * This file implements early detection/parsing of I/O mapping
    * reported to OS through firmware via I/O Remapping Table (IORT)
    * IORT document number: ARM DEN 0049A
+ *
+ * Based on Linux drivers/acpi/arm64/iort.c
+ * => commit ca78d3173cff3503bcd15723b049757f75762d15
+ *
+ * Xen modification:
+ * Sameer Goel <[email protected]>
+ * Copyright (C) 2017, The Linux Foundation, All rights reserved.
+ *
    */

  -#define pr_fmt(fmt)    "ACPI: IORT: " fmt

xen/drivers/acpi/arm/iort.c +31 -8

-
-#include <linux/acpi_iort.h>
-#include <linux/iommu.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
+#include <xen/acpi.h>
+#include <acpi/acpi_iort.h>
+#include <xen/fwnode.h>
+#include <xen/iommu.h>
+#include <xen/lib.h>
+#include <xen/list.h>
+#include <xen/pci.h>
+
+#include <asm/device.h>
+
+/* Xen: Define compatibility functions */
+#define FW_BUG        "[Firmware Bug]: "
+#define pr_err(fmt, ...) printk(XENLOG_ERR fmt, ## __VA_ARGS__)
+#define pr_warn(fmt, ...) printk(XENLOG_WARNING fmt, ## __VA_ARGS__)
+
+/* Alias to Xen allocation helpers */
+#define kfree xfree
+#define kmalloc(size, flags)            _xmalloc(size, sizeof(void *))
+#define kzalloc(size, flags)            _xzalloc(size, sizeof(void *))
+
+/* Redefine WARN macros */
+#undef WARN
+#undef WARN_ON
+#define WARN(condition, format...) ({                    \
+    int __ret_warn_on = !!(condition);                \
+    if (unlikely(__ret_warn_on))                    \
+        printk(format);                        \
+    unlikely(__ret_warn_on);                    \
+})
+#define WARN_TAINT(cond, taint, format...) WARN(cond, format)
+#define WARN_ON(cond)                      (!!cond)

    #define IORT_TYPE_MASK(type)    (1 << (type)) #define IORT_MSI_TYPE        (1 << ACPI_IORT_NODE_ITS_GROUP)

xen/drivers/acpi/arm/iort.c +7 -0

@@ -256,6 +286,13 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
       acpi_status status;
         if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT) {
+        status = AE_NOT_IMPLEMENTED;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0
           struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
           struct acpi_device *adev = to_acpi_device_node(dev->fwnode);
           struct acpi_iort_named_component *ncomp;

@@ -275,11 +312,12 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,

          status = !strcmp(ncomp->device_name, buf.pointer) ? AE_OK : AE_NOT_FOUND; acpi_os_free(buf.pointer);
+#endif
      } else if (node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) { struct acpi_iort_root_complex *pci_rc;
-        struct pci_bus *bus;
+        struct pci_dev *pci_dev;
  -        bus = to_pci_bus(dev);
+        pci_dev = to_pci_dev(dev);
          pci_rc = (struct acpi_iort_root_complex *)node->node_data; /*

xen/drivers/acpi/arm/iort.c +1 -2

@@ -287,12 +325,11 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
            * with root complexes. Each segment number can represent only
            * one root complex.
            */
-        status = pci_rc->pci_segment_number == pci_domain_nr(bus) ?
+        status = pci_rc->pci_segment_number == pci_domain_nr(pci_dev) ?
                               AE_OK : AE_NOT_FOUND;
       } else {
           status = AE_NOT_FOUND;
       }
-out:
       return status;
   }
   @@ -320,6 +357,11 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,

      return 0;
  }
  +/*
+ * Named components are not supported yet so we do not need the
+ * iort_node_get_id function
+ */
+#if 0
  static
  struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, u32 *id_out, u8 type_mask,

xen/drivers/acpi/arm/iort.c +1 -0

@@ -358,6 +400,7 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
         return NULL;
   }
+#endif
     static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node,
                           u32 rid_in, u32 *rid_out,

@@ -410,6 +453,10 @@ fail_map:
       return NULL;
   }

  +/* Xen: Comment out the NamedComponent and ITS mapping code till the support
+ * is available.
+ */
+#if 0
  static struct acpi_iort_node *iort_find_dev_node(struct device *dev) {
      struct pci_bus *pbus;

xen/drivers/acpi/arm/iort.c +0 -0

@@ -481,7 +528,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,
       return 0;
   }

  -/**
+/*
   * iort_get_device_domain() - Find MSI domain related to a device
   * @dev: The device.
   * @req_id: Requester ID for the device.

xen/drivers/acpi/arm/iort.c +1 -1

@@ -510,7 +557,7 @@ static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data)
       *rid = alias;
       return 0;
   }
-
+#endif
   static int arm_smmu_iort_xlate(struct device *dev, u32 streamid,
                      struct fwnode_handle *fwnode,
                      const struct iommu_ops *ops)

@@ -546,6 +593,7 @@ static const struct iommu_ops *iort_iommu_xlate(struct device *dev,
       return ret ? NULL : ops;
   }

  +#if 0 /* Xen: We do not need this function for Xen */ /**
   * iort_set_dma_mask - Set-up dma mask for a device. *

xen/drivers/acpi/arm/iort.c +11 -4

@@ -567,7 +615,7 @@ void iort_set_dma_mask(struct device *dev)
       if (!dev->dma_mask)
           dev->dma_mask = &dev->coherent_dma_mask;
   }
-
+#endif
   /**
    * iort_iommu_configure - Set-up IOMMU configuration for a device.
    *

@@ -583,14 +631,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
       u32 streamid = 0;
         if (dev_is_pci(dev)) {
-        struct pci_bus *bus = to_pci_dev(dev)->bus;
+        struct pci_dev *pci_device = to_pci_dev(dev);
           u32 rid;
   -        pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid,
-                       &rid);
+        rid = PCI_BDF2(pci_device->bus, pci_device->devfn);
             node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,
-                      iort_match_node_callback, &bus->dev);
+                      iort_match_node_callback, dev);
           if (!node)
               return NULL;
   @@ -600,6 +647,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
           ops = iort_iommu_xlate(dev, parent, streamid);
         } else {
+        return NULL;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0

          int i = 0;
            node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT,

xen/drivers/acpi/arm/iort.c +1 -0

@@ -616,11 +670,17 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
               parent = iort_node_get_id(node, &streamid,
                             IORT_IOMMU_TYPE, i++);
           }
+#endif
       }
         return ops;
   }

  +/*
+ * Xen: Not using the parsing ops for now. Need to check and see if it will
+ * be useful to use these in some form, or let the driver parse IORT node.
+ */
+#if 0
  static void __init acpi_iort_register_irq(int hwirq, const char *name, int trigger,
                        struct resource *res)

xen/drivers/acpi/arm/iort.c +15 -45

@@ -807,7 +867,7 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
           return NULL;
       }
   }
-
+#endif
   /**
    * iort_add_smmu_platform_device() - Allocate a platform device for SMMU
    * @node: Pointer to SMMU ACPI IORT node

@@ -817,78 +877,42 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
   static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node)
   {
       struct fwnode_handle *fwnode;
-    struct platform_device *pdev;
-    struct resource *r;
-    enum dev_dma_attr attr;
-    int ret, count;
-    const struct iort_iommu_config *ops = iort_get_iommu_cfg(node);
-
-    if (!ops)
-        return -ENODEV;
-
-    pdev = platform_device_alloc(ops->name, PLATFORM_DEVID_AUTO);
-    if (!pdev)
-        return -ENOMEM;
-
-    count = ops->iommu_count_resources(node);
-
-    r = kcalloc(count, sizeof(*r), GFP_KERNEL);
-    if (!r) {
-        ret = -ENOMEM;
-        goto dev_put;
-    }
-
-    ops->iommu_init_resources(r, node);
+    struct device *dev;
+    int ret;
   -    ret = platform_device_add_resources(pdev, r, count);
       /*
-     * Resources are duplicated in platform_device_add_resources,
-     * free their allocated memory
+     * Not enabling the parsing ops for now. The corresponding driver
+     * can parse this information as needed, so deleting relevant code as
+     * compared to base revision.
        */
-    kfree(r);
   -    if (ret)
-        goto dev_put;
+    dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+    if (!dev)
+        return -ENOMEM;
         /*
        * Add a copy of IORT node pointer to platform_data to
        * be used to retrieve IORT data information.
        */
-    ret = platform_device_add_data(pdev, &node, sizeof(node));
-    if (ret)
-        goto dev_put;
-
-    /*
-     * We expect the dma masks to be equivalent for
-     * all SMMUs set-ups
-     */
-    pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+    dev->type = DEV_ACPI;
+    dev->acpi_node = node;
         fwnode = iort_get_fwnode(node);
         if (!fwnode) {
           ret = -ENODEV;
-        goto dev_put;
+        goto error;
       }
   -    pdev->dev.fwnode = fwnode;
-
-    attr = ops->iommu_is_coherent(node) ?
-                 DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;
-
-    /* Configure DMA for the page table walker */
-    acpi_dma_configure(&pdev->dev, attr);
+    dev->fwnode = fwnode;
   -    ret = platform_device_add(pdev);
-    if (ret)
-        goto dma_deconfigure;
+    /* Call the acpi init functions for IOMMU devices */
+    ret = acpi_device_init(DEVICE_IOMMU, (void *)dev, node->type);
         return 0;

  -dma_deconfigure:
-    acpi_dma_deconfigure(&pdev->dev);

xen/drivers/acpi/arm/iort.c +2 -2

-dev_put:
-    platform_device_put(pdev);
+error:
+    kfree(dev);

        return ret;
  }

xen/drivers/acpi/arm/iort.c +2 -0

@@ -957,5 +981,6 @@ void __init acpi_iort_init(void)
         iort_init_platform_devices();
   -    acpi_probe_device_table(iort);
+    /* Xen; Do not need a device table probe */
+    /* acpi_probe_device_table(iort);*/
   }

xen/drivers/passthrough/arm/smmu.c +1 -0

index 362d578..ad956d5 100644
@@ -181,6 +181,7 @@ static void __iomem *devm_ioremap_resource(struct device *dev,
    * Xen: PCI functions
    * TODO: It should be implemented when PCI will be supported
    */
+#undef to_pci_dev
   #define to_pci_dev(dev)    (NULL)
   static inline int pci_for_each_dma_alias(struct pci_dev *pdev,
                        int (*fn) (struct pci_dev *pdev,

xen/include/acpi/acpi_iort.h +0 -0

index 77e0809..d4315a4 100644
@@ -19,27 +19,32 @@
   #ifndef __ACPI_IORT_H__
   #define __ACPI_IORT_H__

  -#include <linux/acpi.h>

xen/include/acpi/acpi_iort.h +2 -2

-#include <linux/fwnode.h>
-#include <linux/irqdomain.h>
+#include <xen/acpi.h>
+#include <asm/device.h>

  +/* Xen: Not using IORT IRQ bindings */
+#if 0
  #define IORT_IRQ_MASK(irq)        (irq & 0xffffffffULL)
  #define IORT_IRQ_TRIGGER_MASK(irq)    ((irq >> 32) & 0xffffffffULL) int iort_register_domain_token(int trans_id, struct fwnode_handle *fw_node); void iort_deregister_domain_token(int trans_id);
  struct fwnode_handle *iort_find_domain_token(int trans_id);

xen/include/acpi/acpi_iort.h +2 -1

-#ifdef CONFIG_ACPI_IORT
+#endif
+#ifdef CONFIG_ARM_64

  void acpi_iort_init(void);
  bool iort_node_match(u8 type);
+#if 0
  u32 iort_msi_map_rid(struct device *dev, u32 req_id);
  struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id); /* IOMMU interface */
  void iort_set_dma_mask(struct device *dev);
+#endif
  const struct iommu_ops *iort_iommu_configure(struct device *dev); #else
  static inline void acpi_iort_init(void) { }
  static inline bool iort_node_match(u8 type) { return false; } +#if 0
  static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id) { return req_id; }
  static inline struct irq_domain *iort_get_device_domain(struct device *dev,

xen/include/acpi/acpi_iort.h +1 -0

@@ -47,12 +52,10 @@ static inline struct irq_domain *iort_get_device_domain(struct device *dev,
   { return NULL; }
   /* IOMMU interface */
   static inline void iort_set_dma_mask(struct device *dev) { }
+#endif

  static inline
  const struct iommu_ops *iort_iommu_configure(struct device *dev) { return NULL; }
  #endif
  -#define IORT_ACPI_DECLARE(name, table_id, fn)        \
-    ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn) -
  #endif /* __ACPI_IORT_H__ */

xen/include/asm-arm/device.h +0 -0

index 5027c87..4eef9ce 100644
@@ -7,6 +7,7 @@

  enum device_type
  {
      DEV_DT,
+    DEV_ACPI,
  };
    struct dev_archdata {

xen/include/asm-arm/device.h +0 -0

@@ -20,6 +21,7 @@ struct device
   #ifdef CONFIG_HAS_DEVICE_TREE

      struct dt_device_node *of_node; /* Used by drivers imported from Linux */ #endif
+    void *acpi_node; /*Current use case is acpi_iort_node */ struct fwnode_handle *fwnode; /*fw device node identifier */ struct iommu_fwspec *iommu_fwspec;
      struct dev_archdata archdata;

xen/include/xen/acpi.h +20 -0

index 9409350..2f6aae1 100644
@@ -32,6 +32,7 @@
     #include <acpi/acpi.h>
   #include <asm/acpi.h>
+#include <xen/fwnode.h>
     #define ACPI_MADT_GET_(fld, x) (((x) & ACPI_MADT_##fld##_MASK) / \
       (ACPI_MADT_##fld##_MASK & -ACPI_MADT_##fld##_MASK))

@@ -49,6 +50,26 @@
                   (!(entry)) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||  \
                   (entry)->header.length < sizeof(*(entry)))
   +static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
+{
+    struct fwnode_handle *fwnode;
+
+    fwnode = xzalloc(struct fwnode_handle);
+    if (!fwnode)
+        return NULL;
+
+    fwnode->type = FWNODE_ACPI_STATIC;
+
+    return fwnode;
+}
+
+static inline void acpi_free_fwnode_static(struct fwnode_handle *fwnode)
+{
+    if (!fwnode || fwnode->type != FWNODE_ACPI_STATIC)
+        return;
+
+    xfree(fwnode);
+}
   #ifdef CONFIG_ACPI
     enum acpi_interrupt_id {

xen/include/xen/pci.h +3 -0

index 43f2125..182b1a5 100644
@@ -92,8 +92,16 @@ struct pci_dev {
   #define PT_FAULT_THRESHOLD 10
       } fault;
       u64 vf_rlen[6];
+#ifdef CONFIG_ARM
+    struct device dev;
+#endif
   };

  +#ifdef CONFIG_ARM

xen/include/xen/pci.h +4 -0

+#define to_pci_dev(p) container_of(p, struct pci_dev,dev)
+#define pci_domain_nr(dev) dev->seg
+#endif
+

Quoted 3 lines

  #define for_each_pdev(domain, pdev) \
      list_for_each_entry(pdev, &(domain->arch.pdev_list), domain_list)

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Quoted 8 lines · Manish Jaggi

Hi Sameer,

Quoted 6 lines · Sameer Goel

Add support for parsing IORT table to initialize SMMU devices.
* The code for creating an SMMU device has been modified, so that the SMMU device can be initialized.
* The NAMED NODE code has been commented out as this will need DOM0 kernel support.
* ITS code has been included but it has not been tested.

Quoted 2 lines

Could you please refactor this patch into another set of two patches. I am planning to rebase my IORT for Dom0 Hiding patch rework on this patch.

I will try to break this up. Lets discuss this a bit more next week.

Quoted 482 lines

Thanks,
Manish

Quoted 480 lines

Signed-off-by Sameer Goel <[email protected]>

---
   xen/arch/arm/setup.c               |   3 +
   xen/drivers/acpi/Makefile          |   1 +
   xen/drivers/acpi/arm/Makefile      |   1 +
   xen/drivers/acpi/arm/iort.c        | 173 +++++++++++++++++++++----------------
   xen/drivers/passthrough/arm/smmu.c |   1 +
   xen/include/acpi/acpi_iort.h       |  17 ++--
   xen/include/asm-arm/device.h       |   2 +
   xen/include/xen/acpi.h             |  21 +++++
   xen/include/xen/pci.h              |   8 ++
   9 files changed, 146 insertions(+), 81 deletions(-)

create mode 100644 xen/drivers/acpi/arm/Makefile

xen/arch/arm/setup.c +1 -0

index 92f173b..4ba09b2 100644
@@ -49,6 +49,7 @@
   #include <asm/setup.h>
   #include <xsm/xsm.h>
   #include <asm/acpi.h>
+#include <acpi/acpi_iort.h>
     struct bootinfo __initdata bootinfo;
   @@ -796,6 +797,8 @@ void __init start_xen(unsigned long boot_phys_offset,
         tasklet_subsys_init();

+ /* Parse the ACPI iort data */

+    acpi_iort_init();
         xsm_dt_init();

diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile
index 444b11d..e7ffd82 100644

xen/drivers/acpi/Makefile +1 -0

@@ -1,5 +1,6 @@
   subdir-y += tables
   subdir-y += utilities
+subdir-$(CONFIG_ARM) += arm
   subdir-$(CONFIG_X86) += apei
     obj-bin-y += tables.init.o

xen/drivers/acpi/arm/Makefile new file +1 -0

new file mode 100644
index 0000000..7c039bb
@@ -0,0 +1 @@
+obj-y += iort.o

xen/drivers/acpi/arm/iort.c +50 -11

index 2e368a6..7f54062 100644
@@ -14,17 +14,47 @@
    * This file implements early detection/parsing of I/O mapping
    * reported to OS through firmware via I/O Remapping Table (IORT)
    * IORT document number: ARM DEN 0049A
+ *
+ * Based on Linux drivers/acpi/arm64/iort.c
+ * => commit ca78d3173cff3503bcd15723b049757f75762d15
+ *
+ * Xen modification:
+ * Sameer Goel <[email protected]>
+ * Copyright (C) 2017, The Linux Foundation, All rights reserved.
+ *
    */
   -#define pr_fmt(fmt)    "ACPI: IORT: " fmt
-
-#include <linux/acpi_iort.h>
-#include <linux/iommu.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
+#include <xen/acpi.h>
+#include <acpi/acpi_iort.h>
+#include <xen/fwnode.h>
+#include <xen/iommu.h>
+#include <xen/lib.h>
+#include <xen/list.h>
+#include <xen/pci.h>
+
+#include <asm/device.h>
+
+/* Xen: Define compatibility functions */
+#define FW_BUG        "[Firmware Bug]: "
+#define pr_err(fmt, ...) printk(XENLOG_ERR fmt, ## __VA_ARGS__)
+#define pr_warn(fmt, ...) printk(XENLOG_WARNING fmt, ## __VA_ARGS__)
+
+/* Alias to Xen allocation helpers */
+#define kfree xfree
+#define kmalloc(size, flags)            _xmalloc(size, sizeof(void *))
+#define kzalloc(size, flags)            _xzalloc(size, sizeof(void *))
+
+/* Redefine WARN macros */
+#undef WARN
+#undef WARN_ON
+#define WARN(condition, format...) ({                    \
+    int __ret_warn_on = !!(condition);                \
+    if (unlikely(__ret_warn_on))                    \
+        printk(format);                        \
+    unlikely(__ret_warn_on);                    \
+})
+#define WARN_TAINT(cond, taint, format...) WARN(cond, format)
+#define WARN_ON(cond)                      (!!cond)
     #define IORT_TYPE_MASK(type)    (1 << (type))
   #define IORT_MSI_TYPE        (1 << ACPI_IORT_NODE_ITS_GROUP)

@@ -256,6 +286,13 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
       acpi_status status;
         if (node->type == ACPI_IORT_NODE_NAMED_COMPONENT) {
+        status = AE_NOT_IMPLEMENTED;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0
           struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
           struct acpi_device *adev = to_acpi_device_node(dev->fwnode);
           struct acpi_iort_named_component *ncomp;

@@ -275,11 +312,12 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
           status = !strcmp(ncomp->device_name, buf.pointer) ?
                               AE_OK : AE_NOT_FOUND;
           acpi_os_free(buf.pointer);
+#endif
       } else if (node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {
           struct acpi_iort_root_complex *pci_rc;
-        struct pci_bus *bus;
+        struct pci_dev *pci_dev;
   -        bus = to_pci_bus(dev);
+        pci_dev = to_pci_dev(dev);
           pci_rc = (struct acpi_iort_root_complex *)node->node_data;
             /*

@@ -287,12 +325,11 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node,
            * with root complexes. Each segment number can represent only
            * one root complex.
            */
-        status = pci_rc->pci_segment_number == pci_domain_nr(bus) ?
+        status = pci_rc->pci_segment_number == pci_domain_nr(pci_dev) ?
                               AE_OK : AE_NOT_FOUND;
       } else {
           status = AE_NOT_FOUND;
       }
-out:
       return status;
   }
   @@ -320,6 +357,11 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in,

       return 0;

}
+/*
+ * Named components are not supported yet so we do not need the
+ * iort_node_get_id function
+ */

xen/drivers/acpi/arm/iort.c +42 -53

+#if 0
   static
   struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
                       u32 *id_out, u8 type_mask,

@@ -358,6 +400,7 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
         return NULL;
   }
+#endif
     static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node,
                           u32 rid_in, u32 *rid_out,

@@ -410,6 +453,10 @@ fail_map:
       return NULL;
   }
   +/* Xen: Comment out the NamedComponent and ITS mapping code till the support
+ * is available.
+ */
+#if 0
   static struct acpi_iort_node *iort_find_dev_node(struct device *dev)
   {
       struct pci_bus *pbus;

@@ -481,7 +528,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,
       return 0;
   }
   -/**
+/*
    * iort_get_device_domain() - Find MSI domain related to a device
    * @dev: The device.
    * @req_id: Requester ID for the device.

@@ -510,7 +557,7 @@ static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data)
       *rid = alias;
       return 0;
   }
-
+#endif
   static int arm_smmu_iort_xlate(struct device *dev, u32 streamid,
                      struct fwnode_handle *fwnode,
                      const struct iommu_ops *ops)

@@ -546,6 +593,7 @@ static const struct iommu_ops *iort_iommu_xlate(struct device *dev,
       return ret ? NULL : ops;
   }
   +#if 0 /* Xen: We do not need this function for Xen */
   /**
    * iort_set_dma_mask - Set-up dma mask for a device.
    *

@@ -567,7 +615,7 @@ void iort_set_dma_mask(struct device *dev)
       if (!dev->dma_mask)
           dev->dma_mask = &dev->coherent_dma_mask;
   }
-
+#endif
   /**
    * iort_iommu_configure - Set-up IOMMU configuration for a device.
    *

@@ -583,14 +631,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
       u32 streamid = 0;
         if (dev_is_pci(dev)) {
-        struct pci_bus *bus = to_pci_dev(dev)->bus;
+        struct pci_dev *pci_device = to_pci_dev(dev);
           u32 rid;
   -        pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid,
-                       &rid);
+        rid = PCI_BDF2(pci_device->bus, pci_device->devfn);
             node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,
-                      iort_match_node_callback, &bus->dev);
+                      iort_match_node_callback, dev);
           if (!node)
               return NULL;
   @@ -600,6 +647,13 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
           ops = iort_iommu_xlate(dev, parent, streamid);
         } else {
+        return NULL;
+/*
+ * We need the namespace object name from dsdt to match the iort node, this
+ * will need additions to the kernel xen bus notifiers.
+ * So, disabling the named node code till a proposal is approved.
+ */
+#if 0
           int i = 0;
             node = iort_scan_node(ACPI_IORT_NODE_NAMED_COMPONENT,

@@ -616,11 +670,17 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
               parent = iort_node_get_id(node, &streamid,
                             IORT_IOMMU_TYPE, i++);
           }
+#endif
       }
         return ops;
   }
   +/*
+ * Xen: Not using the parsing ops for now. Need to check and see if it will
+ * be useful to use these in some form, or let the driver parse IORT node.
+ */
+#if 0
   static void __init acpi_iort_register_irq(int hwirq, const char *name,
                         int trigger,
                         struct resource *res)

@@ -807,7 +867,7 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
           return NULL;
       }
   }
-
+#endif
   /**
    * iort_add_smmu_platform_device() - Allocate a platform device for SMMU
    * @node: Pointer to SMMU ACPI IORT node

@@ -817,78 +877,42 @@ const struct iort_iommu_config *iort_get_iommu_cfg(struct acpi_iort_node *node)
   static int __init iort_add_smmu_platform_device(struct acpi_iort_node *node)
   {
       struct fwnode_handle *fwnode;
-    struct platform_device *pdev;
-    struct resource *r;
-    enum dev_dma_attr attr;
-    int ret, count;
-    const struct iort_iommu_config *ops = iort_get_iommu_cfg(node);
-
-    if (!ops)
-        return -ENODEV;
-
-    pdev = platform_device_alloc(ops->name, PLATFORM_DEVID_AUTO);
-    if (!pdev)
-        return -ENOMEM;
-
-    count = ops->iommu_count_resources(node);
-
-    r = kcalloc(count, sizeof(*r), GFP_KERNEL);
-    if (!r) {
-        ret = -ENOMEM;
-        goto dev_put;
-    }
-
-    ops->iommu_init_resources(r, node);
+    struct device *dev;
+    int ret;
   -    ret = platform_device_add_resources(pdev, r, count);
       /*
-     * Resources are duplicated in platform_device_add_resources,
-     * free their allocated memory
+     * Not enabling the parsing ops for now. The corresponding driver
+     * can parse this information as needed, so deleting relevant code as
+     * compared to base revision.
        */
-    kfree(r);
   -    if (ret)
-        goto dev_put;
+    dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+    if (!dev)
+        return -ENOMEM;
         /*
        * Add a copy of IORT node pointer to platform_data to
        * be used to retrieve IORT data information.
        */
-    ret = platform_device_add_data(pdev, &node, sizeof(node));
-    if (ret)
-        goto dev_put;
-
-    /*
-     * We expect the dma masks to be equivalent for
-     * all SMMUs set-ups
-     */
-    pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+    dev->type = DEV_ACPI;
+    dev->acpi_node = node;
         fwnode = iort_get_fwnode(node);
         if (!fwnode) {
           ret = -ENODEV;
-        goto dev_put;
+        goto error;
       }
   -    pdev->dev.fwnode = fwnode;
-
-    attr = ops->iommu_is_coherent(node) ?
-                 DEV_DMA_COHERENT : DEV_DMA_NON_COHERENT;
-
-    /* Configure DMA for the page table walker */
-    acpi_dma_configure(&pdev->dev, attr);
+    dev->fwnode = fwnode;
   -    ret = platform_device_add(pdev);
-    if (ret)
-        goto dma_deconfigure;
+    /* Call the acpi init functions for IOMMU devices */
+    ret = acpi_device_init(DEVICE_IOMMU, (void *)dev, node->type);
         return 0;
   -dma_deconfigure:
-    acpi_dma_deconfigure(&pdev->dev);
-dev_put:
-    platform_device_put(pdev);
+error:
+    kfree(dev);
         return ret;
   }

@@ -957,5 +981,6 @@ void __init acpi_iort_init(void)
         iort_init_platform_devices();
   -    acpi_probe_device_table(iort);
+    /* Xen; Do not need a device table probe */
+    /* acpi_probe_device_table(iort);*/
   }

xen/drivers/passthrough/arm/smmu.c +1 -0

index 362d578..ad956d5 100644
@@ -181,6 +181,7 @@ static void __iomem *devm_ioremap_resource(struct device *dev,
    * Xen: PCI functions
    * TODO: It should be implemented when PCI will be supported
    */
+#undef to_pci_dev
   #define to_pci_dev(dev)    (NULL)
   static inline int pci_for_each_dma_alias(struct pci_dev *pdev,
                        int (*fn) (struct pci_dev *pdev,

xen/include/acpi/acpi_iort.h +9 -5

index 77e0809..d4315a4 100644
@@ -19,27 +19,32 @@
   #ifndef __ACPI_IORT_H__
   #define __ACPI_IORT_H__
   -#include <linux/acpi.h>
-#include <linux/fwnode.h>
-#include <linux/irqdomain.h>
+#include <xen/acpi.h>
+#include <asm/device.h>
   +/* Xen: Not using IORT IRQ bindings */
+#if 0
   #define IORT_IRQ_MASK(irq)        (irq & 0xffffffffULL)
   #define IORT_IRQ_TRIGGER_MASK(irq)    ((irq >> 32) & 0xffffffffULL)
     int iort_register_domain_token(int trans_id, struct fwnode_handle *fw_node);
   void iort_deregister_domain_token(int trans_id);
   struct fwnode_handle *iort_find_domain_token(int trans_id);
-#ifdef CONFIG_ACPI_IORT
+#endif
+#ifdef CONFIG_ARM_64
   void acpi_iort_init(void);
   bool iort_node_match(u8 type);
+#if 0
   u32 iort_msi_map_rid(struct device *dev, u32 req_id);
   struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id);
   /* IOMMU interface */
   void iort_set_dma_mask(struct device *dev);
+#endif
   const struct iommu_ops *iort_iommu_configure(struct device *dev);
   #else
   static inline void acpi_iort_init(void) { }
   static inline bool iort_node_match(u8 type) { return false; }
+#if 0
   static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id)
   { return req_id; }
   static inline struct irq_domain *iort_get_device_domain(struct device *dev,

@@ -47,12 +52,10 @@ static inline struct irq_domain *iort_get_device_domain(struct device *dev,
   { return NULL; }
   /* IOMMU interface */
   static inline void iort_set_dma_mask(struct device *dev) { }
+#endif
   static inline
   const struct iommu_ops *iort_iommu_configure(struct device *dev)
   { return NULL; }
   #endif
   -#define IORT_ACPI_DECLARE(name, table_id, fn)        \
-    ACPI_DECLARE_PROBE_ENTRY(iort, name, table_id, 0, NULL, 0, fn)
-
   #endif /* __ACPI_IORT_H__ */

xen/include/asm-arm/device.h +2 -0

index 5027c87..4eef9ce 100644
@@ -7,6 +7,7 @@
   enum device_type
   {
       DEV_DT,
+    DEV_ACPI,
   };
     struct dev_archdata {

@@ -20,6 +21,7 @@ struct device
   #ifdef CONFIG_HAS_DEVICE_TREE
       struct dt_device_node *of_node; /* Used by drivers imported from Linux */
   #endif
+    void *acpi_node; /*Current use case is acpi_iort_node */
       struct fwnode_handle *fwnode; /*fw device node identifier */
       struct iommu_fwspec *iommu_fwspec;
       struct dev_archdata archdata;

xen/include/xen/acpi.h +20 -0

index 9409350..2f6aae1 100644
@@ -32,6 +32,7 @@
     #include <acpi/acpi.h>
   #include <asm/acpi.h>
+#include <xen/fwnode.h>
     #define ACPI_MADT_GET_(fld, x) (((x) & ACPI_MADT_##fld##_MASK) / \
       (ACPI_MADT_##fld##_MASK & -ACPI_MADT_##fld##_MASK))

@@ -49,6 +50,26 @@
                   (!(entry)) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||  \
                   (entry)->header.length < sizeof(*(entry)))
   +static inline struct fwnode_handle *acpi_alloc_fwnode_static(void)
+{
+    struct fwnode_handle *fwnode;
+
+    fwnode = xzalloc(struct fwnode_handle);
+    if (!fwnode)
+        return NULL;
+
+    fwnode->type = FWNODE_ACPI_STATIC;
+
+    return fwnode;
+}
+
+static inline void acpi_free_fwnode_static(struct fwnode_handle *fwnode)
+{
+    if (!fwnode || fwnode->type != FWNODE_ACPI_STATIC)
+        return;
+
+    xfree(fwnode);
+}
   #ifdef CONFIG_ACPI
     enum acpi_interrupt_id {

xen/include/xen/pci.h +7 -0

index 43f2125..182b1a5 100644
@@ -92,8 +92,16 @@ struct pci_dev {
   #define PT_FAULT_THRESHOLD 10
       } fault;
       u64 vf_rlen[6];
+#ifdef CONFIG_ARM
+    struct device dev;
+#endif
   };
   +#ifdef CONFIG_ARM
+#define to_pci_dev(p) container_of(p, struct pci_dev,dev)
+#define pci_domain_nr(dev) dev->seg
+#endif
+

Quoted 8 lines

xen/include/xen/pci.h struct pci_dev { · line 107

Quoted 3 lines

xen/include/xen/pci.h +0 -0

   #define for_each_pdev(domain, pdev) \
       list_for_each_entry(pdev, &(domain->arch.pdev_list), domain_list)
 

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel