[xen staging] xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE

[patchbot@xxxxxxx]

commit 0db1ded6b57cb9ebfaefa2682ed817c0a9dd4ae3
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Jul 27 12:28:24 2020 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jan 12 18:17:02 2021 +0000

    xen/memory: Introduce CONFIG_ARCH_ACQUIRE_RESOURCE
    
    New architectures shouldn't be forced to implement no-op stubs for unused
    functionality.
    
    Introduce CONFIG_ARCH_ACQUIRE_RESOURCE which can be opted in to, and provide
    compatibility logic in xen/mm.h
    
    No functional change.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Paul Durrant <paul@xxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
 xen/arch/x86/Kconfig     | 1 +
 xen/common/Kconfig       | 3 +++
 xen/include/asm-arm/mm.h | 8 --------
 xen/include/xen/mm.h     | 9 +++++++++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 24868aa6ad..78f351f94b 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -6,6 +6,7 @@ config X86
        select ACPI
        select ACPI_LEGACY_TABLES_LOOKUP
        select ARCH_SUPPORTS_INT128
+       select ARCH_ACQUIRE_RESOURCE
        select COMPAT
        select CORE_PARKING
        select HAS_ALTERNATIVE
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 0661328a99..b5c91a1664 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -22,6 +22,9 @@ config GRANT_TABLE
 
          If unsure, say Y.
 
+config ARCH_ACQUIRE_RESOURCE
+       bool
+
 config HAS_ALTERNATIVE
        bool
 
diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
index f8ba49b118..0b7de3102e 100644
--- a/xen/include/asm-arm/mm.h
+++ b/xen/include/asm-arm/mm.h
@@ -358,14 +358,6 @@ static inline void put_page_and_type(struct page_info 
*page)
 
 void clear_and_clean_page(struct page_info *page);
 
-static inline
-int arch_acquire_resource(struct domain *d, unsigned int type, unsigned int id,
-                          unsigned long frame, unsigned int nr_frames,
-                          xen_pfn_t mfn_list[])
-{
-    return -EOPNOTSUPP;
-}
-
 unsigned int arch_get_dma_bitsize(void);
 
 #endif /*  __ARCH_ARM_MM__ */
diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 85a8df9948..e62a5b726e 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -702,4 +702,13 @@ static inline void put_page_alloc_ref(struct page_info 
*page)
     }
 }
 
+#ifndef CONFIG_ARCH_ACQUIRE_RESOURCE
+static inline int arch_acquire_resource(
+    struct domain *d, unsigned int type, unsigned int id, unsigned long frame,
+    unsigned int nr_frames, xen_pfn_t mfn_list[])
+{
+    return -EOPNOTSUPP;
+}
+#endif /* !CONFIG_ARCH_ACQUIRE_RESOURCE */
+
 #endif /* __XEN_MM_H__ */
--
generated by git-patchbot for /home/xen/git/xen.git#staging