svn commit: r300830 - head/sys/dev/hyperv/vmbus

[Sepherosa Ziehau]

Author: sephe
Date: Fri May 27 06:47:04 2016
New Revision: 300830
URL: https://svnweb.freebsd.org/changeset/base/300830

Log:
  hyperv/vmbus: Move MSR EOM to hyperv_reg.h
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC
  Differential Revision:	https://reviews.freebsd.org/D6567

Modified:
  head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  head/sys/dev/hyperv/vmbus/hyperv_reg.h

Modified: head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c	Fri May 27 06:30:35 2016	(r300829)
+++ head/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c	Fri May 27 06:47:04 2016	(r300830)
@@ -118,7 +118,7 @@ handled:
 			 * This will cause message queue rescan to possibly
 			 * deliver another msg from the hypervisor
 			 */
-			wrmsr(HV_X64_MSR_EOM, 0);
+			wrmsr(MSR_HV_EOM, 0);
 		}
 	}
 }
@@ -170,7 +170,7 @@ hv_vmbus_isr(struct vmbus_softc *sc, str
 			 * This will cause message queue rescan to possibly
 			 * deliver another msg from the hypervisor
 			 */
-			wrmsr(HV_X64_MSR_EOM, 0);
+			wrmsr(MSR_HV_EOM, 0);
 		}
 	}
 

Modified: head/sys/dev/hyperv/vmbus/hyperv_reg.h
==============================================================================
--- head/sys/dev/hyperv/vmbus/hyperv_reg.h	Fri May 27 06:30:35 2016	(r300829)
+++ head/sys/dev/hyperv/vmbus/hyperv_reg.h	Fri May 27 06:47:04 2016	(r300830)
@@ -70,6 +70,8 @@
 #define MSR_HV_SIMP_RSVD_MASK		0x0ffeULL
 #define MSR_HV_SIMP_PGSHIFT		12
 
+#define MSR_HV_EOM			0x40000084
+
 #define MSR_HV_SINT0			0x40000090
 #define MSR_HV_SINT_VECTOR_MASK		0x00ffULL
 #define MSR_HV_SINT_RSVD1_MASK		0xff00ULL