From: Nathan Chen <nathanc@nvidia.com>

Introduce support for "cmdqv" IOMMU attribute, which
enables NVIDIA Tegra241 CMDQV, an extension for ARM
SMMUv3. It supports passthroughs of physical SMMU-CMDQ
linked command queue from host space to a VM.

Signed-off-by: Nathan Chen <nathanc@nvidia.com>
---
 docs/formatdomain.rst             |  5 +++++
 src/conf/domain_conf.c            | 15 +++++++++++++++
 src/conf/domain_conf.h            |  1 +
 src/conf/domain_validate.c        |  3 +++
 src/conf/schemas/domaincommon.rng |  5 +++++
 src/qemu/qemu_command.c           |  1 +
 6 files changed, 30 insertions(+)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 458a514b60..8d23bcf317 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -9269,6 +9269,11 @@ Example:
       to enable hardware acceleration support for smmuv3Dev IOMMU devices.
       (QEMU/KVM and ``smmuv3`` model only)
 
+   ``cmdqv``
+      The ``cmdqv`` attribute with possibel values ``on`` and ``off`` can be used
+      to enable NVIDIA Tegra241 CMDQV, an extension for ARM SMMUv3 that supports
+      passthrough of physical SMMU-CMDQ linked command queue from host space to VM.
+
    ``ats``
       The ``ats`` attribute with possible values ``on`` and ``off`` can be used
       to enable reporting Address Translation Services capability to the guest
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 99183b5c82..e93d6602cc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14519,6 +14519,10 @@ virDomainIOMMUDefParseXML(virDomainXMLOption *xmlopt,
                                      &iommu->accel) < 0)
             return NULL;
 
+        if (virXMLPropTristateSwitch(driver, "cmdqv", VIR_XML_PROP_NONE,
+                                     &iommu->cmdqv) < 0)
+            return NULL;
+
         if (virXMLPropTristateSwitch(driver, "ats", VIR_XML_PROP_NONE,
                                      &iommu->ats) < 0)
             return NULL;
@@ -16588,6 +16592,7 @@ virDomainIOMMUDefEquals(const virDomainIOMMUDef *a,
         a->dma_translation != b->dma_translation ||
         a->pci_bus != b->pci_bus ||
         a->accel != b->accel ||
+        a->cmdqv != b->cmdqv ||
         a->ats != b->ats ||
         a->ril != b->ril ||
         a->pasid != b->pasid ||
@@ -22294,6 +22299,12 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUDef *src,
                        dst->accel, src->accel);
         return false;
     }
+    if (src->cmdqv != dst->cmdqv) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Target domain IOMMU device cmdqv value '%1$d' does not match source '%2$d'"),
+                       dst->cmdqv, src->cmdqv);
+        return false;
+    }
     if (src->ats != dst->ats) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target domain IOMMU device ATS value '%1$d' does not match source '%2$d'"),
@@ -28668,6 +28679,10 @@ virDomainIOMMUDefFormat(virBuffer *buf,
         virBufferAsprintf(&driverAttrBuf, " accel='%s'",
                           virTristateSwitchTypeToString(iommu->accel));
     }
+    if (iommu->cmdqv != VIR_TRISTATE_SWITCH_ABSENT) {
+            virBufferAsprintf(&driverAttrBuf, " cmdqv='%s'",
+                              virTristateSwitchTypeToString(iommu->cmdqv));
+        }
     if (iommu->ats != VIR_TRISTATE_SWITCH_ABSENT) {
         virBufferAsprintf(&driverAttrBuf, " ats='%s'",
                           virTristateSwitchTypeToString(iommu->ats));
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 71ed4ce0ed..c619e679d6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3063,6 +3063,7 @@ struct _virDomainIOMMUDef {
     virTristateSwitch xtsup;
     virTristateSwitch pt;
     virTristateSwitch accel;
+    virTristateSwitch cmdqv;
     virTristateSwitch ats;
     virTristateSwitch ril;
     virTristateSwitch pasid;
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 0f84e9f237..856ed2a213 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -3142,6 +3142,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
             iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pci_bus >= 0 ||
             iommu->accel != VIR_TRISTATE_SWITCH_ABSENT ||
+            iommu->cmdqv != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ats != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ril != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pasid != VIR_TRISTATE_SWITCH_ABSENT ||
@@ -3160,6 +3161,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
             iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pci_bus >= 0 ||
             iommu->accel != VIR_TRISTATE_SWITCH_ABSENT ||
+            iommu->cmdqv != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ats != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ril != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pasid != VIR_TRISTATE_SWITCH_ABSENT ||
@@ -3176,6 +3178,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
             iommu->xtsup != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pci_bus >= 0 ||
             iommu->accel != VIR_TRISTATE_SWITCH_ABSENT ||
+            iommu->cmdqv != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ats != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->ril != VIR_TRISTATE_SWITCH_ABSENT ||
             iommu->pasid != VIR_TRISTATE_SWITCH_ABSENT ||
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 3d6dc695c4..3dc6ae2626 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -6334,6 +6334,11 @@
                 <ref name="virOnOff"/>
               </attribute>
             </optional>
+            <optional>
+              <attribute name="cmdqv">
+                <ref name="virOnOff"/>
+              </attribute>
+            </optional>
             <optional>
               <attribute name="ats">
                 <ref name="virOnOff"/>
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c4a6ec7aa6..b9df5062a3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6268,6 +6268,7 @@ qemuBuildPCINestedSmmuv3DevProps(const virDomainDef *def,
                               "s:primary-bus", bus,
                               "s:id", iommu->info.alias,
                               "b:accel", (iommu->accel == VIR_TRISTATE_SWITCH_ON),
+                              "B:tegra241-cmdqv", (iommu->cmdqv == VIR_TRISTATE_SWITCH_ON),
                               "b:ats", (iommu->ats == VIR_TRISTATE_SWITCH_ON),
                               "b:ril", (iommu->ril == VIR_TRISTATE_SWITCH_ON),
                               "b:pasid", (iommu->pasid == VIR_TRISTATE_SWITCH_ON),
-- 
2.43.0