From: Roman Kagan <rkagan@virtuozzo.com> To: "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "K. Y. Srinivasan" <kys@microsoft.com>, "Vitaly Kuznetsov" <vkuznets@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, <x86@kernel.org>, Haiyang Zhang <haiyangz@microsoft.com>, <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <devel@linuxdriverproject.org>, "Denis V . Lunev" <den@openvz.org>, Roman Kagan <rkagan@virtuozzo.com> Subject: [PATCH 08/15] hyperv: dedup crash msr related definitions Date: Tue, 20 Dec 2016 18:55:55 +0300 [thread overview] Message-ID: <20161220155602.6298-9-rkagan@virtuozzo.com> (raw) In-Reply-To: <20161220155602.6298-1-rkagan@virtuozzo.com> Use the definitions already present in the uapi header throughout the guest driver, too. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- drivers/hv/hyperv_vmbus.h | 11 ----------- drivers/hv/vmbus_drv.c | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 9b0f1c9..7bf1b10 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -39,17 +39,6 @@ */ #define HV_UTIL_NEGO_TIMEOUT 55 -#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE 0x400 - -#define HV_X64_MSR_CRASH_P0 0x40000100 -#define HV_X64_MSR_CRASH_P1 0x40000101 -#define HV_X64_MSR_CRASH_P2 0x40000102 -#define HV_X64_MSR_CRASH_P3 0x40000103 -#define HV_X64_MSR_CRASH_P4 0x40000104 -#define HV_X64_MSR_CRASH_CTL 0x40000105 - -#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) - /* Define version of the synthetic interrupt controller. */ #define HV_SYNIC_VERSION (1) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 13dd210..7564a7b 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -77,7 +77,7 @@ static void hyperv_report_panic(struct pt_regs *regs) /* * Let Hyper-V know there is crash data available */ - wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY); + wrmsrl(HV_X64_MSR_CRASH_CTL, HV_X64_MSR_CRASH_CTL_NOTIFY); } static int hyperv_panic_event(struct notifier_block *nb, unsigned long val, @@ -993,7 +993,7 @@ static int vmbus_bus_init(void) /* * Only register if the crash MSRs are available */ - if (ms_hyperv.misc_features & HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE) { + if (ms_hyperv.misc_features & HV_X64_GUEST_CRASH_MSR_AVAILABLE) { register_die_notifier(&hyperv_die_block); atomic_notifier_chain_register(&panic_notifier_list, &hyperv_panic_block); @@ -1535,7 +1535,7 @@ static void __exit vmbus_exit(void) for_each_online_cpu(cpu) tasklet_kill(hv_context.msg_dpc[cpu]); vmbus_free_channels(); - if (ms_hyperv.misc_features & HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE) { + if (ms_hyperv.misc_features & HV_X64_GUEST_CRASH_MSR_AVAILABLE) { unregister_die_notifier(&hyperv_die_block); atomic_notifier_chain_unregister(&panic_notifier_list, &hyperv_panic_block); -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Roman Kagan <rkagan@virtuozzo.com> To: "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "K. Y. Srinivasan" <kys@microsoft.com>, "Vitaly Kuznetsov" <vkuznets@redhat.com> Cc: kvm@vger.kernel.org, "Denis V . Lunev" <den@openvz.org>, Haiyang Zhang <haiyangz@microsoft.com>, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>, Roman Kagan <rkagan@virtuozzo.com>, "H. Peter Anvin" <hpa@zytor.com>, devel@linuxdriverproject.org, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 08/15] hyperv: dedup crash msr related definitions Date: Tue, 20 Dec 2016 18:55:55 +0300 [thread overview] Message-ID: <20161220155602.6298-9-rkagan@virtuozzo.com> (raw) In-Reply-To: <20161220155602.6298-1-rkagan@virtuozzo.com> Use the definitions already present in the uapi header throughout the guest driver, too. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- drivers/hv/hyperv_vmbus.h | 11 ----------- drivers/hv/vmbus_drv.c | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 9b0f1c9..7bf1b10 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -39,17 +39,6 @@ */ #define HV_UTIL_NEGO_TIMEOUT 55 -#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE 0x400 - -#define HV_X64_MSR_CRASH_P0 0x40000100 -#define HV_X64_MSR_CRASH_P1 0x40000101 -#define HV_X64_MSR_CRASH_P2 0x40000102 -#define HV_X64_MSR_CRASH_P3 0x40000103 -#define HV_X64_MSR_CRASH_P4 0x40000104 -#define HV_X64_MSR_CRASH_CTL 0x40000105 - -#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) - /* Define version of the synthetic interrupt controller. */ #define HV_SYNIC_VERSION (1) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 13dd210..7564a7b 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -77,7 +77,7 @@ static void hyperv_report_panic(struct pt_regs *regs) /* * Let Hyper-V know there is crash data available */ - wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY); + wrmsrl(HV_X64_MSR_CRASH_CTL, HV_X64_MSR_CRASH_CTL_NOTIFY); } static int hyperv_panic_event(struct notifier_block *nb, unsigned long val, @@ -993,7 +993,7 @@ static int vmbus_bus_init(void) /* * Only register if the crash MSRs are available */ - if (ms_hyperv.misc_features & HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE) { + if (ms_hyperv.misc_features & HV_X64_GUEST_CRASH_MSR_AVAILABLE) { register_die_notifier(&hyperv_die_block); atomic_notifier_chain_register(&panic_notifier_list, &hyperv_panic_block); @@ -1535,7 +1535,7 @@ static void __exit vmbus_exit(void) for_each_online_cpu(cpu) tasklet_kill(hv_context.msg_dpc[cpu]); vmbus_free_channels(); - if (ms_hyperv.misc_features & HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE) { + if (ms_hyperv.misc_features & HV_X64_GUEST_CRASH_MSR_AVAILABLE) { unregister_die_notifier(&hyperv_die_block); atomic_notifier_chain_unregister(&panic_notifier_list, &hyperv_panic_block); -- 2.9.3
next prev parent reply other threads:[~2016-12-20 19:14 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-20 15:55 [PATCH 00/15] hyperv: more stuff to uapi + cleanup Roman Kagan 2016-12-20 15:55 ` [PATCH 01/15] hyperv: consolidate TSC ref page definitions Roman Kagan 2016-12-20 20:57 ` KY Srinivasan 2016-12-21 6:25 ` Roman Kagan 2016-12-21 6:25 ` Roman Kagan 2016-12-20 15:55 ` [PATCH 02/15] hyperv: uapi-fy synic event flags definitions Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 17:24 ` Stephen Hemminger 2016-12-20 17:24 ` Stephen Hemminger 2016-12-21 6:33 ` Roman Kagan 2016-12-21 6:33 ` Roman Kagan 2016-12-21 10:58 ` kbuild test robot 2016-12-21 18:58 ` KY Srinivasan 2016-12-21 18:58 ` KY Srinivasan 2016-12-20 15:55 ` [PATCH 03/15] hyperv: use standard bitops Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-21 12:00 ` Olaf Hering 2016-12-21 13:23 ` Roman Kagan 2016-12-22 12:33 ` Paolo Bonzini 2016-12-21 19:08 ` KY Srinivasan 2016-12-21 19:08 ` KY Srinivasan 2016-12-20 15:55 ` [PATCH 04/15] hyperv: define VMBus message type Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 15:55 ` [PATCH 05/15] hyperv: GFP_ATOMIC -> GFP_KERNEL Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 15:55 ` [PATCH 06/15] hyperv: avoid unnecessary vmalloc Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-21 19:19 ` KY Srinivasan 2016-12-20 15:55 ` [PATCH 07/15] hyperv: dedup cpuid definitions Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 15:55 ` Roman Kagan [this message] 2016-12-20 15:55 ` [PATCH 08/15] hyperv: dedup crash msr related definitions Roman Kagan 2016-12-20 15:55 ` [PATCH 09/15] hyperv: unify Hyper-V msr definitions Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 15:55 ` [PATCH 10/15] hyperv: uapi-fy PostMessage and SignalEvent hypercall structures Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-21 19:27 ` KY Srinivasan 2016-12-20 15:55 ` [PATCH 11/15] hyperv: uapi-fy monitored notification structures Roman Kagan 2016-12-20 15:55 ` Roman Kagan 2016-12-20 15:55 ` [PATCH 12/15] hyperv: move VMBus connection ids to uapi Roman Kagan 2016-12-20 17:25 ` Stephen Hemminger 2016-12-21 6:29 ` Roman Kagan 2016-12-21 6:29 ` Roman Kagan 2016-12-21 12:18 ` Christoph Hellwig 2016-12-21 12:59 ` Roman Kagan 2016-12-21 12:59 ` Roman Kagan 2016-12-21 14:26 ` Christoph Hellwig 2016-12-21 14:39 ` Roman Kagan 2016-12-21 14:39 ` Roman Kagan 2016-12-21 15:39 ` Paolo Bonzini 2016-12-21 15:43 ` Christoph Hellwig 2016-12-21 15:43 ` Christoph Hellwig 2016-12-21 17:25 ` Paolo Bonzini 2016-12-21 17:50 ` Stephen Hemminger 2016-12-21 17:50 ` Stephen Hemminger 2016-12-21 17:53 ` Paolo Bonzini 2016-12-21 17:53 ` Paolo Bonzini 2016-12-21 17:58 ` Christoph Hellwig 2016-12-21 17:58 ` Christoph Hellwig 2016-12-21 18:02 ` Stephen Hemminger 2016-12-21 18:02 ` Stephen Hemminger 2016-12-21 19:54 ` KY Srinivasan 2016-12-21 19:54 ` KY Srinivasan 2016-12-28 17:09 ` Roman Kagan 2016-12-28 17:09 ` Roman Kagan 2016-12-29 18:29 ` Stephen Hemminger 2016-12-29 18:29 ` Stephen Hemminger 2017-01-02 8:19 ` Paolo Bonzini 2017-01-09 8:32 ` Roman Kagan 2017-01-09 8:40 ` hpa 2017-01-09 8:58 ` Roman Kagan 2017-01-09 8:58 ` Roman Kagan 2017-01-09 9:02 ` Paolo Bonzini 2017-01-02 19:39 ` Stephen Hemminger 2017-01-02 19:39 ` Stephen Hemminger 2017-01-03 9:32 ` Paolo Bonzini 2016-12-20 15:56 ` [PATCH 13/15] hyperv: move function close to its only callsite Roman Kagan 2016-12-20 15:56 ` [PATCH 14/15] hyperv_vmbus: drop unused definitions Roman Kagan 2016-12-20 15:56 ` [PATCH 15/15] hyperv: redefine hv_message without bitfields Roman Kagan 2016-12-21 18:00 ` [PATCH 00/15] hyperv: more stuff to uapi + cleanup KY Srinivasan 2016-12-28 16:57 ` Roman Kagan 2016-12-28 16:57 ` Roman Kagan 2016-12-30 19:45 ` KY Srinivasan 2016-12-30 19:45 ` KY Srinivasan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161220155602.6298-9-rkagan@virtuozzo.com \ --to=rkagan@virtuozzo.com \ --cc=den@openvz.org \ --cc=devel@linuxdriverproject.org \ --cc=haiyangz@microsoft.com \ --cc=hpa@zytor.com \ --cc=kvm@vger.kernel.org \ --cc=kys@microsoft.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ --cc=tglx@linutronix.de \ --cc=vkuznets@redhat.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.