Skip to content

L
linux-davinci
Commit a51ed7d6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: hv: remove ReadMsr and WriteMsr functions from Hv.h 

They aren't needed as wrappers.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e1415db7
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 51 deletions
drivers/staging/hv/Hv.c
View file @ a51ed7d6
...@@ -251,19 +251,17 @@ HvInit ( ...@@ -251,19 +251,17 @@ HvInit (
/* HvQueryHypervisorFeatures(maxLeaf); */ /* HvQueryHypervisorFeatures(maxLeaf); */
/* Determine if we are running on xenlinux (ie x2v shim) or native linux */ /* Determine if we are running on xenlinux (ie x2v shim) or native linux */
gHvContext.GuestId = ReadMsr(HV_X64_MSR_GUEST_OS_ID); rdmsrl(HV_X64_MSR_GUEST_OS_ID, gHvContext.GuestId);
if (gHvContext.GuestId == 0) if (gHvContext.GuestId == 0)
{ {
/* Write our OS info */ /* Write our OS info */
WriteMsr(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID); wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
gHvContext.GuestId = HV_LINUX_GUEST_ID; gHvContext.GuestId = HV_LINUX_GUEST_ID;
} }
/* See if the hypercall page is already set */ /* See if the hypercall page is already set */
hypercallMsr.AsUINT64 = ReadMsr(HV_X64_MSR_HYPERCALL); rdmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
if (gHvContext.GuestId == HV_LINUX_GUEST_ID) if (gHvContext.GuestId == HV_LINUX_GUEST_ID)
{ {
/* Allocate the hypercall page memory */ /* Allocate the hypercall page memory */
...@@ -279,12 +277,11 @@ HvInit ( ...@@ -279,12 +277,11 @@ HvInit (
hypercallMsr.Enable = 1; hypercallMsr.Enable = 1;
/* hypercallMsr.GuestPhysicalAddress = virt_to_phys(virtAddr) >> PAGE_SHIFT; */ /* hypercallMsr.GuestPhysicalAddress = virt_to_phys(virtAddr) >> PAGE_SHIFT; */
hypercallMsr.GuestPhysicalAddress = vmalloc_to_pfn(virtAddr); hypercallMsr.GuestPhysicalAddress = vmalloc_to_pfn(virtAddr);
WriteMsr(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64); wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
/* Confirm that hypercall page did get setup. */ /* Confirm that hypercall page did get setup. */
hypercallMsr.AsUINT64 = 0; hypercallMsr.AsUINT64 = 0;
hypercallMsr.AsUINT64 = ReadMsr(HV_X64_MSR_HYPERCALL); rdmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
if (!hypercallMsr.Enable) if (!hypercallMsr.Enable)
{ {
DPRINT_ERR(VMBUS, "unable to set hypercall page!!"); DPRINT_ERR(VMBUS, "unable to set hypercall page!!");
...@@ -328,7 +325,7 @@ Cleanup: ...@@ -328,7 +325,7 @@ Cleanup:
if (hypercallMsr.Enable) if (hypercallMsr.Enable)
{ {
hypercallMsr.AsUINT64 = 0; hypercallMsr.AsUINT64 = 0;
WriteMsr(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64); wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
} }
vfree(virtAddr); vfree(virtAddr);
...@@ -370,7 +367,7 @@ HvCleanup ( ...@@ -370,7 +367,7 @@ HvCleanup (
if (gHvContext.HypercallPage) if (gHvContext.HypercallPage)
{ {
hypercallMsr.AsUINT64 = 0; hypercallMsr.AsUINT64 = 0;
WriteMsr(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64); wrmsrl(HV_X64_MSR_HYPERCALL, hypercallMsr.AsUINT64);
vfree(gHvContext.HypercallPage); vfree(gHvContext.HypercallPage);
gHvContext.HypercallPage = NULL; gHvContext.HypercallPage = NULL;
} }
...@@ -489,7 +486,7 @@ HvSynicInit ( ...@@ -489,7 +486,7 @@ HvSynicInit (
} }
/* Check the version */ /* Check the version */
version = ReadMsr(HV_X64_MSR_SVERSION); rdmsrl(HV_X64_MSR_SVERSION, version);
DPRINT_INFO(VMBUS, "SynIC version: %llx", version); DPRINT_INFO(VMBUS, "SynIC version: %llx", version);
...@@ -498,14 +495,13 @@ HvSynicInit ( ...@@ -498,14 +495,13 @@ HvSynicInit (
{ {
DPRINT_INFO(VMBUS, "Skipping SIMP and SIEFP setup since it is already set."); DPRINT_INFO(VMBUS, "Skipping SIMP and SIEFP setup since it is already set.");
simp.AsUINT64 = ReadMsr(HV_X64_MSR_SIMP); rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
siefp.AsUINT64 = ReadMsr(HV_X64_MSR_SIEFP); rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
DPRINT_DBG(VMBUS, "Simp: %llx, Sifep: %llx", simp.AsUINT64, siefp.AsUINT64); DPRINT_DBG(VMBUS, "Simp: %llx, Sifep: %llx", simp.AsUINT64, siefp.AsUINT64);
/* Determine if we are running on xenlinux (ie x2v shim) or native linux */ /* Determine if we are running on xenlinux (ie x2v shim) or native linux */
guestID = ReadMsr(HV_X64_MSR_GUEST_OS_ID); rdmsrl(HV_X64_MSR_GUEST_OS_ID, guestID);
if (guestID == HV_LINUX_GUEST_ID) if (guestID == HV_LINUX_GUEST_ID)
{ {
gHvContext.synICMessagePage[0] = phys_to_virt(simp.BaseSimpGpa << PAGE_SHIFT); gHvContext.synICMessagePage[0] = phys_to_virt(simp.BaseSimpGpa << PAGE_SHIFT);
...@@ -535,29 +531,29 @@ HvSynicInit ( ...@@ -535,29 +531,29 @@ HvSynicInit (
} }
/* Setup the Synic's message page */ /* Setup the Synic's message page */
simp.AsUINT64 = ReadMsr(HV_X64_MSR_SIMP); rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
simp.SimpEnabled = 1; simp.SimpEnabled = 1;
simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[0]) >> PAGE_SHIFT; simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[0]) >> PAGE_SHIFT;
DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx", simp.AsUINT64); DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx", simp.AsUINT64);
WriteMsr(HV_X64_MSR_SIMP, simp.AsUINT64); wrmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
/* Setup the Synic's event page */ /* Setup the Synic's event page */
siefp.AsUINT64 = ReadMsr(HV_X64_MSR_SIEFP); rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
siefp.SiefpEnabled = 1; siefp.SiefpEnabled = 1;
siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[0]) >> PAGE_SHIFT; siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[0]) >> PAGE_SHIFT;
DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx", siefp.AsUINT64); DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx", siefp.AsUINT64);
WriteMsr(HV_X64_MSR_SIEFP, siefp.AsUINT64); wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
} }
/* Setup the interception SINT. */ /* Setup the interception SINT. */
/* WriteMsr((HV_X64_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX), */ /* wrmsrl((HV_X64_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX), */
/* interceptionSint.AsUINT64); */ /* interceptionSint.AsUINT64); */
/* Setup the shared SINT. */ /* Setup the shared SINT. */
sharedSint.AsUINT64 = ReadMsr(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT); rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
sharedSint.AsUINT64 = 0; sharedSint.AsUINT64 = 0;
sharedSint.Vector = irqVector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */ sharedSint.Vector = irqVector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */
...@@ -566,13 +562,13 @@ HvSynicInit ( ...@@ -566,13 +562,13 @@ HvSynicInit (
DPRINT_DBG(VMBUS, "HV_X64_MSR_SINT1 msr set to: %llx", sharedSint.AsUINT64); DPRINT_DBG(VMBUS, "HV_X64_MSR_SINT1 msr set to: %llx", sharedSint.AsUINT64);
WriteMsr(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64); wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
/* Enable the global synic bit */ /* Enable the global synic bit */
sctrl.AsUINT64 = ReadMsr(HV_X64_MSR_SCONTROL); rdmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64);
sctrl.Enable = 1; sctrl.Enable = 1;
WriteMsr(HV_X64_MSR_SCONTROL, sctrl.AsUINT64); wrmsrl(HV_X64_MSR_SCONTROL, sctrl.AsUINT64);
gHvContext.SynICInitialized = true; gHvContext.SynICInitialized = true;
...@@ -628,12 +624,12 @@ HvSynicCleanup( ...@@ -628,12 +624,12 @@ HvSynicCleanup(
return; return;
} }
sharedSint.AsUINT64 = ReadMsr(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT); rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
sharedSint.Masked = 1; sharedSint.Masked = 1;
/* Disable the interrupt */ /* Disable the interrupt */
WriteMsr(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64); wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);
/* /*
* Disable and free the resources only if we are running as * Disable and free the resources only if we are running as
...@@ -642,17 +638,17 @@ HvSynicCleanup( ...@@ -642,17 +638,17 @@ HvSynicCleanup(
*/ */
if (gHvContext.GuestId == HV_LINUX_GUEST_ID) if (gHvContext.GuestId == HV_LINUX_GUEST_ID)
{ {
simp.AsUINT64 = ReadMsr(HV_X64_MSR_SIMP); rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
simp.SimpEnabled = 0; simp.SimpEnabled = 0;
simp.BaseSimpGpa = 0; simp.BaseSimpGpa = 0;
WriteMsr(HV_X64_MSR_SIMP, simp.AsUINT64); wrmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
siefp.AsUINT64 = ReadMsr(HV_X64_MSR_SIEFP); rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
siefp.SiefpEnabled = 0; siefp.SiefpEnabled = 0;
siefp.BaseSiefpGpa = 0; siefp.BaseSiefpGpa = 0;
WriteMsr(HV_X64_MSR_SIEFP, siefp.AsUINT64); wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
osd_PageFree(gHvContext.synICMessagePage[0], 1); osd_PageFree(gHvContext.synICMessagePage[0], 1);
osd_PageFree(gHvContext.synICEventPage[0], 1); osd_PageFree(gHvContext.synICEventPage[0], 1);
......
drivers/staging/hv/Hv.h
View file @ a51ed7d6
...@@ -126,26 +126,6 @@ typedef struct { ...@@ -126,26 +126,6 @@ typedef struct {
extern HV_CONTEXT gHvContext; extern HV_CONTEXT gHvContext;
/* Inline routines */
static inline unsigned long long ReadMsr(int msr)
{
unsigned long long val;
rdmsrl(msr, val);
return val;
}
static inline void WriteMsr(int msr, u64 val)
{
wrmsrl(msr, val);
return;
}
/* Hv Interface */ /* Hv Interface */
static int static int
......
drivers/staging/hv/Vmbus.c
View file @ a51ed7d6
...@@ -446,7 +446,7 @@ VmbusOnMsgDPC( ...@@ -446,7 +446,7 @@ VmbusOnMsgDPC(
* possibly deliver another msg from the * possibly deliver another msg from the
* hypervisor * hypervisor
*/ */
WriteMsr(HV_X64_MSR_EOM, 0); wrmsrl(HV_X64_MSR_EOM, 0);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment