From nobody Wed Oct 26 03:51:50 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mxvxy3y60z4gwpJ; Wed, 26 Oct 2022 03:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mxvxy3mwPz3LsZ; Wed, 26 Oct 2022 03:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666756310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nui7mwz+Ay7hwdNPUYOrcFyfO4Yszi4l8Xos1wgdCRc=; b=yZQzwQ/xjMoKsW09Eo41Q0AE/rEArpb8EBIU33j8OH6LW7O6AXnJbTnwEX6Vke1mwgVsLZ a1DxFRJkwGccmTVGINEYtNFM18IJxVLptjQZBcnYLuKS3wA+auqNo0paSe/2NV2PlZ9Hau bXXcTztKhacNLAownwLkx2LPTc9LzyiA33razgFri6ZZkfbCPefkq7JyQeLCIFruEShYHh o6LVSl2xICSu6ADmC6AXQoX7FZ+M5nY03qA/lcozXMDxPS60MfZt5o8AjNvKqSN/CgPkoO UvJwLQY/CsQlM9jQ0FjgSXsMX0yRE1qIppaHJ9N3ona6W0bV6tClNWl9q0HSZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mxvxy2ptKz1311; Wed, 26 Oct 2022 03:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29Q3poDn097317; Wed, 26 Oct 2022 03:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29Q3poEX097316; Wed, 26 Oct 2022 03:51:50 GMT (envelope-from git) Date: Wed, 26 Oct 2022 03:51:50 GMT Message-Id: <202210260351.29Q3poEX097316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: d16d0b6b1981 - main - Hyper-V: Code refactor to avoid redundancy of MSR values on x86 and arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d16d0b6b1981178a33abf5ec297fb132199e902b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666756310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nui7mwz+Ay7hwdNPUYOrcFyfO4Yszi4l8Xos1wgdCRc=; b=sDPEKsHt38ZIsEkANPyrnnUAqEwIaY+wGq9AhkKVJAvkiYtZ2sILQU1Z2BYPPYt+KcwAPJ dvhsEOnOiBeQOZw5dguKpOmZsWJkYZqlZsuDsM9kVQfin00N7p9lg3H9OOCMVvNPVUWlee +Q5JUEKJjTz6wDotoaE5HUi1IKpffF5zIJNRZd8xDGsFyFqlnfuGHoeExk+tIj/o7yeGUC 53n7pjIEcB96esOvC4bZW7Fcuy4BPrFDG68lVuIvLeUZZBct9bUsJaV7ioMXJKOsriPlO5 hEi4iHgxC7U8kz9NcGBoNJc1K/3hkqEiXTEJ3ZMVbGRKKRMiZ9d2dHyhJEFuBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666756310; a=rsa-sha256; cv=none; b=p8JEEyWdW9Md5ZRMSIshIa4iJBWw7fJ9cw8G/BzItftdsql4A2MYyQV/qXqgUbGmbvDL3d tJIcgsLiGT1EXGcDIRBYb/N9Dx2z6AUgf8KYHWGXorh3h1kDfayiQMHBcSRpGDsTC49pek NdcGwFvnNDEMpvlFYx0SuiREbWAN9/QjEWkZ8oaV4SaGUdERo8RzoW6u7FGqZWoAISwMR6 58xL6KgQ/vNhueG4fI5BpXukSKhP3I5uEFKLGTweY3r2TEs/OI7Gi1kh0ixM0VbQb8dnnp pv/5eyKIy8g7aKPJH982GqPt8q5HTF7Cmo4N8caK/LmwfKvf8drNxI0+Hu1PmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=d16d0b6b1981178a33abf5ec297fb132199e902b commit d16d0b6b1981178a33abf5ec297fb132199e902b Author: Souradeep Chakrabarti AuthorDate: 2022-10-26 03:29:01 +0000 Commit: Wei Hu CommitDate: 2022-10-26 03:50:59 +0000 Hyper-V: Code refactor to avoid redundancy of MSR values on x86 and arm64 Refactor the code to put split the MSR values for x86 and arm64 Hyper-V. Code not yet built. This is one of several patches for the arm64 Hyper-V enablement. Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D37103 --- sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c | 1 + sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c | 1 + sys/dev/hyperv/vmbus/aarch64/hyperv_reg.h | 149 +--------------------- sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c | 1 + sys/dev/hyperv/vmbus/hyperv_common_reg.h | 175 ++++++++++++++++++++++++++ sys/dev/hyperv/vmbus/x86/hyperv_reg.h | 147 +--------------------- sys/dev/hyperv/vmbus/x86/hyperv_x86.c | 1 + sys/dev/hyperv/vmbus/x86/vmbus_x86.c | 1 + 8 files changed, 185 insertions(+), 291 deletions(-) diff --git a/sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c b/sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c index ab2d9becc3c5..eb915131fb6f 100644 --- a/sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c +++ b/sys/dev/hyperv/vmbus/aarch64/hyperv_aarch64.c @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include void hyperv_init_tc(void); int hypercall_page_setup(vm_paddr_t); diff --git a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c index 9bfe34044335..d3e0b0a32f1e 100644 --- a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c +++ b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #define HVCALL_SET_VP_REGISTERS 0x0051 diff --git a/sys/dev/hyperv/vmbus/aarch64/hyperv_reg.h b/sys/dev/hyperv/vmbus/aarch64/hyperv_reg.h index 85accc130b77..a0a6773dea67 100644 --- a/sys/dev/hyperv/vmbus/aarch64/hyperv_reg.h +++ b/sys/dev/hyperv/vmbus/aarch64/hyperv_reg.h @@ -37,157 +37,14 @@ */ #define MSR_HV_GUEST_OS_ID 0x00090002 -#define MSR_HV_GUESTID_BUILD_MASK 0xffffULL -#define MSR_HV_GUESTID_VERSION_MASK 0x0000ffffffff0000ULL -#define MSR_HV_GUESTID_VERSION_SHIFT 16 -#define MSR_HV_GUESTID_OSID_MASK 0x00ff000000000000ULL -#define MSR_HV_GUESTID_OSID_SHIFT 48 -#define MSR_HV_GUESTID_OSTYPE_MASK 0x7f00000000000000ULL -#define MSR_HV_GUESTID_OSTYPE_SHIFT 56 -#define MSR_HV_GUESTID_OPENSRC 0x8000000000000000ULL -#define MSR_HV_GUESTID_OSTYPE_LINUX \ - ((0x01ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) -#define MSR_HV_GUESTID_OSTYPE_FREEBSD \ - ((0x02ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) - -#define MSR_HV_HYPERCALL 0x40000001 -#define MSR_HV_HYPERCALL_ENABLE 0x0001ULL -#define MSR_HV_HYPERCALL_RSVD_MASK 0x0ffeULL -#define MSR_HV_HYPERCALL_PGSHIFT 12 - #define MSR_HV_VP_INDEX 0x00090003 - -#define MSR_HV_REFERENCE_TSC 0x40000021 -#define MSR_HV_REFTSC_ENABLE 0x0001ULL -#define MSR_HV_REFTSC_RSVD_MASK 0x0ffeULL -#define MSR_HV_REFTSC_PGSHIFT 12 - #define MSR_HV_SCONTROL 0x000A0010 -#define MSR_HV_SCTRL_ENABLE 0x0001ULL -#define MSR_HV_SCTRL_RSVD_MASK 0xfffffffffffffffeULL - -#define MSR_HV_SIEFP 0x000A0012 -#define MSR_HV_SIEFP_ENABLE 0x0001ULL -#define MSR_HV_SIEFP_RSVD_MASK 0x0ffeULL -#define MSR_HV_SIEFP_PGSHIFT 12 - -#define MSR_HV_SIMP 0x000A0013 -#define MSR_HV_SIMP_ENABLE 0x0001ULL -#define MSR_HV_SIMP_RSVD_MASK 0x0ffeULL -#define MSR_HV_SIMP_PGSHIFT 12 - -#define MSR_HV_EOM 0x000A0014 - +#define MSR_HV_SIEFP 0x000A0012 +#define MSR_HV_SIMP 0x000A0013 #define MSR_HV_SINT0 0x000A0000 -#define MSR_HV_SINT_VECTOR_MASK 0x00ffULL -#define MSR_HV_SINT_RSVD1_MASK 0xff00ULL -#define MSR_HV_SINT_MASKED 0x00010000ULL #define MSR_HV_SINT_AUTOEOI 0x00000000ULL -#define MSR_HV_SINT_RSVD2_MASK 0xfffffffffffc0000ULL -#define MSR_HV_SINT_RSVD_MASK (MSR_HV_SINT_RSVD1_MASK | \ - MSR_HV_SINT_RSVD2_MASK) - -#define MSR_HV_STIMER0_CONFIG 0x400000b0 -#define MSR_HV_STIMER_CFG_ENABLE 0x0001ULL -#define MSR_HV_STIMER_CFG_PERIODIC 0x0002ULL -#define MSR_HV_STIMER_CFG_LAZY 0x0004ULL -#define MSR_HV_STIMER_CFG_AUTOEN 0x0008ULL -#define MSR_HV_STIMER_CFG_SINT_MASK 0x000f0000ULL -#define MSR_HV_STIMER_CFG_SINT_SHIFT 16 - -#define MSR_HV_STIMER0_COUNT 0x400000b1 - -/* - * CPUID leaves - */ - -#define CPUID_LEAF_HV_MAXLEAF 0x40000000 - -#define CPUID_LEAF_HV_INTERFACE 0x40000001 -#define CPUID_HV_IFACE_HYPERV 0x31237648 /* HV#1 */ - +#define MSR_HV_EOM 0x000A0014 #define CPUID_LEAF_HV_IDENTITY 0x00000100 - #define CPUID_LEAF_HV_FEATURES 0x00000200 -/* EAX: features include/hyperv.h CPUID_HV_MSR */ -/* ECX: power management features */ -#define CPUPM_HV_CSTATE_MASK 0x000f /* deepest C-state */ -#define CPUPM_HV_C3_HPET 0x0010 /* C3 requires HPET */ -#define CPUPM_HV_CSTATE(f) ((f) & CPUPM_HV_CSTATE_MASK) -/* EDX: features3 */ -#define CPUID3_HV_MWAIT 0x0001 /* MWAIT */ -#define CPUID3_HV_XMM_HYPERCALL 0x0010 /* Hypercall input through - * XMM regs */ -#define CPUID3_HV_GUEST_IDLE 0x0020 /* guest idle */ -#define CPUID3_HV_NUMA 0x0080 /* NUMA distance query */ -#define CPUID3_HV_TIME_FREQ 0x0100 /* timer frequency query - * (TSC, LAPIC) */ -#define CPUID3_HV_MSR_CRASH 0x0400 /* MSRs for guest crash */ - #define CPUID_LEAF_HV_RECOMMENDS 0x00000201 -#define CPUID_LEAF_HV_LIMITS 0x40000005 -#define CPUID_LEAF_HV_HWFEATURES 0x40000006 - -/* - * Hyper-V Monitor Notification Facility - */ -struct hyperv_mon_param { - uint32_t mp_connid; - uint16_t mp_evtflag_ofs; - uint16_t mp_rsvd; -} __packed; - -/* - * Hyper-V message types - */ -#define HYPERV_MSGTYPE_NONE 0 -#define HYPERV_MSGTYPE_CHANNEL 1 -#define HYPERV_MSGTYPE_TIMER_EXPIRED 0x80000010 - -/* - * Hypercall status codes - */ -#define HYPERCALL_STATUS_SUCCESS 0x0000 - -/* - * Hypercall input values - */ -#define HYPERCALL_POST_MESSAGE 0x005c -#define HYPERCALL_SIGNAL_EVENT 0x005d - -/* - * Hypercall input parameters - */ -#define HYPERCALL_PARAM_ALIGN 8 -#if 0 -/* - * XXX - * <> requires - * input parameters size to be multiple of 8, however, many post - * message input parameters do _not_ meet this requirement. - */ -#define HYPERCALL_PARAM_SIZE_ALIGN 8 -#endif - -/* - * HYPERCALL_POST_MESSAGE - */ -#define HYPERCALL_POSTMSGIN_DSIZE_MAX 240 -#define HYPERCALL_POSTMSGIN_SIZE 256 - -struct hypercall_postmsg_in { - uint32_t hc_connid; - uint32_t hc_rsvd; - uint32_t hc_msgtype; /* HYPERV_MSGTYPE_ */ - uint32_t hc_dsize; - uint8_t hc_data[HYPERCALL_POSTMSGIN_DSIZE_MAX]; -} __packed; -CTASSERT(sizeof(struct hypercall_postmsg_in) == HYPERCALL_POSTMSGIN_SIZE); - -/* - * HYPERCALL_SIGNAL_EVENT - * - * struct hyperv_mon_param. - */ - #endif /* !_HYPERV_REG_H_ */ diff --git a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c index 861443c4a6ed..f899079d22bc 100644 --- a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c +++ b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "acpi_if.h" #include "pcib_if.h" #include "vmbus_if.h" diff --git a/sys/dev/hyperv/vmbus/hyperv_common_reg.h b/sys/dev/hyperv/vmbus/hyperv_common_reg.h new file mode 100644 index 000000000000..b151952158c7 --- /dev/null +++ b/sys/dev/hyperv/vmbus/hyperv_common_reg.h @@ -0,0 +1,175 @@ +/*- SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * Copyright (c) 2022 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_COMMON_REG_H_ +#define _HYPERV_COMMON_REG_H_ + +#include +#include + +#define MSR_HV_GUESTID_BUILD_MASK 0xffffULL +#define MSR_HV_GUESTID_VERSION_MASK 0x0000ffffffff0000ULL +#define MSR_HV_GUESTID_VERSION_SHIFT 16 +#define MSR_HV_GUESTID_OSID_MASK 0x00ff000000000000ULL +#define MSR_HV_GUESTID_OSID_SHIFT 48 +#define MSR_HV_GUESTID_OSTYPE_MASK 0x7f00000000000000ULL +#define MSR_HV_GUESTID_OSTYPE_SHIFT 56 +#define MSR_HV_GUESTID_OPENSRC 0x8000000000000000ULL +#define MSR_HV_GUESTID_OSTYPE_LINUX \ + ((0x01ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) +#define MSR_HV_GUESTID_OSTYPE_FREEBSD \ + ((0x02ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) + +#define MSR_HV_HYPERCALL 0x40000001 +#define MSR_HV_HYPERCALL_ENABLE 0x0001ULL +#define MSR_HV_HYPERCALL_RSVD_MASK 0x0ffeULL +#define MSR_HV_HYPERCALL_PGSHIFT 12 + +#define MSR_HV_REFERENCE_TSC 0x40000021 +#define MSR_HV_REFTSC_ENABLE 0x0001ULL +#define MSR_HV_REFTSC_RSVD_MASK 0x0ffeULL +#define MSR_HV_REFTSC_PGSHIFT 12 + +#define MSR_HV_SCTRL_ENABLE 0x0001ULL +#define MSR_HV_SCTRL_RSVD_MASK 0xfffffffffffffffeULL + +#define MSR_HV_SIEFP_ENABLE 0x0001ULL +#define MSR_HV_SIEFP_RSVD_MASK 0x0ffeULL +#define MSR_HV_SIEFP_PGSHIFT 12 + +#define MSR_HV_SIMP_ENABLE 0x0001ULL +#define MSR_HV_SIMP_RSVD_MASK 0x0ffeULL +#define MSR_HV_SIMP_PGSHIFT 12 + +#define MSR_HV_SINT_VECTOR_MASK 0x00ffULL +#define MSR_HV_SINT_RSVD1_MASK 0xff00ULL +#define MSR_HV_SINT_MASKED 0x00010000ULL + +#define MSR_HV_SINT_RSVD2_MASK 0xfffffffffffc0000ULL +#define MSR_HV_SINT_RSVD_MASK (MSR_HV_SINT_RSVD1_MASK | \ + MSR_HV_SINT_RSVD2_MASK) + +#define MSR_HV_STIMER0_CONFIG 0x400000b0 +#define MSR_HV_STIMER_CFG_ENABLE 0x0001ULL +#define MSR_HV_STIMER_CFG_PERIODIC 0x0002ULL +#define MSR_HV_STIMER_CFG_LAZY 0x0004ULL +#define MSR_HV_STIMER_CFG_AUTOEN 0x0008ULL +#define MSR_HV_STIMER_CFG_SINT_MASK 0x000f0000ULL +#define MSR_HV_STIMER_CFG_SINT_SHIFT 16 + +#define MSR_HV_STIMER0_COUNT 0x400000b1 + +/* + * CPUID leaves + */ + +#define CPUID_LEAF_HV_MAXLEAF 0x40000000 + +#define CPUID_LEAF_HV_INTERFACE 0x40000001 +#define CPUID_HV_IFACE_HYPERV 0x31237648 /* HV#1 */ + +/* EAX: features include/hyperv.h CPUID_HV_MSR */ +/* ECX: power management features */ +#define CPUPM_HV_CSTATE_MASK 0x000f /* deepest C-state */ +#define CPUPM_HV_C3_HPET 0x0010 /* C3 requires HPET */ +#define CPUPM_HV_CSTATE(f) ((f) & CPUPM_HV_CSTATE_MASK) +/* EDX: features3 */ +#define CPUID3_HV_MWAIT 0x0001 /* MWAIT */ +#define CPUID3_HV_XMM_HYPERCALL 0x0010 /* Hypercall input through + * XMM regs */ +#define CPUID3_HV_GUEST_IDLE 0x0020 /* guest idle */ +#define CPUID3_HV_NUMA 0x0080 /* NUMA distance query */ +#define CPUID3_HV_TIME_FREQ 0x0100 /* timer frequency query + * (TSC, LAPIC) */ +#define CPUID3_HV_MSR_CRASH 0x0400 /* MSRs for guest crash */ +#define CPUID_LEAF_HV_LIMITS 0x40000005 +#define CPUID_LEAF_HV_HWFEATURES 0x40000006 + +/* + * Hyper-V Monitor Notification Facility + */ +struct hyperv_mon_param { + uint32_t mp_connid; + uint16_t mp_evtflag_ofs; + uint16_t mp_rsvd; +} __packed; + +/* + * Hyper-V message types + */ +#define HYPERV_MSGTYPE_NONE 0 +#define HYPERV_MSGTYPE_CHANNEL 1 +#define HYPERV_MSGTYPE_TIMER_EXPIRED 0x80000010 + +/* + * Hypercall status codes + */ +#define HYPERCALL_STATUS_SUCCESS 0x0000 + +/* + * Hypercall input values + */ +#define HYPERCALL_POST_MESSAGE 0x005c +#define HYPERCALL_SIGNAL_EVENT 0x005d + +/* + * Hypercall input parameters + */ +#define HYPERCALL_PARAM_ALIGN 8 +#if 0 +/* + * XXX + * <> requires + * input parameters size to be multiple of 8, however, many post + * message input parameters do _not_ meet this requirement. + */ +#define HYPERCALL_PARAM_SIZE_ALIGN 8 +#endif + +/* + * HYPERCALL_POST_MESSAGE + */ +#define HYPERCALL_POSTMSGIN_DSIZE_MAX 240 +#define HYPERCALL_POSTMSGIN_SIZE 256 + +struct hypercall_postmsg_in { + uint32_t hc_connid; + uint32_t hc_rsvd; + uint32_t hc_msgtype; /* HYPERV_MSGTYPE_ */ + uint32_t hc_dsize; + uint8_t hc_data[HYPERCALL_POSTMSGIN_DSIZE_MAX]; +} __packed; +CTASSERT(sizeof(struct hypercall_postmsg_in) == HYPERCALL_POSTMSGIN_SIZE); + +/* + * HYPERCALL_SIGNAL_EVENT + * + * struct hyperv_mon_param. + */ + +#endif /* i!__HYPERV_COMMON_REG_H__ */ diff --git a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h index f76d014b86f5..fec2eda2d673 100644 --- a/sys/dev/hyperv/vmbus/x86/hyperv_reg.h +++ b/sys/dev/hyperv/vmbus/x86/hyperv_reg.h @@ -37,157 +37,14 @@ */ #define MSR_HV_GUEST_OS_ID 0x40000000 -#define MSR_HV_GUESTID_BUILD_MASK 0xffffULL -#define MSR_HV_GUESTID_VERSION_MASK 0x0000ffffffff0000ULL -#define MSR_HV_GUESTID_VERSION_SHIFT 16 -#define MSR_HV_GUESTID_OSID_MASK 0x00ff000000000000ULL -#define MSR_HV_GUESTID_OSID_SHIFT 48 -#define MSR_HV_GUESTID_OSTYPE_MASK 0x7f00000000000000ULL -#define MSR_HV_GUESTID_OSTYPE_SHIFT 56 -#define MSR_HV_GUESTID_OPENSRC 0x8000000000000000ULL -#define MSR_HV_GUESTID_OSTYPE_LINUX \ - ((0x01ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) -#define MSR_HV_GUESTID_OSTYPE_FREEBSD \ - ((0x02ULL << MSR_HV_GUESTID_OSTYPE_SHIFT) | MSR_HV_GUESTID_OPENSRC) - -#define MSR_HV_HYPERCALL 0x40000001 -#define MSR_HV_HYPERCALL_ENABLE 0x0001ULL -#define MSR_HV_HYPERCALL_RSVD_MASK 0x0ffeULL -#define MSR_HV_HYPERCALL_PGSHIFT 12 - #define MSR_HV_VP_INDEX 0x40000002 - -#define MSR_HV_REFERENCE_TSC 0x40000021 -#define MSR_HV_REFTSC_ENABLE 0x0001ULL -#define MSR_HV_REFTSC_RSVD_MASK 0x0ffeULL -#define MSR_HV_REFTSC_PGSHIFT 12 - #define MSR_HV_SCONTROL 0x40000080 -#define MSR_HV_SCTRL_ENABLE 0x0001ULL -#define MSR_HV_SCTRL_RSVD_MASK 0xfffffffffffffffeULL - -#define MSR_HV_SIEFP 0x40000082 -#define MSR_HV_SIEFP_ENABLE 0x0001ULL -#define MSR_HV_SIEFP_RSVD_MASK 0x0ffeULL -#define MSR_HV_SIEFP_PGSHIFT 12 - -#define MSR_HV_SIMP 0x40000083 -#define MSR_HV_SIMP_ENABLE 0x0001ULL -#define MSR_HV_SIMP_RSVD_MASK 0x0ffeULL -#define MSR_HV_SIMP_PGSHIFT 12 - +#define MSR_HV_SIEFP 0x40000082 +#define MSR_HV_SIMP 0x40000083 #define MSR_HV_EOM 0x40000084 - #define MSR_HV_SINT0 0x40000090 -#define MSR_HV_SINT_VECTOR_MASK 0x00ffULL -#define MSR_HV_SINT_RSVD1_MASK 0xff00ULL -#define MSR_HV_SINT_MASKED 0x00010000ULL #define MSR_HV_SINT_AUTOEOI 0x00020000ULL -#define MSR_HV_SINT_RSVD2_MASK 0xfffffffffffc0000ULL -#define MSR_HV_SINT_RSVD_MASK (MSR_HV_SINT_RSVD1_MASK | \ - MSR_HV_SINT_RSVD2_MASK) - -#define MSR_HV_STIMER0_CONFIG 0x400000b0 -#define MSR_HV_STIMER_CFG_ENABLE 0x0001ULL -#define MSR_HV_STIMER_CFG_PERIODIC 0x0002ULL -#define MSR_HV_STIMER_CFG_LAZY 0x0004ULL -#define MSR_HV_STIMER_CFG_AUTOEN 0x0008ULL -#define MSR_HV_STIMER_CFG_SINT_MASK 0x000f0000ULL -#define MSR_HV_STIMER_CFG_SINT_SHIFT 16 - -#define MSR_HV_STIMER0_COUNT 0x400000b1 - -/* - * CPUID leaves - */ - -#define CPUID_LEAF_HV_MAXLEAF 0x40000000 - -#define CPUID_LEAF_HV_INTERFACE 0x40000001 -#define CPUID_HV_IFACE_HYPERV 0x31237648 /* HV#1 */ - #define CPUID_LEAF_HV_IDENTITY 0x40000002 - #define CPUID_LEAF_HV_FEATURES 0x40000003 -/* EAX: features include/hyperv.h CPUID_HV_MSR */ -/* ECX: power management features */ -#define CPUPM_HV_CSTATE_MASK 0x000f /* deepest C-state */ -#define CPUPM_HV_C3_HPET 0x0010 /* C3 requires HPET */ -#define CPUPM_HV_CSTATE(f) ((f) & CPUPM_HV_CSTATE_MASK) -/* EDX: features3 */ -#define CPUID3_HV_MWAIT 0x0001 /* MWAIT */ -#define CPUID3_HV_XMM_HYPERCALL 0x0010 /* Hypercall input through - * XMM regs */ -#define CPUID3_HV_GUEST_IDLE 0x0020 /* guest idle */ -#define CPUID3_HV_NUMA 0x0080 /* NUMA distance query */ -#define CPUID3_HV_TIME_FREQ 0x0100 /* timer frequency query - * (TSC, LAPIC) */ -#define CPUID3_HV_MSR_CRASH 0x0400 /* MSRs for guest crash */ - #define CPUID_LEAF_HV_RECOMMENDS 0x40000004 -#define CPUID_LEAF_HV_LIMITS 0x40000005 -#define CPUID_LEAF_HV_HWFEATURES 0x40000006 - -/* - * Hyper-V Monitor Notification Facility - */ -struct hyperv_mon_param { - uint32_t mp_connid; - uint16_t mp_evtflag_ofs; - uint16_t mp_rsvd; -} __packed; - -/* - * Hyper-V message types - */ -#define HYPERV_MSGTYPE_NONE 0 -#define HYPERV_MSGTYPE_CHANNEL 1 -#define HYPERV_MSGTYPE_TIMER_EXPIRED 0x80000010 - -/* - * Hypercall status codes - */ -#define HYPERCALL_STATUS_SUCCESS 0x0000 - -/* - * Hypercall input values - */ -#define HYPERCALL_POST_MESSAGE 0x005c -#define HYPERCALL_SIGNAL_EVENT 0x005d - -/* - * Hypercall input parameters - */ -#define HYPERCALL_PARAM_ALIGN 8 -#if 0 -/* - * XXX - * <> requires - * input parameters size to be multiple of 8, however, many post - * message input parameters do _not_ meet this requirement. - */ -#define HYPERCALL_PARAM_SIZE_ALIGN 8 -#endif - -/* - * HYPERCALL_POST_MESSAGE - */ -#define HYPERCALL_POSTMSGIN_DSIZE_MAX 240 -#define HYPERCALL_POSTMSGIN_SIZE 256 - -struct hypercall_postmsg_in { - uint32_t hc_connid; - uint32_t hc_rsvd; - uint32_t hc_msgtype; /* HYPERV_MSGTYPE_ */ - uint32_t hc_dsize; - uint8_t hc_data[HYPERCALL_POSTMSGIN_DSIZE_MAX]; -} __packed; -CTASSERT(sizeof(struct hypercall_postmsg_in) == HYPERCALL_POSTMSGIN_SIZE); - -/* - * HYPERCALL_SIGNAL_EVENT - * - * struct hyperv_mon_param. - */ - #endif /* !_HYPERV_REG_H_ */ diff --git a/sys/dev/hyperv/vmbus/x86/hyperv_x86.c b/sys/dev/hyperv/vmbus/x86/hyperv_x86.c index 17cb45d81f41..bb7f14e29ef0 100644 --- a/sys/dev/hyperv/vmbus/x86/hyperv_x86.c +++ b/sys/dev/hyperv/vmbus/x86/hyperv_x86.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #define HYPERV_FREEBSD_BUILD 0ULL #define HYPERV_FREEBSD_VERSION ((uint64_t)__FreeBSD_version) diff --git a/sys/dev/hyperv/vmbus/x86/vmbus_x86.c b/sys/dev/hyperv/vmbus/x86/vmbus_x86.c index 4569b9dffa07..828827f77c35 100644 --- a/sys/dev/hyperv/vmbus/x86/vmbus_x86.c +++ b/sys/dev/hyperv/vmbus/x86/vmbus_x86.c @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "acpi_if.h" #include "pcib_if.h" #include "vmbus_if.h"