[xen staging] Revert "x86/pvh: Allow (un)map_pirq when dom0 is PVH"

[patchbot@xxxxxxx]

commit 90a8f4c7eab05c2323082a367b936d8de1a33071
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Jul 30 14:12:53 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jul 30 17:36:51 2024 +0100

    Revert "x86/pvh: Allow (un)map_pirq when dom0 is PVH"
    
    This reverts commit e42d107d0d8bfa82c92ec7ed69bac259effc97ad.
    
    The Gitlab CI {adl,zen3p}-pci-hvm-x86-64-gcc-debug tests says this breaks 
PCI
    Passthrough to HVM guests, with -EOPNOTSUPP.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/hvm/hypercall.c |  6 ------
 xen/arch/x86/physdev.c       | 12 ++----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index 83a9b4fb1e..7fb3136f0c 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -71,14 +71,8 @@ long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) 
arg)
 
     switch ( cmd )
     {
-        /*
-        * Only being permitted for management of other domains.
-        * Further restrictions are enforced in do_physdev_op.
-        */
     case PHYSDEVOP_map_pirq:
     case PHYSDEVOP_unmap_pirq:
-        break;
-
     case PHYSDEVOP_eoi:
     case PHYSDEVOP_irq_status_query:
     case PHYSDEVOP_get_free_pirq:
diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index 9f30a8c63a..d6dd622952 100644
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -323,11 +323,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) 
arg)
         if ( !d )
             break;
 
-        /* Only mapping when the subject domain has a notion of PIRQ */
-        if ( !is_hvm_domain(d) || has_pirq(d) )
-            ret = physdev_map_pirq(d, map.type, &map.index, &map.pirq, &msi);
-        else
-            ret = -EOPNOTSUPP;
+        ret = physdev_map_pirq(d, map.type, &map.index, &map.pirq, &msi);
 
         rcu_unlock_domain(d);
 
@@ -350,11 +346,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) 
arg)
         if ( !d )
             break;
 
-        /* Only unmapping when the subject domain has a notion of PIRQ */
-        if ( !is_hvm_domain(d) || has_pirq(d) )
-            ret = physdev_unmap_pirq(d, unmap.pirq);
-        else
-            ret = -EOPNOTSUPP;
+        ret = physdev_unmap_pirq(d, unmap.pirq);
 
         rcu_unlock_domain(d);
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging