Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754262AbcL3Tjf (ORCPT ); Fri, 30 Dec 2016 14:39:35 -0500 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:46786 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284AbcL3Tjd (ORCPT ); Fri, 30 Dec 2016 14:39:33 -0500 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com, rkagan@virtuozzo.com, x86@kernel.org, tglx@linutronix.de, hpa@zytor.com Cc: "K. Y. Srinivasan" Subject: [PATCH 15/18] Drivers: hv: vmbus: Define APIs to manipulate the synthetic interrupt controller Date: Fri, 30 Dec 2016 13:36:09 -0800 Message-Id: <1483133772-29776-15-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com> References: <1483133701-29738-1-git-send-email-kys@exchange.microsoft.com> <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfFT637zA+QjApDPItGYzlty9IZmF2gsS0ZMFNebbl+RhvRdPyCEPAlOSAzU9YreJf5c5fNUsMGQAxcZJoFBc99HsOAXSZtbIWUshJbktSf97ICloa+jY sSzlS5jEvcWGrVrFMH/eYc4JUfUcsZZkQita3Ey5USEGF8EdKrZucuyR/2VFl0n8Kl0x5o7L93aQy3QWLeH8LuN0LmKEoOK9IepisWF82VQ9SZtHy9S62Q8c kSitl9jwFEv7kqGrLO3VsdhLyYnxl83EkGpNbo0qIpmIUIvPWFCTIMOQha7Q7iQToXD+JiFhpISGlZHl81V/QByH+YfGEV90Ju2Pbjee9I9TF3cXgwCMK2XZ jv7jz4sYY3/RzmAXc+/zIDxiR0V1+wd59lNrQTjiUU5qzRNqleQKEu951TzapQcfGhJB1Cu93RS3Gr9H/Vz5ulWUDx4POW2EkXyaVcOFAUTECL9QPvzCBjbx gjcS1rKwoeEbIsQ/GXPWjYOWsfm5TAPPUE+uIBWCpVfaHsoZIbJKj3Jf/S6exEWlh0n2ssMacDCIJhtjgmFz949ibbHYUiH/eGeuqg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1889 Lines: 56 From: K. Y. Srinivasan As part of cleaning up architecture specific code, define APIs to manipulate the interrupt controller state. Signed-off-by: K. Y. Srinivasan --- arch/x86/include/asm/mshyperv.h | 3 +++ drivers/hv/hv.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 2ea7e16..1ea19a5 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -146,6 +146,9 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type) #define hv_get_siefp(val) rdmsrl(HV_X64_MSR_SIEFP, val) #define hv_set_siefp(val) wrmsrl(HV_X64_MSR_SIEFP, val) +#define hv_get_synic_state(val) rdmsrl(HV_X64_MSR_SCONTROL, val) +#define hv_set_synic_state(val) wrmsrl(HV_X64_MSR_SCONTROL, val) + void hyperv_callback_vector(void); #ifdef CONFIG_TRACING #define trace_hyperv_callback_vector hyperv_callback_vector diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 0a1da5d..3c9a819 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -294,10 +294,10 @@ int hv_synic_init(unsigned int cpu) wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64); /* Enable the global synic bit */ - rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); + hv_get_synic_state(sctrl.as_uint64); sctrl.enable = 1; - wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); + hv_set_synic_state(sctrl.as_uint64); hv_context.synic_initialized = true; @@ -405,9 +405,9 @@ int hv_synic_cleanup(unsigned int cpu) hv_set_siefp(siefp.as_uint64); /* Disable the global synic bit */ - rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); + hv_get_synic_state(sctrl.as_uint64); sctrl.enable = 0; - wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); + hv_set_synic_state(sctrl.as_uint64); return 0; } -- 1.7.4.1