Drivers: hv: Move Hyper-V extended capability check to arch neutral code

[sfrench/cifs-2.6.git] / arch / x86 / hyperv / hv_init.c

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index bb0ae4b5c00f1bf6654142ddbb69f870610a240c..6952e219cba36b6da255c883a774c846184a3a42 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -614,50 +614,3 @@ bool hv_is_isolation_supported(void)
        return hv_get_isolation_type() != HV_ISOLATION_TYPE_NONE;
 }
 EXPORT_SYMBOL_GPL(hv_is_isolation_supported);
-
-/* Bit mask of the extended capability to query: see HV_EXT_CAPABILITY_xxx */
-bool hv_query_ext_cap(u64 cap_query)
-{
-       /*
-        * The address of the 'hv_extended_cap' variable will be used as an
-        * output parameter to the hypercall below and so it should be
-        * compatible with 'virt_to_phys'. Which means, it's address should be
-        * directly mapped. Use 'static' to keep it compatible; stack variables
-        * can be virtually mapped, making them imcompatible with
-        * 'virt_to_phys'.
-        * Hypercall input/output addresses should also be 8-byte aligned.
-        */
-       static u64 hv_extended_cap __aligned(8);
-       static bool hv_extended_cap_queried;
-       u64 status;
-
-       /*
-        * Querying extended capabilities is an extended hypercall. Check if the
-        * partition supports extended hypercall, first.
-        */
-       if (!(ms_hyperv.priv_high & HV_ENABLE_EXTENDED_HYPERCALLS))
-               return false;
-
-       /* Extended capabilities do not change at runtime. */
-       if (hv_extended_cap_queried)
-               return hv_extended_cap & cap_query;
-
-       status = hv_do_hypercall(HV_EXT_CALL_QUERY_CAPABILITIES, NULL,
-                                &hv_extended_cap);
-
-       /*
-        * The query extended capabilities hypercall should not fail under
-        * any normal circumstances. Avoid repeatedly making the hypercall, on
-        * error.
-        */
-       hv_extended_cap_queried = true;
-       status &= HV_HYPERCALL_RESULT_MASK;
-       if (status != HV_STATUS_SUCCESS) {
-               pr_err("Hyper-V: Extended query capabilities hypercall failed 0x%llx\n",
-                      status);
-               return false;
-       }
-
-       return hv_extended_cap & cap_query;
-}
-EXPORT_SYMBOL_GPL(hv_query_ext_cap);