Page MenuHomeFreeBSD
Files F147348600

D6701.diff
No OneTemporary
Actions

D6701.diff
View Options

Index: head/sys/conf/files.amd64
===================================================================
--- head/sys/conf/files.amd64
+++ head/sys/conf/files.amd64
@@ -278,6 +278,7 @@
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
dev/hyperv/vmbus/vmbus.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
+dev/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv
dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv
dev/nfe/if_nfe.c optional nfe pci
dev/ntb/if_ntb/if_ntb.c optional if_ntb
Index: head/sys/conf/files.i386
===================================================================
--- head/sys/conf/files.i386
+++ head/sys/conf/files.i386
@@ -253,6 +253,7 @@
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
dev/hyperv/vmbus/vmbus.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
+dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv
dev/hyperv/vmbus/i386/vmbus_vector.S optional hyperv
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
Index: head/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c
===================================================================
--- head/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c
+++ head/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 2016 Microsoft Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice unmodified, this list of conditions, and the following
+ * disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <dev/hyperv/vmbus/hyperv_machdep.h>
+
+uint64_t
+hypercall_md(volatile void *hc_addr, uint64_t in_val,
+ uint64_t in_paddr, uint64_t out_paddr)
+{
+ uint64_t status;
+
+ __asm__ __volatile__ ("mov %0, %%r8" : : "r" (out_paddr): "r8");
+ __asm__ __volatile__ ("call *%3" : "=a" (status) :
+ "c" (in_val), "d" (in_paddr), "m" (hc_addr));
+ return (status);
+}
Index: head/sys/dev/hyperv/vmbus/hyperv.c
===================================================================
--- head/sys/dev/hyperv/vmbus/hyperv.c
+++ head/sys/dev/hyperv/vmbus/hyperv.c
@@ -45,6 +45,7 @@
#include <dev/hyperv/include/hyperv_busdma.h>
#include <dev/hyperv/vmbus/hv_vmbus_priv.h>
+#include <dev/hyperv/vmbus/hyperv_machdep.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
#include <dev/hyperv/vmbus/vmbus_var.h>
@@ -104,40 +105,17 @@
* @brief Invoke the specified hypercall
*/
static uint64_t
-hv_vmbus_do_hypercall(uint64_t control, void* input, void* output)
+hv_vmbus_do_hypercall(uint64_t value, void *input, void *output)
{
-#ifdef __x86_64__
- uint64_t hv_status = 0;
- uint64_t input_address = (input) ? hv_get_phys_addr(input) : 0;
- uint64_t output_address = (output) ? hv_get_phys_addr(output) : 0;
- volatile void *hypercall_page = hypercall_context.hc_addr;
-
- __asm__ __volatile__ ("mov %0, %%r8" : : "r" (output_address): "r8");
- __asm__ __volatile__ ("call *%3" : "=a"(hv_status):
- "c" (control), "d" (input_address),
- "m" (hypercall_page));
- return (hv_status);
-#else
- uint32_t control_high = control >> 32;
- uint32_t control_low = control & 0xFFFFFFFF;
- uint32_t hv_status_high = 1;
- uint32_t hv_status_low = 1;
- uint64_t input_address = (input) ? hv_get_phys_addr(input) : 0;
- uint32_t input_address_high = input_address >> 32;
- uint32_t input_address_low = input_address & 0xFFFFFFFF;
- uint64_t output_address = (output) ? hv_get_phys_addr(output) : 0;
- uint32_t output_address_high = output_address >> 32;
- uint32_t output_address_low = output_address & 0xFFFFFFFF;
- volatile void *hypercall_page = hypercall_context.hc_addr;
-
- __asm__ __volatile__ ("call *%8" : "=d"(hv_status_high),
- "=a"(hv_status_low) : "d" (control_high),
- "a" (control_low), "b" (input_address_high),
- "c" (input_address_low),
- "D"(output_address_high),
- "S"(output_address_low), "m" (hypercall_page));
- return (hv_status_low | ((uint64_t)hv_status_high << 32));
-#endif /* __x86_64__ */
+ uint64_t in_paddr = 0, out_paddr = 0;
+
+ if (input != NULL)
+ in_paddr = hv_get_phys_addr(input);
+ if (output != NULL)
+ out_paddr = hv_get_phys_addr(output);
+
+ return hypercall_md(hypercall_context.hc_addr, value,
+ in_paddr, out_paddr);
}
/**
Index: head/sys/dev/hyperv/vmbus/hyperv_machdep.h
===================================================================
--- head/sys/dev/hyperv/vmbus/hyperv_machdep.h
+++ head/sys/dev/hyperv/vmbus/hyperv_machdep.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2016 Microsoft Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice unmodified, this list of conditions, and the following
+ * disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _HYPERV_MACHDEP_H_
+#define _HYPERV_MACHDEP_H_
+
+#include <sys/param.h>
+
+uint64_t hypercall_md(volatile void *hc_addr, uint64_t in_val,
+ uint64_t in_paddr, uint64_t out_paddr);
+
+#endif /* !_HYPERV_MACHDEP_H_ */
Index: head/sys/dev/hyperv/vmbus/i386/hyperv_machdep.c
===================================================================
--- head/sys/dev/hyperv/vmbus/i386/hyperv_machdep.c
+++ head/sys/dev/hyperv/vmbus/i386/hyperv_machdep.c
@@ -0,0 +1,51 @@
+/*-
+ * Copyright (c) 2016 Microsoft Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice unmodified, this list of conditions, and the following
+ * disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <dev/hyperv/vmbus/hyperv_machdep.h>
+
+uint64_t
+hypercall_md(volatile void *hc_addr, uint64_t in_val,
+ uint64_t in_paddr, uint64_t out_paddr)
+{
+ uint32_t in_val_hi = in_val >> 32;
+ uint32_t in_val_lo = in_val & 0xFFFFFFFF;
+ uint32_t status_hi, status_lo;
+ uint32_t in_paddr_hi = in_paddr >> 32;
+ uint32_t in_paddr_lo = in_paddr & 0xFFFFFFFF;
+ uint32_t out_paddr_hi = out_paddr >> 32;
+ uint32_t out_paddr_lo = out_paddr & 0xFFFFFFFF;
+
+ __asm__ __volatile__ ("call *%8" : "=d"(status_hi), "=a"(status_lo) :
+ "d" (in_val_hi), "a" (in_val_lo),
+ "b" (in_paddr_hi), "c" (in_paddr_lo),
+ "D"(out_paddr_hi), "S"(out_paddr_lo),
+ "m" (hc_addr));
+ return (status_lo | ((uint64_t)status_hi << 32));
+}
Index: head/sys/modules/hyperv/vmbus/Makefile
===================================================================
--- head/sys/modules/hyperv/vmbus/Makefile
+++ head/sys/modules/hyperv/vmbus/Makefile
@@ -10,6 +10,7 @@
hv_ring_buffer.c \
hyperv.c \
hyperv_busdma.c \
+ hyperv_machdep.c \
vmbus.c \
vmbus_et.c
SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 11, 5:21 AM (5 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29528375
Default Alt Text
D6701.diff (9 KB)

Event Timeline